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

Craig Kaiser craig at bestpractical.com
Thu Apr 25 10:42:32 EDT 2019


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

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

    Migrate RroupRights page to 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 3b560192d68662d4c4f77cf44917de2550b293fa
Author: Craig Kaiser <craig at bestpractical.com>
Date:   Fri Apr 19 09:09:30 2019 -0400

    Migrate Template page to elevator theme

diff --git a/share/html/Admin/Elements/ModifyTemplate b/share/html/Admin/Elements/ModifyTemplate
index 9aeb15a32..cd565493e 100644
--- a/share/html/Admin/Elements/ModifyTemplate
+++ b/share/html/Admin/Elements/ModifyTemplate
@@ -45,34 +45,47 @@
 %# 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">
-
-<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">
+    <label class="label col-md-3">
+      <&|/l&>Name</&>:
+    </label>
+    <div class="value col-md-9">
+      <input class="form-control" type="text" name="Name" value="<%$Name||''%>" size="80" />
+    </div>
+  </div>
+  <div class="form-row">
+    <label class="label col-md-3">
+      <&|/l&>Description</&>:
+    </label>
+    <div class="value col-md-9">
+      <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 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>
 
 unless ($Type) {
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>
 
 

commit 69678493c1b7ea968630844b3356f16c30ca727a
Author: Craig Kaiser <craig at bestpractical.com>
Date:   Tue Apr 23 15:59:35 2019 -0400

    Migrate UserRights page to elevator theme

diff --git a/share/html/Admin/Global/UserRights.html b/share/html/Admin/Global/UserRights.html
index be0a225b2..2a6e137aa 100644
--- a/share/html/Admin/Global/UserRights.html
+++ b/share/html/Admin/Global/UserRights.html
@@ -51,7 +51,11 @@
 
 <form method="post" action="UserRights.html" name="ModifyUserRights" id="ModifyUserRights">
   <& /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>
 my @results = ProcessACLs(\%ARGS);

commit 03661b1819491a66175f73953995d4f3f7050f14
Author: Craig Kaiser <craig at bestpractical.com>
Date:   Tue Apr 23 16:06:45 2019 -0400

    Migrate global MyRT page to elevator theme

diff --git a/share/html/Admin/Global/MyRT.html b/share/html/Admin/Global/MyRT.html
index f582af6e5..ff8bb32ae 100644
--- a/share/html/Admin/Global/MyRT.html
+++ b/share/html/Admin/Global/MyRT.html
@@ -52,7 +52,11 @@
 <br />
 % for my $pane (@panes) {
 <&|/Widgets/TitleBox, title => loc('RT at a glance').': '.loc($pane->{Name}), bodyclass => "" &>
-<& /Widgets/SelectionBox:show, self => $pane &></&>
+<div class="form-row">
+  <div class="col-md-12">
+    <& /Widgets/SelectionBox:show, self => $pane &></&>
+  </div>
+</div>
 <br />
 % }
 <%init>

commit b69dcb1d339e15aa7dcad404e670212e6c576a75
Author: Craig Kaiser <craig at bestpractical.com>
Date:   Tue Apr 23 16:08:01 2019 -0400

    Migrate DashboardsInMenu page to elevator theme

diff --git a/share/html/Admin/Global/DashboardsInMenu.html b/share/html/Admin/Global/DashboardsInMenu.html
index 21b12077a..f5750ccec 100644
--- a/share/html/Admin/Global/DashboardsInMenu.html
+++ b/share/html/Admin/Global/DashboardsInMenu.html
@@ -52,7 +52,11 @@
 <br />
 % for my $pane (@panes) {
 <&|/Widgets/TitleBox, title => loc('Dashboards in menu'), bodyclass => "" &>
-<& /Widgets/SelectionBox:show, self => $pane &></&>
+<div class="form-row">
+  <div class="col-md-12">
+    <& /Widgets/SelectionBox:show, self => $pane &></&>
+  </div>
+</div>
 <br />
 % }
 <%init>

commit bc6d8179dd66da618011ebc8ff37da546ff1f74c
Author: Craig Kaiser <craig at bestpractical.com>
Date:   Tue Apr 23 16:51:17 2019 -0400

    Migrate Topics page to elevator theme

diff --git a/share/html/Admin/Articles/Elements/Topics b/share/html/Admin/Articles/Elements/Topics
index 6d46dc1b9..946c888f1 100644
--- a/share/html/Admin/Articles/Elements/Topics
+++ b/share/html/Admin/Articles/Elements/Topics
@@ -51,16 +51,22 @@
 <input type="hidden" name="id" value="<%$RootObj->Id%>" />
 
 % if (!$Modify) {
-<table>
-<tr>
-<td><&|/l&>Topic Name</&></td>
-<td><input type="text" name="Name" size="30" /></td>
-</tr>
-<tr>
-<td><&|/l&>Description</&></td>
-<td><input type="text" name="Description" size="50" /></td>
-</tr>
-</table>
+<div class="form-row">
+  <div class="label col-md-3">
+    <&|/l&>Topic Name</&>
+  </div>
+  <div class="value col-md-9">
+    <input class="form-control" type="text" name="Name" size="30" />
+  </div>
+</div>
+<div class="form-row">
+  <div class="label col-md-3">
+    <&|/l&>Description</&>
+  </div>
+  <div class="value col-md-9">
+    <input class="form-control" type="text" name="Description" size="50" />
+  </div>
+</div>
 % } else {
 <a href="Topics.html">New topic</a>
 % }
@@ -71,18 +77,25 @@
 
 <%def .edit>
  
-<table style="margin-top: -0.75em">
-<tr>
-    <td>Topic Name:</td>
-    <td><input type="text" name="Topic-<%$topic->Id%>-Name" size="20" value="<%$topic->Name%>" /></td>
-    <td><input type="submit" name="Update" value="Update"><br /></td>
-</tr>
-<tr>
-    <td>Description:</td>
-    <td> <input type="text" name="Topic-<%$topic->Id%>-Description" size="20" value="<%$topic->Description%>" /></td>
-    <td><input type="submit" name="Delete-Topic-<%$topic->Id%>" value="Delete" /></td>
-</tr>
-</table>
+<div class="form-row">
+  <div class="label col-md-3">
+    Topic Name:
+  </div>
+  <div class="value col-md-9">
+    <input class="form-control" type="text" name="Topic-<%$topic->Id%>-Name" size="20" value="<%$topic->Name%>" />
+  </div>
+  <input type="submit" name="Update" value="Update">
+</div>
+
+<div class="form-row">
+  <div class="label col-md-3">
+    Description:
+  </div>
+  <div class="value col-md-9">
+    <input class="form-control" type="text" name="Topic-<%$topic->Id%>-Description" size="20" value="<%$topic->Description%>" />
+  </div>
+  <input type="submit" name="Delete-Topic-<%$topic->Id%>" value="Delete" />
+</div>
 <%args>
 $topic
 </%args>

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


More information about the rt-commit mailing list