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

Craig Kaiser craig at bestpractical.com
Tue Apr 23 12:42:47 EDT 2019


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

- Log -----------------------------------------------------------------
commit 958dc501f1f5de87906b09f5369c766fa145a0ae
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..4ae76429f 100644
--- a/share/html/Admin/Elements/EditRights
+++ b/share/html/Admin/Elements/EditRights
@@ -174,7 +174,6 @@ if ($anchor =~ /AddPrincipal/) {
 
 <div class="rights-editor clearfix">
   <input type="hidden" value="" name="Anchor" />
-
   <ul>
 <%perl>
 for my $category (@$Principals) {
@@ -195,7 +194,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..06df2557d 100644
--- a/share/html/Admin/Elements/EditRightsCategoryTabs
+++ b/share/html/Admin/Elements/EditRightsCategoryTabs
@@ -105,30 +105,32 @@ $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" %>">
+    <div id="<% "$id-$category" %>" class="col-md-12">
     <ul class="rights-list">
 %     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>
+        <li>
+          <div class="custom-control custom-checkbox">
+            <input
+              type="checkbox"
+              class="custom-control-input"
+              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 class="custom-control-label" for="SetRights-<% $acldesc %>-<% $right %>" title="<% $right %>">
+              <% $available_rights{$right} %>
+              <span class="separator">—</span>
+              <span class="rightname"><% $right %></span>
+            </label>
+          </div>
+        </li>
 %     }
     </ul>
     </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>

commit 04c774ebf13f13748d5899ce993d08eeab76174e
Author: Craig Kaiser <craig at bestpractical.com>
Date:   Fri Apr 19 09:09:30 2019 -0400

    Update template pages for elevator theme

diff --git a/share/html/Admin/Elements/ModifyTemplate b/share/html/Admin/Elements/ModifyTemplate
index 9aeb15a32..8db1735dd 100644
--- a/share/html/Admin/Elements/ModifyTemplate
+++ b/share/html/Admin/Elements/ModifyTemplate
@@ -45,33 +45,38 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
-<table>
-<tr>
-<td class="label"><&|/l&>Name</&>:</td>
-<td class="value"><input type="text" name="Name" value="<%$Name||''%>" size="80" /></td>
-</tr>
-<tr>
-<td class="label"><&|/l&>Description</&>:</td>
-<td class="value"><input type="text" name="Description" value="<%$Description||''%>" size="80" /></td>
-</tr>
-<tr>
-<td class="label"><&|/l&>Type</&>:</td>
-<td class="value">
+<div class="col-md-12">
+  <div class="form-row">
+    <label class="label"><&|/l&>Name</&>:</label>
+    <div class="value"><input class="form-control" type="text" name="Name" value="<%$Name||''%>" size="80" /></div>
+  </div>
+  <div class="form-row">
+    <label class="label"><&|/l&>Description</&>:</label>
+    <div class="value"><input type="text" class="form-control" name="Description" value="<%$Description||''%>" size="80" /></div>
+  </div>
+  <div class="form-row">
+    <div><&|/l&>Type</&>:</div>
+    <div class="custom-control custom-radio">
+      <input class="custom-control-input" type="radio" name="Type" id="Type-Perl" value="Perl" <% $Type eq "Perl" ? 'checked="checked"' : "" |n %>></input>
+      <label class="custom-control-label" for="Type-Perl"><&|/l&>Perl</&></label><br />
+    </div>
+    <div class="custom-control custom-radio">
+      <input class="custom-control-input" type="radio" name="Type" id="Type-Simple" value="Simple" <% $Type eq "Simple" ? 'checked="checked"' : "" |n %>>
+      <label class="custom-control-label" for="Type-Simple"><&|/l&>Simple</&></label><br />
+    </div>
+  </div>
+</div>
 
-<input type="radio" name="Type" id="Type-Perl" value="Perl" <% $Type eq "Perl" ? 'checked="checked"' : "" |n %>></input>
-<label for="Type-Perl"><&|/l&>Perl</&></label><br />
-
-<input type="radio" name="Type" id="Type-Simple" value="Simple" <% $Type eq "Simple" ? 'checked="checked"' : "" |n %>>
-<label for="Type-Simple"><&|/l&>Simple</&></label><br />
-
-</td>
-</tr>
-<tr>
-<td class="label" valign="top"><&|/l&>Content</&>:</td>
-<td class="value"><textarea name="Content" rows="25" cols="80" wrap="soft">
-<%$Content||''%></textarea></td>
-</tr>
-</table>
+<div class="col-md-12">
+  <div class="form-row">
+    <div class="label" valign="top"><&|/l&>Content</&>:</div>
+  </div>
+  <div class="form-row">
+    <div class="value">
+      <textarea class="form-control" name="Content" rows="25" cols="80" wrap="soft"><%$Content||''%></textarea>
+    </div>
+  </div>
+</div>
 
 <%INIT>
 
diff --git a/share/html/Admin/Global/Template.html b/share/html/Admin/Global/Template.html
index f6cb55a9d..983ebfe2f 100644
--- a/share/html/Admin/Global/Template.html
+++ b/share/html/Admin/Global/Template.html
@@ -58,13 +58,22 @@
 
 %# hang onto the queue id
 <input type="hidden" class="hidden" name="Queue" value="<%$Queue%>" />
-<& /Admin/Elements/ModifyTemplate,
-    Name        => $TemplateObj->Name // $ARGS{Name},
-    Description => $TemplateObj->Description // $ARGS{Description},
-    Content     => $TemplateObj->Content // $ARGS{Content},
-    Type        => $TemplateObj->Type // $ARGS{Type},
-&>
-<& /Elements/Submit, Label => $SubmitLabel, Reset => 1 &>
+<div class="col-md-12">
+  <div class="form-row">
+    <& /Admin/Elements/ModifyTemplate,
+      Name        => $TemplateObj->Name // $ARGS{Name},
+      Description => $TemplateObj->Description // $ARGS{Description},
+      Content     => $TemplateObj->Content // $ARGS{Content},
+      Type        => $TemplateObj->Type // $ARGS{Type},
+    &>
+  </div>
+</div>
+
+<div class="form-row">
+  <div class="col-md-12">
+    <& /Elements/Submit, Label => $SubmitLabel, Reset => 1 &>
+  </div>
+</div>
 </form>
 
 

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


More information about the rt-commit mailing list