From ebdd9f1da38e95a0457d9beb52d676c8b2f8f59f Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 13 Oct 2022 18:07:07 +0000 Subject: [PATCH] Bug 31767: Add 'page-section' to tags page This patch updates tags 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. Note: This patch contains indentation changes, so use diff accordingly. To test, apply the patch and go to Tools -> Tags. - Confirm that the content area of the page looks correct. - Click one of the tag terms to view the list of titles tagged with that term. Confirm that this page looks correct too. Signed-off-by: Lucas Gass Signed-off-by: Katrin Fischer --- .../prog/en/modules/tags/list.tt | 76 ++++----- .../prog/en/modules/tags/review.tt | 144 +++++++++--------- 2 files changed, 112 insertions(+), 108 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt index a8ffed276e..59dcad2365 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt @@ -45,45 +45,47 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : [% IF ( titles ) %]

Titles tagged with the term [% tag | html %]

- - - - - - +
+
TitleLocation 
+ + + + + - [% FOREACH title IN titles %] - - - + - - - [% END %] -
TitleLocation 
[% INCLUDE 'biblio-title.inc' biblio=title link = 1 %] - [% title.author | html %] -

[% IF ( title.publishercode ) %]- [% title.publishercode | html %] - [% IF ( title.place ) %] [% title.place | html %][% END %][% END %] - [% IF ( title.pages ) %] - [% title.pages | html %][% IF ( title.size ) %] [% title.size | html %] - [% END %] - [% END %]

- [% IF ( title.notes ) %] -

[% title.notes | html %]

[% END %] - [% IF ( title.TagLoop ) %]

Tagged with: [% FOREACH TagLoo IN title.TagLoop %] - [% TagLoo.term | html %] ([% TagLoo.weight_total | html %])[% IF ( loop.last ) %][% ELSE %], [% END %] - [% END %]

- [% END %] - 		[% IF ( title.items.count ) %]
    [% FOREACH item IN title.items %] -
  • - [% Branches.GetName(item.holdingbranch) | html %] - - [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => item.location ) | html %] - - [% IF ( item.itemcallnumber ) %] - ([% item.itemcallnumber | html %]) + [% FOREACH title IN titles %] +
[% INCLUDE 'biblio-title.inc' biblio=title link = 1 %] + [% title.author | html %] +

[% IF ( title.publishercode ) %]- [% title.publishercode | html %] + [% IF ( title.place ) %] [% title.place | html %][% END %][% END %] + [% IF ( title.pages ) %] - [% title.pages | html %][% IF ( title.size ) %] [% title.size | html %] [% END %] - - [% END %][% ELSE %]This record has no items.[% END %] -

+ [% END %]

+ [% IF ( title.notes ) %] +

[% title.notes | html %]

[% END %] + [% IF ( title.TagLoop ) %]

Tagged with: [% FOREACH TagLoo IN title.TagLoop %] + [% TagLoo.term | html %] ([% TagLoo.weight_total | html %])[% IF ( loop.last ) %][% ELSE %], [% END %] + [% END %]

+ [% END %] + + [% IF ( title.items.count ) %]
    [% FOREACH item IN title.items %] +
  • + [% Branches.GetName(item.holdingbranch) | html %] + + [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => item.location ) | html %] + + [% IF ( item.itemcallnumber ) %] + ([% item.itemcallnumber | html %]) + [% END %] +
    • + [% END %]
[% ELSE %]This record has no items.[% END %] + +
+ + [% END %] + + [% ELSE %]
There are no titles tagged with the term [% tag | html %]
[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt index 02ef5f7cdc..5de814da48 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt @@ -88,78 +88,80 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } [% END %] [% IF ( tagloop ) %] -

- - - - - - - - - [% UNLESS ( filter_approved_pending ) %][% END %] - - - - - [% FOREACH tagloo IN tagloop %] - - - - - - [% IF ( tagloo.approved ) %] - - - [% ELSE %] - - [% UNLESS ( filter_approved_pending ) %][% END %] +
+

+
 StatusTermWeightActionsReviewerDate
- [% IF ( tagloo.approved == 0 ) %] - - [% ELSIF ( tagloo.approved == 1 ) %] - - [% ELSE %] - - [% END %] - - [% IF ( tagloo.approved == -1 ) %] - - [% ELSIF ( tagloo.approved == 1 ) %] - - [% ELSE %] - - [% END %] - [% tagloo.term | html %] - [% tagloo.weight_total | html %] - - [% IF ( tagloo.approved_by_name ) %][% tagloo.approved_by_name | html %][% ELSE %] [% END %] - -  
+ + + + + + + + [% UNLESS ( filter_approved_pending ) %][% END %] + + + + + [% FOREACH tagloo IN tagloop %] + + + + + + [% IF ( tagloo.approved ) %] + + + [% ELSE %] + + [% UNLESS ( filter_approved_pending ) %][% END %] + [% END %] + + [% END %] - - - [% END %] - -
 StatusTermWeightActionsReviewerDate
+ [% IF ( tagloo.approved == 0 ) %] + + [% ELSIF ( tagloo.approved == 1 ) %] + + [% ELSE %] + + [% END %] + + [% IF ( tagloo.approved == -1 ) %] + + [% ELSIF ( tagloo.approved == 1 ) %] + + [% ELSE %] + + [% END %] + [% tagloo.term | html %] + [% tagloo.weight_total | html %] + + [% IF ( tagloo.approved_by_name ) %][% tagloo.approved_by_name | html %][% ELSE %] [% END %] + +   + [% tagloo.date_approved | $KohaDates %] +
- [% tagloo.date_approved | $KohaDates %] -
+ + + [% END %] [% IF ( tagloop ) %]
-- 2.30.2