From f199236417086c0a81eda3db697d4939ebfda8b9 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Sat, 13 Jan 2024 15:58:17 +0000 Subject: [PATCH] Bug 34872: Add page-section to cart pop-up in staff interface This adds the page-section class to the tables in the cart pop-up in the staff interface. To test: * Search for records in the staff interface and add some to the cart * Open the cart, review the normal and brief view * Apply patch * Review normal and brief view again - tables/sections should now have the white background. Signed-off-by: Owen Leonard Signed-off-by: Marcel de Rooy Signed-off-by: Katrin Fischer (cherry picked from commit 34749a20bddccfa853e3abf8bae104c07bb89db5) Signed-off-by: Fridolin Somers --- .../prog/en/modules/basket/basket.tt | 456 +++++++++--------- 1 file changed, 230 insertions(+), 226 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt index 36edd9fa2e..b2ed2e990d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt @@ -7,7 +7,7 @@ [% BLOCK controls %]

Select all Clear all - | Selected items : + | Selected items: Remove [% IF ( loggedinusername ) %] @@ -83,261 +83,265 @@ - - [% IF ( BIBLIO_RESULT.isbn ) %] - - - - - [% END %] +
+
ISBN[% BIBLIO_RESULT.isbn | html %]
+ [% IF ( BIBLIO_RESULT.isbn ) %] + + + + + [% END %] + + [% IF ( BIBLIO_RESULT.HASAUTHORS ) %] + + + + + [% END %] + + [% IF ( BIBLIO_RESULT.publishercode ) %] + + + + + [% END %] + + [% IF ( BIBLIO_RESULT.pages ) %] + + + + + [% END %] + + [% IF ( BIBLIO_RESULT.seriestitle ) %] + + + + + [% END %] + + [% IF ( BIBLIO_RESULT.MARCSUBJCTS ) %] + + + + + [% END %] + + [% IF ( BIBLIO_RESULT.copyrightdate ) %] + + + + [% END %] + + [% IF ( BIBLIO_RESULT.MARCNOTES ) %] + + + + + [% END %] + + [% IF ( BIBLIO_RESULT.unititle ) %] + + + + + [% END %] + + [% IF ( BIBLIO_RESULT.serial ) %] + + + + + [% END %] + + [% IF ( BIBLIO_RESULT.dewey ) %] + + + + + [% END %] + + [% IF ( BIBLIO_RESULT.classification ) %] + + + + + [% END %] + + [% IF ( BIBLIO_RESULT.lccn ) %] + + + + + [% END %] + + + [% IF BIBLIO_RESULT.MARCURLS.size %] + + + + + [% END %] + + [% IF BIBLIO_RESULT.HOSTITEMENTRIES || BIBLIO_RESULT.HOSTINFO %] + + + + + [% END %] - [% IF ( BIBLIO_RESULT.HASAUTHORS ) %] - + - [% END %] +
ISBN[% BIBLIO_RESULT.isbn | html %]
Author(s) + [% IF ( BIBLIO_RESULT.author ) %] +

[% BIBLIO_RESULT.author | html %]

+ [% END %] + [% IF ( BIBLIO_RESULT.MARCAUTHORS ) %] + [% FOREACH MARCAUTHOR IN BIBLIO_RESULT.MARCAUTHORS %] +

+ [% FOREACH MARCAUTHOR_SUBFIELDS_LOO IN MARCAUTHOR.MARCAUTHOR_SUBFIELDS_LOOP %] + [% MARCAUTHOR_SUBFIELDS_LOO.separator | html %] + [% MARCAUTHOR_SUBFIELDS_LOO.value | html %] + [% END %] +

+ [% END %] + [% END %] +
Publisher[% BIBLIO_RESULT.place | html %] [% BIBLIO_RESULT.publishercode | html %] [% BIBLIO_RESULT.publicationyear | html %] +
Details[% BIBLIO_RESULT.pages | html %] [% BIBLIO_RESULT.illus | html %] [% BIBLIO_RESULT.item('size') | html %]
Collection [% BIBLIO_RESULT.seriestitle | html %]
Subject(s) + [% FOREACH MARCSUBJCT IN BIBLIO_RESULT.MARCSUBJCTS %] +

+ [% FOREACH MARCSUBJECT_SUBFIELDS_LOO IN MARCSUBJCT.MARCSUBJECT_SUBFIELDS_LOOP %] + [% MARCSUBJECT_SUBFIELDS_LOO.separator | html %][% MARCSUBJECT_SUBFIELDS_LOO.value | html %] + [% END %] +

+ [% END %] +
Copyright [% BIBLIO_RESULT.copyrightdate | html %]
Notes + [% FOREACH MARCNOTE IN BIBLIO_RESULT.MARCNOTES %] +

+ [% IF MARCNOTE.marcnote.match('^https?://\S+$') %] + - [% MARCNOTE.marcnote | html %] + [% ELSE %] + - [% MARCNOTE.marcnote | html %] + [% END %] + [% END %] +

Unified title [% BIBLIO_RESULT.unititle | html %]
Serial[% BIBLIO_RESULT.serial | html %]
Dewey[% BIBLIO_RESULT.dewey | html %]
Classification [% BIBLIO_RESULT.classification | html %]
LCCN [% BIBLIO_RESULT.lccn | html %]
URL(s) + [% FOREACH MARCurl IN BIBLIO_RESULT.MARCURLS %] + [% IF MARCurl.part %]

[% MARCurl.part | html %]

[% END %] + [% MARCurl.linktext | html %] + [% IF MARCurl.notes %] + [% FOREACH note IN MARCurl.notes %] +

[% note.note | html %]

+ [% END %] + [% END %] + [% END %] +
In + [% IF BIBLIO_RESULT.HOSTITEMENTRIES %] +

[% INCLUDE 'biblio-title.inc' link = 1 biblio=BIBLIO_RESULT.HOSTITEMENTRIES %] [% BIBLIO_RESULT.RELATEDPARTS | html %]

+ [% ELSE %] +

[% BIBLIO_RESULT.HOSTINFO | html %]

+ [% END %] +
Author(s)Location(s) - [% IF ( BIBLIO_RESULT.author ) %] -

[% BIBLIO_RESULT.author | html %]

- [% END %] - [% IF ( BIBLIO_RESULT.MARCAUTHORS ) %] - [% FOREACH MARCAUTHOR IN BIBLIO_RESULT.MARCAUTHORS %] + [% IF BIBLIO_RESULT.ITEM_RESULTS.count %] + [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]

- [% FOREACH MARCAUTHOR_SUBFIELDS_LOO IN MARCAUTHOR.MARCAUTHOR_SUBFIELDS_LOOP %] - [% MARCAUTHOR_SUBFIELDS_LOO.separator | html %] - [% MARCAUTHOR_SUBFIELDS_LOO.value | html %] + [% Branches.GetName(ITEM_RESULT.holdingbranch) | html %] + + [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => ITEM_RESULT.location ) | html %] + + [% IF ( ITEM_RESULT.itemcallnumber ) %] + ([% ITEM_RESULT.itemcallnumber | html %]) [% END %]

[% END %] + [% ELSE %] + This record has no items. [% END %]
+ + [% END # /FOREACH BIBLIO_RESULT %] + [% # /bookbag_form %] - [% IF ( BIBLIO_RESULT.publishercode ) %] - - Publisher - [% BIBLIO_RESULT.place | html %] [% BIBLIO_RESULT.publishercode | html %] [% BIBLIO_RESULT.publicationyear | html %] - - - [% END %] + [% ELSE # IF verbose %] - [% IF ( BIBLIO_RESULT.pages ) %] - - Details - [% BIBLIO_RESULT.pages | html %] [% BIBLIO_RESULT.illus | html %] [% BIBLIO_RESULT.item('size') | html %] - - [% END %] +

+ [% PROCESS controls %] - [% IF ( BIBLIO_RESULT.seriestitle ) %] +
+ + - - + + + + - [% END %] + - [% IF ( BIBLIO_RESULT.MARCSUBJCTS ) %] + [% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %] - + - - [% END %] - - [% IF ( BIBLIO_RESULT.copyrightdate ) %] - - - - [% END %] - - [% IF ( BIBLIO_RESULT.MARCNOTES ) %] - - - - - [% END %] - - [% IF ( BIBLIO_RESULT.unititle ) %] - - - - - [% END %] - - [% IF ( BIBLIO_RESULT.serial ) %] - - - - - [% END %] - - [% IF ( BIBLIO_RESULT.dewey ) %] - - - - - [% END %] - - [% IF ( BIBLIO_RESULT.classification ) %] - - - - - [% END %] - - [% IF ( BIBLIO_RESULT.lccn ) %] - - - - - [% END %] - - - [% IF BIBLIO_RESULT.MARCURLS.size %] - - - + - - [% END %] - - [% IF BIBLIO_RESULT.HOSTITEMENTRIES || BIBLIO_RESULT.HOSTINFO %] - - - - [% END %] - - - - - + [% END # /FOREACH BIBLIO_RESULT %]
Collection [% BIBLIO_RESULT.seriestitle | html %] TitleItem type + Items +
Subject(s) + + - [% FOREACH MARCSUBJCT IN BIBLIO_RESULT.MARCSUBJCTS %] -

- [% FOREACH MARCSUBJECT_SUBFIELDS_LOO IN MARCSUBJCT.MARCSUBJECT_SUBFIELDS_LOOP %] - [% MARCSUBJECT_SUBFIELDS_LOO.separator | html %][% MARCSUBJECT_SUBFIELDS_LOO.value | html %] + [% INCLUDE 'biblio-title.inc' biblio=BIBLIO_RESULT link = 1 %] + [% BIBLIO_RESULT.author | html %] +

+ [% IF ( BIBLIO_RESULT.publishercode ) %] + - [% BIBLIO_RESULT.publishercode | html %] + [% IF ( BIBLIO_RESULT.place ) %] + [% BIBLIO_RESULT.place | html %] [% END %] -

+ [% END %] + [% IF ( BIBLIO_RESULT.pages ) %] + - [% BIBLIO_RESULT.pages | html %] + [% IF ( BIBLIO_RESULT.item('size') ) %] + [% BIBLIO_RESULT.item('size') | html %] + [% END %] + [% END %] +

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

[% BIBLIO_RESULT.notes | html %]

[% END %] -
Copyright [% BIBLIO_RESULT.copyrightdate | html %]
Notes - [% FOREACH MARCNOTE IN BIBLIO_RESULT.MARCNOTES %] -

- [% IF MARCNOTE.marcnote.match('^https?://\S+$') %] - - [% MARCNOTE.marcnote | html %] + [% IF BIBLIO_RESULT.HOSTITEMENTRIES || BIBLIO_RESULT.HOSTINFO %] +

In: + [% IF BIBLIO_RESULT.HOSTITEMENTRIES %] + [% INCLUDE 'biblio-title.inc' link = 1 biblio=BIBLIO_RESULT.HOSTITEMENTRIES %] [% BIBLIO_RESULT.RELATEDPARTS | html %] [% ELSE %] - - [% MARCNOTE.marcnote | html %] + [% BIBLIO_RESULT.HOSTINFO | html %] [% END %] +

[% END %] + +
Unified title [% BIBLIO_RESULT.unititle | html %]
Serial[% BIBLIO_RESULT.serial | html %]
Dewey[% BIBLIO_RESULT.dewey | html %]
Classification [% BIBLIO_RESULT.classification | html %]
LCCN [% BIBLIO_RESULT.lccn | html %]
URL(s) - [% FOREACH MARCurl IN BIBLIO_RESULT.MARCURLS %] - [% IF MARCurl.part %]

[% MARCurl.part | html %]

[% END %] - [% MARCurl.linktext | html %] - [% IF MARCurl.notes %] - [% FOREACH note IN MARCurl.notes %] -

[% note.note | html %]

- [% END %] + 		[% BIBLIO_RESULT.description | html %] + [% IF ( BIBLIO_RESULT.ITEM_RESULTS ) %] + [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %] +
+ + + [% ITEM_RESULT.itemcallnumber | html %] + + [% Branches.GetName(ITEM_RESULT.holdingbranch) | html %] + + [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => ITEM_RESULT.location ) | html %] + + +
[% END %] - [% END %] -
In - [% IF BIBLIO_RESULT.HOSTITEMENTRIES %] -

[% INCLUDE 'biblio-title.inc' link = 1 biblio=BIBLIO_RESULT.HOSTITEMENTRIES %] [% BIBLIO_RESULT.RELATEDPARTS | html %]

[% ELSE %] -

[% BIBLIO_RESULT.HOSTINFO | html %]

+ This record has no items. [% END %]
Location(s) - [% IF BIBLIO_RESULT.ITEM_RESULTS.count %] - [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %] -

- [% Branches.GetName(ITEM_RESULT.holdingbranch) | html %] - - [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => ITEM_RESULT.location ) | html %] - - [% IF ( ITEM_RESULT.itemcallnumber ) %] - ([% ITEM_RESULT.itemcallnumber | html %]) - [% END %] -

- [% END %] - [% ELSE %] - This record has no items. - [% END %] -
- [% END # /FOREACH BIBLIO_RESULT %] - [% # /bookbag_form %] - - [% ELSE # IF verbose %] - -
- [% PROCESS controls %] - - - - - - - - - - - - [% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %] - - - - - - - [% END # /FOREACH BIBLIO_RESULT %] -
 TitleItem type - Items -
- - - [% INCLUDE 'biblio-title.inc' biblio=BIBLIO_RESULT link = 1 %] - [% BIBLIO_RESULT.author | html %] -

- [% IF ( BIBLIO_RESULT.publishercode ) %] - - [% BIBLIO_RESULT.publishercode | html %] - [% IF ( BIBLIO_RESULT.place ) %] - [% BIBLIO_RESULT.place | html %] - [% END %] - [% END %] - [% IF ( BIBLIO_RESULT.pages ) %] - - [% BIBLIO_RESULT.pages | html %] - [% IF ( BIBLIO_RESULT.item('size') ) %] - [% BIBLIO_RESULT.item('size') | html %] - [% END %] - [% END %] -

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

[% BIBLIO_RESULT.notes | html %]

- [% END %] - [% IF BIBLIO_RESULT.HOSTITEMENTRIES || BIBLIO_RESULT.HOSTINFO %] -

In: - [% IF BIBLIO_RESULT.HOSTITEMENTRIES %] - [% INCLUDE 'biblio-title.inc' link = 1 biblio=BIBLIO_RESULT.HOSTITEMENTRIES %] [% BIBLIO_RESULT.RELATEDPARTS | html %] - [% ELSE %] - [% BIBLIO_RESULT.HOSTINFO | html %] - [% END %] -

- [% END %] - - - 		[% BIBLIO_RESULT.description | html %] - [% IF ( BIBLIO_RESULT.ITEM_RESULTS ) %] - [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %] -
- - - [% ITEM_RESULT.itemcallnumber | html %] - - [% Branches.GetName(ITEM_RESULT.holdingbranch) | html %] - - [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => ITEM_RESULT.location ) | html %] - - -
- [% END %] - [% ELSE %] - This record has no items. - [% END %] -
+
[% END # /IF verbose %] -- 2.39.2