[Rt-commit] rtir branch, 4.2-theme/migrate-to-elevator-themes, repushed
Blaine Motsinger
blaine at bestpractical.com
Mon Sep 23 16:46:27 EDT 2019
The branch 4.2-theme/migrate-to-elevator-themes was deleted and repushed:
was faf57f5699eea8eed5ac82ea9b4d4b755de454f8
now 2cfbb20fc2b89eb042bea8b9b336f7712c7511f5
1: 857706ac = 1: 857706ac Migrate RTIR/index to elevator themes
2: b6a39e7d = 2: b6a39e7d Migrate RTIR/Display to elevator themes
3: be8d48a6 = 3: be8d48a6 Fix has_watchers test regex for elevator themes
4: a18bd87e = 4: a18bd87e Fix ticket_is_linked_to_inc test regex for elevator themes
5: e42a2dff = 5: e42a2dff Migrate RTIR/Incident/Display to elevator themes
6: ecec102a = 6: ecec102a Migrate RTIR/Incident/Create to elevator themes
7: 09016018 = 7: 09016018 Migrate RTIR/Create to elevator themes
8: 24691153 = 8: 24691153 Migrate RTIR/Tools/Lookup to elevator themes
9: 3833dcfe = 9: 3833dcfe Migrate RTIR/Reporting to elevator themes
10: 7d376de2 = 10: 7d376de2 Migrate RTIR/Incident/Reply to elevator themes
11: a8537ca4 = 11: a8537ca4 Migrate RTIR/Update to elevator themes
12: f02a0744 = 12: f02a0744 Migrate RTIR/Merge to elevator themes
13: 74dbe3d5 = 13: 74dbe3d5 Migrate modals to new elevator themes
14: faf57f56 ! 14: 2cfbb20f Migrate RTIR/Edit to elevator themes
@@ -1,10 +1,6 @@
Author: Blaine Motsinger <blaine at bestpractical.com>
Migrate RTIR/Edit to elevator themes
-
- WIP
-
- still needs RTIR/Elements/EditPeople
diff --git a/html/RTIR/Edit.html b/html/RTIR/Edit.html
--- a/html/RTIR/Edit.html
@@ -215,3 +211,252 @@
% if ( !RT::IR->IsIncidentQueue($Ticket->QueueObj)) {
<&| /Widgets/TitleBox, title => loc('People'), class => 'ticket-info-people' &>
+
+diff --git a/html/RTIR/Elements/AddWatchers b/html/RTIR/Elements/AddWatchers
+--- a/html/RTIR/Elements/AddWatchers
++++ b/html/RTIR/Elements/AddWatchers
+@@
+
+ <&|/l&>Add new Correspondents</&>:<br />
+
+-<table>
+ % if ( $Users ) {
+-<tr><td><&|/l&>Type</&></td><td><&|/l&>Username</&></td></tr>
+-% while ( my $u = $Users->Next ) {
+-<tr><td><& /Elements/SelectWatcherType, Name => "Ticket-AddWatcher-Principal-". $u->PrincipalId, Queue => $Ticket->QueueObj &></td>
+-<td><& /Elements/ShowUser, User => $u &></td></tr>
++ <div class="form-row">
++ <div class="col-md-3">
++ <&|/l&>Type</&>
++ </div>
++ <div class="col-md-3">
++ <&|/l&>Username</&>
++ </div>
++ </div>
++% while (my $u = $Users->Next ) {
++ <div class="form-row">
++ <div class="col-md-3">
++ <& /Elements/SelectWatcherType, Name => "Ticket-AddWatcher-Principal-". $u->PrincipalId, Queue => $Ticket->QueueObj &>
++ </div>
++ <div class="col-md-3">
++ <span class="form-control current-value">
++ <& /Elements/ShowUser, User => $u &>
++ </span>
++ </div>
++ </div>
+ % }
+ % }
+
+ % if ( $Groups->Count ) {
+-<tr><td><&|/l&>Type</&></td><td><&|/l&>Group</&></td></tr>
+-% while ( my $g = $Groups->Next ) {
+-<tr><td><& /Elements/SelectWatcherType, Name => "Ticket-AddWatcher-Principal-". $g->PrincipalId, Scope => 'queue', Queue => $Ticket->QueueObj &></td>
+-<td><% $g->Name %> (<% $g->Description||'' %>)</td></tr>
++ <div class="form-row">
++ <div class="col-md-3">
++ <&|/l&>Type</&>
++ </div>
++ <div class="col-md-auto">
++ <&|/l&>Group</&>
++ </div>
++ </div>
++% while (my $g = $Groups->Next ) {
++ <div class="form-row">
++ <div class="col-md-3">
++ <& /Elements/SelectWatcherType, Name => "Ticket-AddWatcher-Principal-". $g->PrincipalId, Scope => 'queue', Queue => $Ticket->QueueObj &>
++ </div>
++ <div class="col-md-auto">
++ <span class="form-control current-value">
++ <% $g->Name %> (<% $g->Description||'' %>)
++ </span>
++ </div>
++ </div>
+ % }
+ % }
+
+-<tr><td><&|/l&>Type</&></td><td><&|/l&>Email</&></td></tr>
++ <div class="form-row">
++ <div class="col-md-3">
++ <&|/l&>Type</&>
++ </div>
++ <div class="col-md-3">
++ <&|/l&>Email</&>
++ </div>
++ </div>
+
+-<tr><td><& /Elements/SelectWatcherType, Name => "WatcherTypeEmail1", Queue => $Ticket->QueueObj &></td>
+-<td><input type="text" name="WatcherAddressEmail1" size="15" /></td></tr>
++ <div class="form-row">
++ <div class="col-md-3">
++ <& /Elements/SelectWatcherType, Name => "WatcherTypeEmail1", Queue => $Ticket->QueueObj &>
++ </div>
++ <div class="col-md-3">
++ <input type="text" class="form-control" name="WatcherAddressEmail1" size="20" />
++ </div>
++ </div>
+
+-<tr><td><& /Elements/SelectWatcherType, Name => "WatcherTypeEmail2", Queue => $Ticket->QueueObj &></td>
+-<td><input type="text" name="WatcherAddressEmail2" size="15" /></td></tr>
++ <div class="form-row">
++ <div class="col-md-3">
++ <& /Elements/SelectWatcherType, Name => "WatcherTypeEmail2", Queue => $Ticket->QueueObj &>
++ </div>
++ <div class="col-md-3">
++ <input type="text" class="form-control" name="WatcherAddressEmail2" size="20" />
++ </div>
++ </div>
+
+-<tr><td><& /Elements/SelectWatcherType, Name => "WatcherTypeEmail3", Queue => $Ticket->QueueObj &></td>
+-<td><input type="text" name="WatcherAddressEmail3" size="15" /></td></tr>
+-
+-</table>
++ <div class="form-row">
++ <div class="col-md-3">
++ <& /Elements/SelectWatcherType, Name => "WatcherTypeEmail3", Queue => $Ticket->QueueObj &>
++ </div>
++ <div class="col-md-3">
++ <input type="text" class="form-control" name="WatcherAddressEmail3" size="20" />
++ </div>
++ </div>
+
+ <%INIT>
+ my ($Users, $Groups);
+
+diff --git a/html/RTIR/Elements/EditPeople b/html/RTIR/Elements/EditPeople
+--- a/html/RTIR/Elements/EditPeople
++++ b/html/RTIR/Elements/EditPeople
+@@
+ %# those contributions and any derivatives thereof.
+ %#
+ %# END BPS TAGGED BLOCK }}}
+-<table>
+-<tr>
+-<td valign="top" width="50%">
+-<h3><&|/l&>Current Correspondents</&></h3>
+-<table>
+- <tr>
+- <td> </td>
+- <td><&|/l&>(Check box to delete)</&></td>
+- <tr>
+- <td class="labeltop">
+- <&|/l&>Correspondents</&>:
+- </td>
+- <td class="value">
+- <& /Ticket/Elements/EditWatchers, TicketObj => $Ticket, Watchers => $Ticket->Requestors &>
+- </td>
+- </tr>
+- <tr>
+- <td height="1" colspan="2" bgcolor="#999999"></td>
+- <tr>
+- <tr>
+- <td class="labeltop">
+- <&|/l&>Cc</&>:
+- </td>
+- <td class="value">
+- <& /Ticket/Elements/EditWatchers, TicketObj => $Ticket, Watchers => $Ticket->Cc &>
+- </td>
+- </tr>
+- <tr>
+- <td height="1" colspan="2" bgcolor="#999999"></td>
+- <tr>
+- <td class="labeltop">
+- <&|/l&>Admin Cc</&>:
+- </td>
+- <td class="value">
+- <& /Ticket/Elements/EditWatchers, TicketObj => $Ticket, Watchers => $Ticket->AdminCc &>
+- </td>
+- </tr>
++<div class="row">
+
++ <div class="col-md-6">
++ <h3><&|/l&>Current Correspondents</&></h3>
++ <div class="form-row">
++ <div class="label col-md-3 empty">
++ </div>
++ <div class="value col-md-9">
++ <span class="current-value form-control"><&|/l&>(Check box to delete)</&></span>
++ </div>
++ </div>
++ <div class="form-row">
++ <div class="label col-md-3">
++ <&|/l&>Correspondents</&>:
++ </div>
++ <div class="value col-md-9">
++ <& /Ticket/Elements/EditWatchers, TicketObj => $Ticket, Watchers => $Ticket->Requestors &>
++ </div>
++ </div>
++ <div class="form-row">
++ <div class="label col-md-3">
++ <&|/l&>Cc</&>:
++ </div>
++ <div class="value col-md-9">
++ <& /Ticket/Elements/EditWatchers, TicketObj => $Ticket, Watchers => $Ticket->Cc &>
++ </div>
++ </div>
++ <div class="form-row">
++ <div class="label col-md-3">
++ <&|/l&>Admin Cc</&>:
++ </div>
++ <div class="value col-md-9">
++ <& /Ticket/Elements/EditWatchers, TicketObj => $Ticket, Watchers => $Ticket->AdminCc &>
++ </div>
++ </div>
+ % my $multi_roles = $Ticket->QueueObj->CustomRoles;
+ % $multi_roles->LimitToMultipleValue;
+ % while (my $role = $multi_roles->Next) {
+-
+- <tr>
+- <td height="1" colspan="2" bgcolor="#999999"></td>
+- <tr>
+- <td class="labeltop">
+- <% $role->Name %>:
+- </td>
+- <td class="value">
+- <& /Ticket/Elements/EditWatchers, Watchers => $Ticket->RoleGroup($role->GroupType), TicketObj => $Ticket &>
+- </td>
+-
+- </tr>
++ <div class="form-row">
++ <div class="label col-md-3">
++ <% $role->Name %>:
++ </div>
++ <div class="value col-md-9">
++ <& /Ticket/Elements/EditWatchers, Watchers => $Ticket->RoleGroup($role->GroupType), TicketObj => $Ticket &>
++ </div>
++ </div>
+ % }
+-</table>
+-
+-</td>
+-<td valign="top" width="50%">
++ </div>
+
+-<h3><&|/l&>New Correspondents</&></h3>
+-<&|/l&>Find people whose</&><br />
+-<& /Elements/SelectUsers &>
+-<input type="submit" name="OnlySearchForPeople" value="<&|/l&>Go!</&>" />
++ <div class="col-md-6">
++ <h3><&|/l&>New Correspondents</&></h3>
++ <&|/l&>Find people whose</&><br />
++ <div class="form-row">
++ <& /Elements/SelectUsers &>
++ <div class="col-auto">
++ <input type="submit" class="button btn btn-lg btn-primary form-control" name="OnlySearchForPeople" value="<&|/l&>Go!</&>" />
++ </div>
++ </div>
+
+-<& AddWatchers, Ticket => $Ticket, UserString => $UserString,
+- UserOp => $UserOp, UserField => $UserField &>
+-</td>
+-</tr>
++ <& AddWatchers, Ticket => $Ticket, UserString => $UserString, UserOp => $UserOp, UserField => $UserField &>
++ </div>
+
+-<& /Elements/EditCustomFields, Object => $Ticket, Grouping => 'People', InTable => 1 &>
++ <& /Elements/EditCustomFields, Object => $Ticket, Grouping => 'People', InTable => 1 &>
+
+-</table>
++</div>
+
+ <%ARGS>
+ $UserField => undef
More information about the rt-commit
mailing list