From 575342a10e4f677b3653105d6909f0404623c4f1 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 13 Oct 2022 17:47:35 +0000 Subject: [PATCH] Bug 31763: Add 'page-section' to patron lists page This patch updates patron lists templates 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. Unrelated change: I wrapped some form controls in a
to make it consistent with other pages and to work better with the updated markup. Note: This patch contains indentation changes, so use diff accordingly. To test, apply the patch and go to Tools -> Patron lists. - If necessary, create one or more patron lists so that the table appears. Confirm that the content area looks correct. - Click Actions -> Add patrons to confirm that the screen looks correct. Signed-off-by: Lucas Gass Signed-off-by: David Nind --- .../prog/en/modules/patron_lists/list.tt | 94 +++++++------- .../prog/en/modules/patron_lists/lists.tt | 116 +++++++++--------- 2 files changed, 108 insertions(+), 102 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt index 23ade3ef86..ac4497cb27 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt @@ -169,54 +169,58 @@ - - - - - - - - - - - - - - - - - [% FOREACH p IN list.patron_list_patrons %] +
+
 CardFirst nameSurnameAddressCategoryLibraryExpires onCirc notes
+ - - - - - - - - - + + + + + + + + + - [% END %] - -
- - - - - [% p.borrowernumber.cardnumber | html %] - - [% p.borrowernumber.firstname | html %][% p.borrowernumber.surname | html %] - [% p.borrowernumber.address | html %] - [% p.borrowernumber.address2 | html %] - [% p.borrowernumber.city | html %] - [% p.borrowernumber.state | html %] - [% p.borrowernumber.country | html %] - [% p.borrowernumber.categorycode.description | html %] ([% p.borrowernumber.categorycode.categorycode | html %])[% p.borrowernumber.branchcode.branchname | html %][% p.borrowernumber.dateexpiry | $KohaDates %][% p.borrowernumber.borrowernotes | html %] CardFirst nameSurnameAddressCategoryLibraryExpires onCirc notes
+ + + + [% FOREACH p IN list.patron_list_patrons %] + + + + + + + + [% p.borrowernumber.cardnumber | html %] + + + [% p.borrowernumber.firstname | html %] + [% p.borrowernumber.surname | html %] + + [% p.borrowernumber.address | html %] + [% p.borrowernumber.address2 | html %] + [% p.borrowernumber.city | html %] + [% p.borrowernumber.state | html %] + [% p.borrowernumber.country | html %] + + [% p.borrowernumber.categorycode.description | html %] ([% p.borrowernumber.categorycode.categorycode | html %]) + [% p.borrowernumber.branchcode.branchname | html %] + [% p.borrowernumber.dateexpiry | $KohaDates %] + [% p.borrowernumber.borrowernotes | html %] + + [% END %] + + + - - - +
+ + + +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt index dcacfc83b2..229d97c8bd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt @@ -45,69 +45,71 @@ [% IF ( lists ) %] - - - - - - - - - - - - [% FOREACH l IN lists %] - [% SET shared_by_other = l.owner.id != logged_in_user.id %] +
+
NamePatrons in listShared 
+ - - - - + + + + + + + + [% FOREACH l IN lists %] + [% SET shared_by_other = l.owner.id != logged_in_user.id %] + + + + + - - [% END %] - -
[% l.name | html %][% l.patron_list_patrons_rs.count || 0 | html %] - [% IF l.shared %] - [% IF shared_by_other %] - by [% INCLUDE 'patron-title.inc' patron=l.owner %] - [% ELSE %] - by you - [% END %] - [% END %] - -
- - Actions - -
NamePatrons in listShared 
[% l.name | html %][% l.patron_list_patrons_rs.count || 0 | html %] + [% IF l.shared %] + [% IF shared_by_other %] + by [% INCLUDE 'patron-title.inc' patron=l.owner %] + [% ELSE %] + by you [% END %] - [% IF ( l.patron_list_patrons_rs.count ) %] -
  • -
  • - Print patron cards -
  • - [% IF CAN_user_tools_edit_patrons %] -
  • - - Batch edit patrons - -
  • + [% END %] +
    +
    + + Actions + + -
    -
    + + + + + [% END %] + + +