[Rt-commit] rtir branch, 4.2-theme/migrate-to-elevator-themes, updated. 4.0.1rc1-110-ga0e89d8a

Blaine Motsinger blaine at bestpractical.com
Tue Feb 25 19:58:35 EST 2020


The branch, 4.2-theme/migrate-to-elevator-themes has been updated
       via  a0e89d8aa60dc7702d3a6176bce47bfb2890da2e (commit)
       via  c06372907ff28a69dd873b5af2ccd1c77ab3db92 (commit)
       via  9296bdf06c7f31ef16b34a7f34518e0698afc9e8 (commit)
       via  291dc8c15a45500286bdc43fe73fe756228f5c54 (commit)
      from  8cdb81b7f19a6efb6431accc623fce3559f2c60d (commit)

Summary of changes:
 html/Callbacks/RTIR/Elements/MakeClicky/Default | 20 ++++++++++----------
 html/RTIR/Display.html                          |  8 ++++----
 html/RTIR/Elements/CreateTicketInQueue          |  2 +-
 html/RTIR/Elements/EditPeople                   |  2 +-
 html/RTIR/Elements/ShowDates                    | 10 +++++-----
 html/RTIR/Elements/ShowIncidents                |  8 ++++----
 html/RTIR/Elements/ShowPeople                   | 12 ++++++------
 html/RTIR/Incident/Create.html                  |  4 ++--
 static/css/rtir-styles.css                      | 14 +++++++-------
 9 files changed, 40 insertions(+), 40 deletions(-)

- Log -----------------------------------------------------------------
commit 291dc8c15a45500286bdc43fe73fe756228f5c54
Author: Blaine Motsinger <blaine at bestpractical.com>
Date:   Tue Feb 25 10:45:01 2020 -0600

    Fix button styles

diff --git a/html/Callbacks/RTIR/Elements/MakeClicky/Default b/html/Callbacks/RTIR/Elements/MakeClicky/Default
index 82bdc26e..d6fcaed3 100644
--- a/html/Callbacks/RTIR/Elements/MakeClicky/Default
+++ b/html/Callbacks/RTIR/Elements/MakeClicky/Default
@@ -82,7 +82,7 @@ my %actions;
         # don't execute on non-rtir tickets or in SelfService
         return $super unless defined $args{type} and !$SelfService;
 
-        my $result = qq{ <a class="button button-small btn btn-lg btn-primary" href="}. RT::IR->HREFTo("Tools/Lookup.html?".$args{lookup_params}."type=host&q=".$escaped_host).qq{">}
+        my $result = qq{ <a class="button btn-sm btn-primary" href="}. RT::IR->HREFTo("Tools/Lookup.html?".$args{lookup_params}."type=host&q=".$escaped_host).qq{">}
             .loc('lookup "[_1]"', $host) .qq{</a>};
         return $super . qq{ <span class="clickylink">$result</span>};
     },
@@ -96,7 +96,7 @@ my %actions;
         # don't execute on non-rtir tickets or in SelfService
         return $super unless defined $args{type} and !$SelfService;
 
-        my $result = qq{ <a class="button button-small btn btn-lg btn-primary" href="}. RT::IR->HREFTo("Tools/Lookup.html?".$args{lookup_params}."type=host&q=".$escaped_host).qq{">}
+        my $result = qq{ <a class="button btn-sm btn-primary" href="}. RT::IR->HREFTo("Tools/Lookup.html?".$args{lookup_params}."type=host&q=".$escaped_host).qq{">}
             .loc('lookup "[_1]"', $host) .qq{</a>};
         return $super . qq{ <span class="clickylink">$result</span>};
     },
@@ -108,17 +108,17 @@ my %actions;
 
         $args{host} ||= $args{value};
         my $escaped_host = $escaper->($args{host});
-        my $result .= qq{ <a class="button button-small btn btn-lg btn-primary" href="}. RT::IR->HREFTo("Tools/Lookup.html?".$args{lookup_params}."type=ip&q=".$escaped_host).qq{">}
+        my $result .= qq{ <a class="button btn-sm btn-primary" href="}. RT::IR->HREFTo("Tools/Lookup.html?".$args{lookup_params}."type=ip&q=".$escaped_host).qq{">}
                       .loc('Lookup IP') .q{</a>};
         if ( $args{incident} && !RT->Config->Get('RTIR_DisableCountermeasures') ) {
-            $result .= qq{ <a class="button button-small btn btn-lg btn-primary create_child_} . RT::IR->lifecycle_countermeasure . qq{" href="} .
+            $result .= qq{ <a class="button btn-sm btn-primary create_child_} . RT::IR->lifecycle_countermeasure . qq{" href="} .
             RT::IR->HREFTo("CreateInQueue.html?Incident=".$args{incident}."&Lifecycle=".RT::IR->lifecycle_countermeasure.qq{&IP-Value=$escaped_host})
             .qq{">Block</a>};
         }
         if ( $args{'object'} && $args{'object'}->id ) {
             my $cf = RT::IR::GetCustomField('IP');
             my $tid = $args{'object'}->id;
-            $result .= qq{ <a class="button button-small btn btn-lg btn-primary" href="}.
+            $result .= qq{ <a class="button btn-sm btn-primary" href="}.
             RT::IR->HREFTo("Edit.html?id=".$tid
                 .qq{&Object-RT::Ticket-$tid-CustomField-}. $cf->id .qq{-AddValue=$escaped_host}
                 .q{&SaveChanges=1})
@@ -154,14 +154,14 @@ my %actions;
         my $email = $args{'value'}; $email =~ s/^<|>$//g;
         my $escaped_email = $escaper->($email);
 
-        my $result = qq{<a class="button button-small btn btn-lg btn-primary" href="}.
+        my $result = qq{<a class="button btn-sm btn-primary" href="}.
             RT::IR->HREFTo(qq{Tools/Lookup.html?$args{'lookup_params'}type=email&q=$escaped_email}). qq{">}
             .loc('lookup email') .q{</a>};
         if ( $args{'incident'} ) {
             if ( $r->uri =~ /Lookup.html$/ ) {
                 $result .= qq{<input type="checkbox" name="Requestorbox-$escaped_email" unchecked />};
             }
-            $result .= qq{ <a class="button button-small btn btn-lg btn-primary" href="}.
+            $result .= qq{ <a class="button btn-sm btn-primary" href="}.
                 RT::IR->HREFTo( "CreateInQueue.html"
                 . qq{?Incident=$args{'incident'}}
                 . qq{&Lifecycle=}.RT::IR->lifecycle_investigation
@@ -171,7 +171,7 @@ my %actions;
         }
         my $domain = (split /@/, $email, 2)[1];
         my $escaped_domain = $escaper->($domain);
-        $result .= ' <a class="button button-small btn btn-lg btn-primary" href="'. RT::IR->HREFTo(qq{Tools/Lookup.html?$args{'lookup_params'}type=host&q=$escaped_domain}). '">'
+        $result .= ' <a class="button btn-sm btn-primary" href="'. RT::IR->HREFTo(qq{Tools/Lookup.html?$args{'lookup_params'}type=host&q=$escaped_domain}). '">'
                .loc('lookup "[_1]"', $domain) .'</a>';
         return $escaper->($args{'value'}) . qq{ <span class="clickylink">$result</span>};
     },
@@ -182,7 +182,7 @@ my %actions;
         return $escaper->($args{value}) unless defined $args{type} and !$SelfService;
 
         $args{value} = $escaper->($args{value});
-        my $result = qq{ <a class="button button-small btn btn-lg btn-primary" href="}. RT::IR->HREFTo(qq{Tools/Lookup.html?$args{lookup_params}type=handle&q=$args{value}}).qq{">}
+        my $result = qq{ <a class="button btn-sm btn-primary" href="}. RT::IR->HREFTo(qq{Tools/Lookup.html?$args{lookup_params}type=handle&q=$args{value}}).qq{">}
                .loc('lookup') .qq{</a>};
         return $args{value} . qq{ <span class="clickylink">$result</span>};
     },
@@ -193,7 +193,7 @@ my %actions;
         return $escaper->($args{value}) unless defined $args{type} and !$SelfService;
 
         $args{value} = $escaper->($args{value});
-        my $result = qq{ <a class="button button-small btn btn-lg btn-primary" href="}. RT::IR->HREFTo(qq{Tools/Lookup.html?$args{lookup_params}type=host&q=$args{value}}). qq{">}
+        my $result = qq{ <a class="button btn-sm btn-primary" href="}. RT::IR->HREFTo(qq{Tools/Lookup.html?$args{lookup_params}type=host&q=$args{value}}). qq{">}
                .loc('lookup host') .qq{</a>};
         return $args{value} . qq{ <span class="clickylink">$result</span>};
     },
diff --git a/html/RTIR/Elements/CreateTicketInQueue b/html/RTIR/Elements/CreateTicketInQueue
index 3ede976d..b39b53d9 100644
--- a/html/RTIR/Elements/CreateTicketInQueue
+++ b/html/RTIR/Elements/CreateTicketInQueue
@@ -48,7 +48,7 @@
 <form action="<% $SendTo %>" name="CreateTicketInQueue" id="CreateTicketInQueue" \
 % $m->callback(CallbackName => 'InFormElement');
 >
-% my $button_start = '<input type="submit" class="button btn btn-lg btn-primary form-control" value="';
+% my $button_start = '<input type="submit" class="button btn btn-primary form-control" value="';
 % my $button_end = '" />';
 % my $queue_selector = $m->scomp('/RTIR/Elements/SelectNewTicketQueue', OnChange => 'document.CreateTicketInQueue.submit()', SendTo => $SendTo );
 <&|/l_unsafe, $button_start, $button_end, $queue_selector &>[_1]New ticket in[_2] [_3]</&>
diff --git a/html/RTIR/Elements/EditPeople b/html/RTIR/Elements/EditPeople
index 93dd1145..bc049127 100644
--- a/html/RTIR/Elements/EditPeople
+++ b/html/RTIR/Elements/EditPeople
@@ -100,7 +100,7 @@
     <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!</&>" />
+        <input type="submit" class="button btn btn-primary form-control" name="OnlySearchForPeople" value="<&|/l&>Go!</&>" />
       </div>
     </div>
 
diff --git a/html/RTIR/Elements/ShowIncidents b/html/RTIR/Elements/ShowIncidents
index 0810c4a0..32147da9 100644
--- a/html/RTIR/Elements/ShowIncidents
+++ b/html/RTIR/Elements/ShowIncidents
@@ -57,10 +57,10 @@
 &>
 <div class="actions">
 % unless ( $action ) {
-<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>
+<a class="button btn-sm btn btn-primary" id="link-incident" href="<% RT::IR->HREFTo('Link/ToIncident/?id='. $id ) %>">Link</a>
+<a class="button btn-sm btn 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 btn btn-lg btn-primary" href="<% RT::IR->HREFTo('Display.html?Action='. $action.'&id='. $id) %>"><% loc( $action ) %></a>
+<a class="button btn-sm btn 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 button-small btn btn-lg btn-primary\" href=\"". RT::IR->HREFTo("Display.html?id=$id&DeleteLink--MemberOf-__id__=1").\">". loc('Unlink') ."</a>/TITLE:'";
+    $dformat .= ", '<a class=\"button btn-sm btn btn-primary\" href=\"". RT::IR->HREFTo("Display.html?id=$id&DeleteLink--MemberOf-__id__=1").\">". loc('Unlink') ."</a>/TITLE:'";
 }
 </%INIT>
 
diff --git a/static/css/rtir-styles.css b/static/css/rtir-styles.css
index 40d3c57f..e2d25d7b 100644
--- a/static/css/rtir-styles.css
+++ b/static/css/rtir-styles.css
@@ -200,7 +200,3 @@ body.rtir .sf-menu a.sf-with-ul {
 body.rtir table.lookup-tool-forms td {
     vertical-align: middle;
 }
-
-body.rtir .button.button-small {
-    padding: 0.2em 0.5em;
-}

commit 9296bdf06c7f31ef16b34a7f34518e0698afc9e8
Author: Blaine Motsinger <blaine at bestpractical.com>
Date:   Tue Feb 25 11:44:51 2020 -0600

    Fix position of topactions

diff --git a/static/css/rtir-styles.css b/static/css/rtir-styles.css
index e2d25d7b..8fe36133 100644
--- a/static/css/rtir-styles.css
+++ b/static/css/rtir-styles.css
@@ -75,7 +75,10 @@ body.rtir #topactions #simple-search input[type="search"]:focus {
     transition: width 0.25s ease-in-out;
 }
 
-body.rtir #topactions { min-width: 44em; white-space: no-wrap; }
+body.rtir #topactions {
+    white-space: no-wrap;
+    right: 22.7em;
+}
 
 #comp-RTIR .myrt>table>tr>td:first-child {
     width: 80%;

commit c06372907ff28a69dd873b5af2ccd1c77ab3db92
Author: Blaine Motsinger <blaine at bestpractical.com>
Date:   Tue Feb 25 18:54:13 2020 -0600

    Fix label and value row alignment

diff --git a/html/RTIR/Display.html b/html/RTIR/Display.html
index 3ccfafe3..f267b2d6 100644
--- a/html/RTIR/Display.html
+++ b/html/RTIR/Display.html
@@ -71,7 +71,7 @@
           <% loc("Constituency") %>:
         </div>
         <div class="value col-md-9">
-          <span class="current-value form-control"><% $constituency %></span>
+          <span class="current-value"><% $constituency %></span>
         </div>
       </div>
 % }
@@ -80,7 +80,7 @@
           <% loc("Status") %>:
         </div>
         <div class="value col-md-9">
-          <span class="current-value form-control"><% $Ticket->Status %></span>
+          <span class="current-value"><% $Ticket->Status %></span>
         </div>
       </div>
 % if ( !$Ticket->QueueObj->SLADisabled ) {
@@ -89,7 +89,7 @@
           <&|/l&>SLA</&>:
         </div>
         <div class="value col-md-9">
-          <span class="current-value form-control"><% loc($Ticket->SLA) %></span>
+          <span class="current-value"><% loc($Ticket->SLA) %></span>
         </div>
       </div>
 % }
@@ -106,7 +106,7 @@
           <&|/l&>Time Worked</&>:
         </div>
         <div class="value col-md-9">
-          <span class="current-value form-control"><%loc('[_1] min', $TimeWorked)%></span>
+          <span class="current-value"><%loc('[_1] min', $TimeWorked)%></span>
         </div>
       </div>
 
diff --git a/html/RTIR/Elements/ShowDates b/html/RTIR/Elements/ShowDates
index 5803a42a..1bc48058 100644
--- a/html/RTIR/Elements/ShowDates
+++ b/html/RTIR/Elements/ShowDates
@@ -50,7 +50,7 @@
       <&|/l&>Created</&>:
     </div>
     <div class="value col-md-9">
-      <span class="current-value form-control"><% $Ticket->CreatedObj->AsString %></span>
+      <span class="current-value"><% $Ticket->CreatedObj->AsString %></span>
     </div>
   </div>
   <div class="form-row">
@@ -58,7 +58,7 @@
       <&|/l&>Starts</&>:
     </div>
     <div class="value col-md-9">
-      <span class="current-value form-control"><% $Ticket->StartsObj->AsString %></span>
+      <span class="current-value"><% $Ticket->StartsObj->AsString %></span>
     </div>
   </div>
 % if ( RT::IR->IsReportQueue($Ticket->QueueObj) || RT::IR->IsInvestigationQueue($Ticket->QueueObj) || RT::IR->IsCountermeasureQueue($Ticket->QueueObj) ) {
@@ -67,7 +67,7 @@
       <&|/l&>Started</&>:
     </div>
     <div class="value col-md-9">
-      <span class="current-value form-control"><% $Ticket->StartedObj->AsString %></span>
+      <span class="current-value"><% $Ticket->StartedObj->AsString %></span>
     </div>
   </div>
 % }
@@ -76,7 +76,7 @@
       <&|/l&>Due</&>:
     </div>
     <div class="value col-md-9">
-      <span class="current-value form-control">
+      <span class="current-value">
 % my $due = $Ticket->DueObj;
 % if ( ($due->Diff || 0) < 0 ) {
         <span class="overdue"><% $due->AsString %></span>
@@ -98,7 +98,7 @@
       <&|/l&>Updated</&>:
     </div>
     <div class="value col-md-9">
-      <span class="current-value form-control"><a href="#lasttrans"><% $Ticket->LastUpdated ? (loc("[_1] by [_2]", $Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)) : loc("Never") | h %></a></span>
+      <span class="current-value"><a href="#lasttrans"><% $Ticket->LastUpdated ? (loc("[_1] by [_2]", $Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)) : loc("Never") | h %></a></span>
     </div>
   </div>
 <& /Elements/ShowCustomFields, Grouping => 'Dates', Object => $Ticket, Table => 0 &>
diff --git a/html/RTIR/Elements/ShowPeople b/html/RTIR/Elements/ShowPeople
index 5b62842f..c9664487 100644
--- a/html/RTIR/Elements/ShowPeople
+++ b/html/RTIR/Elements/ShowPeople
@@ -54,7 +54,7 @@
     </div>
 % my $owner = $Ticket->OwnerObj;
     <div class="value col-md-9">
-      <span class="current-value form-control"><& /Elements/ShowUser, User => $owner, Ticket => $Ticket &></span>
+      <span class="current-value"><& /Elements/ShowUser, User => $owner, Ticket => $Ticket &></span>
       <& /Elements/ShowUserEmailFrequency, User => $owner, Ticket => $Ticket &>
 % $m->callback( User => $owner, Ticket => $Ticket, %ARGS, CallbackName => 'AboutThisUser' );
     </div>
@@ -75,7 +75,7 @@
       <% $role->Name %>:
     </div>
     <div class="value col-md-9">
-      <span class="current-value form-control"><& /Elements/ShowUser, User => $user, Ticket => $Ticket &></span>
+      <span class="current-value"><& /Elements/ShowUser, User => $user, Ticket => $Ticket &></span>
       <& /Elements/ShowUserEmailFrequency, User => $user, Ticket => $Ticket &>
 % $m->callback( User => $user, Ticket => $Ticket, %ARGS, CallbackName => 'AboutThisUser' );
     </div>
@@ -87,7 +87,7 @@
       <&|/l&>Correspondents</&>:
     </div>
     <div class="value col-md-9">
-      <span class="current-value form-control"><& /Ticket/Elements/ShowGroupMembers, Group => $Ticket->Requestors, Ticket => $Ticket &></span>
+      <span class="current-value"><& /Ticket/Elements/ShowGroupMembers, Group => $Ticket->Requestors, Ticket => $Ticket &></span>
     </div>
   </div>
   <div class="form-row">
@@ -95,7 +95,7 @@
       <&|/l&>Cc</&>:
     </div>
     <div class="value col-md-9">
-      <span class="current-value form-control"><& /Ticket/Elements/ShowGroupMembers, Group => $Ticket->Cc, Ticket => $Ticket &></span>
+      <span class="current-value"><& /Ticket/Elements/ShowGroupMembers, Group => $Ticket->Cc, Ticket => $Ticket &></span>
     </div>
   </div>
   <div class="form-row">
@@ -103,7 +103,7 @@
       <&|/l&>AdminCc</&>:
     </div>
     <div class="value col-md-9">
-      <span class="current-value form-control"><& /Ticket/Elements/ShowGroupMembers, Group => $Ticket->AdminCc, Ticket => $Ticket &></span>
+      <span class="current-value"><& /Ticket/Elements/ShowGroupMembers, Group => $Ticket->AdminCc, Ticket => $Ticket &></span>
     </div>
   </div>
 
@@ -115,7 +115,7 @@
       <% $role->Name %>:
     </div>
     <div class="value col-md-9">
-      <span class="current-value form-control"><& /Ticket/Elements/ShowGroupMembers, Group => $Ticket->RoleGroup($role->GroupType), Ticket => $Ticket &></span>
+      <span class="current-value"><& /Ticket/Elements/ShowGroupMembers, Group => $Ticket->RoleGroup($role->GroupType), Ticket => $Ticket &></span>
     </div>
   </div>
 % }
diff --git a/html/RTIR/Incident/Create.html b/html/RTIR/Incident/Create.html
index 8883e546..1ab32f33 100644
--- a/html/RTIR/Incident/Create.html
+++ b/html/RTIR/Incident/Create.html
@@ -97,7 +97,7 @@ if ( $ChildObj && $ChildObj->id && !$ChildObj->CurrentUserHasRight('ModifyTicket
       <% loc('Constituency') %>:
     </div>
     <div class="value col-md-9">
-      <span class="current-value form-control"><% $constituency %></span>
+      <span class="current-value"><% $constituency %></span>
     </div>
   </div>
 % }
@@ -126,7 +126,7 @@ if ( $ChildObj && $ChildObj->id && !$ChildObj->CurrentUserHasRight('ModifyTicket
       <&|/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>
   </div>
   <div class="form-row">

commit a0e89d8aa60dc7702d3a6176bce47bfb2890da2e
Author: Blaine Motsinger <blaine at bestpractical.com>
Date:   Tue Feb 25 18:55:16 2020 -0600

    Fix nav and header to match RT styling
    
    This commit fixes the padding for main and page navigation and
    removes the colored background for the header.

diff --git a/static/css/rtir-styles.css b/static/css/rtir-styles.css
index 8fe36133..8648435d 100644
--- a/static/css/rtir-styles.css
+++ b/static/css/rtir-styles.css
@@ -1,8 +1,10 @@
+/* TODO: this section of stlying has been commented out to disable the colored header until we re-implement.
 body.rtir div#header,
 body.rtir .ticket-timer .ticket-link {
     background: #404080;
     color: #fff;
 }
+*/
 
 body.rtir input[type="reset"],
 body.rtir input[type="submit"],
@@ -195,9 +197,8 @@ body.rtir #editquery, body.rtir #editsearches {
     margin-top:8.1em;
 }
 
-
 body.rtir .sf-menu a.sf-with-ul {
-    padding-right:2em;
+    padding-right: 1rem;
 }
 
 body.rtir table.lookup-tool-forms td {

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


More information about the rt-commit mailing list