Attachment 142835 Details for Bug 24606 – Bug 24606: (QA follow-up) Fix up interface

[patch] Bug 24606: (QA follow-up) Fix up interface

Bug-24606-QA-follow-up-Fix-up-interface.patch (text/plain), 6.19 KB, created by Kyle M Hall (khall) on 2022-10-31 16:00:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2022-10-31 16:00:09 UTC

Size: 6.19 KB

patch

obsolete

>From b93050ba12667622c30547dbfea6905ae8493d2e 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
>
>---
> .../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 0f180caf69..f0242bd8e3 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
>@@ -163,47 +163,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.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 24606: 141613 | 141614 | 141615 | 141616 | 141617 | 141717 | 141718 | 141719 | 141720 | 141721 | 141972 | 142003 | 142004 | 142005 | 142006 | 142007 | 142008 | 142833 | 142834 | 142835 | 142836 | 142837 | 142877 | 142878 | 142879 | 142880 | 142881 | 142882 | 142883 | 142884 | 142885 | 142886 | 142887 | 142888 | 143020 | 143569 | 143570 | 143571 | 143572 | 143573 | 143574 | 143575 | 143576 | 143577 | 143578 | 143579 | 143580 | 143581 | 143794 | 143795 | 143796 | 143989 | 143990 | 144161