[Rt-commit] rtir branch, 4.2-theme/migrate-to-elevator-themes, repushed
Blaine Motsinger
blaine at bestpractical.com
Fri Mar 6 16:13:30 EST 2020
The branch 4.2-theme/migrate-to-elevator-themes was deleted and repushed:
was f540952e1389a9873087e144a1551f08081ceb78
now 5b28e684b56688ad89cfae85122ffc57660d3b18
1: 857706ac ! 1: f43f60f4 Migrate RTIR/index to elevator themes
@@ -10,7 +10,7 @@
% $m->callback(CallbackName => 'InFormElement');
>
-% my $button_start = '<input type="submit" class="button" value="';
-+% 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]</&>
2: b6a39e7d ! 2: b07e03b7 Migrate RTIR/Display to elevator themes
@@ -10,7 +10,7 @@
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{">}
++ 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>};
},
@@ -19,7 +19,7 @@
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{">}
++ 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>};
},
@@ -28,11 +28,11 @@
$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{">}
++ 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 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="} .
++ $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>};
}
@@ -40,7 +40,7 @@
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="}.
++ $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})
@@ -49,7 +49,7 @@
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="}.
++ 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'} ) {
@@ -57,7 +57,7 @@
$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="}.
++ $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
@@ -66,7 +66,7 @@
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}). '">'
++ $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>};
},
@@ -75,7 +75,7 @@
$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{">}
++ 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>};
},
@@ -84,7 +84,7 @@
$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{">}
++ 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>};
},
@@ -124,7 +124,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>
% }
@@ -139,7 +139,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 ) {
@@ -152,7 +152,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>
% }
@@ -179,7 +179,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>
@@ -234,7 +234,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">
@@ -242,7 +242,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) ) {
@@ -255,7 +255,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>
% }
@@ -267,7 +267,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>
@@ -289,7 +289,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 &>
@@ -307,11 +307,11 @@
% 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>
++<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" 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>
++<a class="button btn-sm btn btn-primary" href="<% RT::IR->HREFTo('Display.html?Action='. $action.'&id='. $id) %>"><% loc( $action ) %></a>
% }
</div>
</span>
@@ -320,7 +320,7 @@
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:'";
++ $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>
@@ -343,7 +343,7 @@
- <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>
++ <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' );
- </td>
@@ -366,7 +366,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' );
- </tr>
@@ -391,7 +391,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">
@@ -399,7 +399,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">
@@ -407,7 +407,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>
@@ -423,7 +423,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>
% }
3: be8d48a6 = 3: 0265c9a6 Fix has_watchers test regex for elevator themes
4: a18bd87e = 4: 417d3875 Fix ticket_is_linked_to_inc test regex for elevator themes
5: e42a2dff ! 5: e5448a22 Migrate RTIR/Incident/Display to elevator themes
@@ -14,72 +14,6 @@
},
url => sub {
my %args = @_;
-@@
- # 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 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>};
- },
-@@
- # 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 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>};
- },
-@@
-
- $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 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 btn btn-lg btn-primary 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 btn btn-lg btn-primary" 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})
-@@
- 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 button-small btn btn-lg btn-primary" href="}.
- RT::IR->HREFTo( "CreateInQueue.html"
- . qq{?Incident=$args{'incident'}}
- . qq{&Lifecycle=}.RT::IR->lifecycle_investigation
-@@
- 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 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>};
- },
-@@
- 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 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/Incident/Display.html b/html/RTIR/Incident/Display.html
--- a/html/RTIR/Incident/Display.html
@@ -131,16 +65,16 @@
+ <% 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>
+% }
+ <div class="form-row">
+ <div class="label col-md-3">
-+ <% loc("Queue") %>
++ <% loc("Queue") %>:
+ </div>
+ <div class="value col-md-9">
-+ <span class="current-value form-control"><% $TicketObj->QueueObj->Name %></span>
++ <span class="current-value"><% $TicketObj->QueueObj->Name %></span>
+ </div>
+ </div>
+ <div class="form-row">
@@ -148,7 +82,7 @@
+ <% loc("Status") %>:
+ </div>
+ <div class="value col-md-9">
-+ <span class="current-value form-control"><% $TicketObj->Status %></span>
++ <span class="current-value"><% $TicketObj->Status %></span>
+ </div>
+ </div>
% if ( !$TicketObj->QueueObj->SLADisabled ) {
@@ -161,7 +95,7 @@
+ <&|/l&>SLA</&>:
+ </div>
+ <div class="value col-md-9">
-+ <span class="current-value form-control"><% loc($TicketObj->SLA) %></span>
++ <span class="current-value"><% loc($TicketObj->SLA) %></span>
+ </div>
+ </div>
% }
@@ -186,7 +120,7 @@
+ <&|/l&>Owner</&>:
+ </div>
+ <div class="value col-md-9">
-+ <span class="current-value form-control"><& /Elements/ShowUser, User => $TicketObj->OwnerObj &></span>
++ <span class="current-value"><& /Elements/ShowUser, User => $TicketObj->OwnerObj &></span>
+ </div>
+ </div>
+ <div class="form-row">
@@ -194,7 +128,7 @@
+ <&|/l&>Subject</&>:
+ </div>
+ <div class="value col-md-9">
-+ <span class="current-value form-control"><% $TicketObj->Subject %></span>
++ <span class="current-value"><% $TicketObj->Subject %></span>
+ </div>
+ </div>
+ <div class="form-row">
@@ -202,7 +136,7 @@
+ <&|/l&>Priority</&>:
+ </div>
+ <div class="value col-md-9">
-+ <span class="current-value form-control"><& /Ticket/Elements/ShowPriority, Ticket => $TicketObj &></span>
++ <span class="current-value"><& /Ticket/Elements/ShowPriority, Ticket => $TicketObj &></span>
+ </div>
+ </div>
+ <div class="form-row">
@@ -210,7 +144,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>
6: ecec102a ! 6: 84f61676 Migrate RTIR/Incident/Create to elevator themes
@@ -19,7 +19,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>
% }
@@ -31,7 +31,9 @@
+ <% loc('Split from') %>:
+ </div>
+ <div class="value col-md-9">
-+ <a href="<%RT::IR->HREFTo('Incident/Display.html?id='.$SplitObj->id)%>"><% loc("[_1] #[_2]: [_3]", RT::IR::TicketType(Lifecycle => $SplitObj->QueueObj->Lifecycle), $SplitObj->Id, $SplitObj->Subject) %></a>
++ <span class="current-value form-control">
++ <a href="<%RT::IR->HREFTo('Incident/Display.html?id='.$SplitObj->id)%>"><% loc("[_1] #[_2]: [_3]", RT::IR::TicketType(Lifecycle => $SplitObj->QueueObj->Lifecycle), $SplitObj->Id, $SplitObj->Subject) %></a>
++ </span>
+ </div>
+ </div>
% }
@@ -44,7 +46,9 @@
+ <% loc('Link with') %>:
+ </div>
+ <div class="value col-md-9">
-+ <a href="<%RT::IR->HREFTo('Display.html?id='.$ChildObj->id)%>"><% loc("[_1] #[_2]: [_3]", RT::IR::TicketType(Lifecycle => $ChildObj->QueueObj->Lifecycle), $ChildObj->Id, $ChildObj->Subject) %></a>
++ <span class="current-value form-control">
++ <a href="<%RT::IR->HREFTo('Display.html?id='.$ChildObj->id)%>"><% loc("[_1] #[_2]: [_3]", RT::IR::TicketType(Lifecycle => $ChildObj->QueueObj->Lifecycle), $ChildObj->Id, $ChildObj->Subject) %></a>
++ </span>
+ </div>
+ </div>
% }
@@ -116,6 +120,7 @@
+ &>
+ </div>
% }
++ </div>
% if ( !$QueueObj->SLADisabled ) {
- <tr class="sla">
- <td class="label"><&|/l&>SLA</&>:</td>
@@ -126,22 +131,21 @@
- QueueObj => $QueueObj,
- &></td>
- </tr>
-+ <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>
% }
-</tr>
-+ </div>
-<& /RTIR/Elements/EditCustomFields,
+<& /RTIR/Elements/EditCustomFields,
@@ -158,6 +162,12 @@
<& /Elements/EditCustomFieldCustomGroupings,
%ARGS,
@@
+ Groupings => [ RT::CustomField->CustomGroupings('RTIR::Ticket'), '' ],
+ &>
+
+-</div>
++</div> <!-- end ticket-create-basics -->
+
<div class="ticket-create-details">
<&| /Widgets/TitleBox, title => $Title, class => 'ticket-info-message' &>
@@ -168,10 +178,10 @@
- <td class="value"><input type="text" name="Subject" maxsize="200" value="<% $ARGS{'Subject'} || '' %>" /></td>
- </tr>
+ <div class="form-row">
-+ <div class="label col-md-3">
++ <div class="form-group label col-md-3">
+ <&|/l&>Subject</&>:
+ </div>
-+ <div class="value col-md-9">
++ <div class="form-group value col-md-9">
+ <input class="form-control" type="text" name="Subject" value="<% $ARGS{'Subject'} || '' %>" />
+ </div>
+ </div>
@@ -197,16 +207,11 @@
- IncludeSignature => 0,
-&>
-</td></tr>
-+ <div class="form-row">
-+ <div class="label col-md-3">
-+ <&|/l&>Message</&>:
-+ </div>
-+ <div class="value col-md-9">
-+ <& /Elements/MessageBox,
-+ Default => $ARGS{'Content'},
-+ IncludeSignature => 0,
-+ &>
-+ </div>
++ <div class="form-group">
++ <& /Elements/MessageBox,
++ Default => $ARGS{'Content'},
++ IncludeSignature => 0,
++ &>
+ </div>
<& /Ticket/Elements/AddAttachments, %ARGS, QueueObj => $QueueObj &>
@@ -216,6 +221,25 @@
<&| /Widgets/TitleBox, title => loc('Details'), class => 'ticket-info-details' &>
<& /Ticket/Elements/EditBasics,
+@@
+ ],
+ &>
+ </&>
++
++<div class="form-row">
++ <div class="col-md-12">
++ <& /Elements/Submit, Name => 'CreateIncident', Label => $SubmitLabel, SubmitId => 'create-ticket' &>
++ </div>
+ </div>
+
+-<& /Elements/Submit, Name => 'CreateIncident', Label => $SubmitLabel, SubmitId => 'create-ticket' &>
++</div> <!-- end ticket-create-details -->
+
+-</div>
++</div> <!-- end ticket-create-incident -->
+
+ % $m->callback( CallbackName => 'FormEnd', QueueObj => $QueueObj, Constituency => $constituency,
+ % ChildObj => $ChildObj, SplitObj => $SplitObj, ARGSRef => \%ARGS );
diff --git a/static/css/rtir-styles.css b/static/css/rtir-styles.css
--- a/static/css/rtir-styles.css
7: 09016018 ! 7: 7d46642d Migrate RTIR/Create to elevator themes
@@ -212,10 +212,10 @@
- <td class="value"><input type="text" name="Subject" maxsize="200" value="<% $Subject || '' %>" /></td>
- </tr>
+ <div class="form-row">
-+ <div class="label col-md-3">
++ <div class="form-group label col-md-3">
+ <&|/l&>Subject</&>:
+ </div>
-+ <div class="value col-md-9">
++ <div class="form-group value col-md-9">
+ <input class="form-control" type="text" name="Subject" value="<% $Subject || '' %>" />
+ </div>
+ </div>
@@ -235,11 +235,7 @@
- <tr>
- <td class="label"><&|/l&>Message</&>:</td>
- <td class="value">
-+ <div class="form-row">
-+ <div class="label col-md-3">
-+ <&|/l&>Message</&>:
-+ </div>
-+ <div class="value col-md-9">
++ <div class="form-group">
<%perl>
my $include_signature = 1;
unless (exists $ARGS{Content}) {
@@ -249,16 +245,23 @@
% }
- </td>
- </tr>
-+ </div>
+ </div>
<& /Ticket/Elements/AddAttachments, %ARGS, QueueObj => $QueueObj &>
-</table></&>
+</&>
-
- <& /Elements/Submit, Name => "Create", Label => $SubmitCaption, SubmitId => 'create-ticket' &>
++
++<div class="form-row">
++ <div class="col-md-12">
++ <& /Elements/Submit, Name => "Create", Label => $SubmitCaption, SubmitId => 'create-ticket' &>
++ </div>
++</div>
+
+-<& /Elements/Submit, Name => "Create", Label => $SubmitCaption, SubmitId => 'create-ticket' &>
</div></div>
+
+
diff --git a/html/RTIR/Elements/SelectIncident b/html/RTIR/Elements/SelectIncident
--- a/html/RTIR/Elements/SelectIncident
8: 24691153 ! 8: ef432970 Migrate RTIR/Tools/Lookup to elevator themes
@@ -128,7 +128,7 @@
- <span class="input"><input type="text" size="30" name="q" value="<% $q %>" /></span>
- <input type="submit" value="<%loc('Go')%>" />
+ <div class="col-md-4">
-+ <input class="form-control" type="text" name="q" value="<% $q %>" />
++ <input class="form-control" type="text" name="q" value="<% $q %>" />
+ </div>
+ <div class="col-md-auto">
+ <input class="form-control btn btn-primary button" type="submit" value="<%loc('Go')%>" />
@@ -219,3 +219,36 @@
+</div>
+% }
+diff --git a/html/RTIR/Tools/Lookup.html b/html/RTIR/Tools/Lookup.html
+--- a/html/RTIR/Tools/Lookup.html
++++ b/html/RTIR/Tools/Lookup.html
+@@
+ <hr>
+ % }
+
+-<h2><&|/l&>Look Up Information</&></h2>
+-<& Elements/Tools,
+- %ARGS,
+- q => $q,
+- TicketObj => $TicketObj,
+- PassArguments => [qw(ticket type HideResults)],
+-&>
++<div class="form-row">
++ <div class="col-md-12">
++ <h2><&|/l&>Look Up Information</&></h2>
++ <& Elements/Tools,
++ %ARGS,
++ q => $q,
++ TicketObj => $TicketObj,
++ PassArguments => [qw(ticket type HideResults)],
++ &>
+
+ % $m->callback(CallbackName => 'AfterTools', %ARGS, ARGSRef => \%ARGS, Ticket => $TicketObj, LookupType => $type, q => $q);
+
++ </div>
++</div>
++
+ <%INIT>
+ my @results;
+ # Redirect when necessary
+
9: 3833dcfe = 9: dd3a9351 Migrate RTIR/Reporting to elevator themes
10: 7d376de2 ! 10: 7ba18d69 Migrate RTIR/Incident/Reply to elevator themes
@@ -35,11 +35,7 @@
% }
-<tr><td class="label" valign="top"><&|/l&>Message</&>:</td><td>
-+<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'} ) {
@@ -48,7 +44,6 @@
<& /Elements/MessageBox, Name => "UpdateContent", %ARGS &>
% }
-</td></tr>
-+ </div>
+</div>
<%ARGS>
@@ -178,36 +173,106 @@
<& /Elements/Crypt/SignEncryptWidget:ShowIssues, self => $gnupg_widget &>
-+<div class="form-row">
- <h2><&|/l&>Reporters</&></h2>
- <& /RTIR/Search/Elements/ShowResults,
- BaseURL => $BaseURL,
-@@
- OrderBy => $OrderBy,
- Order => $Order,
+-<h2><&|/l&>Reporters</&></h2>
+-<& /RTIR/Search/Elements/ShowResults,
+- BaseURL => $BaseURL,
+- BaseQuery => RT::IR->Query(Lifecycle => RT::IR->lifecycle_report, MemberOf => $id),
+- Query => $Query,
+- DisplayFormat => "__CheckBox.{SelectedReports}__, $Format",
+- Format => $Format,
+- Rows => $Rows,
+- Page => $Page,
+- OrderBy => $OrderBy,
+- Order => $Order,
+-&>
++<div class="form-row">
++ <div class="col-md-12">
++ <h2><&|/l&>Reporters</&></h2>
++ <& /RTIR/Search/Elements/ShowResults,
++ BaseURL => $BaseURL,
++ BaseQuery => RT::IR->Query(Lifecycle => RT::IR->lifecycle_report, MemberOf => $id),
++ Query => $Query,
++ DisplayFormat => "__CheckBox.{SelectedReports}__, $Format",
++ Format => $Format,
++ Rows => $Rows,
++ Page => $Page,
++ OrderBy => $OrderBy,
++ Order => $Order,
++ &>
++ </div>
++</div>
+ % if ( $All ) {
+-<h2><&|/l&>Investigation Correspondents</&></h2>
+-<& /RTIR/Search/Elements/ShowResults,
+- BaseURL => $BaseURL,
+- BaseQuery => RT::IR->Query(Lifecycle => RT::IR->lifecycle_investigation, MemberOf => $id),
+- Query => $Query,
+- DisplayFormat => "__CheckBox.{SelectedInvestigations}__, $Format",
+- Format => $Format,
+- Rows => $Rows,
+- Page => $Page,
+- OrderBy => $OrderBy,
+- Order => $Order,
+-&>
++<div class="form-row">
++ <div class="col-md-12">
++ <h2><&|/l&>Investigation Correspondents</&></h2>
++ <& /RTIR/Search/Elements/ShowResults,
++ BaseURL => $BaseURL,
++ BaseQuery => RT::IR->Query(Lifecycle => RT::IR->lifecycle_investigation, MemberOf => $id),
++ Query => $Query,
++ DisplayFormat => "__CheckBox.{SelectedInvestigations}__, $Format",
++ Format => $Format,
++ Rows => $Rows,
++ Page => $Page,
++ OrderBy => $OrderBy,
++ Order => $Order,
++ &>
++ </div>
++</div>
+ % unless( RT->Config->Get('RTIR_DisableCountermeasures') ) {
+-<h2><&|/l&>Countermeasure Correspondents</&></h2>
+-<& /RTIR/Search/Elements/ShowResults,
+- BaseURL => $BaseURL,
+- BaseQuery => RT::IR->Query(Lifecycle => RT::IR->lifecycle_countermeasure, MemberOf => $id),
+- Query => $Query,
+- DisplayFormat => "__CheckBox.{SelectedCountermeasures}__, $Format",
+- Format => $Format,
+- Rows => $Rows,
+- Page => $Page,
+- OrderBy => $OrderBy,
+- Order => $Order,
+-&>
++<div class="form-row">
++ <div class="col-md-12">
++ <h2><&|/l&>Countermeasure Correspondents</&></h2>
++ <& /RTIR/Search/Elements/ShowResults,
++ BaseURL => $BaseURL,
++ BaseQuery => RT::IR->Query(Lifecycle => RT::IR->lifecycle_countermeasure, MemberOf => $id),
++ Query => $Query,
++ DisplayFormat => "__CheckBox.{SelectedCountermeasures}__, $Format",
++ Format => $Format,
++ Rows => $Rows,
++ Page => $Page,
++ OrderBy => $OrderBy,
++ Order => $Order,
++ &>
++ </div>
++</div>
+ % }
+ % }
+
+@@
+ GnuPGWidget => $gnupg_widget,
&>
-+</div>
- % if ( $All ) {
-+<div class="form-row">
- <h2><&|/l&>Investigation Correspondents</&></h2>
- <& /RTIR/Search/Elements/ShowResults,
- BaseURL => $BaseURL,
-@@
- OrderBy => $OrderBy,
- Order => $Order,
- &>
-+</div>
- % unless( RT->Config->Get('RTIR_DisableCountermeasures') ) {
-+<div class="form-row">
- <h2><&|/l&>Countermeasure Correspondents</&></h2>
- <& /RTIR/Search/Elements/ShowResults,
- BaseURL => $BaseURL,
-@@
- OrderBy => $OrderBy,
- Order => $Order,
- &>
-+</div>
- % }
- % }
-
-
+
+-<& /Elements/Submit, Name => "SubmitTicket", Label => loc("Update Incident") &>
++<div class="form-row">
++ <div class="col-md-12">
++ <& /Elements/Submit, Name => "SubmitTicket", Label => loc("Update Incident") &>
++ </div>
++</div>
+ </form>
+
+ <%INIT>
+
11: a8537ca4 ! 11: c05572e8 Migrate RTIR/Update to elevator themes
@@ -54,7 +54,7 @@
&>
-</table></&></div>
-+</&></div>
++</&></div> <!-- end ticket-update-metadata -->
<div id="ticket-update-message">
@@ -90,13 +90,18 @@
<& /RTIR/Elements/UpdateData, %ARGS, Ticket => $Ticket, GnuPGWidget => $gnupg_widget &>
-</table>
-+</&></div>
++</&>
- <& /Elements/Submit, Name => 'SubmitTicket' &>
+-<& /Elements/Submit, Name => 'SubmitTicket' &>
++<div class="form-row">
++ <div class="col-md-12">
++ <& /Elements/Submit, Name => 'SubmitTicket' &>
++ </div>
++</div>
-</&></div>
--
++</div> <!-- end ticket-update-message -->
+
</form>
- <%INIT>
12: f02a0744 < --: ------- Migrate RTIR/Merge to elevator themes
--: ------- > 12: 1e3ba63e Migrate RTIR/Merge to elevator themes
13: 74dbe3d5 ! 13: ac34e8db Migrate modals to new elevator themes
@@ -1,6 +1,14 @@
Author: Blaine Motsinger <blaine at bestpractical.com>
Migrate modals to new elevator themes
+
+ Although RT no longer uses modals for the create pages, the
+ functionality in RTIR is slightly different. Since there can be
+ more than one queue (with incidents for example), the ability to
+ select the queue on create is still required. For now, the logic
+ within rtir.js still serves the ability to select which queue, but
+ will later be changed to add the select dropdown directly to the
+ create pages.
diff --git a/MANIFEST b/MANIFEST
--- a/MANIFEST
14: 2cfbb20f ! 14: c1df683a Migrate RTIR/Edit to elevator themes
@@ -168,7 +168,8 @@
% }
- <& /RTIR/Elements/EditCustomFields, %ARGS, TicketObj => $Ticket &>
-</table>
--
++ <& /RTIR/Elements/EditCustomFields, %ARGS, TicketObj => $Ticket &>
+
-</&>
-
-<& /Elements/EditCustomFieldCustomGroupings,
@@ -177,30 +178,26 @@
- CustomFieldGenerator => sub { $Ticket->QueueObj->TicketCustomFields },
- Groupings => [ RT::CustomField->CustomGroupings('RTIR::Ticket'), '' ],
-&>
--
--
--</td>
--<td valign="top" width="50%">
--
--<&| /Widgets/TitleBox, title => loc('Dates'), class => 'ticket-info-dates' &>
--<& /Ticket/Elements/EditDates, %ARGS, TicketObj => $Ticket &>
--</&>
--
--</td>
--</tr>
--</table>
--<br />
-+ <& /RTIR/Elements/EditCustomFields, %ARGS, TicketObj => $Ticket &>
-+
+ </&>
-+
+
+ <& /Elements/EditCustomFieldCustomGroupings,
+ %ARGS,
+ Object => $Ticket,
+ CustomFieldGenerator => sub { $Ticket->QueueObj->TicketCustomFields },
+ Groupings => [ RT::CustomField->CustomGroupings('RTIR::Ticket'), '' ],
+ &>
-+
+
+-</td>
+-<td valign="top" width="50%">
+-
+-<&| /Widgets/TitleBox, title => loc('Dates'), class => 'ticket-info-dates' &>
+-<& /Ticket/Elements/EditDates, %ARGS, TicketObj => $Ticket &>
+-</&>
+-
+-</td>
+-</tr>
+-</table>
+-<br />
+ </div>
+ <div class="col-md-6">
+ <&| /Widgets/TitleBox, title => loc('Dates'), class => 'ticket-info-dates' &>
@@ -211,6 +208,23 @@
% if ( !RT::IR->IsIncidentQueue($Ticket->QueueObj)) {
<&| /Widgets/TitleBox, title => loc('People'), class => 'ticket-info-people' &>
+@@
+ </&>
+ % }
+
+-<& /Elements/Submit, Name => 'SaveChanges', Label => loc('Save Changes'),
+- Caption => loc("If you've updated anything above, be sure to"), color => "#333399",
+-&>
++<div class="form-row">
++ <div class="col-md-12">
++ <& /Elements/Submit, Name => 'SaveChanges', Label => loc('Save Changes'),
++ Caption => loc("If you've updated anything above, be sure to"), color => "#333399",
++ &>
++ </div>
++</div>
+ </form>
+
+ <%INIT>
diff --git a/html/RTIR/Elements/AddWatchers b/html/RTIR/Elements/AddWatchers
--- a/html/RTIR/Elements/AddWatchers
@@ -441,7 +455,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>
15: 21508531 < --: ------- Migrate RTIR/Advanced to elevator themes
--: ------- > 15: 175a2742 Migrate RTIR/Advanced to elevator themes
16: 8cdb81b7 = 16: eecd3f6e Fix articles tests for RT 4.6 articles refactor
17: 291dc8c1 < --: ------- Fix button styles
18: 9296bdf0 < --: ------- Fix position of topactions
19: 1605bfe3 < --: ------- Fix label and value row alignment
20: 8fc8b8fe ! 17: 14527302 Migrate nav, header, topactions to elevator themes
@@ -1,9 +1,11 @@
Author: Blaine Motsinger <blaine at bestpractical.com>
- Fix nav and header to match RT styling
+ Migrate nav, header, topactions to elevator themes
- This commit fixes the padding for main and page navigation and
- removes the colored background for the header.
+ This commit fixes the padding for main and page navigation, removes
+ the colored background for the header, right alignment for
+ topactions, and removes unused button-small style to match RT's
+ layout for the elevator themes.
diff --git a/static/css/rtir-styles.css b/static/css/rtir-styles.css
--- a/static/css/rtir-styles.css
@@ -20,6 +22,18 @@
body.rtir input[type="reset"],
body.rtir input[type="submit"],
@@
+ 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%;
+@@
margin-top:8.1em;
}
@@ -30,4 +44,10 @@
}
body.rtir table.lookup-tool-forms td {
+ vertical-align: middle;
+ }
+-
+-body.rtir .button.button-small {
+- padding: 0.2em 0.5em;
+-}
21: bd34e727 < --: ------- Fix message box alignment to match RT styling
22: fdd0e3a9 = 18: 65e66d7e Update requires_rt and message for 5.0
23: a5856085 ! 19: eb64da8f Disable InlineEdit for ticket lists in forms
@@ -29,6 +29,18 @@
&>
</&>
<%ARGS>
+
+diff --git a/html/RTIR/Elements/MergeWith b/html/RTIR/Elements/MergeWith
+--- a/html/RTIR/Elements/MergeWith
++++ b/html/RTIR/Elements/MergeWith
+@@
+ OrderBy => $OrderBy,
+ Order => $Order,
+ BaseURL => RT::IR->HREFTo("Merge/?id=$id"),
++ InlineEdit => 0,
+ &>
+ </div>
+ </div>
diff --git a/html/RTIR/Elements/SelectIncident b/html/RTIR/Elements/SelectIncident
--- a/html/RTIR/Elements/SelectIncident
@@ -76,29 +88,29 @@
--- a/html/RTIR/Incident/Reply/index.html
+++ b/html/RTIR/Incident/Reply/index.html
@@
- Page => $Page,
- OrderBy => $OrderBy,
- Order => $Order,
-+ InlineEdit => 0,
- &>
+ Page => $Page,
+ OrderBy => $OrderBy,
+ Order => $Order,
++ InlineEdit => 0,
+ &>
+ </div>
</div>
- % if ( $All ) {
@@
- Page => $Page,
- OrderBy => $OrderBy,
- Order => $Order,
-+ InlineEdit => 0,
- &>
+ Page => $Page,
+ OrderBy => $OrderBy,
+ Order => $Order,
++ InlineEdit => 0,
+ &>
+ </div>
</div>
- % unless( RT->Config->Get('RTIR_DisableCountermeasures') ) {
@@
- Page => $Page,
- OrderBy => $OrderBy,
- Order => $Order,
-+ InlineEdit => 0,
- &>
+ Page => $Page,
+ OrderBy => $OrderBy,
+ Order => $Order,
++ InlineEdit => 0,
+ &>
+ </div>
</div>
- % }
diff --git a/html/RTIR/Link/FromIncident/index.html b/html/RTIR/Link/FromIncident/index.html
--- a/html/RTIR/Link/FromIncident/index.html
24: 50d38ec1 = 20: c831c86a Update article tests as we don't have "New Article" page menu
25: f540952e = 21: 5b28e684 Update attachment tests as now we show icons instead of filenames
More information about the rt-commit
mailing list