[Rt-commit] rt branch, 4.6/update-styling-of-reminders, repushed

[Blaine Motsinger]

The branch 4.6/update-styling-of-reminders was deleted and repushed:
       was e8601eae728a784677ff3f9f4c45a7b36c3607ea
       now af3e485cda4adfaf50b9ed3b81c9eb307ddb82d0

1: e8601eae7 ! 1: af3e485cd Fix styling for reminders
    @@ -12,21 +12,51 @@
      % my $editable = 0;
      % if ($has_reminders) {
     -<div class="form-row">
    -+<div class="form-row reminder-headers">
    ++<div class="form-row reminder-headers p-2 mt-0">
      % if ( $Edit ) {
        <&|/l&>Reminders</&>
      % } else {
     @@
      </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" />
    +@@
    + </div>
      % }
      % if ( $editable ) {
     -<i><&|/l&>(Check box to complete)</&></i>
    -+<div class="form-row">
    -+  <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>
    ++<hr class="mt-2 mb-2">
      % } else {
    + 
    + %# we must always include resolved reminders due to the browser
    +@@
    + % }
    + 
    + % 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>
    +@@
    + <%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">
     @@
      $Ticket
      $Index
    @@ -40,7 +70,7 @@
      % }
     -      <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">
    ++      <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 %>
    @@ -65,7 +95,7 @@
            </div>
     -      <div class="form-row <% $Index%2 ? 'oddline' : 'evenline' %>">
     +
    -+      <div class="form-row">
    ++      <div class="form-row m-0 pb-2">
              <div class="label col-md-3">
                <&|/l&>Owner</&>:
              </div>
    @@ -107,6 +137,34 @@
          </div>
      </%method>
      <%method ShowEntry>
    +@@
    + % 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
    +--- a/share/html/Ticket/Reminders.html
    ++++ b/share/html/Ticket/Reminders.html
    +@@
    + <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
     --- a/share/static/css/elevator-light/forms.css
    @@ -117,32 +175,8 @@
      }
     +
     +/* reminders */
    -+#UpdateReminders .form-row {
    -+    margin-top: 0;
    -+}
    -+
    -+#UpdateReminders .form-row .oddline .form-row, #UpdateReminders .form-row .evenline .form-row {
    -+    margin: 0;
    -+    padding: 0.5rem 0;
    -+}
    -+
    -+#UpdateReminders .form-row.reminder-headers {
    -+    padding: 0.5rem;
    ++#UpdateReminders .form-row.reminder-headers, #UpdateReminders [id^=reminder-] {
     +    border-bottom: 1px solid #dee2e6;
    -+}
    -+
    -+#UpdateReminders [id^=reminder-] {
    -+    border-bottom: 1px solid #dee2e6;
    -+}
    -+
    -+#UpdateReminders i {
    -+    margin-top: 0.5rem;
    -+    margin-left: 0.5rem;
    -+}
    -+
    -+#UpdateReminders hr {
    -+    margin-top: 0.5rem;
    -+    margin-bottom: 0.5rem;
     +}
     +
     +#UpdateReminders .current-value {