Fixed issue #12592: No ''Delete this user'' message

LimeSurvey · Oct 12, 2017 · b35e30f · b35e30f
1 parent 051a3a6
commit b35e30f
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/application/models/User.php b/application/models/User.php
@@ -331,7 +331,9 @@ class='btn btn-default btn-xs action_usercontrol_button'>
                         "action"=> "deluser"
                     ));
 
-                $deleteUser = "<button
+                $deleteUser = "
+                <span style='mar0;padding:0;' data-toggle='tooltip' title='".gT('Delete this user')."'>
+                <button
                 data-toggle='modal'
                 data-href='#'
                 data-onclick='$.post(".$deleteUrl.",{
@@ -345,7 +347,7 @@ class='btn btn-default btn-xs action_usercontrol_button'>
                 data-message='".gT("Delete this user")."'
                 class='btn btn-default btn-xs'>
                     <span class='fa fa-trash  text-danger'></span>
-                </button>";
+                </button></span>";
             }
         } else {
             if (Permission::model()->hasGlobalPermission('superadmin','read')
@@ -382,7 +384,8 @@ class='btn btn-default btn-xs'>
                     ));
 
                      //'admin/user/sa/deluser'
-                    $deleteUser = "<button
+                    $deleteUser = "<span style='margin:0;padding:0;display: inline-block;' data-toggle='tooltip' title='".gT('Delete this user')."'>
+                    <button
                         id='delete_user_".$this->uid."'
                         data-toggle='modal'
                         data-target='#confirmation-modal'
@@ -394,7 +397,7 @@ class='btn btn-default btn-xs'>
                         data-message='".gT("Do you want to delete this user?")."'
                         class='btn btn-default btn-xs '>
                             <span class='fa fa-trash  text-danger'></span>
-                        </button>";
+                        </button></span>";
                 }
 
                 if (Yii::app()->session['loginID'] == "1" && $this->parent_id !=1 ) {