From 8a993d7bf47cf55fa85d719ab86206829a2a68f8 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 13 Oct 2022 18:09:21 +0000 Subject: [PATCH] Bug 31764: Add 'page-section' to patron clubs page This patch updates patron clubs template so that the main content of the page is wrapped with a "page-section" div. This ensures that content has sufficient contrast. See Bug 31757. Note: This patch contains indentation changes, so use diff accordingly. To test, apply the patch and go to Tools -> Patron clubs. - If necessary, add at least one club template and at least one club based on that template. - Confirm that the display of club templates and clubs looks correct. - Locate some patrons and add them to a club. - On the patron clubs page, locate a club with enrollments and click Actions -> Enrollments. Confirm that the page looks correct. Signed-off-by: Lucas Gass Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi --- .../prog/en/modules/clubs/club-enrollments.tt | 42 +++++---- .../prog/en/modules/clubs/clubs.tt | 92 ++++++++++--------- 2 files changed, 70 insertions(+), 64 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt index d06771f7c8..838540ae75 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt @@ -44,28 +44,30 @@ [% ELSE %]

Club enrollments for [% club.name | html %]

- - - - - - - - - - [% FOREACH e IN club.club_enrollments %] - [% SET p = e.patron %] +
+
NameCard number
+ - - + + - [% END %] - -
- [% p.surname | html %], [% p.firstname | html %] - - [% p.cardnumber | html %] - NameCard number
+ + + + [% FOREACH e IN club.club_enrollments %] + [% SET p = e.patron %] + + + [% p.surname | html %], [% p.firstname | html %] + + + [% p.cardnumber | html %] + + + [% END %] + + + [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt index 72ef2f0039..ffdbf47e12 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt @@ -69,51 +69,53 @@ [% END %] [% IF club_templates.count %] - - - - - - - - - - - - - [% FOREACH t IN club_templates %] +
+
NameDescriptionPublic enrollmentEmail requiredLibraryActions
+ - - - - - - + + + + + + - [% END %] - -
[% t.name | html %][% t.description | html %] - [% IF t.is_enrollable_from_opac %] - Yes - [% ELSE %] - No - [% END %] - - [% IF t.is_email_required %] - Yes - [% ELSE %] - No - [% END %] - [% Branches.GetName( t.branchcode ) | html %] - [% IF CAN_user_clubs_edit_templates %] - - Edit - - - Delete - - [% END %] - NameDescriptionPublic enrollmentEmail requiredLibraryActions
+ + + [% FOREACH t IN club_templates %] + + [% t.name | html %] + [% t.description | html %] + + [% IF t.is_enrollable_from_opac %] + Yes + [% ELSE %] + No + [% END %] + + + [% IF t.is_email_required %] + Yes + [% ELSE %] + No + [% END %] + + [% Branches.GetName( t.branchcode ) | html %] + + [% IF CAN_user_clubs_edit_templates %] + + Edit + + + Delete + + [% END %] + + + [% END %] + + + [% ELSE %]
No club templates defined.
[% END %] @@ -138,7 +140,9 @@ [% END %] [% IF clubs.count %] - [% INCLUDE 'clubs-table.inc' %] +
+ [% INCLUDE 'clubs-table.inc' %] +
[% ELSE %] [% IF club_templates.count %]
No clubs defined.
-- 2.39.5