[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 8e1f970af1cd337273d79a4aa09f9afd39bb7503
       now 24691153ebec349c5efa32baefb8173cafdddde1

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: 8e1f970a ! 8: 24691153 Migrate RTIR/Tools/Lookup to elevator themes
    @@ -1,6 +1,49 @@
     Author: Blaine Motsinger <blaine at bestpractical.com>
     
         Migrate RTIR/Tools/Lookup to elevator themes
    +
    +diff --git a/html/RTIR/Tools/Elements/LookupRelatedTickets b/html/RTIR/Tools/Elements/LookupRelatedTickets
    +--- a/html/RTIR/Tools/Elements/LookupRelatedTickets
    ++++ b/html/RTIR/Tools/Elements/LookupRelatedTickets
    +@@
    + %# those contributions and any derivatives thereof.
    + %#
    + %# END BPS TAGGED BLOCK }}}
    +-<table width="100%" border="0" cellpadding="2" cellspacing="0">
    +-<tr><td valign="top" width="50%">
    +-
    +-<& LookupSummary, %ARGS, Lifecycle => RT::IR->lifecycle_incident, Query => $query &>
    +-
    +-</td><td valign="top" width="50%">
    +-
    +-<& LookupSummary, %ARGS, Lifecycle => RT::IR->lifecycle_investigation, Query => $query &>
    +-
    +-</td></tr><tr><td valign="top" width="50%">
    +-
    +-<& LookupSummary, %ARGS, Lifecycle => RT::IR->lifecycle_report, Query => $query &>
    +-
    +-</td><td width="50%" valign="top">
    +-
    ++<div class="row">
    ++  <div class="boxcontainer col-md-6">
    ++    <& LookupSummary, %ARGS, Lifecycle => RT::IR->lifecycle_incident, Query => $query &>
    ++    <& LookupSummary, %ARGS, Lifecycle => RT::IR->lifecycle_investigation, Query => $query &>
    ++  </div>
    ++  <div class="boxcontainer col-md-6">
    ++    <& LookupSummary, %ARGS, Lifecycle => RT::IR->lifecycle_report, Query => $query &>
    + % unless ( RT->Config->Get('RTIR_DisableCountermeasures') ) {
    +-<& LookupSummary, %ARGS, Lifecycle => RT::IR->lifecycle_countermeasure, Query => $query &>
    ++    <& LookupSummary, %ARGS, Lifecycle => RT::IR->lifecycle_countermeasure, Query => $query &>
    + % }
    +-
    +-</td></tr>
    +-
    +-</table>
    ++  </div>
    ++</div>
    + <%args>
    + $LookupType => undef
    + $q => undef
     
     diff --git a/html/RTIR/Tools/Elements/SelectWhoisServer b/html/RTIR/Tools/Elements/SelectWhoisServer
     --- a/html/RTIR/Tools/Elements/SelectWhoisServer
    @@ -28,7 +71,7 @@
      <form action="Lookup.html" method="get">
     +  <div class="form-row">
     +    <div class="col-md-2">
    -+      <%loc('Research Tool')%>:
    ++      <span class="current-value form-control"><%loc('Research Tool')%>:</span>
     +    </div>
      % foreach my $arg ( grep exists $ARGS{$_}, @PassArguments ) {
     -  <input type="hidden" name="<% $arg %>" value="<% $ARGS{ $arg } %>" />
    @@ -40,7 +83,9 @@
     +    <div class="col-md-4">
     +      <input class="form-control" type="text" name="q" value="<% $q %>" />
     +    </div>
    -+    <div class="col-md-auto"> at </div>
    ++    <div class="col-md-auto">
    ++      <span class="current-value form-control">at</span>
    ++    </div>
     +    <div class="col-md-3">
     +      <select class="form-control selectpicker" name="ResearchTool">
      % for my $tool (grep {defined } keys %$research_tools) {
    @@ -74,7 +119,7 @@
      <form action="Traceroute.html" method="get" target="_blank">
     +  <div class="form-row">
     +    <div class="col-md-2">
    -+      <%loc('Traceroute to')%>:
    ++      <span class="current-value form-control"><%loc('Traceroute to')%>:</span>
     +    </div>
      % foreach my $arg ( grep exists $ARGS{$_}, @PassArguments ) {
     -  <input type="hidden" name="<% $arg %>" value="<% $ARGS{ $arg } %>" />
    @@ -109,7 +154,7 @@
      <form name="ToolFormWhois" action="Lookup.html" method="get">
     +  <div class="form-row">
     +    <div class="col-md-2">
    -+      <%loc('WHOIS')%>:
    ++      <span class="current-value form-control"><%loc('WHOIS')%>:</span>
     +    </div>
      % foreach my $arg ( grep exists $ARGS{$_}, @PassArguments ) {
     -  <input type="hidden" name="<% $arg %>" value="<% $ARGS{ $arg } %>" />
    @@ -123,7 +168,9 @@
     +    <div class="col-md-4">
     +      <input class="form-control" type="text" name="q" value="<% $q %>" />
     +    </div>
    -+    <div class="col-md-auto"> at </div>
    ++    <div class="col-md-auto">
    ++      <span class="current-value form-control">at</span>
    ++    </div>
     +    <div class="col-md-3">
     +      <& SelectWhoisServer, Name => 'WhoisServer', Default => $WhoisServer &>
     +    </div>
    @@ -157,5 +204,17 @@
     +  </div>
     +</div>
      
    ++% unless ( $ARGS{ HideResults } ) {
    ++<br>
    ++<div class="row">
    ++  <div class="col-md-12">
      <%perl>
      for my $tool (@$tools) {
    +     if ($m->comp_exists('ToolResults' . $tool)) {
    +@@
    +     }
    + }
    + </%perl>
    ++  </div>
    ++</div>
    ++% }