From ff49ea79d9afa4a37fb7e342c2100ba0ef8e26e1 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 14 Jul 2020 21:30:39 +0000
Subject: [PATCH] Bug 25987: Fix alignment of fields in label batch creation
 form

This patch makes minor markup changes to the template for the label
batch creation process so that form fields line up correctly.

Unrelated change: A hint has been moved out of the label area to below
the textarea in order to conform with established patterns.

To test, apply the patch and go to Tools > Label creator > New > Label
batch.

 - In the batch creation form the "Enter by itemnumber" and "Enter by
   barcode" should be aligned correctly with each other.
 - The "One number per line..." hint should appear below the textarea.
 - Test that the form fields are still correctly aligned after adding
   some items to the batch and the "description" field is shown in the
   form.

Works for me!

Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit 00f04146e915b2b1a9881439ac34088e6486921f)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
---
 .../en/modules/labels/label-edit-batch.tt     | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt
index 27282a95b9..24b3de3e4b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt
@@ -62,23 +62,28 @@
                                 <div>
                                     <fieldset class="rows" style="border-bottom: 0px; border: 0px;">
                                     <ol><li id="description">
-                                        <input type="hidden" name="op" value="add" />
-                                        <input type="hidden" name="batch_id" value="[% batch_id | html %]" />
-                                        <label for="description">Batch description: </label>
-                                        <input type="text" name="description" value="[% description | html %]"> <span id="change-status"></span>
-                                    </li>
+                                            <input type="hidden" name="op" value="add" />
+                                            <input type="hidden" name="batch_id" value="[% batch_id | html %]" />
+                                            <label for="description">Batch description: </label>
+                                            <input type="text" name="description" value="[% description | html %]"> <span id="change-status"></span>
+                                        </li>
                                     <li>
                                         <input type="radio" name="number_type" id="barcode_enter" value="barcode" checked />
-                                        <label for="barcode_enter">Enter by barcode:</label><br/>
+                                        <label for="barcode_enter">Enter by barcode:</label>
+                                    </li>
+                                    <li>
                                         <input type="radio" name="number_type" id="itemnum_enter" value="itemnumber" />
                                         <label for="itemnum_enter">Enter by itemnumber:</label>
                                     </li>
                                     <li>
-                                        <label for="number_list">Add by barcode(s) or itemnumbers(s):
-                                            <br /> <span class="hint">One number per line.</span>
-                                            <br /> <span class="hint">Leave empty to add via item search (itemnumber).</span>
+                                        <label for="number_list">
+                                            Add by barcode(s) or itemnumbers(s):
                                         </label>
                                         <textarea rows="5" id="number_list" name="number_list" tabindex="1" class="focus"></textarea>
+                                        <div class="hint">
+                                            One number per line.
+                                            <br /> Leave empty to add via item search (itemnumber)
+                                        </div>
                                     </li></ol>
                                     </fieldset>
                                 </div>
-- 
2.39.5