From 2502a54682f1fa02aaa39373515624a2fdd6e7eb Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 23 Mar 2020 12:24:34 +0000
Subject: [PATCH] Bug 24953: Minor corrections to hold ratios report sidebar

This patch makes some minor corrections to the sidebar form on the hold
ratios report page:

 - Correct markup errors
 - Change the text of labels from "included" to "include"
 - Move checkboxes to the left of labels

To test, apply the patch and rebuild the staff client CSS
(https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client)

 - Go to Circulation -> Hold ratios
 - In the sidebar, confirm that the labels "Include ordered" and
   "Include suspended" appear to the right of their associated
   checkboxes.
 - Validate the source of the page. There should be no errors.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 .../intranet-tmpl/prog/css/src/staff-global.scss   |  1 +
 .../prog/en/modules/circ/reserveratios.tt          | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
index 87b5680de3..0a704fa499 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
@@ -149,6 +149,7 @@ aside {
                 &.checkbox {
                     label {
                         display: inline;
+                        margin-left: 0;
                     }
                 }
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt
index 907d633649..224c0928f0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt
@@ -129,25 +129,25 @@
     <li>
         <label for="ratio">Hold ratio:</label>
         <input type="text" size="5" id="ratio" name="ratio" value="[% ratio | html %]" />
-    <li>
+    </li>
 
-    <li>
-        <label for="include_ordered">Included ordered:</label>
+    <li class="checkbox">
         [% IF include_ordered %]
             <input id="include_ordered" name="include_ordered" type="checkbox" checked="checked"/>
         [% ELSE %]
             <input id="include_ordered" name="include_ordered" type="checkbox"/>
         [% END %]
-    <li>
+        <label for="include_ordered">Include ordered</label>
+    </li>
 
-    <li>
-        <label for="include_suspended">Included suspended:</label>
+    <li class="checkbox">
         [% IF include_suspended %]
             <input id="include_suspended" name="include_suspended" type="checkbox" checked="checked"/>
         [% ELSE %]
             <input id="include_suspended" name="include_suspended" type="checkbox"/>
         [% END %]
-    <li>
+        <label for="include_suspended">Include suspended</label>
+    </li>
 
     <li>
         <label for="from">Start date:</label>
-- 
2.39.5