From 7db5145bd4d8fbe7292cd0f2072c33392f97c314 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 13 Jan 2023 14:07:41 +0000 Subject: [PATCH] Bug 32628: Add 'page-section' to various serials pages This patch adds a "page-section" container div around the main section of serials pages which lack it. This patch contains indentation changes, so please ignore whitespace when looking at the diff. To test you must have at least one subscription in your system. Apply the patch and view the following pages to confirm that the main content is contained in a white box: - Subscription batch edit: - Go to Serials -> Search subscriptions -> Results - Check the box next to one or more search results and click "Edit selected serials." - Subscription frequencies: - Serials -> Manage frequencies - View subscription alerts: - Log in to the OPAC and search for a subscription. - On the subscription detail page click the "Subscribe to to email notification on new issues." - In the staff interface, locate that subscription and view its details. - Click the "subscribers" link under "Patron notification." --- .../modules/serials/subscription-batchedit.tt | 2 +- .../serials/subscription-frequencies.tt | 58 ++++++++++--------- .../prog/en/modules/serials/viewalerts.tt | 42 +++++++------- 3 files changed, 53 insertions(+), 49 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt index ba122bddf2..6b38351a52 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt @@ -37,7 +37,7 @@

Subscription batch edit

-
+

You are about to edit the following subscriptions:

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt index 0272ef373e..5cfe13bde1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt @@ -136,35 +136,37 @@ [% END %] [% IF (frequencies_loop.size) %] -
- - - - - - - - - - - - [% FOREACH frequency IN frequencies_loop %] - - - - - - - - - [% END %] - -
DescriptionUnitIssues per unitUnits per issueDisplay orderActions
[% frequency.description | html %][% PROCESS translate_frequnit frequnit=frequency.unit %][% frequency.issuesperunit | html %][% frequency.unitsperissue | html %][% frequency.displayorder | html %] - Edit - Delete -
+
+ + + + + + + + + + + + + [% FOREACH frequency IN frequencies_loop %] + + + + + + + + + [% END %] + +
DescriptionUnitIssues per unitUnits per issueDisplay orderActions
[% frequency.description | html %][% PROCESS translate_frequnit frequnit=frequency.unit %][% frequency.issuesperunit | html %][% frequency.unitsperissue | html %][% frequency.displayorder | html %] + Edit + Delete +
+
[% ELSE %] -

There is no defined frequency.

+

There is no defined frequency.

[% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt index ddf38a7c37..e8e8c1f8c5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt @@ -31,28 +31,30 @@
-

Alert subscribers for [% bibliotitle | html %]

+

Alert subscribers for [% bibliotitle | html %]

+

+ Subscription: [% bibliotitle | html %] #[% subscriptionid | html %] +

-

- Subscription: [% bibliotitle | html %] #[% subscriptionid | html %] -

+
-[% IF subscribers.count %] - - - - - [% FOREACH subscriber IN subscribers %] - - - - [% END %] -
Patron name
- [% INCLUDE 'patron-title.inc' patron=subscriber %] -
-[% ELSE %] -

There are no patrons subscribed to this subscription serial alert.

-[% END %] + [% IF subscribers.count %] + + + + + [% FOREACH subscriber IN subscribers %] + + + + [% END %] +
Patron name
+ [% INCLUDE 'patron-title.inc' patron=subscriber %] +
+ [% ELSE %] +

There are no patrons subscribed to this subscription serial alert.

+ [% END %] +
-- 2.20.1