[Rt-commit] rt branch, 4.6-theme/tools-pages, created. rt-4.4.4-223-g5d44c2124
Craig Kaiser
craig at bestpractical.com
Wed May 15 14:26:58 EDT 2019
The branch, 4.6-theme/tools-pages has been created
at 5d44c2124f026c4dc2b1dcef707f653939925c54 (commit)
- Log -----------------------------------------------------------------
commit 5d44c2124f026c4dc2b1dcef707f653939925c54
Author: Craig Kaiser <craig at bestpractical.com>
Date: Wed May 15 13:08:23 2019 -0400
Migrate tools pages for elevator theme
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..31f9ff424 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 class="form-row">
+ <div width="25" bgcolor="#999999"> </div>
<%PERL>
my %show;
while (my $link = $approving->Next()) {
@@ -98,9 +97,7 @@ foreach my $id (sort keys %show) {
$m->print($refer);
</%PERL>
-</td>
-</tr>
-</table>
+</div>
% }
<%ARGS>
diff --git a/share/html/Tools/MyDay.html b/share/html/Tools/MyDay.html
index d1c56e582..effe51a86 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">
% 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%>>
+ <h2><a
+ href="<%RT->Config->Get('WebPath')%>/Ticket/Display.html?id=<%$Ticket->Id%>"><%$Ticket->Id%>:
+ <%$Ticket->Subject%></a>
+ </h2>
+ </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</&>:
+ </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