Merge branch '6.0/ticket-update-label-value'

bestpractical · Nov 8, 2024 · 4af7c30 · 4af7c30
2 parents 26474d9 + dd65dd9
commit 4af7c30
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 40 deletions.
diff --git a/share/html/Ticket/Elements/UpdateCc b/share/html/Ticket/Elements/UpdateCc
@@ -47,29 +47,22 @@
 %# END BPS TAGGED BLOCK }}}
 % $m->callback(CallbackName => 'BeforeCc', ARGSRef => \%ARGS, Ticket => $TicketObj, one_time_Ccs => \@one_time_Ccs, txn_addresses => \%txn_addresses);
 
-<div class="row mt-2">
-  <div class="label col-2">
-    <&|/l&>One-time Cc</&>:
-  </div>
-  <div class="value col-9">
-    <& /Elements/EmailInput, Name => 'UpdateCc', Size => undef, Default => $ARGS{UpdateCc}, AutocompleteMultiple => 1, Options => \@one_time_Ccs &>
-    <input type="hidden" id="UpdateIgnoreAddressCheckboxes" name="UpdateIgnoreAddressCheckboxes" value="<% $ARGS{UpdateIgnoreAddressCheckboxes} || 0 %>">
-  </div>
-</div>
+<&| /Elements/LabeledValue, Label => loc("One-time Cc"), &>
+  <& /Elements/EmailInput, Name => 'UpdateCc', Size => undef, Default => $ARGS{UpdateCc}, AutocompleteMultiple => 1, Options => \@one_time_Ccs &>
+  <input type="hidden" id="UpdateIgnoreAddressCheckboxes" name="UpdateIgnoreAddressCheckboxes" value="<% $ARGS{UpdateIgnoreAddressCheckboxes} || 0 %>">
+</&>
 
 %if (scalar @one_time_Ccs) {
-<div class="row">
-  <div class="label col-2"></div>
-  <div class="value col-9">
-    <div class="row mt-2">
+  <&| /Elements/LabeledValue, Label => '', &>
+    <div class="row">
 %   if ($hide_cc_suggestions) {
       <a href="#" class="ToggleSuggestions" data-hide-label="<% $hide_label %>" data-show-label="<% $show_label %>">
         <i class="label">(<&|/l&>show suggestions</&>)</i>
       </a>
       <div class="OneTimeCcs d-flex flex-wrap hidden">
 %   }
 
-      <div class="col-auto"><% GetSVGImage( Name => 'info', Title => loc('Check to add'), Size => 12 ) |n %></div>
+      <div class="col-auto d-flex align-items-center"><% GetSVGImage( Name => 'info', Title => loc('Check to add'), Size => 12 ) |n %></div>
       <div class="col-auto">
         <div class="form-check">
           <input type="checkbox" class="form-check-input" id="AllSuggestedCc" name="AllSuggestedCc" value="1" onclick="setCheckbox(this, /^UpdateCc-/); checkboxesToInput('UpdateCc', 'input[name^=UpdateCc-]:checkbox');">
@@ -99,32 +92,23 @@
       </div>
 %   }
     </div>
-  </div>
-</div>
+  </&>
 %}
-
-<div class="row mt-2">
-  <div class="label col-2">
-    <&|/l&>One-time Bcc</&>:
-  </div>
-  <div class="value col-9">
-    <& /Elements/EmailInput, Name => 'UpdateBcc', Size => undef, Default => $ARGS{UpdateBcc}, AutocompleteMultiple => 1, Options => \@one_time_Ccs &>
-  </div>
-</div>
+<&| /Elements/LabeledValue, Label => loc("One-time Bcc"), &>
+  <& /Elements/EmailInput, Name => 'UpdateBcc', Size => undef, Default => $ARGS{UpdateBcc}, AutocompleteMultiple => 1, Options => \@one_time_Ccs &>
+</&>
 
 %if (scalar @one_time_Ccs) {
-<div class="row">
-  <div class="label col-2"></div>
-  <div class="value col-9">
-    <div class="row mt-2">
+  <&| /Elements/LabeledValue, Label => '', &>
+    <div class="row">
 %   if ($hide_cc_suggestions) {
       <a href="#" class="ToggleSuggestions" data-hide-label="<% $hide_label %>" data-show-label="<% $show_label %>">
         <i class="label">(<&|/l&>show suggestions</&>)</i>
       </a>
       <div class="OneTimeCcs d-flex flex-wrap hidden">
 %   }
 
-      <div class="col-auto"><% GetSVGImage( Name => 'info', Title => loc('Check to add'), Size => 12 ) |n %></div>
+      <div class="col-auto d-flex align-items-center"><% GetSVGImage( Name => 'info', Title => loc('Check to add'), Size => 12 ) |n %></div>
       <div class="col-auto">
         <div class="form-check">
           <input type="checkbox" class="checkbox form-check-input" id="AllSuggestedBcc" name="AllSuggestedBcc" value="1" onclick="setCheckbox(this, /^UpdateBcc-/); checkboxesToInput('UpdateBcc', 'input[name^=UpdateBcc-]:checkbox');">
@@ -165,9 +149,8 @@ jQuery(function() {
 });
 </script>
 %   }
-    </div>
   </div>
-</div>
+</&>
 %}
 
 <%args>

diff --git a/share/html/Ticket/Widgets/Update/Message b/share/html/Ticket/Widgets/Update/Message
@@ -64,15 +64,10 @@
 % }
 % $m->callback( %ARGS, CallbackName => 'AfterGnuPG' );
 
-  <div class="row mt-2">
-    <div class="label col-2">
-      <&|/l&>Subject</&>:
-    </div>
-    <div class="value col-9">
-      <input class="form-control" type="text" name="UpdateSubject" value="<% $ARGS{UpdateSubject} || $Ticket->Subject || '' %>" />
+<&| /Elements/LabeledValue, Label => loc("Subject"), &>
+  <input class="form-control" type="text" name="UpdateSubject" value="<% $ARGS{UpdateSubject} || $Ticket->Subject || '' %>" />
 % $m->callback( %ARGS, CallbackName => 'AfterSubject' );
-    </div>
-  </div>
+</&>
   <& /Articles/Elements/BeforeMessageBox, %ARGS &>
 
   <div class="messagebox-container action-<% $type %>">