Dev: Reodered buttons in user groups table also added border to buttons

LimeSurvey · Jul 14, 2021 · 53a3d78 · 53a3d78
1 parent a107cb2
commit 53a3d78
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/application/controllers/UserGroupController.php b/application/controllers/UserGroupController.php
@@ -1,5 +1,7 @@
 <?php
-
+/**
+ * UserGroupController
+ **/
 class UserGroupController extends LSBaseController
 {
     /**

diff --git a/application/models/UserGroup.php b/application/models/UserGroup.php
@@ -317,29 +317,29 @@ public function getColumns()
     }
 
     /**
+     * Returns the buttons for grid view
      * @return string
      */
     public function getButtons()
     {
-
-        // View users
-        $url = Yii::app()->createUrl("userGroup/viewGroup/ugid/$this->ugid");
-        $button = '<a class="btn btn-default list-btn" data-toggle="tooltip" data-placement="left" title="' . gT('View users') . '" href="' . $url . '" role="button"><span class="fa fa-list-alt" ></span></a>';
-
         // Edit user group
         if (Permission::model()->hasGlobalPermission('usergroups', 'update')) {
             $url = Yii::app()->createUrl("userGroup/edit/ugid/$this->ugid");
-            $button .= ' <a class="btn btn-default list-btn" data-toggle="tooltip" data-placement="left" title="' . gT('Edit user group') . '" href="' . $url . '" role="button"><span class="fa fa-pencil" ></span></a>';
+            $button = ' <a class="btn btn-default list-btn green-border" style="margin-right: 5px;" data-toggle="tooltip" data-placement="left" title="' . gT('Edit user group') . '" href="' . $url . '" role="button"><span class="fa fa-pencil" ></span></a>';
         }
 
+        // View users
+        $url = Yii::app()->createUrl("userGroup/viewGroup/ugid/$this->ugid");
+        $button .= '<a class="btn btn-default list-btn" data-toggle="tooltip" data-placement="left" title="' . gT('View users') . '" href="' . $url . '" role="button"><span class="fa fa-list-alt" ></span></a>';
+
         // Mail to user group
         // Which permission should be checked for this button to be available?
         $url = Yii::app()->createUrl("userGroup/mailToAllUsersInGroup/ugid/$this->ugid");
         $button .= ' <a class="btn btn-default list-btn" data-toggle="tooltip" data-placement="left" title="' . gT('Email user group') . '" href="' . $url . '" role="button"><span class="icon-invite" ></span></a>';
 
         // Delete user group
         if (Permission::model()->hasGlobalPermission('usergroups', 'delete')) {
-            $button .= ' <span data-toggle="tooltip" title="' . gT('Delete user group') . '"><button class="btn btn-default list-btn action__delete-group" data-placement="left" href="#delete-modal" data-toggle="modal" data-ugid="' . $this->ugid . '" role="button"><i class="fa fa-trash text-warning"></i></button></span>';
+            $button .= ' <span data-toggle="tooltip" title="' . gT('Delete user group') . '"><button class="btn btn-default list-btn red-border action__delete-group" data-placement="left" href="#delete-modal" data-toggle="modal" data-ugid="' . $this->ugid . '" role="button"><i class="fa fa-trash"></i></button></span>';
         }
 
         return $button;