[Rt-commit] rt branch, 4.6/update-styling-of-reminders, created. rt-4.4.4-767-gaf3e485cd
Blaine Motsinger
blaine at bestpractical.com
Thu Feb 13 18:47:17 EST 2020
The branch, 4.6/update-styling-of-reminders has been created
at af3e485cda4adfaf50b9ed3b81c9eb307ddb82d0 (commit)
- Log -----------------------------------------------------------------
commit af3e485cda4adfaf50b9ed3b81c9eb307ddb82d0
Author: Blaine Motsinger <blaine at bestpractical.com>
Date: Fri Jan 31 13:54:13 2020 -0600
Fix styling for reminders
Updated pages include My and Tickets reminders pages and portlets.
diff --git a/share/html/Ticket/Elements/Reminders b/share/html/Ticket/Elements/Reminders
index 945c44e76..32da13150 100644
--- a/share/html/Ticket/Elements/Reminders
+++ b/share/html/Ticket/Elements/Reminders
@@ -73,7 +73,7 @@ my $reminder_collection = $count_reminders->Collection;
<input type="hidden" class="hidden" name="update-reminders" value="1" />
% my $editable = 0;
% if ($has_reminders) {
-<div class="form-row">
+<div class="form-row reminder-headers p-2 mt-0">
% if ( $Edit ) {
<&|/l&>Reminders</&>
% } else {
@@ -90,7 +90,7 @@ my $reminder_collection = $count_reminders->Collection;
</div>
% my $i = 0;
% while ( my $reminder = $reminder_collection->Next ) {
-<div class="form-row">
+<div class="form-row mt-0">
% $i++;
% if ( $reminder->Status eq $resolve_status && !$ShowCompleted ) {
<input type="hidden" class="hidden" name="Complete-Reminder-<% $reminder->id %>" value="1" />
@@ -107,9 +107,11 @@ my $reminder_collection = $count_reminders->Collection;
</div>
% }
% if ( $editable ) {
-<i><&|/l&>(Check box to complete)</&></i>
+<div class="form-row mt-0">
+ <i class="mt-2 ml-2"><&|/l&>(Check box to complete)</&></i>
+</div>
% }
-<hr>
+<hr class="mt-2 mb-2">
% } else {
%# we must always include resolved reminders due to the browser
@@ -127,7 +129,7 @@ my $reminder_collection = $count_reminders->Collection;
% }
% if ( $editable && $ShowSave ) {
-<div class="form-row">
+<div class="form-row mt-0">
<div class="col-md-12">
<div class="save"><input type="submit" class="button form-control btn btn-primary" value="<&|/l&>Save</&>" /></div>
</div>
@@ -137,7 +139,7 @@ my $reminder_collection = $count_reminders->Collection;
<%args>
$Ticket
</%args>
-<div class="form-row">
+<div class="form-row mt-0">
<div class="col-md-12">
<&|/l&>New reminder:</&>
<div class="form-row">
@@ -173,23 +175,24 @@ $Reminder
$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"
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="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') ) {
disabled="disabled"
% }
- />
- <label class="custom-control-label" for="Complete-Reminder-<% $Reminder->id %>"></label>
+ />
+ <label class="custom-control-label" for="Complete-Reminder-<% $Reminder->id %>"></label>
+ </div>
</div>
- <div class="form-row">
- <div class="label col-md-3">
+ <div class="label col-md-2">
<&|/l&>Subject</&>:
</div>
<div class="value col-md-9">
@@ -200,29 +203,33 @@ readonly="readonly"
/>
</div>
</div>
- <div class="form-row <% $Index%2 ? 'oddline' : 'evenline' %>">
+
+ <div class="form-row m-0 pb-2">
<div class="label col-md-3">
<&|/l&>Owner</&>:
</div>
<div class="value col-md-9">
- <& /Elements/SelectOwner, Name => 'Reminder-Owner-'.$Reminder->id, QueueObj => $Ticket->QueueObj, Default => $Reminder->Owner, DefaultValue => 0 &>
- </div>
- <div class="label col-md-3">
- <&|/l&>Due</&>:
- </div>
- <div class="value col-md-9">
-% if ( $Reminder->CurrentUserHasRight('ModifyTicket') ) {
- <div class="form-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>
- <div class="col-auto">
- <span class="current-value form-control">(<% $Reminder->DueObj->AsString %>)</span>
+ <div class="label col-auto">
+ <&|/l&>Due</&>:
</div>
- </div>
+ <div class="value">
+% if ( $Reminder->CurrentUserHasRight('ModifyTicket') ) {
+ <div class="float-left">
+ <& /Elements/SelectDate, Name => 'Reminder-Due-'.$Reminder->id &>
+ </div>
+ <div class="float-left ml-3">
+ <span class="current-value form-control">(<% $Reminder->DueObj->AsString %>)</span>
+ </div>
% }
+ </div>
+ </div>
</div>
</div>
+
</div>
</%method>
<%method ShowEntry>
@@ -235,7 +242,7 @@ $Index
% my $overdue = $dueobj->IsSet && $dueobj->Diff < 0 ? 1 : 0;
<div class="col-md-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">
<input name="Complete-Reminder-<% $Reminder->id %>" type="hidden"
diff --git a/share/html/Ticket/Reminders.html b/share/html/Ticket/Reminders.html
index 66e727abc..6d4bc4ab0 100644
--- a/share/html/Ticket/Reminders.html
+++ b/share/html/Ticket/Reminders.html
@@ -55,12 +55,12 @@
<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">
<& /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">
<& /Elements/Submit, Label => loc('Save Changes') &>
</div>
diff --git a/share/static/css/elevator-light/forms.css b/share/static/css/elevator-light/forms.css
index e422e40ba..0a8c0afe1 100644
--- a/share/static/css/elevator-light/forms.css
+++ b/share/static/css/elevator-light/forms.css
@@ -393,3 +393,12 @@ textarea.code {
#EditConfig ul.plugins {
margin: 0;
}
+
+/* reminders */
+#UpdateReminders .form-row.reminder-headers, #UpdateReminders [id^=reminder-] {
+ border-bottom: 1px solid #dee2e6;
+}
+
+#UpdateReminders .current-value {
+ background-color: unset;
+}
diff --git a/share/static/css/elevator-light/misc.css b/share/static/css/elevator-light/misc.css
index f5e0d21cc..30ed80c79 100644
--- a/share/static/css/elevator-light/misc.css
+++ b/share/static/css/elevator-light/misc.css
@@ -126,7 +126,7 @@ svg.icon-helper {
/* row colouring */
.oddline {
- background-color: rgba(0, 0, 0, 0.05);
+ background-color: rgba(242, 242, 242);
}
.cke_toolgroup a.cke_button {
-----------------------------------------------------------------------
More information about the rt-commit
mailing list