[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 2d63aa8da9908054de6d775b832ca4d0f7bdc369
       now e8601eae728a784677ff3f9f4c45a7b36c3607ea

1: 2d63aa8da9 ! 1: e8601eae72 Fix styling for reminders
    @@ -35,6 +35,30 @@
        <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">
    ++      <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">
     @@
                />
              </div>
    @@ -46,23 +70,37 @@
                <&|/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>
    -+
    -+      <div class="form-row">
    -         <div class="label col-md-3">
    -           <&|/l&>Due</&>:
    -         </div>
    -         <div class="value col-md-9">
    - % if ( $Reminder->CurrentUserHasRight('ModifyTicket') ) {
    +-          <& /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-auto">
    -               <& /Elements/SelectDate, Name => 'Reminder-Due-'.$Reminder->id &>
    ++            <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>
     +