[Rt-commit] rt branch, 4.6-theme/admin-queues-pages, created. rt-4.4.4-204-gfbaa1ce66
Blaine Motsinger
blaine at bestpractical.com
Tue Apr 30 16:42:49 EDT 2019
The branch, 4.6-theme/admin-queues-pages has been created
at fbaa1ce66c66ae34840e1c5d3df128f265b23762 (commit)
- Log -----------------------------------------------------------------
commit 5b6b4553814ec6e99431204374dfc971c5e3b3c9
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..bfedf6d39 100644
--- a/share/html/Admin/Queues/index.html
+++ b/share/html/Admin/Queues/index.html
@@ -56,18 +56,31 @@
<input type="hidden" name="<% $field %>" value="<% $ARGS{ $field } %>" />
% }
-<select name="QueueField">
+ <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>
+ </select>
<& /Elements/SelectMatch, Name => 'QueueOp', Default => $QueueOp &>
-<input type="text" size="8" name="QueueString" value="<% $QueueString %>" />
+<input type="text" class="form-control" size="8" name="QueueString" value="<% $QueueString %>" />
<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 e05e6e449b46781aa538dc64338be4c24f17e3f5
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 4998c96f17883453024aa2560a802e3682c69478
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 9bcebfce333dcdf63c2bdddd1364d61181c8662a
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 2f76f8e2060e8a3fe83bc295f538fc79f816b758
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 a901f4d03e1806640da1a8f51ad3784038a09f5b
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 fbaa1ce66c66ae34840e1c5d3df128f265b23762
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>
-----------------------------------------------------------------------
More information about the rt-commit
mailing list