[Rt-commit] rtir branch, 4.2-theme/countermeasures-page, created. 4.0.1rc1-91-g99cbc820

Blaine Motsinger blaine at bestpractical.com
Wed Aug 28 19:36:16 EDT 2019


The branch, 4.2-theme/countermeasures-page has been created
        at  99cbc820d8ca735c8f462ee6a935efa04850f923 (commit)

- Log -----------------------------------------------------------------
commit 99cbc820d8ca735c8f462ee6a935efa04850f923
Author: Blaine Motsinger <blaine at bestpractical.com>
Date:   Wed Aug 28 18:34:41 2019 -0500

    WIP - Migrate RTIR/Display to elevator themes
    
    This commit migrates the Countermeasure display page and elements
    to the elevator themes.

diff --git a/html/RTIR/Display.html b/html/RTIR/Display.html
index b0d55166..94d70e29 100644
--- a/html/RTIR/Display.html
+++ b/html/RTIR/Display.html
@@ -55,9 +55,8 @@
 
 <div class="summary"><&| /Widgets/TitleBox, title => loc('Ticket metadata') &>
 
-<table class="ticket-summary" width="100%">
-<tr>
-<td class="boxcontainer" valign="top">
+<div class="row ticket-summary">
+  <div class="boxcontainer col-md-6">
 % $m->callback( %ARGS, Ticket => $Ticket, CallbackName => 'LeftColumnStart' );
 
 <&| /Widgets/TitleBox,
@@ -65,44 +64,53 @@
     title_href  => RT::IR->HREFTo("Edit.html?id=".$Ticket->Id),
     class => 'ticket-info-basics',
 &>
-<table class="basics">
 % if (my $constituency = RT::IR->ConstituencyFor($Ticket)) {
-  <tr>
-    <td class="label"><% loc("Constituency") %>:</td>
-    <td class="value">
+  <div class="form-row">
+    <div class="col-md-3 label">
+      <% loc("Constituency") %>
+    </div>
+    <div class="col-md-9 value">
       <% $constituency %>
-    </td>
-  </tr>
-  <tr>
-
+    </div>
+  </div>
 % }
-  <tr>
-    <td class="label"><% loc("Status") %>:</td>
-    <td class="value">
+  <div class="form-row">
+    <div class="col-md-3 label">
+      <% loc("Status") %>:
+    </div>
+    <div class="col-md-9 value">
       <% $Ticket->Status %>
-    </td>
-  </tr>
+    </div>
+  </div>
 % if ( !$Ticket->QueueObj->SLADisabled ) {
-  <tr class="sla">
-    <td class="label"><&|/l&>SLA</&>:</td>
-    <td class="value"><% loc($Ticket->SLA) %></td>
-  </tr>
+  <div class="form-row sla">
+    <div class="col-md-3 label">
+      <&|/l&>SLA</&>:
+    </div>
+    <div class="col-md-9 value">
+      <% loc($Ticket->SLA) %>
+    </div>
+  </div>
 % }
-  <tr>
-    <td class="label"><% loc("Incident") %>:</td>
-    <td class="value">
+  <div class="form-row">
+    <div class="col-md-3 label">
+      <% loc("Incident") %>:
+    </div>
+    <div class="col-md-9 value">
       <& /RTIR/Elements/ShowIncidents, Ticket => $Ticket &>
-    </td>
-  </tr>
-  <tr>
-    <td class="label"><&|/l&>Time Worked</&>:</td>
-    <td class="value"><%loc('[_1] min', $TimeWorked)%></td>
-  </tr>
+    </div>
+  </div>
+  <div class="form-row">
+    <div class="col-md-3 label">
+      <&|/l&>Time Worked</&>:
+    </div>
+    <div class="col-md-9 value">
+      <%loc('[_1] min', $TimeWorked)%>
+    </div>
+  </div>
 
   <& /Elements/ShowCustomFields, Grouping => 'Basics', Object => $Ticket, Table => 0 &>
 
-</table>
-
 </&>
 
 <& /Elements/ShowCustomFieldCustomGroupings,
@@ -115,7 +123,8 @@
 <& /Ticket/Elements/ShowAttachments, Ticket => $Ticket,
    Attachments => $attachments &>
 
-</td> <td class="boxcontainer" valign="top">
+  </div>
+  <div class="boxcontainer col-md-6">
 % $m->callback( %ARGS, Ticket => $Ticket, CallbackName => 'RightColumnStart' );
 
     <&| /Widgets/TitleBox,
@@ -134,9 +143,8 @@
 % $m->callback( %ARGS, Ticket => $Ticket, CallbackName => 'BeforeRequestor' );
     <br />  
       <& /Ticket/Elements/ShowRequestor, Ticket => $Ticket, DisplayPath => RT::IR->HREFTo("Display.html") &>
-  </td>
-</tr>
-</table>
+  </div>
+</div>
 
 </&></div>
 
diff --git a/html/RTIR/Elements/ShowIncidents b/html/RTIR/Elements/ShowIncidents
index 1e76990b..6e07a7ba 100644
--- a/html/RTIR/Elements/ShowIncidents
+++ b/html/RTIR/Elements/ShowIncidents
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2018 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2019 Best Practical Solutions, LLC
 %#                                          <sales at bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -57,10 +57,10 @@
 &>
 <div class="actions">
 % unless ( $action ) {
-<a class="button button-small" id="link-incident" href="<% RT::IR->HREFTo('Link/ToIncident/?id='. $id ) %>">Link</a>
-<a class="button button-small" id="create-incident" href="<% RT::IR->HREFTo('CreateInQueue.html?Lifecycle=' . RT::IR->lifecycle_incident . '&Child='. $id ) %>">New</a>
+<a class="button button-small btn btn-lg btn-primary" id="link-incident" href="<% RT::IR->HREFTo('Link/ToIncident/?id='. $id ) %>">Link</a>
+<a class="button button-small btn btn-lg btn-primary" id="create-incident" href="<% RT::IR->HREFTo('CreateInQueue.html?Lifecycle=' . RT::IR->lifecycle_incident . '&Child='. $id ) %>">New</a>
 % } elsif ( $action ne 'No' ) {
-<a class="button button-small" href="<% RT::IR->HREFTo('Display.html?Action='. $action.'&id='. $id) %>"><% loc( $action ) %></a>
+<a class="button button-small btn btn-lg btn-primary" href="<% RT::IR->HREFTo('Display.html?Action='. $action.'&id='. $id) %>"><% loc( $action ) %></a>
 % }
 </div>
 </span>
@@ -98,7 +98,7 @@ my $query = RT::IR->RelevantIncidentsQuery( $Ticket );
 my $format = RT->Config->Get('RTIRSearchResultFormats')->{'ListIncidents'};
 my $dformat = $format;
 if ( $show_unlink ) {
-    $dformat .= ", '<a class=\"button\" href=\"". RT::IR->HREFTo("Display.html?id=$id&DeleteLink--MemberOf-__id__=1").\">". loc('Unlink') ."</a>/TITLE:'";
+    $dformat .= ", '<a class=\"button button-small btn btn-lg btn-primary\" href=\"". RT::IR->HREFTo("Display.html?id=$id&DeleteLink--MemberOf-__id__=1").\">". loc('Unlink') ."</a>/TITLE:'";
 }
 </%INIT>
 

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


More information about the rt-commit mailing list