From 7573d3caf1a7b4aaa7ba86f9b6d168ebc6ac8b90 Mon Sep 17 00:00:00 2001
From: Kyle Hall <kyle@bywatersolutions.com>
Date: Mon, 31 Oct 2022 11:59:53 -0400
Subject: [PATCH] Bug 24606: (QA follow-up) Fix up interface

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 .../prog/en/modules/cataloguing/additem.tt    | 76 +++++++++++--------
 1 file changed, 43 insertions(+), 33 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
index 73bb1f1b35..3dbf2c0cf2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
@@ -164,47 +164,57 @@
     [% END %]
 
     <div id="item-template-toolbar" class="btn-toolbar">
-        <select name="template_id" id="template_id" class="select2" style="width: 20em">
-            <option value="0" selected="selected">Do not use template</option>
-            <optgroup label="My templates">
-                [% FOREACH t IN item_templates.owned %]
-                    [% IF t.id == template_id %]
-                        <option data-editor="1" value="[% t.id | html %]" selected="selected">[% t.name | html %][% IF t.is_shared %] (shared)[% END %]</option>
-                    [% ELSE %]
-                        <option data-editor="1" value="[% t.id | html %]">[% t.name | html %][% IF t.is_shared %] (shared)[% END %]</option>
-                    [% END %]
-                [% END %]
-            </optgroup>
-            <optgroup label="Shared templates">
-                [% FOREACH t IN item_templates.shared %]
-                    [% IF t.id == template_id %]
-                        [% IF CAN_user_editcatalogue_manage_item_editor_templates %]
-                            <option data-editor="1" value="[% t.id | html %]" selected="selected">[% t.name | html %]</option>
+        <div class="btn-group">
+            <select name="template_id" id="template_id" class="select2" style="width: 20em">
+                <option value="0" selected="selected">Do not use template</option>
+                <optgroup label="My templates">
+                    [% FOREACH t IN item_templates.owned %]
+                        [% IF t.id == template_id %]
+                            <option data-editor="1" value="[% t.id | html %]" selected="selected">[% t.name | html %][% IF t.is_shared %] (shared)[% END %]</option>
                         [% ELSE %]
-                            <option data-editor="0" value="[% t.id | html %]" selected="selected">[% t.name | html %]</option>
+                            <option data-editor="1" value="[% t.id | html %]">[% t.name | html %][% IF t.is_shared %] (shared)[% END %]</option>
                         [% END %]
-                    [% ELSE %]
-                        [% IF CAN_user_editcatalogue_manage_item_editor_templates %]
-                            <option data-editor="1" value="[% t.id | html %]">[% t.name | html %]</option>
+                    [% END %]
+                </optgroup>
+                <optgroup label="Shared templates">
+                    [% FOREACH t IN item_templates.shared %]
+                        [% IF t.id == template_id %]
+                            [% IF CAN_user_editcatalogue_manage_item_editor_templates %]
+                                <option data-editor="1" value="[% t.id | html %]" selected="selected">[% t.name | html %]</option>
+                            [% ELSE %]
+                                <option data-editor="0" value="[% t.id | html %]" selected="selected">[% t.name | html %]</option>
+                            [% END %]
                         [% ELSE %]
-                            <option data-editor="0" value="[% t.id | html %]">[% t.name | html %]</option>
+                            [% IF CAN_user_editcatalogue_manage_item_editor_templates %]
+                                <option data-editor="1" value="[% t.id | html %]">[% t.name | html %]</option>
+                            [% ELSE %]
+                                <option data-editor="0" value="[% t.id | html %]">[% t.name | html %]</option>
+                            [% END %]
                         [% END %]
                     [% END %]
+                </optgroup>
+            </select>
+        </div>
+        <div class="btn-group">
+            <button type="submit" id="load_template_submit" name="load_template_submit" value="1"><i class="fa fa-wpforms"></i> Apply template</button>
+        </div>
+        <div class="btn-group">
+            <label for="use_template_for_session">
+                [% IF use_template_for_session %]
+                    <input type="checkbox" id="use_template_for_session" name="use_template_for_session" checked="checked">
+                [% ELSE %]
+                    <input type="checkbox" id="use_template_for_session" name="use_template_for_session">
                 [% END %]
-            </optgroup>
-        </select>
-        <button type="submit" id="load_template_submit" name="load_template_submit" value="1"><i class="fa fa-wpforms"></i> Apply template</button>
-        <label for="use_template_for_session">
-            [% IF use_template_for_session %]
-                <input type="checkbox" id="use_template_for_session" name="use_template_for_session" checked="checked">
-            [% ELSE %]
-                <input type="checkbox" id="use_template_for_session" name="use_template_for_session">
-            [% END %]
-        For session</label>
+            For session</label>
+        </div>
 
-        <button type="submit" id="unload_template_submit" name="unload_template_submit" value="1"><i class="fa fa-eraser"></i> Clear template</button>
+        <div class="btn-group">
+            <button type="submit" id="unload_template_submit" name="unload_template_submit" value="1"><i class="fa fa-eraser"></i> Clear template</button>
+        </div>
 
-        <button type="submit" id="delete_template_submit" name="delete_template_submit" value="1" disabled><i class="fa fa-trash"></i> Delete template</button>
+        <div class="btn-group">
+            <button type="submit" id="delete_template_submit" name="delete_template_submit" value="1" disabled><i class="fa fa-trash"></i> Delete template</button>
+        </div>
 
     </div>
 
-- 
2.39.5