[Rt-commit] rtir branch, 4.2-theme/countermeasures-page, created. 4.0.1rc1-91-ge444cc56
Blaine Motsinger
blaine at bestpractical.com
Fri Aug 30 14:15:10 EDT 2019
The branch, 4.2-theme/countermeasures-page has been created
at e444cc56c3361792a5cbdd0637aa88c9e87ef18c (commit)
- Log -----------------------------------------------------------------
commit e444cc56c3361792a5cbdd0637aa88c9e87ef18c
Author: Blaine Motsinger <blaine at bestpractical.com>
Date: Thu Aug 29 11:47:28 2019 -0500
Migrate RTIR/Display to elevator themes
This commit migrates the Countermeasure display page and elements
to the elevator themes.
diff --git a/html/Callbacks/RTIR/Elements/MakeClicky/Default b/html/Callbacks/RTIR/Elements/MakeClicky/Default
index 15cabafd..09b6f0a3 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" href="}. RT::IR->HREFTo("Tools/Lookup.html?".$args{lookup_params}."type=host&q=".$escaped_host).qq{">}
+ 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{">}
.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" href="}. RT::IR->HREFTo("Tools/Lookup.html?".$args{lookup_params}."type=host&q=".$escaped_host).qq{">}
+ 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{">}
.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" href="}. RT::IR->HREFTo("Tools/Lookup.html?".$args{lookup_params}."type=ip&q=".$escaped_host).qq{">}
+ 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{">}
.loc('Lookup IP') .q{</a>};
if ( $args{incident} && !RT->Config->Get('RTIR_DisableCountermeasures') ) {
- $result .= qq{<a class="button button-small create_child_} . RT::IR->lifecycle_countermeasure . qq{" href="} .
+ $result .= qq{<a class="button button-small btn btn-lg 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" href="}.
+ $result .= qq{<a class="button button-small btn btn-lg 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" href="}.
+ 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=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" href="}.
+ $result .= qq{<a class="button button-small btn btn-lg 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" href="'. RT::IR->HREFTo(qq{Tools/Lookup.html?$args{'lookup_params'}type=host&q=$escaped_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}). '">'
.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" href="}. RT::IR->HREFTo(qq{Tools/Lookup.html?$args{lookup_params}type=handle&q=$args{value}}).qq{">}
+ 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{">}
.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" href="}. RT::IR->HREFTo(qq{Tools/Lookup.html?$args{lookup_params}type=host&q=$args{value}}). qq{">}
+ 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{">}
.loc('lookup host') .qq{</a>};
return $args{value} . qq{ <span class="clickylink">$result</span>};
},
diff --git a/html/RTIR/Display.html b/html/RTIR/Display.html
index b0d55166..3ccfafe3 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,43 +64,55 @@
title_href => RT::IR->HREFTo("Edit.html?id=".$Ticket->Id),
class => 'ticket-info-basics',
&>
-<table class="basics">
+ <div>
% if (my $constituency = RT::IR->ConstituencyFor($Ticket)) {
- <tr>
- <td class="label"><% loc("Constituency") %>:</td>
- <td class="value">
- <% $constituency %>
- </td>
- </tr>
- <tr>
-
+ <div class="form-row">
+ <div class="label col-md-3">
+ <% loc("Constituency") %>:
+ </div>
+ <div class="value col-md-9">
+ <span class="current-value form-control"><% $constituency %></span>
+ </div>
+ </div>
% }
- <tr>
- <td class="label"><% loc("Status") %>:</td>
- <td class="value">
- <% $Ticket->Status %>
- </td>
- </tr>
+ <div class="form-row">
+ <div class="label col-md-3">
+ <% loc("Status") %>:
+ </div>
+ <div class="value col-md-9">
+ <span class="current-value form-control"><% $Ticket->Status %></span>
+ </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">
+ <div class="label col-md-3">
+ <&|/l&>SLA</&>:
+ </div>
+ <div class="value col-md-9">
+ <span class="current-value form-control"><% loc($Ticket->SLA) %></span>
+ </div>
+ </div>
% }
- <tr>
- <td class="label"><% loc("Incident") %>:</td>
- <td class="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 class="form-row">
+ <div class="label col-md-3">
+ <% loc("Incident") %>:
+ </div>
+ <div class="value col-md-9">
+ <& /RTIR/Elements/ShowIncidents, Ticket => $Ticket &>
+ </div>
+ </div>
+ <div class="form-row">
+ <div class="label col-md-3">
+ <&|/l&>Time Worked</&>:
+ </div>
+ <div class="value col-md-9">
+ <span class="current-value form-control"><%loc('[_1] min', $TimeWorked)%></span>
+ </div>
+ </div>
<& /Elements/ShowCustomFields, Grouping => 'Basics', Object => $Ticket, Table => 0 &>
-</table>
+ </div>
</&>
@@ -115,7 +126,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 +146,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/ShowDates b/html/RTIR/Elements/ShowDates
index dfe13826..5803a42a 100644
--- a/html/RTIR/Elements/ShowDates
+++ b/html/RTIR/Elements/ShowDates
@@ -45,24 +45,38 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
-<table>
- <tr>
- <td class="label"><&|/l&>Created</&>:</td>
- <td class="value"><% $Ticket->CreatedObj->AsString %></td>
- </tr>
- <tr>
- <td class="label"><&|/l&>Starts</&>:</td>
- <td class="value"><% $Ticket->StartsObj->AsString %></td>
- </tr>
+ <div class="form-row">
+ <div class="label col-md-3">
+ <&|/l&>Created</&>:
+ </div>
+ <div class="value col-md-9">
+ <span class="current-value form-control"><% $Ticket->CreatedObj->AsString %></span>
+ </div>
+ </div>
+ <div class="form-row">
+ <div class="label col-md-3">
+ <&|/l&>Starts</&>:
+ </div>
+ <div class="value col-md-9">
+ <span class="current-value form-control"><% $Ticket->StartsObj->AsString %></span>
+ </div>
+ </div>
% if ( RT::IR->IsReportQueue($Ticket->QueueObj) || RT::IR->IsInvestigationQueue($Ticket->QueueObj) || RT::IR->IsCountermeasureQueue($Ticket->QueueObj) ) {
- <tr>
- <td class="label"><&|/l&>Started</&>:</td>
- <td class="value"><% $Ticket->StartedObj->AsString %></td>
- </tr>
+ <div class="form-row">
+ <div class="label col-md-3">
+ <&|/l&>Started</&>:
+ </div>
+ <div class="value col-md-9">
+ <span class="current-value form-control"><% $Ticket->StartedObj->AsString %></span>
+ </div>
+ </div>
% }
- <tr>
- <td class="labeltop"><&|/l&>Due</&>:</td>
- <td class="value">
+ <div class="form-row">
+ <div class="label col-md-3">
+ <&|/l&>Due</&>:
+ </div>
+ <div class="value col-md-9">
+ <span class="current-value form-control">
% my $due = $Ticket->DueObj;
% if ( ($due->Diff || 0) < 0 ) {
<span class="overdue"><% $due->AsString %></span>
@@ -76,14 +90,18 @@
[<a href="Display.html?Due_Date=now%20%2B%20<% $Due |u %>&id=<% $Ticket->Id %>"><% loc("Set to [_1] from now", $Due ) %></a>]
% }
% }
- </td>
- </tr>
- <tr>
- <td class="label"><&|/l&>Updated</&>:</td>
- <td class="value"><a href="#lasttrans"><% $Ticket->LastUpdated ? (loc("[_1] by [_2]", $Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)) : loc("Never") | h %></a></td>
- </tr>
+ </span>
+ </div>
+ </div>
+ <div class="form-row">
+ <div class="label col-md-3">
+ <&|/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>
+ </div>
+ </div>
<& /Elements/ShowCustomFields, Grouping => 'Dates', Object => $Ticket, Table => 0 &>
-</table>
<%ARGS>
$Ticket => undef
</%ARGS>
diff --git a/html/RTIR/Elements/ShowIncidents b/html/RTIR/Elements/ShowIncidents
index 1e76990b..0810c4a0 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" 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>
diff --git a/html/RTIR/Elements/ShowPeople b/html/RTIR/Elements/ShowPeople
index 7968d34d..5b62842f 100644
--- a/html/RTIR/Elements/ShowPeople
+++ b/html/RTIR/Elements/ShowPeople
@@ -48,15 +48,17 @@
%# XXX: this is a duplication of RT's /Ticket/Elements/ShowPeople
%# the only difference is s/Requestor/Correspondent/, keep in sync
-<table>
- <tr>
- <td class="label"><&|/l&>Owner</&>:</td>
+ <div class="form-row">
+ <div class="label col-md-3">
+ <&|/l&>Owner</&>:
+ </div>
% my $owner = $Ticket->OwnerObj;
- <td class="value"><& /Elements/ShowUser, User => $owner, Ticket => $Ticket &>
- <& /Elements/ShowUserEmailFrequency, User => $owner, Ticket => $Ticket &>
+ <div class="value col-md-9">
+ <span class="current-value form-control"><& /Elements/ShowUser, User => $owner, Ticket => $Ticket &></span>
+ <& /Elements/ShowUserEmailFrequency, User => $owner, Ticket => $Ticket &>
% $m->callback( User => $owner, Ticket => $Ticket, %ARGS, CallbackName => 'AboutThisUser' );
- </td>
- </tr>
+ </div>
+ </div>
% my $single_roles = $Ticket->QueueObj->CustomRoles;
% $single_roles->LimitToSingleValue;
@@ -68,38 +70,57 @@
%# so fall back to nobody
% my $user = $users->First || RT->Nobody;
- <tr>
- <td class="label"><% $role->Name %>:</td>
- <td class="value"><& /Elements/ShowUser, User => $user, Ticket => $Ticket &></td>
- <& /Elements/ShowUserEmailFrequency, User => $user, Ticket => $Ticket &>
+ <div class="form-row">
+ <div class="label col-md-3">
+ <% $role->Name %>:
+ </div>
+ <div class="value col-md-9">
+ <span class="current-value form-control"><& /Elements/ShowUser, User => $user, Ticket => $Ticket &></span>
+ <& /Elements/ShowUserEmailFrequency, User => $user, Ticket => $Ticket &>
% $m->callback( User => $user, Ticket => $Ticket, %ARGS, CallbackName => 'AboutThisUser' );
- </tr>
+ </div>
+ </div>
% }
- <tr>
- <td class="labeltop"><&|/l&>Correspondents</&>:</td>
- <td class="value"><& /Ticket/Elements/ShowGroupMembers, Group => $Ticket->Requestors, Ticket => $Ticket &></td>
- </tr>
- <tr>
- <td class="labeltop"><&|/l&>Cc</&>:</td>
- <td class="value"><& /Ticket/Elements/ShowGroupMembers, Group => $Ticket->Cc, Ticket => $Ticket &></td>
- </tr>
- <tr>
- <td class="labeltop"><&|/l&>AdminCc</&>:</td>
- <td class="value"><& /Ticket/Elements/ShowGroupMembers, Group => $Ticket->AdminCc, Ticket => $Ticket &></td>
- </tr>
+ <div class="form-row">
+ <div class="label col-md-3">
+ <&|/l&>Correspondents</&>:
+ </div>
+ <div class="value col-md-9">
+ <span class="current-value form-control"><& /Ticket/Elements/ShowGroupMembers, Group => $Ticket->Requestors, Ticket => $Ticket &></span>
+ </div>
+ </div>
+ <div class="form-row">
+ <div class="label col-md-3">
+ <&|/l&>Cc</&>:
+ </div>
+ <div class="value col-md-9">
+ <span class="current-value form-control"><& /Ticket/Elements/ShowGroupMembers, Group => $Ticket->Cc, Ticket => $Ticket &></span>
+ </div>
+ </div>
+ <div class="form-row">
+ <div class="label col-md-3">
+ <&|/l&>AdminCc</&>:
+ </div>
+ <div class="value col-md-9">
+ <span class="current-value form-control"><& /Ticket/Elements/ShowGroupMembers, Group => $Ticket->AdminCc, Ticket => $Ticket &></span>
+ </div>
+ </div>
% my $multi_roles = $Ticket->QueueObj->CustomRoles;
% $multi_roles->LimitToMultipleValue;
% while (my $role = $multi_roles->Next) {
- <tr>
- <td class="labeltop"><% $role->Name %>:</td>
- <td class="value"><& /Ticket/Elements/ShowGroupMembers, Group => $Ticket->RoleGroup($role->GroupType), Ticket => $Ticket &></td>
- </tr>
+ <div class="form-row">
+ <div class="label col-md-3">
+ <% $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>
+ </div>
+ </div>
% }
<& /Elements/ShowCustomFields, Grouping => 'People', Object => $Ticket, Table => 0 &>
-</table>
<%ARGS>
$Ticket => undef
</%ARGS>
-----------------------------------------------------------------------
More information about the rt-commit
mailing list