From 7e2b0163fcdf54af007c482a16817a5aae56bb98 Mon Sep 17 00:00:00 2001
From: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Date: Wed, 23 Nov 2022 17:12:59 +0000
Subject: [PATCH] Bug 32257: Label for patron attributes misaligned

Label has now been realigned to match the format of the fields above. When
clicking to add a new field, the delete button was also misaligned. This has
 now been reformatted to sit next to the "New" button

Test Plan:
1) Navigate to Tools > Batch patron modification
2) Add either card or borrower numbers to bring up the edit patrons fields
3) "Patron attributes:" is on the far right and above the select box. When
   adding a new field there is a big gap between the Add and  Delete buttons
4) Apply patch and navigate to same area
5) Observe that the Patron attributes option is aligned to match the fields
   above and the gap between the buttons has been removed

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit d2ee603a608d8eadd33c8deeaaa2b04868960ab0)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 .../prog/en/modules/tools/modborrowers.tt     | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
index 0837de9c73..09f0d5e09d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
@@ -368,14 +368,16 @@
                                         [% END %]
                                         [% IF ( patron_attributes_codes ) %]
                                             <li class="attributes">
-                                                <label style="width:auto;">Patron attribute:
-                                                    <select name="patron_attributes">
-                                                        <option value=""></option>
-                                                        [% FOREACH pac IN patron_attributes_codes %]
-                                                            <option value="[% pac.attribute_code | html %]" data-type="[% pac.type | html %]" data-category="[% pac.category_lib | html %]">[% pac.attribute_lib | html %]</option>
-                                                        [% END %]
-                                                    </select>
+                                                <label style="width:auto;">
+                                                    <span>Patron Attribute:</span>
                                                 </label>
+                                                <select name="patron_attributes">
+                                                    <option value=""></option>
+                                                    [% FOREACH pac IN patron_attributes_codes %]
+                                                        <option value="[% pac.attribute_code | html %]" data-type="[% pac.type | html %]" data-category="[% pac.category_lib | html %]">[% pac.attribute_lib | html %]</option>
+                                                    [% END %]
+                                                </select>
+
                                                 <input type="checkbox" title="check to delete this field" name="disable_input" value="attr0_value" />
                                                 <span class="patron_attributes_value"><input type"hidden" name="patron_attributes_value" /></span>
                                                 <a href="#" class="add_attributes" title="Add an attribute"><i class="fa fa-fw fa-plus"></i> New</a>
@@ -543,7 +545,8 @@
             var li_node = $("li.attributes:last");
             var li_clone = $(li_node).clone();
             if ( $(li_clone).find("a.del_attributes").length == 0 ) {
-                $(li_clone).append('<a href="#" title="' + _("Delete") + '" class="del_attributes"><i class="fa fa-fw fa-trash"></i> ' + _("Delete") + '</a>');
+                var add_attributes = $(li_clone).find("a.add_attributes")
+                $(add_attributes).after('<a href="#" title="' + _("Delete") + '" class="del_attributes"><i class="fa fa-fw fa-trash"></i> ' + _("Delete") + '</a>');
             }
             $(li_clone).find('select[name="patron_attributes"]').change(function() {
                 updateAttrValues(this);
-- 
2.39.5