Fix #663

userfrosting · Mar 12, 2017 · e07e19f · e07e19f
1 parent 374614f
commit e07e19f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/app/sprinkles/admin/assets/local/pages/css/tablesorter-custom.css b/app/sprinkles/admin/assets/local/pages/css/tablesorter-custom.css
@@ -21,3 +21,10 @@
 .panel-heading-buttons h3 {
     padding-top: 7.5px;
 }
+
+/* Don't display tablesorter filter field when disabled
+   ========================================================================== */
+
+.tablesorter thead .disabled {
+    display: none
+}
diff --git a/app/sprinkles/admin/templates/components/tables/groups.html.twig b/app/sprinkles/admin/templates/components/tables/groups.html.twig
@@ -13,7 +13,7 @@
             <tr>
                 <th class="sorter-metatext" data-column-name="name" data-column-template="#group-table-column-info">{{translate('GROUP')}} <i class="fa fa-sort"></i></th>
                 <th class="sorter-metatext" data-column-name="description" data-column-template="#group-table-column-description">{{translate("DESCRIPTION")}} <i class="fa fa-sort"></i></th>
-                <th data-column-template="#group-table-column-actions">{{translate("ACTIONS")}} <i class="fa fa-sort"></i></th>
+                <th data-column-template="#group-table-column-actions" data-sorter="false" data-filter="false">{{translate("ACTIONS")}}</th>
             </tr>
         </thead>
         <tbody>
@@ -50,7 +50,7 @@
                     {% endverbatim %}{{translate("ACTIONS")}}{% verbatim %}
                     <span class="caret"></span>
                 </button>
-                <ul class="dropdown-menu" role="menu">
+                <ul class="dropdown-menu dropdown-menu-right" role="menu">
                     <li>
                         <a href="#" data-slug="{{row.slug}}" class="js-group-edit">
                         <i class="fa fa-edit"></i> {% endverbatim %}{{translate("GROUP.EDIT")}}{% verbatim %}

diff --git a/app/sprinkles/admin/templates/components/tables/roles.html.twig b/app/sprinkles/admin/templates/components/tables/roles.html.twig
@@ -13,7 +13,7 @@
             <tr>
                 <th class="sorter-metatext" data-column-name="name" data-column-template="#role-table-column-info">{{translate('ROLE')}} <i class="fa fa-sort"></i></th>
                 <th class="sorter-metatext" data-column-name="description" data-column-template="#role-table-column-description">{{translate('DESCRIPTION')}} <i class="fa fa-sort"></i></th>
-                <th data-column-template="#role-table-column-actions">{{translate('ACTIONS')}} <i class="fa fa-sort"></i></th>
+                <th data-column-template="#role-table-column-actions" data-sorter="false" data-filter="false">{{translate('ACTIONS')}}</th>
             </tr>
         </thead>
         <tbody>
@@ -50,7 +50,7 @@
                     {% endverbatim %}{{translate("ACTIONS")}}{% verbatim %}
                     <span class="caret"></span>
                 </button>
-                <ul class="dropdown-menu" role="menu">
+                <ul class="dropdown-menu dropdown-menu-right" role="menu">
                     <li>
                         <a href="#" data-slug="{{row.slug}}" class="js-role-permissions">
                         <i class="fa fa-key"></i> {% endverbatim %}{{translate("PERMISSION.MANAGE")}}{% verbatim %}

diff --git a/app/sprinkles/admin/templates/components/tables/users.html.twig b/app/sprinkles/admin/templates/components/tables/users.html.twig
@@ -78,7 +78,7 @@
                         </button>
                     {{/ifCond }}
                 {{/ifCond }}
-                <ul class="dropdown-menu" role="menu">
+                <ul class="dropdown-menu dropdown-menu-right" role="menu">
                     {{#ifCond row.flag_verified 0 }}
                     <li>
                         <a href="#" data-user_name="{{row.user_name}}" class="js-user-activate">