From d9e1ce3df55c2bc5f8026a8dd18babd558dab1c7 Mon Sep 17 00:00:00 2001
From: Katrin Fischer <katrin.fischer.83@web.de>
Date: Tue, 5 Feb 2019 21:44:58 +0000
Subject: [PATCH] Bug 22170: Improve display of add/edit library group modal
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Tries to bring the emodal for adding/editing library root
and sub groups more in line with the rest of Koha.

To test:
 - Go to Administration > Library groups
 - With and without patch test following actions:
   - Add a new root group
   - Edit root group
   - Add sub-group entry
   - Edit sub-group entry
- Verify that with the patch the display of the labels
  is more standard (bold and aligned to the right) and
  the input fields are a bit longer to allow for
  easier data entry.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Mikaël Olangcay Brisebois <mikael.olangcay-brisebois@inLibro.com>

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 90b43c6e5fceda3d6bcc4fb24c99934331df1acc)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit ca9f17517df3f97a5ee66e99b5f90f37f74989a5)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
---
 .../prog/en/modules/admin/library_groups.tt   | 53 ++++++++++---------
 1 file changed, 29 insertions(+), 24 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt
index 9dc7d393e5..d7cae6529c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt
@@ -179,19 +179,21 @@
                         <h3 id="add-group-modal-label">Add group</h3>
                     </div>
                     <div class="modal-body">
-                        <input type="hidden" id="add-group-modal-parent-id" name="parent_id" value="" />
-                        <input type="hidden" id="add-group-modal-action" name="action" value="add">
-
-                        <p>
-                            <label for="add-group-modal-title">Title: </label>
-                            <input type="text" name="title" id="add-group-modal-title" required="required" />
-                            <i>required</i>
-                        </p>
-
-                        <p>
-                            <label for="add-group-modal-description">Description: </label>
-                            <input type="text" name="description" id="add-group-modal-description" />
-                        </p>
+                        <fieldset class="rows">
+                            <input type="hidden" id="add-group-modal-parent-id" name="parent_id" value="" />
+                            <input type="hidden" id="add-group-modal-action" name="action" value="add">
+                            <ol>
+                                <li>
+                                    <label for="add-group-modal-title">Title: </label>
+                                    <input type="text" size="40" maxlength="100" name="title" id="add-group-modal-title" required="required" />
+                                    <span class="required">Required</span>
+                                </li>
+                                <li>
+                                    <label for="add-group-modal-description">Description: </label>
+                                    <input type="text" size="40" name="description" id="add-group-modal-description" />
+                                </li>
+                            </ol>
+                        </fieldset>
                         <div id="root-group-features-add">
                             <h3>Features</h3>
                             <div class="checkbox">
@@ -231,17 +233,20 @@
                     <div class="modal-body">
                         <input type="hidden" id="edit-group-modal-id" name="id" value="" />
                         <input type="hidden" id="edit-group-modal-action" name="action" value="edit" />
-
-                        <p>
-                            <label for="edit-group-modal-title">Title: </label>
-                            <input type="text" id="edit-group-modal-title" name="title" value="" required="required" />
-                            <i>required</i>
-                        </p>
-
-                        <p>
-                            <label for="edit-group-modal-description">Description: </label>
-                            <input type="text" id="edit-group-modal-description" name="description" value="" />
-                        </p>
+                        <fieldset class="rows">
+                            <ol>
+                                <li>
+                                    <label for="edit-group-modal-title">Title: </label>
+                                    <input type="text" size="40" maxlength="100" id="edit-group-modal-title" name="title" value="" required="required" />
+                                    <span class="required">Required</span>
+                                </li>
+
+                                <li>
+                                    <label for="edit-group-modal-description">Description: </label>
+                                    <input type="text" size="40" id="edit-group-modal-description" name="description" value="" />
+                                </li>
+                            </ol>
+                        </fieldset>
                         <div id="root-group-features-edit">
                             <h3>Features</h3>
                             <div class="checkbox">
-- 
2.39.5