[Rt-commit] rt branch, 4.6-theme/admin-queues-pages, created. rt-4.4.4-207-ge2d13bb20

Blaine Motsinger blaine at bestpractical.com
Thu May 2 17:40:50 EDT 2019


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

- Log -----------------------------------------------------------------
commit 42344a85a12ecfc79ea053df40dd0f195b364a1e
Author: Blaine Motsinger <blaine at bestpractical.com>
Date:   Thu Apr 25 15:08:13 2019 -0500

    Migrate Admin/Queues/index to elevator themes

diff --git a/share/html/Admin/Queues/index.html b/share/html/Admin/Queues/index.html
index c2e95d380..4fb79be47 100644
--- a/share/html/Admin/Queues/index.html
+++ b/share/html/Admin/Queues/index.html
@@ -56,18 +56,40 @@
 <input type="hidden" name="<% $field %>" value="<% $ARGS{ $field } %>" />
 % }
 
-<select name="QueueField">
+  <div class="form-row">
+    <div class="col-md-1">
+      <select name="QueueField" class="form-control selectpicker">
 % foreach my $col (qw(Name Description CorrespondAddress CommentAddress Lifecycle SubjectTag)) {
-<option <% $QueueField eq $col ? 'selected="selected"' : '' |n %> value="<% $col %>"><% loc($col) %></option>
+        <option <% $QueueField eq $col ? 'selected="selected"' : '' |n %> value="<% $col %>"><% loc($col) %></option>
 % }
-</select>
-<& /Elements/SelectMatch, Name => 'QueueOp', Default => $QueueOp &>
-<input type="text" size="8" name="QueueString" value="<% $QueueString %>" />
+      </select>
+    </div>
+    <div class="col-md-1">
+      <& /Elements/SelectMatch, Name => 'QueueOp', Default => $QueueOp &>
+    </div>
+    <div class="col-md-1">
+      <input type="text" class="form-control" size="8" name="QueueString" value="<% $QueueString %>" />
+    </div>
+  </div>
+
 <br />
 
-<input type="checkbox" class="checkbox" id="FindDisabledQueues" name="FindDisabledQueues" value="1" <% $FindDisabledQueues? 'checked="checked"': '' |n%> />
-<label for="FindDisabledQueues"><&|/l&>Include disabled queues in listing.</&></label>
-<div align="right"><input type="submit" class="button" value="<&|/l&>Go!</&>" /></div>
+  <div class="form-row">
+    <div class="col-md-12">
+      <div class="custom-control custom-checkbox">
+        <input type="checkbox" class="custom-control-input checkbox" id="FindDisabledQueues" name="FindDisabledQueues" value="1" <% $FindDisabledQueues? 'checked="checked"': '' |n%> />
+        <label class="custom-control-label" for="FindDisabledQueues"><&|/l&>Include disabled queues in listing.</&></label>
+      </div>
+    </div>
+  </div>
+
+  <div class="form-row">
+    <div class="col-md-12">
+      <div align="right">
+        <input type="submit" class="form-control btn btn-primary" value="<&|/l&>Go!</&>" />
+      </div>
+    </div>
+  </div>
 </form>
 
 <p><&|/l&>Select a queue</&>:</p>

commit 915db7a0c53981ca63de898850ed6d6901067173
Author: Blaine Motsinger <blaine at bestpractical.com>
Date:   Thu Apr 25 17:54:56 2019 -0500

    Migrate Admin/Queues/DefaultValues to elevator themes

diff --git a/share/html/Admin/Queues/DefaultValues.html b/share/html/Admin/Queues/DefaultValues.html
index 201e8c8ab..650949f5c 100644
--- a/share/html/Admin/Queues/DefaultValues.html
+++ b/share/html/Admin/Queues/DefaultValues.html
@@ -53,85 +53,109 @@
 <input type="hidden" name="id" value="<% $queue->id %>" />
 
 <div class="ticket-info-basics">
-    <&| /Widgets/TitleBox, title => loc('Basics') &>
-    <table>
-    <tr><td class="label"><&|/l&>Priority</&>:</td>
-    <td><& /Elements/SelectPriority,
-        Name => "InitialPriority",
-        Default => $queue->DefaultValue('InitialPriority'),
-    &></td></tr>
-    <tr><td class="label"><&|/l&>Final Priority</&>:</td>
-    <td><& /Elements/SelectPriority,
-        Name => "FinalPriority",
-        Default => $queue->DefaultValue('FinalPriority'),
-    &><br /><span><em><&|/l&>requires running rt-crontool</&></em></span></td></tr>
-    <& /Elements/EditCustomFields,
-        Object => RT::Ticket->new($session{CurrentUser}),
-        CustomFields => $queue->TicketCustomFields->LimitToDefaultValuesSupportedTypes,
-        Grouping => 'Basics',
-        InTable => 1,
-    &>
-    </table>
-    </&>
+  <&| /Widgets/TitleBox, title => loc('Basics') &>
+  <div class="form-row">
+    <div class="col-md-3 label">
+      <&|/l&>Priority</&>:
+    </div>
+    <div class="col-md-9 value">
+      <& /Elements/SelectPriority, Name => "InitialPriority", Default => $queue->DefaultValue('InitialPriority') &>
+    </div>
+  </div>
+
+  <div class="form-row">
+    <div class="col-md-3 label">
+      <&|/l&>Final Priority</&>:
+    </div>
+    <div class="col-md-9 value">
+      <& /Elements/SelectPriority, Name => "FinalPriority", Default => $queue->DefaultValue('FinalPriority') &>
+      <br />
+      <span><em><&|/l&>requires running rt-crontool</&></em></span>
+    </div>
+  </div>
+
+  <& /Elements/EditCustomFields,
+      Object => RT::Ticket->new($session{CurrentUser}),
+      CustomFields => $queue->TicketCustomFields->LimitToDefaultValuesSupportedTypes,
+      Grouping => 'Basics',
+      InTable => 1,
+  &>
+  </&>
 </div>
 
 <div class="ticket-info-dates">
-    <&|/Widgets/TitleBox, title => loc("Dates") &>
-    <table>
-    <tr><td class="label"><&|/l&>Starts</&>:</td><td><& /Elements/SelectDate, Name => "Starts", Default => $queue->DefaultValue('Starts') || '' &></td></tr>
-    <tr><td class="label"><&|/l&>Due</&>:</td><td><& /Elements/SelectDate, Name => "Due", Default => $queue->DefaultValue('Due') || '' &></td></tr>
-    <& /Elements/EditCustomFields,
-        Object => RT::Ticket->new($session{CurrentUser}),
-        CustomFields => $queue->TicketCustomFields->LimitToDefaultValuesSupportedTypes,
-        Grouping => 'Dates',
-        InTable => 1,
-    &>
-    </table>
-    </&>
+  <&|/Widgets/TitleBox, title => loc("Dates") &>
+  <div class="form-row">
+    <div class="col-md-3 label">
+      <&|/l&>Starts</&>:
+    </div>
+    <div class="col-md-9 value">
+      <& /Elements/SelectDate, Name => "Starts", Default => $queue->DefaultValue('Starts') || '' &>
+    </div>
+  </div>
+
+  <div class="form-row">
+    <div class="col-md-3 label">
+      <&|/l&>Due</&>:
+    </div>
+    <div class="col-md-9 value">
+      <& /Elements/SelectDate, Name => "Due", Default => $queue->DefaultValue('Due') || '' &>
+    </div>
+  </div>
+
+  <& /Elements/EditCustomFields,
+      Object => RT::Ticket->new($session{CurrentUser}),
+      CustomFields => $queue->TicketCustomFields->LimitToDefaultValuesSupportedTypes,
+      Grouping => 'Dates',
+      InTable => 1,
+  &>
+  </&>
 </div>
 
 % if ( RT->Config->ObjectHasCustomFieldGrouping(Object => RT::Ticket->new($session{CurrentUser}), Grouping => 'People') ) {
 <div class="ticket-info-people">
-    <&|/Widgets/TitleBox, title => loc("People") &>
-    <table>
-    <& /Elements/EditCustomFields,
-        Object => RT::Ticket->new($session{CurrentUser}),
-        CustomFields => $queue->TicketCustomFields->LimitToDefaultValuesSupportedTypes,
-        Grouping => 'People',
-        InTable => 1,
-    &>
-    </table>
-    </&>
+  <&|/Widgets/TitleBox, title => loc("People") &>
+  <& /Elements/EditCustomFields,
+      Object => RT::Ticket->new($session{CurrentUser}),
+      CustomFields => $queue->TicketCustomFields->LimitToDefaultValuesSupportedTypes,
+      Grouping => 'People',
+      InTable => 1,
+  &>
+  </&>
 </div>
 % }
 
 % if ( RT->Config->ObjectHasCustomFieldGrouping(Object => RT::Ticket->new($session{CurrentUser}), Grouping => 'Links') ) {
 <div class="ticket-info-links">
-    <&|/Widgets/TitleBox, title => loc("Links") &>
-    <table>
-    <& /Elements/EditCustomFields,
-        Object => RT::Ticket->new($session{CurrentUser}),
-        CustomFields => $queue->TicketCustomFields->LimitToDefaultValuesSupportedTypes,
-        Grouping => 'Links',
-        InTable => 1,
-    &>
-    </table>
-    </&>
+  <&|/Widgets/TitleBox, title => loc("Links") &>
+  <& /Elements/EditCustomFields,
+      Object => RT::Ticket->new($session{CurrentUser}),
+      CustomFields => $queue->TicketCustomFields->LimitToDefaultValuesSupportedTypes,
+      Grouping => 'Links',
+      InTable => 1,
+  &>
+  </&>
 </div>
 % }
 
 <& /Elements/EditCustomFieldCustomGroupings, CustomFieldGenerator => sub { $queue->TicketCustomFields->LimitToDefaultValuesSupportedTypes }, Object => RT::Ticket->new($session{CurrentUser}) &>
 
 <div class="ticket-info-cfs">
-    <&|/Widgets/TitleBox, title => loc("Transaction Custom Fields") &>
-    <table>
-    <& /Elements/EditCustomFields, CustomFields => $queue->TicketTransactionCustomFields->LimitToDefaultValuesSupportedTypes, Object => RT::Transaction->new($session{CurrentUser}), QueueObj => $queue, InTable => 1 &>
-    </table>
-    </&>
+  <&|/Widgets/TitleBox, title => loc("Transaction Custom Fields") &>
+  <& /Elements/EditCustomFields, CustomFields => $queue->TicketTransactionCustomFields->LimitToDefaultValuesSupportedTypes, Object => RT::Transaction->new($session{CurrentUser}), QueueObj => $queue, InTable => 1 &>
+  </&>
 </div>
 
-<& /Elements/Submit, Name => 'Update', Label => loc('Save Changes') &>
-<& /Elements/Submit, Name => 'Reset', Label => loc('Reset Custom Field Values to Default') &>
+<div class="form-row">
+  <div class="col-md-12">
+    <& /Elements/Submit, Name => 'Update', Label => loc('Save Changes') &>
+  </div>
+</div>
+<div class="form-row">
+  <div class="col-md-12">
+    <& /Elements/Submit, Name => 'Reset', Label => loc('Reset Custom Field Values to Default') &>
+  </div>
+</div>
 </form>
 
 <%INIT>

commit ccee1f8adca7c3d48348b2a3c4f20c3d7912b889
Author: Blaine Motsinger <blaine at bestpractical.com>
Date:   Thu Apr 25 18:00:13 2019 -0500

    Migrate Admin/Queues/GroupRights to elevator themes

diff --git a/share/html/Admin/Queues/GroupRights.html b/share/html/Admin/Queues/GroupRights.html
index 110dbd07e..9b975d669 100644
--- a/share/html/Admin/Queues/GroupRights.html
+++ b/share/html/Admin/Queues/GroupRights.html
@@ -56,7 +56,11 @@
 
   <& /Admin/Elements/EditRights, Context => $QueueObj, 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 85c1c83e369809a67bb1594cf1e5dbb606955e45
Author: Blaine Motsinger <blaine at bestpractical.com>
Date:   Tue Apr 30 15:34:50 2019 -0500

    Migrate Admin/Queues/People to elevator themes

diff --git a/share/html/Admin/Queues/People.html b/share/html/Admin/Queues/People.html
index a18447a3b..2ec8bc962 100644
--- a/share/html/Admin/Queues/People.html
+++ b/share/html/Admin/Queues/People.html
@@ -55,83 +55,98 @@
 <form method="post" action="People.html">
 <input type="hidden" class="hidden" name="id" value="<%$QueueObj->Id%>" />
 
-<table width="100%">
-<tr>
-<td valign="top" >
+  <div class="row">
+    <div class="boxcontainer current-watchers col-xl-6">
+      <h3><&|/l&>Current watchers</&></h3>
 
-<h3><&|/l&>Current watchers</&></h3>
-
-<i><&|/l&>(Check box to delete)</&></i><br /><br />
+      <i><&|/l&>(Check box to delete)</&></i><br /><br />
 
 % for my $Name ($QueueObj->ManageableRoleGroupTypes) {
-    <& /Admin/Elements/EditQueueWatcherGroup,
-        Label    => loc($QueueObj->LabelForRole($Name)),
-        QueueObj => $QueueObj,
-        Watchers => $QueueObj->RoleGroup($Name, CheckRight => 'SeeQueue')
-    &>
+      <& /Admin/Elements/EditQueueWatcherGroup,
+          Label    => loc($QueueObj->LabelForRole($Name)),
+          QueueObj => $QueueObj,
+          Watchers => $QueueObj->RoleGroup($Name, CheckRight => 'SeeQueue')
+      &>
 % }
 
 % $m->callback(CallbackName => 'CurrentWatchers', QueueObj => $QueueObj);
-
-</td>
-<td valign="top">
-<h3><&|/l&>New watchers</&></h3>
-
-<&|/l&>Find people whose</&><br />
-<& /Elements/SelectUsers &>
-<input type="submit" class="button" name="OnlySearchForPeople" value="<&|/l&>Go!</&>" />
-<br />
-<&|/l&>Find groups whose</&><br />
-<& /Elements/SelectGroups &>
-<input type="submit" class="button" name="OnlySearchForGroup" value="<&|/l&>Go!</&>" />
-
-<p>
-<&|/l&>Add new watchers</&>:<br />
-<p>
-<strong><&|/l&>Users</&></strong>
+    </div>
+
+    <div class="boxcontainer new-watchers col-xl-6">
+      <h3><&|/l&>New watchers</&></h3>
+      <&|/l&>Find people whose</&><br />
+      <div class="form-row">
+        <& /Elements/SelectUsers &>
+        <div class="col-auto">
+          <input type="submit" class="button btn btn-primary form-control" name="OnlySearchForPeople" value="<&|/l&>Go!</&>" />
+        </div>
+      </div>
+      <br />
+
+      <&|/l&>Find groups whose</&><br />
+      <div class="form-row">
+        <& /Elements/SelectGroups &>
+        <div class="col-auto">
+          <input type="submit" class="button btn btn-primary form-control" name="OnlySearchForGroup" value="<&|/l&>Go!</&>" />
+        </div>
+      </div>
+
+      <br />
+      <&|/l&>Add new watchers</&>:<br />
+      <strong><&|/l&>Users</&></strong>
 % if ($user_msg) {
-<br />
-<em><%$user_msg%></em>
+      <br />
+      <em><%$user_msg%></em>
 % } elsif ($Users) {
-<ul>
 % while (my $u = $Users->Next ) {
-<li><& /Elements/SelectWatcherType,
-    Scope => 'queue',
-    Name  => "Queue-AddWatcher-Principal-". $u->PrincipalId,
-    Queue => $QueueObj,
-&>
-<& /Elements/ShowUser, User => $u &></li>
+      <div class="form-row">
+        <div class="col-md-3">
+          <& /Elements/SelectWatcherType,
+              Scope => 'queue',
+              Name  => "Queue-AddWatcher-Principal-". $u->PrincipalId,
+              Queue => $QueueObj,
+          &>
+        </div>
+        <div class="col-md-3">
+          <span class="form-control current-value">
+            <& /Elements/ShowUser, User => $u &>
+          </span>
+        </div>
+      </div>
 % }
-</ul>
 % }
 
-<p>
-<strong><&|/l&>Groups</&></strong>
-
+      <br />
+      <strong><&|/l&>Groups</&></strong>
 % if ($group_msg) {
-<br />
-<em><%$group_msg%></em>
+      <br />
+      <em><%$group_msg%></em>
 % } elsif ($Groups) {
-<ul>
 % while (my $g = $Groups->Next ) {
-<li><& /Elements/SelectWatcherType,
-    Scope => 'queue',
-    Name  => "Queue-AddWatcher-Principal-".$g->PrincipalId,
-    Queue => $QueueObj,
-&>
-<%$g->Name%> (<%$g->Description%>)
+      <div class="form-row">
+        <div class="col-md-3">
+          <& /Elements/SelectWatcherType,
+              Scope => 'queue',
+              Name  => "Queue-AddWatcher-Principal-".$g->PrincipalId,
+              Queue => $QueueObj,
+          &>
+        </div>
+        <div class="col-md-3">
+          <span class="form-control current-value">
+            <%$g->Name%> (<%$g->Description%>)
+          </span>
+        </div>
+      </div>
 % }
-</ul>
 % }
-
-</td>
-</tr>
-</table>
-
-
-
-
-<& /Elements/Submit, Label => loc('Save Changes'), Caption => loc("If you've updated anything above, be sure to"), Reset => 1 &>
+    </div>
+  </div>
+
+  <div class="form-row">
+    <div class="col-md-12">
+      <& /Elements/Submit, Label => loc('Save Changes'), Caption => loc("If you've updated anything above, be sure to"), Reset => 1 &>
+    </div>
+  </div>
 </form>
 
 <%INIT>

commit e4df941c471e456560f5df15a390a01d277e8da9
Author: Blaine Motsinger <blaine at bestpractical.com>
Date:   Tue Apr 30 15:37:26 2019 -0500

    Migrate Admin/Queues/Templates to elevator themes

diff --git a/share/html/Admin/Elements/EditTemplates b/share/html/Admin/Elements/EditTemplates
index c1708c209..f8c10c6dc 100644
--- a/share/html/Admin/Elements/EditTemplates
+++ b/share/html/Admin/Elements/EditTemplates
@@ -70,7 +70,12 @@
 <i><&|/l&>(Check box to delete)</&></i>
 % }
 
-<& /Elements/Submit, Label => loc('Delete Template') &>
+  <div class="form-row">
+    <div class="col-md-12">
+      <& /Elements/Submit, Label => loc('Delete Template') &>
+    </div>
+  </div>
+
 </form>
 
 <%INIT>

commit b71530fe4a166638db5a4ed94a3241325630a95d
Author: Blaine Motsinger <blaine at bestpractical.com>
Date:   Tue Apr 30 15:39:43 2019 -0500

    Migrate Admin/Queues/Template to elevator themes

diff --git a/share/html/Admin/Elements/ModifyTemplate b/share/html/Admin/Elements/ModifyTemplate
index 9aeb15a32..4780817a1 100644
--- a/share/html/Admin/Elements/ModifyTemplate
+++ b/share/html/Admin/Elements/ModifyTemplate
@@ -45,33 +45,48 @@
 %# 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="form-row">
+  <div class="col-md-3 label">
+    <&|/l&>Name</&>:
+  </div>
+  <div class="col-md-9 value">
+    <input type="text" class="form-control" name="Name" value="<%$Name||''%>" size="80" />
+  </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 />
+<div class="form-row">
+  <div class="col-md-3 label">
+    <&|/l&>Description</&>:
+  </div>
+  <div class="col-md-9 value">
+    <input type="text" class="form-control" name="Description" value="<%$Description||''%>" size="80" />
+  </div>
+</div>
 
-<input type="radio" name="Type" id="Type-Simple" value="Simple" <% $Type eq "Simple" ? 'checked="checked"' : "" |n %>>
-<label for="Type-Simple"><&|/l&>Simple</&></label><br />
+<div class="form-row">
+  <div class="col-md-3 label">
+    <&|/l&>Type</&>:
+  </div>
+  <div class="col-md-9 value">
+    <div class="custom-control custom-radio">
+      <input type="radio" name="Type" class="custom-control-input" 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 type="radio" name="Type" class="custom-control-input" 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>
 
-</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="form-row">
+  <div class="col-md-3 label">
+    <&|/l&>Content</&>:
+  </div>
+  <div class="col-md-9 value">
+    <textarea name="Content" class="form-control" rows="25" cols="80" wrap="soft"><%$Content||''%></textarea>
+  </div>
+</div>
 
 <%INIT>
 
diff --git a/share/html/Admin/Queues/Template.html b/share/html/Admin/Queues/Template.html
index 5d5bc1c71..e12ad84fb 100644
--- a/share/html/Admin/Queues/Template.html
+++ b/share/html/Admin/Queues/Template.html
@@ -64,7 +64,11 @@
     Content     => $TemplateObj->Content // $ARGS{Content},
     Type        => $TemplateObj->Type // $ARGS{Type},
 &>
-<& /Elements/Submit, Label => $SubmitLabel, Reset => 1 &>
+  <div class="form-row">
+    <div class="col-md-12">
+      <& /Elements/Submit, Label => $SubmitLabel, Reset => 1 &>
+    </div>
+  </div>
 </form>
 
 

commit bf9117f6fbe20363313805b1aeef475d9253ee14
Author: Blaine Motsinger <blaine at bestpractical.com>
Date:   Tue Apr 30 15:40:58 2019 -0500

     Migrate Admin/Queues/UserRights to elevator themes

diff --git a/share/html/Admin/Queues/UserRights.html b/share/html/Admin/Queues/UserRights.html
index f09d3c849..cb9e0d72e 100644
--- a/share/html/Admin/Queues/UserRights.html
+++ b/share/html/Admin/Queues/UserRights.html
@@ -57,7 +57,11 @@
 
   <& /Admin/Elements/EditRights, Context => $QueueObj, 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 443a35b3f54bf58b23fea8494b29dda7e3b7e801
Author: Blaine Motsinger <blaine at bestpractical.com>
Date:   Tue Apr 30 17:50:15 2019 -0500

    Migrate Admin/Queues/Modify to elevator themes

diff --git a/share/html/Admin/Elements/ShowKeyInfo b/share/html/Admin/Elements/ShowKeyInfo
index 9e2762fda..e76d3329f 100644
--- a/share/html/Admin/Elements/ShowKeyInfo
+++ b/share/html/Admin/Elements/ShowKeyInfo
@@ -45,7 +45,8 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
-<&| /Widgets/TitleBox, title => $title &><table>
+<&| /Widgets/TitleBox, title => $title &>
+
 % while ( my $protocol = shift @protocols ) {
 % my %res = RT::Crypt->GetKeyInfo(
 %     Protocol => $protocol,
@@ -53,48 +54,108 @@
 %     Type     => $Type,
 % );
 % if ( $res{'exit_code'} ) {
-<tr><th colspan="2"><% loc("Couldn't get [_1] keys information", $protocol) %></th></tr>
+<div class="form-row">
+  <div class="col-md-12">
+    <% loc("Couldn't get [_1] keys information", $protocol) %>
+  </div>
+</div>
 % } elsif ( !keys %{ $res{'info'} } ) {
-<tr><th colspan="2"><% loc('No [_1] keys for this address', $protocol) %></th></tr>
+<div class="form-row">
+  <div class="col-md-12">
+    <% loc('No [_1] keys for this address', $protocol) %>
+  </div>
+</div>
 % } else {
-
-<tr><th colspan="2"><% loc("[_1] key '[_2]'", $protocol, $res{'info'}{'Formatted'} ) %></th></tr>
+<div class="form-row">
+  <div class="col-md-12">
+    <% loc("[_1] key '[_2]'", $protocol, $res{'info'}{'Formatted'} ) %>
+  </div>
+</div>
 
 % if ( $Type ne 'private' && $res{'info'}{'Trust'} ) {
-<tr><th class="label"><% loc('Trust') %>:</th>  <td><% loc( $res{'info'}{'Trust'} ) %></td></tr>
+<div class="form-row">
+  <div class="col-md-3 label">
+    <% loc('Trust') %>:
+  </div>
+  <div class="col-md-9 value">
+    <span class="current-value form-control"><% loc( $res{'info'}{'Trust'} ) %></span>
+  </div>
+</div>
 % }
 
-<tr><th class="label"><% loc('Fingerprint') %>:</th>
-<td><% $res{'info'}{'Fingerprint'} %></td></tr>
+<div class="form-row">
+  <div class="col-md-3 label">
+    <% loc('Fingerprint') %>:
+  </div>
+  <div class="col-md-9 value">
+    <span class="current-value form-control"><% $res{'info'}{'Fingerprint'} %></span>
+  </div>
+</div>
 
 % $_->CurrentUser( $session{CurrentUser} ) for grep {$_} (@{$res{'info'}}{qw|Created Expire|});
-<tr><th class="label"><% loc('Created') %>:</th>
-<td><% $res{'info'}{'Created'}? $res{'info'}{'Created'}->AsString( Time => 0 ): loc('never') %></td></tr>
+<div class="form-row">
+  <div class="col-md-3 label">
+    <% loc('Created') %>:
+  </div>
+  <div class="col-md-9 value">
+    <span class="current-value form-control">
+      <% $res{'info'}{'Created'}? $res{'info'}{'Created'}->AsString( Time => 0 ): loc('never') %>
+    </span>
+  </div>
+</div>
 
-<tr><th class="label"><% loc('Expire') %>:</th>
-<td><% $res{'info'}{'Expire'}? $res{'info'}{'Expire'}->AsString( Time => 0 ): loc('never') %></td></tr>
+<div class="form-row">
+  <div class="col-md-3 label">
+    <% loc('Expire') %>:
+  </div>
+  <div class="col-md-9 value">
+    <span class="current-value form-control">
+      <% $res{'info'}{'Expire'}? $res{'info'}{'Expire'}->AsString( Time => 0 ): loc('never') %>
+    </span>
+  </div>
+</div>
 
 % foreach my $uinfo( @{ $res{'info'}{'User'} } ) {
 % if ($uinfo->{'Created'} or $uinfo->{'Expire'}) {
 %   $_->CurrentUser( $session{CurrentUser} ) for grep {$_} ($uinfo->{'Created'}, $uinfo->{'Expire'});
-<tr><th class="label"><% loc('User (created - expire)') %>:</th>
-<td><% $uinfo->{'String'} %> \
-(<% $uinfo->{'Created'}? $uinfo->{'Created'}->AsString( Time => 0 ): loc('never') %> - \
-<% $uinfo->{'Expire'}? $uinfo->{'Expire'}->AsString( Time => 0 ): loc('never') %>)</td></tr>
+<div class="form-row">
+  <div class="col-md-3 label">
+    <% loc('User (created - expire)') %>:
+  </div>
+  <div class="col-md-9 value">
+    <span class="current-value form-control">
+      <% $uinfo->{'String'} %> \
+     (<% $uinfo->{'Created'}? $uinfo->{'Created'}->AsString( Time => 0 ): loc('never') %> - \
+      <% $uinfo->{'Expire'}? $uinfo->{'Expire'}->AsString( Time => 0 ): loc('never') %>)
+    </span>
+  </div>
+</div>
 % } else {
-<tr><th class="label"><% loc('User') %>:</th>
-<td><% $uinfo->{'String'} %></td></tr>
+<div class="form-row">
+  <div class="col-md-3 label">
+    <% loc('User') %>:
+  </div>
+  <div class="col-md-9 value">
+    <span class="current-value form-control"><% $uinfo->{'String'} %></span>
+  </div>
+</div>
+
 % }
 % }
 
 % }
 
 % if ( @protocols ) {
-<tr><th colspan="2"> </th></tr>
+<div class="form-row">
+  <div class="col-md-12">
+     
+  </div>
+</div>
 % }
 
 % }
-</table></&>
+
+</&>
 
 <%ARGS>
 $EmailAddress
diff --git a/share/html/Admin/Queues/Modify.html b/share/html/Admin/Queues/Modify.html
index 6a5a57029..3d46d5d86 100644
--- a/share/html/Admin/Queues/Modify.html
+++ b/share/html/Admin/Queues/Modify.html
@@ -54,117 +54,190 @@
 <form action="<%RT->Config->Get('WebPath')%>/Admin/Queues/Modify.html" name="ModifyQueue" method="post" enctype="multipart/form-data">
 <input type="hidden" class="hidden" name="id" value="<% $Create? 'new': $QueueObj->Id %>" />
 % $m->callback( CallbackName => 'FormStart', Create => $Create, ARGSRef => \%ARGS );
-<table>
-<tr><td align="right"><&|/l&>Queue Name</&>:</td><td colspan="3">
+
+  <div class="form-row">
+    <div class="col-md-3 label">
+      <&|/l&>Queue Name</&>:
+    </div>
+    <div class="col-md-9 value">
 % if ($InternalQueue) {
-<% $QueueObj->Name %>
+      <% $QueueObj->Name %>
 % } else {
-<input type="text" name="Name" value="<% $Create ? "" : $QueueObj->Name || $Name %>" />
+      <input type="text" class="form-control" name="Name" value="<% $Create ? "" : $QueueObj->Name || $Name %>" />
 % }
-</td></tr>
+    </div>
+  </div>
 
-<tr><td align="right"><&|/l&>Description</&>:</td>
-<td colspan="3"><input type="text" name="Description" value="<% $Create ? "" : $QueueObj->Description || $Description || '' %>" size="60" /></td>
-</tr>
+  <div class="form-row">
+    <div class="col-md-3 label">
+      <&|/l&>Description</&>:
+    </div>
+    <div class="col-md-9 value">
+      <input type="text" class="form-control" name="Description" value="<% $Create ? "" : $QueueObj->Description || $Description || '' %>" size="60" />
+    </div>
+  </div>
 
-<tr><td align="right"><&|/l&>Lifecycle</&>:</td><td colspan="3">
+  <div class="form-row">
+    <div class="col-md-3 label">
+      <&|/l&>Lifecycle</&>:
+    </div>
+    <div class="col-md-9 value">
 % if ($InternalQueue) {
-<% $QueueObj->Lifecycle %>
+      <% $QueueObj->Lifecycle %>
 % } else {
-<& /Widgets/Form/Select:InputOnly,
-    Name         => 'Lifecycle',
-    Values       => [ sort { loc($a) cmp loc($b) } RT::Lifecycle->List ],
-    CurrentValue => $Create ? "default" : $QueueObj->Lifecycle || $ARGS{'Lifecycle'},
-    Default      => 0,
-&>
+      <& /Widgets/Form/Select:InputOnly,
+          Name         => 'Lifecycle',
+          Values       => [ sort { loc($a) cmp loc($b) } RT::Lifecycle->List ],
+          CurrentValue => $Create ? "default" : $QueueObj->Lifecycle || $ARGS{'Lifecycle'},
+          Default      => 0,
+      &>
 % }
-</td></tr>
+    </div>
+  </div>
+
+  <div class="form-row">
+    <div class="col-md-3 label">
+      <&|/l&>Subject Tag</&>:
+    </div>
+    <div class="col-md-9 value">
+      <input type="text" class="form-control" name="SubjectTag" value="<% $ARGS{'SubjectTag'} || ($Create ? "" : $QueueObj->SubjectTag || '' ) %>" size="60" />
+    </div>
+  </div>
 
-<tr><td align="right"><&|/l&>Subject Tag</&>:</td>
-<td colspan="3"><input type="text" name="SubjectTag" value="<% $ARGS{'SubjectTag'} || ($Create ? "" : $QueueObj->SubjectTag || '' ) %>" size="60" /></td>
-</tr>
+  <div class="form-row">
+    <div class="col-md-3 label">
+      <&|/l&>Sort Order</&>:
+    </div>
+    <div class="col-md-9 value">
+      <input type="text" class="form-control" name="SortOrder" value="<% $Create ? 0 : $QueueObj->SortOrder || $SortOrder || 0 %>" size="60" />
+    </div>
+  </div>
 
-<tr><td align="right"><&|/l&>Sort Order</&>:</td>
-<td colspan="3"><input type="text" name="SortOrder" value="<% $Create ? 0 : $QueueObj->SortOrder || $SortOrder || 0 %>" size="60" /></td>
-</tr>
+  <div class="form-row">
+    <div class="col-md-3 label">
+      <&|/l&>Reply Address</&>:
+    </div>
+    <div class="col-md-9 value">
+      <input type="email" class="form-control" name="CorrespondAddress" value="<% $Create ? "" : $QueueObj->CorrespondAddress || $CorrespondAddress || '' %>" />
+      <span><em><&|/l , RT->Config->Get('CorrespondAddress')&>(If left blank, will default to [_1])</&></em></span>
+    </div>
 
-<tr><td align="right"><&|/l&>Reply Address</&>:</td>
-<td><input type="email" name="CorrespondAddress" value="<% $Create ? "" : $QueueObj->CorrespondAddress || $CorrespondAddress || '' %>" />
-<br /><span><em><&|/l , RT->Config->Get('CorrespondAddress')&>(If left blank, will default to [_1])</&></em></span></td>
-<td align="right"><&|/l&>Comment Address</&>:</td>
-<td><input type="email" name="CommentAddress" value="<% $Create ? "" : $QueueObj->CommentAddress || $CommentAddress || '' %>" />
-<br /><span><em><&|/l , RT->Config->Get('CommentAddress')&>(If left blank, will default to [_1])</&></em></span></td>
-</tr>
+    <div class="col-md-3 label">
+      <&|/l&>Comment Address</&>:
+    </div>
+    <div class="col-md-9 value">
+      <input type="email" class="form-control" name="CommentAddress" value="<% $Create ? "" : $QueueObj->CommentAddress || $CommentAddress || '' %>" />
+      <span><em><&|/l , RT->Config->Get('CommentAddress')&>(If left blank, will default to [_1])</&></em></span>
+    </div>
+  </div>
 
-<tr><td align="right"><input type="checkbox" class="checkbox" id="SLAEnabled" name="SLAEnabled" value="1" 
+  <div class="form-row">
+    <div class="col-md-12">
+      <div class="custom-control custom-checkbox">
+        <input type="checkbox" class="custom-control-input checkbox" id="SLAEnabled" name="SLAEnabled" value="1" 
 % if ( $QueueObj->id && !$QueueObj->SLADisabled ) {
-checked="checked"
+        checked="checked"
 % }
- /></td>
-<td colspan="3"><label for="SLAEnabled"><&|/l&>SLA Enabled (Unchecking this box disables SLA for this queue)</&></label><br />
-<input type="hidden" class="hidden" name="SetSLAEnabled" value="1" />
-</td></tr>
+        />
+        <label class="custom-control-label" for="SLAEnabled"><&|/l&>SLA Enabled (Unchecking this box disables SLA for this queue)</&></label>
+        <input type="hidden" class="hidden" name="SetSLAEnabled" value="1" />
+      </div>
+    </div>
+  </div>
 
 % my $CFs = $QueueObj->CustomFields;
 % while (my $CF = $CFs->Next) {
-<tr valign="top"><td align="right">
-<% $CF->Name %>:
-</td><td>
-<& /Elements/EditCustomField, CustomField => $CF,
-                              Object => $QueueObj, &>
-</td></tr>
+  <div class="form-row">
+    <div class="col-md-3 label">
+      <% $CF->Name %>:
+    </div>
+    <div class="col-md-9 value">
+      <& /Elements/EditCustomField, CustomField => $CF,
+                                    Object => $QueueObj, &>
+    </div>
+  </div>
 % }
 
 % if ( RT->Config->Get('Crypt')->{'Enable'} ) {
-<tr><td align="right"><input type="checkbox" class="checkbox" id="Sign" name="Sign" value="1" <% $QueueObj->Sign? 'checked="checked"': '' |n%> /></td>
-<td><label for="Sign"><&|/l&>Sign by default</&></label></td>
-<td align="right"><input type="checkbox" class="checkbox" id="Encrypt" name="Encrypt" value="1" <% $QueueObj->Encrypt? 'checked="checked"': '' |n%> /></td>
-<td><label for="Encrypt"><&|/l&>Encrypt by default</&></label></td>
-</tr>
-<tr><td align="right"><input type="checkbox" class="checkbox" id="SignAuto" name="SignAuto" value="1" <% $QueueObj->SignAuto? 'checked="checked"': '' |n%> /></td>
-<td colspan="3"><label for="SignAuto"><&|/l_unsafe, "<b>","</b>","<i>","</i>"&>Sign all auto-generated mail.  [_1]Caution[_2]: Enabling this option alters the signature from providing [_3]authentication[_4] to providing [_3]integrity[_4].</&></label></td></tr>
+  <div class="form-row">
+    <div class="col-md-12">
+      <div class="custom-control custom-checkbox">
+        <input type="checkbox" class="custom-control-input checkbox" id="Sign" name="Sign" value="1" <% $QueueObj->Sign? 'checked="checked"': '' |n%> />
+        <label class="custom-control-label" for="Sign"><&|/l&>Sign by default</&></label>
+      </div>
+    </div>
+
+    <div class="col-md-12">
+      <div class="custom-control custom-checkbox">
+        <input type="checkbox" class="custom-control-input checkbox" id="Encrypt" name="Encrypt" value="1" <% $QueueObj->Encrypt? 'checked="checked"': '' |n%> />
+        <label class="custom-control-label" for="Encrypt"><&|/l&>Encrypt by default</&></label>
+      </div>
+    </div>
+  </div>
+
+  <div class="form-row">
+    <div class="col-md-12">
+      <div class="custom-control custom-checkbox">
+        <input type="checkbox" class="custom-control-input checkbox" id="SignAuto" name="SignAuto" value="1" <% $QueueObj->SignAuto? 'checked="checked"': '' |n%> />
+        <label class="custom-control-label" for="SignAuto"><&|/l_unsafe, "<b>","</b>","<i>","</i>"&>Sign all auto-generated mail.  [_1]Caution[_2]: Enabling this option alters the signature from providing [_3]authentication[_4] to providing [_3]integrity[_4].</&></label>
+      </div>
+    </div>
+  </div>
 % }
 
 % unless ($InternalQueue) {
-<tr><td align="right"><input type="checkbox" class="checkbox" id="Enabled" name="Enabled" value="1" <%$EnabledChecked|n%> /></td>
-<td colspan="3"><label for="Enabled"><&|/l&>Enabled (Unchecking this box disables this queue)</&></label><br />
-<input type="hidden" class="hidden" name="SetEnabled" value="1" />
+  <div class="form-row">
+    <div class="col-md-12">
+      <div class="custom-control custom-checkbox">
+        <input type="checkbox" class="custom-control-input checkbox" id="Enabled" name="Enabled" value="1" <%$EnabledChecked|n%> />
+        <label class="custom-control-label" for="Enabled"><&|/l&>Enabled (Unchecking this box disables this queue)</&></label>
+        <input type="hidden" class="hidden" name="SetEnabled" value="1" />
 % $m->callback( %ARGS, QueueObj => $QueueObj, results => \@results );
-</td></tr>
+      </div>
+    </div>
+  </div>
 % }
 
 % if ( RT->Config->Get('Crypt')->{'Enable'} ) {
-<tr><td colspan="4">
-<input type="hidden" class="hidden" name="SetCrypt" value="1" />
+  <div class="form-row">
+    <div class="col-md-12"> <% # colspan=4 %>
+      <input type="hidden" class="hidden" name="SetCrypt" value="1" />
 % if ( my $email = $QueueObj->CorrespondAddress || RT->Config->Get('CorrespondAddress') ) {
-<& /Admin/Elements/ShowKeyInfo, Type => 'private', EmailAddress => $email &>
+      <& /Admin/Elements/ShowKeyInfo, Type => 'private', EmailAddress => $email &>
 % } else {
-<&|/Widgets/TitleBox, title => loc( 'Private keys') &>
-<i><&|/l&>You have enabled encryption support but have not set a correspondence address for this queue.</&>
-<&|/l&>You must set a correspondence address for this queue in order to configure a private key.</&></i>
-</&>
+      <&|/Widgets/TitleBox, title => loc( 'Private keys') &>
+      <i><&|/l&>You have enabled encryption support but have not set a correspondence address for this queue.</&>
+      <&|/l&>You must set a correspondence address for this queue in order to configure a private key.</&></i>
+      </&>
 % }
-</td></tr>
-<tr><td colspan="4">
+    </div>
+  </div>
+
+  <div class="form-row">
+    <div class="col-md-12"> <% # colspan=4 %>
 % if ( my $email = $QueueObj->CommentAddress || RT->Config->Get('CommentAddress') ) {
-<& /Admin/Elements/ShowKeyInfo, Type => 'private', EmailAddress => $email &>
+      <& /Admin/Elements/ShowKeyInfo, Type => 'private', EmailAddress => $email &>
 % } else {
-<&|/Widgets/TitleBox, title => loc( 'Private keys') &>
-<i><&|/l&>You have enabled encryption support but have not set a comment address for this queue.</&>
-<&|/l&>You must set a comment address for this queue in order to configure a private key.</&></i>
-</&>
-%}
-</td></tr>
+      <&|/Widgets/TitleBox, title => loc( 'Private keys') &>
+      <i><&|/l&>You have enabled encryption support but have not set a correspondence address for this queue.</&>
+      <&|/l&>You must set a correspondence address for this queue in order to configure a private key.</&></i>
+      </&>
+% }
+    </div>
+  </div>
 % }
 
-</table>
+  <div class="form-row">
+    <div class="col-md-12">
 % if ( $Create ) {
-<& /Elements/Submit, Label => loc('Create') &>
+      <& /Elements/Submit, Label => loc('Create') &>
 % } else {
-<& /Elements/Submit, Label => loc('Save Changes') &>
+      <& /Elements/Submit, Label => loc('Save Changes') &>
 % }
-</form>
+    </div>
+  </div>
 
+</form>
 
 
 <%INIT>

commit 9736bbbd19dede6b1c1efd232219e0c76435a7bd
Author: Blaine Motsinger <blaine at bestpractical.com>
Date:   Wed May 1 18:06:29 2019 -0500

    Migrate Admin/Queues/Scrips to elevator themes

diff --git a/share/html/Admin/Elements/EditScrips b/share/html/Admin/Elements/EditScrips
index 4cb4d1a41..d5e21a545 100644
--- a/share/html/Admin/Elements/EditScrips
+++ b/share/html/Admin/Elements/EditScrips
@@ -66,11 +66,15 @@
 <p><i><&|/l&>(No scrips)</&></i></p>
 % }
 
-<& /Elements/Submit,
-    Name => 'RemoveScrips',
-    Caption => loc("Un-apply selected scrips"),
-    Label => loc("Update"),
-&>
+<div class="form-row">
+  <div class="col-md-12">
+    <& /Elements/Submit,
+        Name => 'RemoveScrips',
+        Caption => loc("Un-apply selected scrips"),
+        Label => loc("Update"),
+    &>
+  </div>
+</div>
 
 <h2><&|/l&>Not applied scrips</&></h2>
 % $scrips = $find_scrips->(Added => 0);
@@ -90,11 +94,15 @@
 
 <& SelectStageForAdded &>
 
-<& /Elements/Submit,
-    Name => 'AddScrips',
-    Caption => loc("Apply selected scrips"),
-    Label => loc("Update"),
-&>
+<div class="form-row">
+  <div class="col-md-12">
+    <& /Elements/Submit,
+        Name => 'AddScrips',
+        Caption => loc("Apply selected scrips"),
+        Label => loc("Update"),
+    &>
+  </div>
+</div>
 
 </form>
 

commit e2d13bb209e8f0a8e2e8666b66e8e51103ab397d
Author: Blaine Motsinger <blaine at bestpractical.com>
Date:   Wed May 1 19:01:03 2019 -0500

    Fix tests for whitespace differences

diff --git a/t/mail/gnupg-bad.t b/t/mail/gnupg-bad.t
index a9fd45a49..12f3c9fd5 100644
--- a/t/mail/gnupg-bad.t
+++ b/t/mail/gnupg-bad.t
@@ -17,7 +17,7 @@ $m->get( $baseurl.'/Admin/Queues/');
 $m->follow_link_ok( {text => 'General'} );
 $m->submit_form( form_number => 3,
          fields      => { CorrespondAddress => 'rt at example.com' } );
-$m->content_like(qr/rt\@example.com.* - never/, 'has key info.');
+$m->content_like(qr/rt\@example.com.* -\s*never/, 'has key info.');
 
 ok(my $user = RT::User->new(RT->SystemUser));
 ok($user->Load('root'), "Loaded user 'root'");
diff --git a/t/mail/gnupg-incoming.t b/t/mail/gnupg-incoming.t
index 54b30d2a3..3dc5bec37 100644
--- a/t/mail/gnupg-incoming.t
+++ b/t/mail/gnupg-incoming.t
@@ -29,7 +29,7 @@ $m->get( $baseurl.'/Admin/Queues/');
 $m->follow_link_ok( {text => 'General'} );
 $m->submit_form( form_number => 3,
                  fields      => { CorrespondAddress => 'general at example.com' } );
-$m->content_like(qr/general\@example.com.* - never/, 'has key info.');
+$m->content_like(qr/general\@example.com.* -\s*never/, 'has key info.');
 
 ok(my $user = RT::User->new(RT->SystemUser));
 ok($user->Load('root'), "Loaded user 'root'");
diff --git a/t/mail/gnupg-realmail.t b/t/mail/gnupg-realmail.t
index 1609cffbb..c4439dcd8 100644
--- a/t/mail/gnupg-realmail.t
+++ b/t/mail/gnupg-realmail.t
@@ -15,7 +15,7 @@ $m->get_ok( '/Admin/Queues/');
 $m->follow_link_ok( {text => 'General'} );
 $m->submit_form( form_number => 3,
          fields      => { CorrespondAddress => 'rt-recipient at example.com' } );
-$m->content_like(qr/rt-recipient\@example.com.* - never/, 'has key info.');
+$m->content_like(qr/rt-recipient\@example.com.* -\s*never/, 'has key info.');
 
 my $eid = 0;
 for my $usage (qw/signed encrypted signed&encrypted/) {
diff --git a/t/mail/gnupg-special.t b/t/mail/gnupg-special.t
index 15aad3489..7c67afb12 100644
--- a/t/mail/gnupg-special.t
+++ b/t/mail/gnupg-special.t
@@ -20,7 +20,7 @@ ok( $m->login, 'we did log in' );
         form_number => 3,
         fields      => { CorrespondAddress => 'rt-recipient at example.com' },
     );
-    $m->content_like(qr/rt-recipient\@example.com.* - never/, 'has key info.');
+    $m->content_like(qr/rt-recipient\@example.com.* -\s*never/, 'has key info.');
 }
 
 ok(my $user = RT::User->new(RT->SystemUser));

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


More information about the rt-commit mailing list