[Rt-commit] rt branch, 4.6-theme/approvals-pages, created. rt-4.4.4-233-g9081d4637
Craig Kaiser
craig at bestpractical.com
Tue May 21 10:07:22 EDT 2019
The branch, 4.6-theme/approvals-pages has been created
at 9081d4637e1bb34031e64ff94de53536fef85cf1 (commit)
- Log -----------------------------------------------------------------
commit 9081d4637e1bb34031e64ff94de53536fef85cf1
Author: Craig Kaiser <craig at bestpractical.com>
Date: Tue May 21 09:50:48 2019 -0400
Migrate approvlas page to elevator theme
diff --git a/share/html/Approvals/Elements/Approve b/share/html/Approvals/Elements/Approve
index d08f9f247..775df5d2b 100644
--- a/share/html/Approvals/Elements/Approve
+++ b/share/html/Approvals/Elements/Approve
@@ -68,32 +68,40 @@
<div class="action">
<div>
% if ( $inactive && $status eq 'resolved' ) {
- <input type="radio" class="radio" id="Approval-<%$ticket->Id%>-Action-approve" name="Approval-<%$ticket->Id%>-Action" value="approve" checked="checked" />
- <label for="Approval-<%$ticket->Id%>-Action-approve"><% loc('[_1] (Unchanged)', loc('Approve')) %></label>
+ <div class="custom-control custom-radio">
+ <input type="radio" class="radio custom-control-input" id="Approval-<%$ticket->Id%>-Action-approve" name="Approval-<%$ticket->Id%>-Action" value="approve" checked="checked" />
+ <label class="custom-control-label" for="Approval-<%$ticket->Id%>-Action-approve"><% loc('[_1] (Unchanged)', loc('Approve')) %></label>
+ </div>
% } else {
- <input type="radio" class="radio" id="Approval-<%$ticket->Id%>-Action-approve" name="Approval-<%$ticket->Id%>-Action" value="approve" />
- <label for="Approval-<%$ticket->Id%>-Action-approve"><&|/l&>Approve</&></label>
+ <div class="custom-control custom-radio">
+ <input type="radio" class="radio custom-control-input" id="Approval-<%$ticket->Id%>-Action-approve" name="Approval-<%$ticket->Id%>-Action" value="approve" />
+ <label class="custom-control-label" for="Approval-<%$ticket->Id%>-Action-approve"><&|/l&>Approve</&></label>
+ </div>
% }
</div>
<div>
% if ( $inactive && $status ne 'resolved' ) {
- <input type="radio" class="radio" id="Approval-<%$ticket->Id%>-Action-deny" name="Approval-<%$ticket->Id%>-Action" value="deny" checked="checked" />
- <label for="Approval-<%$ticket->Id%>-Action-deny"><% loc('[_1] (Unchanged)', loc('Deny')) %></label>
+ <div class="custom-control custom-radio">
+ <input type="radio" class="radio custom-control-input" id="Approval-<%$ticket->Id%>-Action-deny" name="Approval-<%$ticket->Id%>-Action" value="deny" checked="checked" />
+ <label class="custom-control-label" for="Approval-<%$ticket->Id%>-Action-deny"><% loc('[_1] (Unchanged)', loc('Deny')) %></label>
+ </div>
% } else {
- <input type="radio" class="radio" id="Approval-<%$ticket->Id%>-Action-deny" name="Approval-<%$ticket->Id%>-Action" value="deny" />
- <label for="Approval-<%$ticket->Id%>-Action-deny"><&|/l&>Deny</&></label>
+ <div class="custom-control custom-radio">
+ <input type="radio" class="radio custom-control-input" id="Approval-<%$ticket->Id%>-Action-deny" name="Approval-<%$ticket->Id%>-Action" value="deny" />
+ <label class="custom-control-label" for="Approval-<%$ticket->Id%>-Action-deny"><&|/l&>Deny</&></label>
+ </div>
% }
</div>
% unless ( $inactive ) {
- <div>
- <input type="radio" class="radio" id="Approval-<%$ticket->Id%>-Action-none" name="Approval-<%$ticket->Id%>-Action" value="none" checked="checked" />
- <label for="Approval-<%$ticket->Id%>-Action-none"><&|/l&>No action</&></label>
+ <div class="custom-control custom-radio">
+ <input type="radio" class="radio custom-control-input" id="Approval-<%$ticket->Id%>-Action-none" name="Approval-<%$ticket->Id%>-Action" value="none" checked="checked" />
+ <label class="custom-control-label" for="Approval-<%$ticket->Id%>-Action-none"><&|/l&>No action</&></label>
</div>
% }
</div>
<div class="notes">
<label for="Approval-<%$ticket->Id%>-Notes"><&|/l&>Notes</&></label>
- <textarea name="Approval-<%$ticket->Id%>-Notes" id="Approval-<%$ticket->Id%>-Notes" rows="2" cols="70"></textarea>
+ <textarea class="form-control" name="Approval-<%$ticket->Id%>-Notes" id="Approval-<%$ticket->Id%>-Notes" rows="2" cols="70"></textarea>
</div>
<div class="clear"></div>
</div>
diff --git a/share/html/Approvals/Elements/PendingMyApproval b/share/html/Approvals/Elements/PendingMyApproval
index 185136c85..3f2d6eb0c 100644
--- a/share/html/Approvals/Elements/PendingMyApproval
+++ b/share/html/Approvals/Elements/PendingMyApproval
@@ -55,24 +55,49 @@
% }
<&| /Widgets/TitleBox, title => loc("Search for approvals") &>
-<input type="checkbox" class="checkbox" value="1" id="ShowPending" name="ShowPending"
+
+ <div class="form-row">
+ <div class="custom-control custom-checkbox">
+ <input class="custom-control-input" type="checkbox" value="1" id="ShowPending" name="ShowPending"
<%((!$ARGS{'ShowRejected'} && !$ARGS{'ShowResolved'}) ||
$ARGS{'ShowPending'})
&& qq[checked="checked"] |n%> />
-<label for="ShowPending"><&|/l&>Show pending requests</&></label><br />
+<label class="custom-control-label" for="ShowPending"><&|/l&>Show pending requests</&></label>
+ </div>
+ </div>
-<input type="checkbox" class="checkbox" value="1" id="ShowResolved" name="ShowResolved" <% defined($ARGS{'ShowResolved'}) && $ARGS{'ShowResolved'} && qq[checked="checked"] |n%> />
-<label for="ShowResolved"><&|/l&>Show approved requests</&></label><br />
+ <div class="form-row">
+ <div class="custom-control custom-checkbox">
+ <input type="checkbox" class="custom-control-input" value="1" id="ShowResolved" name="ShowResolved" <% defined($ARGS{'ShowResolved'}) && $ARGS{'ShowResolved'} && qq[checked="checked"] |n%> />
+ <label class="custom-control-label" for="ShowResolved"><&|/l&>Show approved requests</&></label><br />
+ </div>
+ </div>
-<input type="checkbox" class="checkbox" value="1" id="ShowRejected" name="ShowRejected" <% defined($ARGS{'ShowRejected'}) && $ARGS{'ShowRejected'} && qq[checked="checked"] |n%> />
-<label for="ShowRejected"><&|/l&>Show denied requests</&></label><br />
+ <div class="form-row">
+ <div class="custom-control custom-checkbox">
+ <input type="checkbox" class="custom-control-input" value="1" id="ShowRejected" name="ShowRejected" <% defined($ARGS{'ShowRejected'}) && $ARGS{'ShowRejected'} && qq[checked="checked"] |n%> />
+ <label class="custom-control-label" for="ShowRejected"><&|/l&>Show denied requests</&></label><br />
+ </div>
+ </div>
-<input type="checkbox" class="checkbox" value="1" id="ShowDependent" name="ShowDependent" <% defined($ARGS{'ShowDependent'}) && $ARGS{'ShowDependent'} && qq[checked="checked"] |n%> />
-<label for="ShowDependent"><&|/l&>Show requests awaiting other approvals</&></label><br />
+ <div class="form-row">
+ <div class="custom-control custom-checkbox">
+ <input type="checkbox" class="custom-control-input" value="1" id="ShowDependent" name="ShowDependent" <% defined($ARGS{'ShowDependent'}) && $ARGS{'ShowDependent'} && qq[checked="checked"] |n%> />
+ <label class="custom-control-label" for="ShowDependent"><&|/l&>Show requests awaiting other approvals</&></label><br />
+ </div>
+ </div>
-<&|/l_unsafe, qq{<input type='text' size='15' class="datepicker" value='}.($created_before->IsSet &&$created_before->ISO(Timezone => 'user'))."' name='CreatedBefore' id='CreatedBefore' autocomplete='off' />"&>Only show approvals for requests created before [_1]</&><br />
+ <div class="form-inline">
+ <div class="col-md-auto">
+ <&|/l_unsafe, qq{<input type='text' size='15' class="form-control datepicker" value='}.($created_before->IsSet &&$created_before->ISO(Timezone => 'user'))."' name='CreatedBefore' id='CreatedBefore' autocomplete='off' />"&>Only show approvals for requests created before [_1]</&>
+ </div>
+ </div>
-<&|/l_unsafe, qq{<input type='text' size='15' class="datepicker" value='}.( $created_after->IsSet && $created_after->ISO(Timezone => 'user'))."' name='CreatedAfter' id='CreatedAfter' autocomplete='off' />"&>Only show approvals for requests created after [_1]</&>
+ <div class="form-inline">
+ <div class="col-md-auto">
+ <&|/l_unsafe, qq{<input type='text' size='15' class="form-control datepicker" value='}.( $created_after->IsSet && $created_after->ISO(Timezone => 'user'))."' name='CreatedAfter' id='CreatedAfter' autocomplete='off' />"&>Only show approvals for requests created after [_1]</&>
+ </div>
+ </div>
</&>
<%init>
diff --git a/share/html/Approvals/Elements/ShowDependency b/share/html/Approvals/Elements/ShowDependency
index b9746fa79..09d2914f3 100644
--- a/share/html/Approvals/Elements/ShowDependency
+++ b/share/html/Approvals/Elements/ShowDependency
@@ -49,9 +49,8 @@
% if ($approving->Count) {
<h3><&|/l&>Tickets which depend on this approval:</&></h3>
-<table width="100%">
-<tr>
-<td width="25" bgcolor="#999999"> </td><td>
+
+<div bgcolor="#999999"> </div>
<%PERL>
my %show;
while (my $link = $approving->Next()) {
@@ -98,10 +97,6 @@ foreach my $id (sort keys %show) {
$m->print($refer);
</%PERL>
-</td>
-</tr>
-</table>
-
% }
<%ARGS>
$Ticket
-----------------------------------------------------------------------
More information about the rt-commit
mailing list