[Rt-commit] rt branch, 4.6-theme/tools-pages, created. rt-4.4.4-202-g69da685e3
Craig Kaiser
craig at bestpractical.com
Wed May 1 17:07:25 EDT 2019
The branch, 4.6-theme/tools-pages has been created
at 69da685e385a726894b9a44b333f10c25df5091a (commit)
- Log -----------------------------------------------------------------
commit 69da685e385a726894b9a44b333f10c25df5091a
Author: Craig Kaiser <craig at bestpractical.com>
Date: Wed May 1 15:18:13 2019 -0400
Migrate tools pages for new theme
diff --git a/share/html/Approvals/Elements/Approve b/share/html/Approvals/Elements/Approve
index d08f9f247..955303dd6 100644
--- a/share/html/Approvals/Elements/Approve
+++ b/share/html/Approvals/Elements/Approve
@@ -45,7 +45,7 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
-<div class="approval">
+<div class="approval col-md-12">
<div class="name">
<a href="<%RT->Config->Get('WebPath')%>/Approvals/Display.html?id=<%$ticket->Id%>"><% loc("#[_1]: [_2]", $ticket->Id, $ticket->Subject) %></a> (<%loc($ticket->Status)%>)
</div>
diff --git a/share/html/Approvals/Elements/PendingMyApproval b/share/html/Approvals/Elements/PendingMyApproval
index 185136c85..a1157b504 100644
--- a/share/html/Approvals/Elements/PendingMyApproval
+++ b/share/html/Approvals/Elements/PendingMyApproval
@@ -54,26 +54,50 @@
% }
% }
-<&| /Widgets/TitleBox, title => loc("Search for approvals") &>
-<input type="checkbox" class="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 />
+<div class="col-md-12">
+ <&| /Widgets/TitleBox, title => loc("Search for approvals") &>
-<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 class="custom-control-input" type="checkbox" value="1" id="ShowPending" name="ShowPending"
+ <%((!$ARGS{'ShowRejected'} && !$ARGS{'ShowResolved'}) ||
+ $ARGS{'ShowPending'})
+ && qq[checked="checked"] |n%>
+ />
+ <label class="custom-control-label" for="ShowPending"><&|/l&>Show pending requests</&></label>
+ </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="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="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="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>
-<&|/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-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_after->IsSet && $created_after->ISO(Timezone => 'user'))."' name='CreatedAfter' id='CreatedAfter' autocomplete='off' />"&>Only show approvals for requests created after [_1]</&>
-</&>
+ <div class="form-row form-inline">
+ <&|/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]</&><br />
+ </div>
+
+ <div class="form-row form-inline">
+ <&|/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>
my $tickets = RT::Tickets->new( $session{'CurrentUser'} );
diff --git a/share/html/Approvals/Elements/ShowDependency b/share/html/Approvals/Elements/ShowDependency
index b9746fa79..733935986 100644
--- a/share/html/Approvals/Elements/ShowDependency
+++ b/share/html/Approvals/Elements/ShowDependency
@@ -49,9 +49,9 @@
% if ($approving->Count) {
<h3><&|/l&>Tickets which depend on this approval:</&></h3>
-<table width="100%">
-<tr>
-<td width="25" bgcolor="#999999"> </td><td>
+<div class="col-md-12">
+ <div class="form-row">
+ <div class="col-md-12" width="25" bgcolor="#999999"> </div>
<%PERL>
my %show;
while (my $link = $approving->Next()) {
diff --git a/share/html/Tools/MyDay.html b/share/html/Tools/MyDay.html
index d1c56e582..ef4f84086 100644
--- a/share/html/Tools/MyDay.html
+++ b/share/html/Tools/MyDay.html
@@ -52,24 +52,53 @@
<h2><&|/l, $session{'CurrentUser'}->Name &>Active tickets for [_1]</&></h2>
<form method="post" action="MyDay.html">
-<table width="100%" cellpadding="0" cellspacing="0" class="myday">
+<div class="myday col-md-12">
% while ( my $Ticket = $Tickets->Next()) {
% $i++;
-% my $class = $i % 2 ? 'class="evenline"' : 'class="oddline"';
-<tr <%$class|n%>><td colspan="2"><h2><a
-href="<%RT->Config->Get('WebPath')%>/Ticket/Display.html?id=<%$Ticket->Id%>"><%$Ticket->Id%>:
-<%$Ticket->Subject%></a></h2></td></tr>
-<tr <%$class|n%>><td><span class="label"><&|/l&>Worked</&>:</span><input type="text" size="3" name="UpdateTimeWorked-<%$Ticket->Id%>" /> <&|/l&>minutes</&>
-</td>
-<td rowspan="2"><span class="label"><&|/l&>Comments</&>:<br /></span><textarea name="UpdateContent-<%$Ticket->Id%>" rows="5"
-cols="60"></textarea></td></tr>
-<tr <%$class|n%>>
-<td><span class="label"><&|/l&>Status</&>:</span> <& /Ticket/Elements/SelectStatus, Name=> 'UpdateStatus-'.$Ticket->Id, TicketObj => $Ticket &></td>
- </tr>
+% my $class = $i % 2 ? 'class="evenline form-row"' : 'class="oddline form-row"';
+ <div <%$class|n%>>
+ <div class="col-md-12"><h2><a
+ href="<%RT->Config->Get('WebPath')%>/Ticket/Display.html?id=<%$Ticket->Id%>"><%$Ticket->Id%>:
+ <%$Ticket->Subject%></a></h2>
+ </div>
+ </div>
+ <div <%$class|n%>>
+ <span class="col-md-auto label">
+ <&|/l&>Worked</&>:
+ </span>
+ <span class="col-md-2 form-inline value">
+ <input class="form-control" type="text" size="3" name="UpdateTimeWorked-<%$Ticket->Id%>" />
+ <&|/l&>minutes</&>
+ </span>
+ </div>
+
+ <div class="form-row">
+ <span class="label col-md-auto">
+ <&|/l&>Status</&>:
+ </span>
+ <div class="form-row">
+ <div class="col-md-auto value">
+ <& /Ticket/Elements/SelectStatus, Name=> 'UpdateStatus-'.$Ticket->Id, TicketObj => $Ticket &>
+ </div>
+ </div>
+
+ <span class="label col-md-auto">
+ <&|/l&>Comments</&>:<br />
+ </span>
+ <div class="col-md-auto value">
+ <textarea class="form-control" name="UpdateContent-<%$Ticket->Id%>" rows="5"
+ cols="60">
+ </textarea>
+ </div>
+ </div>
% }
-</table>
-<& /Elements/Submit, Label => loc('Record all updates') , Reset => 1, ResetLabel => loc('Clear')&>
+ <div class="form-row">
+ <div class="col-md-12">
+ <& /Elements/Submit, Label => loc('Record all updates') , Reset => 1, ResetLabel => loc('Clear')&>
+ </div>
+ </div>
+</div>
</form>
</html>
<%INIT>
-----------------------------------------------------------------------
More information about the rt-commit
mailing list