Port Reports to LabeledValue

4 files changed, 34 insertions, 94 deletions

diff --git a/share/html/Reports/CreatedByDates.html b/share/html/Reports/CreatedByDates.html
index 50900a86c4..2036adb055 100644
--- a/share/html/Reports/CreatedByDates.html
+++ b/share/html/Reports/CreatedByDates.html
@@ -95,32 +95,17 @@ $m->callback( CallbackName => 'MassageQuery', %ARGS, ARGSRef => \%ARGS,
 
 <hr />
 
-  <div class="form-row">
-    <div class="label col-3">
-      <&|/l&>Queue</&>:
-    </div>
-    <div class="value col-9">
-      <& /Elements/SelectQueue, Name => 'Queue', NamedValues => 1, Default => $QueueObj->id &>
-    </div>
-  </div>
+  <&| /Elements/LabeledValue, Label => loc("Queue") &>
+    <& /Elements/SelectQueue, Name => 'Queue', NamedValues => 1, Default => $QueueObj->id &>
+  </&>
 
-  <div class="form-row">
-    <div class="label col-3">
-      <&|/l&>Tickets created after</&>:
-    </div>
-    <div class="value col-9">
-      <& /Elements/SelectDate, Name => 'CreatedAfter', Default => $CreatedAfter &>
-    </div>
-  </div>
+  <&| /Elements/LabeledValue, Label => loc("Tickets created after") &>
+    <& /Elements/SelectDate, Name => 'CreatedAfter', Default => $CreatedAfter &>
+  </&>
 
-  <div class="form-row">
-    <div class="label col-3">
-      <&|/l&>Tickets created before</&>:
-    </div>
-    <div class="value col-9">
-      <& /Elements/SelectDate, Name => 'CreatedBefore', Default => $CreatedBefore &>
-    </div>
-  </div>
+  <&| /Elements/LabeledValue, Label => loc("Tickets created before") &>
+    <& /Elements/SelectDate, Name => 'CreatedBefore', Default => $CreatedBefore &>
+  </&>
 
   <div class="form-row">
     <div class="col-12">
diff --git a/share/html/Reports/ResolvedByDates.html b/share/html/Reports/ResolvedByDates.html
index 922304e7f6..ec071fb0dc 100644
--- a/share/html/Reports/ResolvedByDates.html
+++ b/share/html/Reports/ResolvedByDates.html
@@ -98,32 +98,17 @@ $m->callback( CallbackName => 'MassageQuery', %ARGS, ARGSRef => \%ARGS,
 % }
 
 <hr />
-  <div class="form-row">
-    <div class="label col-3">
-      <&|/l&>Queue</&>:
-    </div>
-    <div class="value col-9">
-      <& /Elements/SelectQueue, Name => 'Queue', NamedValues => 1, Default => $QueueObj->id &>
-    </div>
-  </div>
+  <&| /Elements/LabeledValue, Label => loc("Queue") &>
+    <& /Elements/SelectQueue, Name => 'Queue', NamedValues => 1, Default => $QueueObj->id &>
+  </&>
 
-  <div class="form-row">
-    <div class="label col-3">
-      <&|/l&>Tickets resolved after</&>:
-    </div>
-    <div class="value col-9">
-      <& /Elements/SelectDate, Name => 'ResolvedAfter', Default => $ResolvedAfter &>
-    </div>
-  </div>
+  <&| /Elements/LabeledValue, Label => loc("Tickets resolved after") &>
+    <& /Elements/SelectDate, Name => 'ResolvedAfter', Default => $ResolvedAfter &>
+  </&>
 
-  <div class="form-row">
-    <div class="label col-3">
-      <&|/l&>Tickets resolved before</&>:
-    </div>
-    <div class="value col-9">
-      <& /Elements/SelectDate, Name => 'ResolvedBefore', Default => $ResolvedBefore &>
-    </div>
-  </div>
+  <&| /Elements/LabeledValue, Label => loc("Tickets resolved before") &>
+    <& /Elements/SelectDate, Name => 'ResolvedBefore', Default => $ResolvedBefore &>
+  </&>
   <div class="form-row">
     <div class="col-12">
       <& /Elements/Submit &>
diff --git a/share/html/Reports/ResolvedByOwner.html b/share/html/Reports/ResolvedByOwner.html
index 0a64188609..6e9c71516c 100644
--- a/share/html/Reports/ResolvedByOwner.html
+++ b/share/html/Reports/ResolvedByOwner.html
@@ -74,14 +74,9 @@ $m->callback( CallbackName => 'MassageQuery', %ARGS, ARGSRef => \%ARGS,
 
 <hr />
 
-  <div class="form-row">
-    <div class="label col-3">
-      <&|/l&>Queue</&>:
-    </div>
-    <div class="value col-9">
-      <& /Elements/SelectQueue, Name => 'Queue', NamedValues => 1, Default => $QueueObj->id &>
-    </div>
-  </div>
+  <&| /Elements/LabeledValue, Label => loc("Queue") &>
+    <& /Elements/SelectQueue, Name => 'Queue', NamedValues => 1, Default => $QueueObj->id &>
+  </&>
 
   <div class="form-row">
     <div class="col-12">
diff --git a/share/html/Reports/TimeWorkedReport.html b/share/html/Reports/TimeWorkedReport.html
index 259683ab6d..ecd7b405d3 100644
--- a/share/html/Reports/TimeWorkedReport.html
+++ b/share/html/Reports/TimeWorkedReport.html
@@ -52,52 +52,27 @@
 <div class="container">
 <&| /Widgets/TitleBox, hideable => 0, class => 'user-timeworked-form-content', content_class => 'mx-auto width-md' &>
   <form method="POST" action="TimeWorkedReport.html" class="mx-auto">
-    <div class="form-row">
-      <div class="label col-3">
-        <&|/l&>User</&>:
-      </div>
-      <div class="value col-9">
+    <&| /Elements/LabeledValue, Label => loc("User") &>
         <input class="form-control user-time-worked-input" name="User" data-autocomplete="Users" data-autocomplete-return="Name" placeholder="<%
 loc("Find a user...") %>" value="<% $User %>" />
-      </div>
-    </div>
-    <div class="form-row">
-      <div class="label col-3">
-        <&|/l&>Start Date</&>:
-      </div>
-      <div class="value col-9">
-        <& /Elements/SelectDate, ShowTime => 1, Name => 'StartDate', Default => $StartDate &>
-      </div>
-    </div>
-    <div class="form-row">
-      <div class="label col-3">
-        <&|/l&>End Date</&>:
-      </div>
-      <div class="value col-9">
-        <& /Elements/SelectDate, ShowTime => 1, Name => 'EndDate', Default => $EndDate &>
-      </div>
-    </div>
-    <div class="form-row">
-      <div class="label col-3">
-        <&|/l&>Sort By</&>:
-      </div>
-      <div class="value col-9">
+    </&>
+    <&| /Elements/LabeledValue, Label => loc("Start Date") &>
+      <& /Elements/SelectDate, ShowTime => 1, Name => 'StartDate', Default => $StartDate &>
+    </&>
+    <&| /Elements/LabeledValue, Label => loc("End Date") &>
+      <& /Elements/SelectDate, ShowTime => 1, Name => 'EndDate', Default => $EndDate &>
+    </&>
+    <&| /Elements/LabeledValue, Label => loc("Sort By") &>
         <select name="SortBy" class="selectpicker">
           <option value="Date" <% $SortBy eq 'Date' ?  'selected="selected"' : '' |n%>><&|/l&>By Date</&></option>
           <option value="User" <% $SortBy eq 'User' ? 'selected="selected"' : '' |n%>><&|/l&>By User</&></option>
           <option value="Ticket" <% $SortBy eq 'Ticket' ? 'selected="selected"' : '' |n%>><&|/l&>By Ticket</&></option>
           <option value="Queue" <% $SortBy eq 'Queue' ? 'selected="selected"' : '' |n%>><&|/l&>By Queue</&></option>
         </select>
-      </div>
-    </div>
-    <div class="form-row">
-      <div class="label col-3">
-        <&|/l&>Queue</&>:
-      </div>
-      <div class="value col-9">
-        <& /Elements/SelectQueue, Name => 'Queue', Id => 'queue', Default => $Queue &>
-      </div>
-    </div>
+    </&>
+    <&| /Elements/LabeledValue, Label => loc("Queue") &>
+      <& /Elements/SelectQueue, Name => 'Queue', Id => 'queue', Default => $Queue &>
+    </&>
     <div class="form-row">
       <div class="col-12">
         <& /Elements/Submit, Label => loc('See Time') &>