From 87dabd4c77b5f4031427b34e1c4f33600e0a8560 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 17 Nov 2023 18:44:46 +0000 Subject: [PATCH] Bug 35364: Update label creator pop-up windows with consistent footer markup This patch updates several serials module templates in order to style submission and close buttons in a fixed footer at the bottom of pop-up windows, with markup consistent with other pop-up windows. Unrelated change: A couple of templates have had a "page-section" div added where it was missing. To test, apply the patch and go to Serials. For each affected template, test that the window looks correct and the buttons in the footer work correctly: - New subscription -> - Search for a vendor: - Vendor search form - Vendor search results - Search for record - Record search form - Record search results - Complete the process of creating a subscription if there are no other subscriptions already in your database. - From the subscription detail page, click the "Renew" button in the toolbar and test that window. - From the subscription detail page, click the "Create routing list" link in the left-hand sidebar menu. - Add one or more recipients and click "Save" - Click "Save and preview routing slip" and test the resulting pop-up. Signed-off-by: David Nind --- .../en/modules/serials/acqui-search-result.tt | 41 +++++++++++-------- .../prog/en/modules/serials/acqui-search.tt | 19 +++++++-- .../prog/en/modules/serials/result.tt | 15 +++++-- .../modules/serials/routing-preview-slip.tt | 12 +++++- .../serials/subscription-bib-search.tt | 11 +++-- .../en/modules/serials/subscription-renew.tt | 19 +++++++-- 6 files changed, 86 insertions(+), 31 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt index c8e8311fcc..54e38efc18 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt @@ -13,29 +13,38 @@ [% UNLESS count %]

Your search returned no results.

[% ELSIF ( supplier.length < 1 ) %] -

Vendor search: [% count | html %] result(s) found

+

[% count | html %] result(s) found

[% ELSE %] -

Vendor search: [% count | html %] result(s) found for '[% supplier | html %]'

+

[% count | html %] result(s) found for '[% supplier | html %]'

[% END %] [% IF ( loop_suppliers ) %] - - - - - - [% FOREACH loop_supplier IN loop_suppliers %] +
+
VendorSelect
- - - - [% END %] -
[% loop_supplier.name | html %]Choose
+ Vendor + Select + + [% FOREACH loop_supplier IN loop_suppliers %] + + [% loop_supplier.name | html %] + Choose + + [% END %] + + [% END %] -

Perform a new search

- - + [% MACRO jsinclude BLOCK %]