[Rt-commit] rt branch, 4.6-theme/admin-global-pages, created. rt-4.4.4-184-gd687efcbe

[Craig Kaiser]

The branch, 4.6-theme/admin-global-pages has been created
        at  d687efcbebecc693b6b1589a5aac68fb9edd0f9a (commit)

- Log -----------------------------------------------------------------
commit d687efcbebecc693b6b1589a5aac68fb9edd0f9a
Author: Craig Kaiser <craig at bestpractical.com>
Date:   Thu Apr 18 09:39:34 2019 -0400

    Update styling on group rights page for elevator theme

diff --git a/share/html/Admin/Elements/EditRights b/share/html/Admin/Elements/EditRights
index 3bcf0059d..e97744e61 100644
--- a/share/html/Admin/Elements/EditRights
+++ b/share/html/Admin/Elements/EditRights
@@ -174,19 +174,20 @@ if ($anchor =~ /AddPrincipal/) {
 
 <div class="rights-editor clearfix">
   <input type="hidden" value="" name="Anchor" />
-
   <ul>
 <%perl>
 for my $category (@$Principals) {
     my ($name, $collection, $col, $loc) = @$category;
 </%perl>
-<li class="category"><% loc($name) %></li>
+    <div class="col-md-12 category">
+       <span class="current-value form-control"><% loc($name) %></span>
+    </div>
 <%perl>
     while ( my $obj = $collection->Next ) {
         my $display = ref $col eq 'CODE' ? $col->($obj) : $obj->$col;
         my $id = "acl-" . $obj->PrincipalId;
 </%perl>
-<li><a href="#<% $id %>"><span class="rights-editor-label" id="<% "principal-tab-$id" %>"><% $loc ? loc($display) : $display %></span></a></li>
+    <li><a href="#<% $id %>"><span class="rights-editor-label" id="<% "principal-tab-$id" %>"><% $loc ? loc($display) : $display %></span></a></li>
 <%perl>
     }
 }
@@ -195,7 +196,7 @@ for my $category (@$Principals) {
     <li class="category"><&|/l, loc($AddPrincipal) &>Add [_1]</&></li>
     <li class="addprincipal">
       <a href="#acl-AddPrincipal">
-        <input type="text" value=""
+        <input type="text" value="" class="form-control"
             data-autocomplete="<% lc $AddPrincipal eq 'user' ? 'Users' : 'Groups' %>"
 % if ( lc $AddPrincipal eq 'user' ) {
             data-autocomplete-return="Name"
diff --git a/share/html/Admin/Elements/EditRightsCategoryTabs b/share/html/Admin/Elements/EditRightsCategoryTabs
index 14b4bdc69..e93f7ef59 100644
--- a/share/html/Admin/Elements/EditRightsCategoryTabs
+++ b/share/html/Admin/Elements/EditRightsCategoryTabs
@@ -105,32 +105,38 @@ $available_rights{$_} = loc( $available_rights{$_} ) for keys %available_rights;
     <div class="category-tabs">
       <ul>
 % for my $category (sort { $catsort{$a} <=> $catsort{$b} } keys %categories) {
-        <li><a href="#<% "$id-$category" %>"><span class="rights-editor-label" id="<% "category-tab-$id-$category" %>"><% $category_desc{$category} || loc($category) %></span></a></li>
+        <li><a href="#<% "$id-$category" %>"><span class="current-value form-control rights-editor-label" id="<% "category-tab-$id-$category" %>"><% $category_desc{$category} || loc($category) %></span></a></li>
 % }
       </ul>
 % for my $category (sort { $catsort{$a} <=> $catsort{$b} } keys %categories) {
-    <div id="<% "$id-$category" %>">
-    <ul class="rights-list">
+    <div id="<% "$id-$category" %>" class="col-md-12">
+      <ul class="rights-list">
+        <div class="form-row">
 %     for my $right (sort { $available_rights{$a} cmp $available_rights{$b} } @{$categories{$category}}) {
-      <li>
-        <input
-            type="checkbox"
-            class="checkbox"
-            name="SetRights-<% $acldesc %>"
-            id="SetRights-<% $acldesc %>-<% $right %>"
-            value="<% $right %>"
-            data-category-tab="<% "category-tab-$id-$category" %>"
-            data-principal-tab="<% "principal-tab-$id" %>"
-            <% $current_rights{$right} ? 'checked' : '' %>
-        />
-        <label for="SetRights-<% $acldesc %>-<% $right %>" title="<% $right %>">
-          <% $available_rights{$right} %>
-          <span class="separator">—</span>
-          <span class="rightname"><% $right %></span>
-        </label>
-      </li>
+          <div class="col-md-12">
+            <div class="form-row">
+              <div class="custom-control custom-checkbox">
+                <input
+                  type="checkbox"
+                  class="checkbox"
+                  name="SetRights-<% $acldesc %>"
+                  id="SetRights-<% $acldesc %>-<% $right %>"
+                  value="<% $right %>"
+                  data-category-tab="<% "category-tab-$id-$category" %>"
+                  data-principal-tab="<% "principal-tab-$id" %>"
+                  <% $current_rights{$right} ? 'checked' : '' %>
+                />
+              </div>
+              <label for="SetRights-<% $acldesc %>-<% $right %>" title="<% $right %>">
+                <% $available_rights{$right} %>
+                <span class="separator">—</span>
+                <span class="rightname"><% $right %></span>
+              </label>
+            </div>
+          </div>
 %     }
-    </ul>
+        </div>
+      </ul>
     </div>
 % }
     </div>
diff --git a/share/html/Admin/Global/GroupRights.html b/share/html/Admin/Global/GroupRights.html
index 985d00101..8ab06da7a 100644
--- a/share/html/Admin/Global/GroupRights.html
+++ b/share/html/Admin/Global/GroupRights.html
@@ -51,7 +51,11 @@
 
 <form method="post" action="GroupRights.html" id="ModifyGroupRights" name="ModifyGroupRights">
   <& /Admin/Elements/EditRights, Context => $RT::System, Principals => \@principals &>
-  <& /Elements/Submit, Label => loc('Save Changes') &>
+  <div class="form-row">
+    <div class="col-md-12">
+      <& /Elements/Submit, Label => loc('Save Changes') &>
+    </div>
+  </div>
 </form>
   
 <%INIT>

-----------------------------------------------------------------------