[Rt-commit] rt branch, 5.0/jumbo-update-ticket-layout, created. rt-5.0.0-51-gd63a564b37

[? sunnavy]

The branch, 5.0/jumbo-update-ticket-layout has been created
        at  d63a564b372966a150f3d965850767bee46096f1 (commit)

- Log -----------------------------------------------------------------
commit d63a564b372966a150f3d965850767bee46096f1
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Thu Oct 8 03:29:31 2020 +0800

    Use ticket update page layout for "Update ticket" portlet on jumbo page
    
    mainly 3 changes:
    
    * Make message box take the whole width
    * Move attachments below messagebox
    * Reduce other label cols from 3 to 2

diff --git a/share/html/Ticket/Elements/EditTransactionCustomFields b/share/html/Ticket/Elements/EditTransactionCustomFields
index c5d6886259..f0e21d74a9 100644
--- a/share/html/Ticket/Elements/EditTransactionCustomFields
+++ b/share/html/Ticket/Elements/EditTransactionCustomFields
@@ -53,13 +53,13 @@
 % while (my $CF = $CustomFields->Next()) {
 % next unless $CF->CurrentUserHasRight('ModifyCustomField');
 <div class="form-row">
-<div class="label col-3">
+<div class="label col-<% $LabelCols %>">
   <span class="name"><% $CF->Name %>:</span>
 % if ( $CF->EntryHint ) {
   <span class="far fa-question-circle icon-helper" data-toggle="tooltip" data-placement="top" data-original-title="<% $CF->EntryHint %>"></span>
 % }
 </div>
-<div class="value col-9">
+<div class="value col-<% $ValueCols %>">
 <& /Elements/EditCustomField,
     %ARGS,
     CustomField => $CF,
@@ -94,5 +94,7 @@ $m->callback( CallbackName => 'MassageTransactionCustomFields', CustomFields =>
 $TicketObj => undef
 $QueueObj => undef
 $InTable => 0
+$LabelCols => 3
+$ValueCols => 9
 </%ARGS>
 
diff --git a/share/html/Ticket/ModifyAll.html b/share/html/Ticket/ModifyAll.html
index 8fd5723241..9a57a9594d 100644
--- a/share/html/Ticket/ModifyAll.html
+++ b/share/html/Ticket/ModifyAll.html
@@ -87,7 +87,7 @@
 <&| /Widgets/TitleBox, title => loc('Update ticket'), class => 'messagedetails' &>
 <div>
   <div class="form-row input-row">
-    <div class="label col-3"><&|/l&>Update Type</&>:</div>
+    <div class="label col-2"><&|/l&>Update Type</&>:</div>
     <div class="value col-9">
       <select name="UpdateType" id="UpdateType" class="form-control selectpicker">
 % if ($CanComment) {
@@ -101,19 +101,16 @@
     </div>
   </div>
   <div class="form-row input-row">
-    <div class="label col-3"><&|/l&>Subject</&>:</div>
+    <div class="label col-2"><&|/l&>Subject</&>:</div>
     <div class="value col-9"><input class="form-control" type="text" name="UpdateSubject" value="<%$Ticket->Subject%>" />
 % $m->callback( %ARGS, CallbackName => 'AfterSubject' );
     </div>
   </div>
 
-  <& /Ticket/Elements/EditTransactionCustomFields, %ARGS, TicketObj => $Ticket &>
+  <& /Ticket/Elements/EditTransactionCustomFields, %ARGS, TicketObj => $Ticket, LabelCols => 2 &>
 
-<& /Ticket/Elements/AddAttachments, %ARGS, TicketObj => $Ticket &>
-
-  <div class="form-row input-row">
-    <div class="label col-3"><&|/l&>Message</&>:</div>
-    <div class="value col-9 messagebox-container action-<% $ARGS{UpdateType} || ($CanComment ? 'private' : 'response') %>">
+  <div class="my-2">
+    <div class="messagebox-container action-<% $ARGS{UpdateType} || ($CanComment ? 'private' : 'response') %>">
 % $m->callback( %ARGS, CallbackName => 'BeforeMessageBox' );
 % if (defined $ARGS{UpdateContent} && length($ARGS{UpdateContent})) {
     <& /Elements/MessageBox, Name=>"UpdateContent", Default=>$ARGS{UpdateContent}, IncludeSignature => 0 &>
@@ -122,6 +119,8 @@
 % }
     </div>
   </div>
+<& /Ticket/Elements/AddAttachments, %ARGS, TicketObj => $Ticket &>
+
 </div>
 </&>
   

-----------------------------------------------------------------------