[Rt-commit] rt branch 5.0/search-chart-sort-axis-labels updated. rt-5.0.5-186-ga1a982cfcd

[BPS Git Server]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "rt".

The branch, 5.0/search-chart-sort-axis-labels has been updated
       via  a1a982cfcd288b321c6560cd8ffb41243187ae60 (commit)
      from  0c5e8d2a8c159579609349bb74dce4d6278d2bb9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a1a982cfcd288b321c6560cd8ffb41243187ae60
Author: Jim Brandt <jbrandt at bestpractical.com>
Date:   Wed Apr 10 16:32:33 2024 -0400

    Improve layout of x-axis options

diff --git a/share/html/Search/Chart.html b/share/html/Search/Chart.html
index 667d5d1344..d44cfef8a9 100644
--- a/share/html/Search/Chart.html
+++ b/share/html/Search/Chart.html
@@ -277,10 +277,12 @@ $m->callback( ARGSRef => \%ARGS, QueryArgsRef => \%query );
         <label class="custom-control-label" for="ChartStyleIncludeSQL"><&|/l&>Include TicketSQL query</&></label>
       </div>
 
+      <div class="form-row sorting">
+        <h5 class="titlebox-inner-heading mt-2 ml-2">X-Axis</h5>
+      </div>
       <div class="form-row sorting">
         <div class="label col-auto">
-          <span class="far fa-question-circle icon-helper" data-toggle="tooltip" data-placement="top" data-original-title="<&|/l&>Value only works for count calculations</&>"></span>
-          <&|/l&>Order by</&>:
+          <&|/l&>Order by</&>:<span class="far fa-question-circle icon-helper" data-toggle="tooltip" data-placement="top" data-original-title="<&|/l&>Value only works for count calculations</&>"></span>
         </div>
         <div class="value col-auto">
           <select name="ChartOrderBy" class="form-control selectpicker">
@@ -290,22 +292,20 @@ $m->callback( ARGSRef => \%ARGS, QueryArgsRef => \%query );
         </div>
         <div class="value col-auto">
           <select name="ChartOrder" class="form-control selectpicker">
-            <option value="ASC" <% $query{ChartOrder} eq 'ASC' ? 'selected="selected"' : '' |n %>><&|/l&>ASC</&></option>
-            <option value="DESC" <% $query{ChartOrder} eq 'DESC' ? 'selected="selected"' : '' |n %>><&|/l&>DESC</&></option>
+            <option value="ASC" <% $query{ChartOrder} eq 'ASC' ? 'selected="selected"' : '' |n %>><&|/l&>Ascending</&></option>
+            <option value="DESC" <% $query{ChartOrder} eq 'DESC' ? 'selected="selected"' : '' |n %>><&|/l&>Descending</&></option>
           </select>
         </div>
-        <div class="label col-auto"><&|/l&>Limit</&>:</div>
+        <div class="label col-auto"><&|/l&>Limit chart to</&>:</div>
         <div class="value col-auto">
           <div class="input-group">
             <div class="input-group-prepend">
               <span class="input-group-text"><&|/l&>top</&></span>
             </div>
             <input name="ChartLimit" size="3" class="form-control" value="<% $query{ChartLimit} // '' %>" />
-            <div class="input-group-append">
-              <span class="input-group-text"><&|/l&>items</&></span>
-            </div>
           </div>
         </div>
+          <span class="label col-auto"><&|/l&>items</&></span>
       </div>
     </&>
 
diff --git a/share/static/css/elevator-light/boxes.css b/share/static/css/elevator-light/boxes.css
index f1bc9c61e2..f09ea3b8de 100644
--- a/share/static/css/elevator-light/boxes.css
+++ b/share/static/css/elevator-light/boxes.css
@@ -60,6 +60,10 @@
     border-radius: 0 0.25em 0 0.25em;
 }
 
+.titlebox-inner-heading {
+    color: #3858a3
+}
+
 .titlebox:hover .titlebox-title .right a,
 .titlebox:active .titlebox-title .right a {
     color: #000

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

Summary of changes:
 share/html/Search/Chart.html              | 16 ++++++++--------
 share/static/css/elevator-light/boxes.css |  4 ++++
 2 files changed, 12 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
rt