[Rt-commit] rt branch, 4.6/update-styling-of-reminders, repushed
Blaine Motsinger
blaine at bestpractical.com
Thu May 7 16:40:15 EDT 2020
The branch 4.6/update-styling-of-reminders was deleted and repushed:
was 42ed436c3d6115dbf0628ae8e6086d02115666ab
now 72a6f2848ab4958531c46b059c0bc9182c5bbb21
1: 42ed436c3d ! 1: 72a6f2848a Fix styling for reminders
@@ -45,57 +45,47 @@
% if ( $editable && $ShowSave ) {
-<div class="form-row">
+<div class="form-row mt-0">
- <div class="col-md-12">
+ <div class="col-12">
<div class="save"><input type="submit" class="button form-control btn btn-primary" value="<&|/l&>Save</&>" /></div>
</div>
@@
- <%args>
- $Ticket
- </%args>
--<div class="form-row">
-+<div class="form-row mt-0">
- <div class="col-md-12">
+ <div class="col-12">
<&|/l&>New reminder:</&>
<div class="form-row">
-- <div class="label col-md-3">
-+ <div class="label col-md-2">
+- <div class="label col-3">
++ <div class="label col-2">
<&|/l&>Subject</&>:
</div>
- <div class="value col-md-9">
+ <div class="value col-9">
@@
</div>
</div>
<div class="form-row">
-- <div class="label col-md-3">
-+ <div class="label col-md-2">
+- <div class="label col-3">
++ <div class="label col-2">
<&|/l&>Owner</&>:
</div>
-- <div class="value col-md-9">
-+ <div class="value col-md-2">
- <& /Elements/SelectOwner, Name => 'NewReminder-Owner', QueueObj => $Ticket->QueueObj, Default=>$session{'CurrentUser'}->id, DefaultValue => 0 &>
+ <div class="value col-9">
+- <& /Elements/SelectOwner, Name => 'NewReminder-Owner', QueueObj => $Ticket->QueueObj, Default=>$session{'CurrentUser'}->id, DefaultValue => 0 &>
++ <div class="selectowner">
++ <& /Elements/SelectOwner, Name => 'NewReminder-Owner', QueueObj => $Ticket->QueueObj, Default=>$session{'CurrentUser'}->id, DefaultValue => 0 &>
++ </div>
</div>
</div>
<div class="form-row">
-- <div class="label col-md-3">
-+ <div class="label col-md-2">
+- <div class="label col-3">
++ <div class="label col-2">
<&|/l&>Due</&>:
</div>
- <div class="value col-md-9">
-@@
- $Ticket
- $Index
- </%args>
--
- <div class="col-md-12 <% $Index%2 ? 'oddline' : 'evenline' %>" id="reminder-<% $Reminder->id %>">
- % unless ( $Reminder->CurrentUserHasRight('ModifyTicket') ) {
- <input class="custom-control-input" name="Complete-Reminder-<% $Reminder->id %>" type="hidden"
+ <div class="value col-9">
+@@
value=<% $Reminder->Status eq $Reminder->LifecycleObj->ReminderStatusOnResolve ? 1 : 0 %>
/>
% }
- <div class="custom-control custom-checkbox">
- <input class="custom-control-input" type="checkbox" value="1" id="Complete-Reminder-<% $Reminder->id %>" name="Complete-Reminder-<% $Reminder->id %>" <% $Reminder->Status eq $Reminder->LifecycleObj->ReminderStatusOnResolve ? 'checked="checked"' : '' |n %>
+ <div class="form-row m-0 pb-2 pt-2">
-+ <div class="col-md-1">
++ <div class="col-1">
+ <div class="custom-control custom-checkbox">
+ <input class="custom-control-input" type="checkbox" value="1" id="Complete-Reminder-<% $Reminder->id %>" name="Complete-Reminder-<% $Reminder->id %>" <% $Reminder->Status eq $Reminder->LifecycleObj->ReminderStatusOnResolve ? 'checked="checked"' : '' |n %>
% unless ( $Reminder->CurrentUserHasRight('ModifyTicket') ) {
@@ -108,36 +98,36 @@
+ </div>
</div>
- <div class="form-row">
-- <div class="label col-md-3">
-+ <div class="label col-md-1">
+- <div class="label col-3">
++ <div class="label col-1">
<&|/l&>Subject</&>:
</div>
- <div class="value col-md-9">
+ <div class="value col-9">
@@
/>
</div>
</div>
- <div class="form-row <% $Index%2 ? 'oddline' : 'evenline' %>">
-- <div class="label col-md-3">
-+
+- <div class="label col-3">
+ <div class="form-row m-0 pb-2">
-+ <div class="label col-md-2">
++ <div class="label col-2">
<&|/l&>Owner</&>:
</div>
- <div class="value col-md-9">
+ <div class="value col-9">
- <& /Elements/SelectOwner, Name => 'Reminder-Owner-'.$Reminder->id, QueueObj => $Ticket->QueueObj, Default => $Reminder->Owner, DefaultValue => 0 &>
- </div>
-- <div class="label col-md-3">
+- <div class="label col-3">
- <&|/l&>Due</&>:
- </div>
-- <div class="value col-md-9">
+- <div class="value col-9">
-% if ( $Reminder->CurrentUserHasRight('ModifyTicket') ) {
- <div class="form-row">
-- <div class="col-auto">
++ <div class="row">
+ <div class="col-auto">
- <& /Elements/SelectDate, Name => 'Reminder-Due-'.$Reminder->id &>
-+ <div class="row">
-+ <div class="col-md-3">
-+ <& /Elements/SelectOwner, Name => 'Reminder-Owner-'.$Reminder->id, QueueObj => $Ticket->QueueObj, Default => $Reminder->Owner, DefaultValue => 0 &>
++ <div class="selectowner">
++ <& /Elements/SelectOwner, Name => 'Reminder-Owner-'.$Reminder->id, QueueObj => $Ticket->QueueObj, Default => $Reminder->Owner, DefaultValue => 0 &>
++ </div>
</div>
- <div class="col-auto">
- <span class="current-value form-control">(<% $Reminder->DueObj->AsString %>)</span>
@@ -165,11 +155,11 @@
@@
% my $overdue = $dueobj->IsSet && $dueobj->Diff < 0 ? 1 : 0;
- <div class="col-md-12 <% $Index%2 ? 'oddline' : 'evenline' %>" id="reminder-<% $Reminder->id %>">
+ <div class="col-12 <% $Index%2 ? 'oddline' : 'evenline' %>" id="reminder-<% $Reminder->id %>">
- <div class="form-row">
+ <div class="form-row m-0 pb-2 pt-2">
% unless ( $Reminder->CurrentUserHasRight('ModifyTicket') ) {
- <div class="col-md-4">
+ <div class="col-4">
<input name="Complete-Reminder-<% $Reminder->id %>" type="hidden"
diff --git a/share/html/Ticket/Reminders.html b/share/html/Ticket/Reminders.html
@@ -179,15 +169,15 @@
<form action="<%RT->Config->Get('WebPath')%>/Ticket/Reminders.html" name="UpdateReminders" id="UpdateReminders" method="post">
<&|/Widgets/TitleBox, title => loc("Reminders"), class=>'ticket-info-reminders' &>
<div class="row">
-- <div class="col-md-6">
-+ <div class="col-md-9">
+- <div class="col-6">
++ <div class="col-9">
<& /Ticket/Elements/Reminders, Ticket => $Ticket, ShowCompleted => 1, Edit => 1, ShowSave => 0 &>
</div>
</div>
</&>
- <div class="form-row">
+ <div class="form-row mt-0">
- <div class="col-md-12">
+ <div class="col-12">
<& /Elements/Submit, Label => loc('Save Changes') &>
</div>
@@ -195,10 +185,9 @@
--- a/share/static/css/elevator-light/forms.css
+++ b/share/static/css/elevator-light/forms.css
@@
- #EditConfig ul.plugins {
margin: 0;
}
-+
+
+/* reminders */
+#UpdateReminders .form-row.reminder-headers, #UpdateReminders [id^=reminder-] {
+ border-bottom: 1px solid #dee2e6;
@@ -207,19 +196,26 @@
+#UpdateReminders .current-value {
+ background-color: unset;
+}
++
+ /* javascript selection box */
+
+ .selectionbox-js .source li .remove {
diff --git a/share/static/css/elevator-light/misc.css b/share/static/css/elevator-light/misc.css
--- a/share/static/css/elevator-light/misc.css
+++ b/share/static/css/elevator-light/misc.css
@@
- }
-
- .datepicker {
-- width: 17em;
-+ width: 13rem;
- }
-
+ min-width: 10em;
+ }
+
++.selectowner {
++ max-width: 15.8em;
++ min-width: 10em;
++}
++
.dashboard-subscription tr.frequency .value input {
+ margin-bottom: 0.75em;
+ }
@@
/* row colouring */
More information about the rt-commit
mailing list