[Rt-commit] rtir branch, 4.2-theme/migrate-to-elevator-themes, repushed

[Blaine Motsinger]

The branch 4.2-theme/migrate-to-elevator-themes was deleted and repushed:
       was 368d9bee2b1525fe7f03caffa8ad44a1a15045ac
       now 9a3a7649064ccabbae7e42427a387ab27503e194

 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: 2cfbb20f = 14: 2cfbb20f Migrate RTIR/Edit to elevator themes
15: 21508531 = 15: 21508531 Migrate RTIR/Advanced to elevator themes
16: 8cdb81b7 = 16: 8cdb81b7 Fix articles tests for RT 4.6 articles refactor
17: 291dc8c1 = 17: 291dc8c1 Fix button styles
18: 9296bdf0 = 18: 9296bdf0 Fix position of topactions
19: c0637290 ! 19: 4a1f81bb Fix label and value row alignment
    @@ -162,12 +162,35 @@
        </div>
      % }
     @@
    -       <&|/l&>Queue</&>:
    +       &>
          </div>
    -     <div class="value col-md-9">
    --      <span class="current-value form-control"><& /Ticket/Elements/ShowQueue, QueueObj => $QueueObj &></span>
    -+      <span class="current-value"><& /Ticket/Elements/ShowQueue, QueueObj => $QueueObj &></span>
    + % }
    ++  </div>
    + % if ( !$QueueObj->SLADisabled ) {
    +-    <div class="form-row">
    +-      <div class="label col-md-3">
    +-        <&|/l&>SLA</&>:
    +-      </div>
    +-      <div class="value col-md-9">
    +-        <& /Elements/SelectSLA,
    ++  <div class="form-row">
    ++    <div class="label col-md-3">
    ++      <&|/l&>SLA</&>:
    ++    </div>
    ++    <div class="value col-md-9">
    ++      <& /Elements/SelectSLA,
    +           Name         => 'SLA',
    +           Default      => $ARGS{SLA} || RT::SLA->GetDefaultServiceLevel(Queue => $QueueObj),
    +           DefaultValue => RT::SLA->GetDefaultServiceLevel(Queue => $QueueObj) ? 0 : 1,
    +           QueueObj     => $QueueObj,
    +-        &>
    +-      </div>
    ++      &>
          </div>
    +-% }
        </div>
    -   <div class="form-row">
    ++% }
    + 
    + <& /RTIR/Elements/EditCustomFields,
    +     %ARGS,
     
20: a0e89d8a = 20: cd706a1c Fix nav and header to match RT styling
21: 368d9bee ! 21: 9a3a7649 Fix message box alignment to match RT styling
    @@ -40,6 +40,31 @@
      
        <& /Ticket/Elements/AddAttachments, %ARGS, QueueObj => $QueueObj &>
     
    +diff --git a/html/RTIR/Elements/UpdateData b/html/RTIR/Elements/UpdateData
    +--- a/html/RTIR/Elements/UpdateData
    ++++ b/html/RTIR/Elements/UpdateData
    +@@
    + </div>
    + % }
    + 
    +-<div class="form-row">
    +-  <div class="label col-md-3">
    +-    <&|/l&>Message</&>:
    +-  </div>
    +-  <div class="value col-md-9">
    ++<div class="form-group">
    + <& /Articles/Elements/BeforeMessageBox, %ARGS &>
    + % $m->callback( %ARGS, CallbackPage => '/Ticket/Update.html', CallbackName => 'BeforeMessageBox' );
    + % if ( exists $ARGS{'UpdateContent'} ) {
    +@@
    + % } else {
    + <& /Elements/MessageBox, Name => "UpdateContent", %ARGS &>
    + % }
    +-  </div>
    + </div>
    + 
    + <%ARGS>
    +
     diff --git a/html/RTIR/Incident/Create.html b/html/RTIR/Incident/Create.html
     --- a/html/RTIR/Incident/Create.html
     +++ b/html/RTIR/Incident/Create.html