From f4589971526e9dfc47be7722a069d06efc4bbf28 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Tue, 31 Jan 2023 13:39:20 +0000 Subject: [PATCH] Bug 32633: (QA follow-up) Move page-section nesting This follow-up makes a small change to the page-section nesting on the Cataloging and Authorities search results pages. We move the 'h2' outside of the page section but include the paging and number of results inside with the results tables themselves. Signed-off-by: Martin Renvoize Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 734a1fe63ba52b9ce214bb8129493b8184a6f59d) Signed-off-by: Jacob O'Mara --- .../modules/authorities/searchresultlist.tt | 136 +++++++------- .../prog/en/modules/cataloguing/addbooks.tt | 172 +++++++++--------- 2 files changed, 157 insertions(+), 151 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt index 3e7e074874..db9bd530a1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt @@ -49,84 +49,86 @@

Authority search results

-[% IF ( total ) %] -
[% pagination_bar | $raw %]
+
+ [% IF ( total ) %] +
[% pagination_bar | $raw %]
-

- Results [% from | html %] to [% to | html %] of [% total | html %] -

+

+ Results [% from | html %] to [% to | html %] of [% total | html %] +

-
- - - - - [% UNLESS ( isEDITORS ) %] - +
+
SummaryHeading typeUsed in
+ + + + [% UNLESS ( isEDITORS ) %] + + [% END %] + [% IF Koha.Preference('ShowHeadingUse') %] + + [% END %] + [% IF ( CAN_user_editauthorities ) %] + + [% END %] + + [% FOREACH resul IN result %] + + + + [% UNLESS ( resul.isEDITORS ) %] + [% END %] [% IF Koha.Preference('ShowHeadingUse') %] - + [% END %] [% IF ( CAN_user_editauthorities ) %] - + [% END %] - - [% FOREACH resul IN result %] - - [% END %] - - - [% UNLESS ( resul.isEDITORS ) %] - - [% END %] - [% IF Koha.Preference('ShowHeadingUse') %] - - [% END %] - [% IF ( CAN_user_editauthorities ) %] - - [% END %] - - [% END %] -
SummaryHeading typeUsed inHeading use 
+ [% IF resul.html %] + [% resul.html | $raw %] + [% ELSE %] + [% PROCESS authresult summary=resul.summary authid=resul.authid %] + [% END %] + [% resul.authtype | html %] + [% IF resul.used > 0 %] + [% resul.used | html %] record(s) + [% ELSE %] + 0 records + [% END %] + Heading use
    +
  • [% IF resul.main %][% ELSE %][% END %] Main/Added Entry
    • +
  • [% IF resul.subject %][% ELSE %][% END %] Subject
    • +
  • [% IF resul.series %][% ELSE %][% END %] Series Title
    • +
  +
+ + Actions + +
+
- [% IF resul.html %] - [% resul.html | $raw %] - [% ELSE %] - [% PROCESS authresult summary=resul.summary authid=resul.authid %] +
[% resul.authtype | html %] - [% IF resul.used > 0 %] - [% resul.used | html %] record(s) - [% ELSE %] - 0 records - [% END %] -
    -
  • [% IF resul.main %][% ELSE %][% END %] Main/Added Entry
    • -
  • [% IF resul.subject %][% ELSE %][% END %] Subject
    • -
  • [% IF resul.series %][% ELSE %][% END %] Series Title
    • -
-
- - Actions - -
-
-
+ +
-[% INCLUDE 'authority-detail-modal.inc' %] + [% INCLUDE 'authority-detail-modal.inc' %] -
[% pagination_bar | $raw %]
+
[% pagination_bar | $raw %]
-[% ELSE %] - No results found -[% END %] + [% ELSE %] + No results found + [% END %] + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt index 0b34c3ffe5..ce30a2fc1c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt @@ -95,100 +95,102 @@ [% IF ( total ) %]

Records found in the catalog

+
[% total | html %] result(s) found in catalog, [% breeding_count | html %] result(s) found in reservoir
[% pagination_bar | $raw %]
-
- - - - - - - - [% FOREACH resultsloo IN resultsloop %] +
+
 TitleLocation 
- - + + + + + [% FOREACH resultsloo IN resultsloop %] + + + - - + - - [% END # /FOREACH resultsloo %] -
-

- [% INCLUDE 'biblio-title.inc' biblio=resultsloo link = 1 %] -

- [% IF ( resultsloo.summary ) %] -

[% resultsloo.summary | html %]

- [% ELSE %] + 		 TitleLocation 

- [% IF ( resultsloo.author ) %] - [% resultsloo.author | html %] - [% ELSE %] -   - [% END %] - [% IF ( resultsloo.isbn ) %] - [% resultsloo.isbn | html %] [% END %] - [% IF ( resultsloo.publicationyear ) %] - [% resultsloo.publicationyear | html %][% END %] - [% IF ( resultsloo.publishercode ) %]- [% resultsloo.publishercode | html %][% END %] - [% IF ( resultsloo.copyrightdate ) %] - [% resultsloo.copyrightdate | html %][% END %] - [% IF ( resultsloo.edition ) %]Edition: [% resultsloo.edition | html %][% END %] - [% IF ( resultsloo.place ) %] ; [% resultsloo.place | html %][% END %] - [% IF ( resultsloo.pages ) %] - [% resultsloo.pages | html %][% END %] - [% IF ( resultsloo.item('size') ) %] ; [% resultsloo.item('size') | html %][% END %] - [% IF ( resultsloo.timestamp ) %] (modified on [% resultsloo.timestamp | html %])[% END %] + [% INCLUDE 'biblio-title.inc' biblio=resultsloo link = 1 %]

- [% END %] - 		- [% IF ( resultsloo.available_items_loop ) %] - - [% FOREACH items_loo IN resultsloo.available_items_loop %] - [% items_loo.count | html %] [% items_loo.branchname | html %] - [% IF ( items_loo.location ) %][% items_loo.location | html %][% END %] - [% IF ( items_loo.itemcallnumber ) %][% items_loo.itemcallnumber | html %][% END %] - [% IF ( items_loo.classification ) %] - - [% items_loo.classification | html %] - + [% IF ( resultsloo.summary ) %] +

[% resultsloo.summary | html %]

+ [% ELSE %] +

+ [% IF ( resultsloo.author ) %] + [% resultsloo.author | html %] + [% ELSE %] +   [% END %] -
- [% END %] - - [% END %] - - [% IF ( resultsloo.onloancount ) %] Checked out ([% resultsloo.onloancount | html %]),
[% END %] - [% IF ( resultsloo.withdrawncount ) %] Withdrawn ([% resultsloo.withdrawncount | html %]),
[% END %] - [% IF ( resultsloo.itemlostcount ) %] Lost ([% resultsloo.itemlostcount | html %])
[% END %] - [% IF ( resultsloo.recalledcount ) %] Waiting to fill recall ([% resultsloo.recalled | html %])[% END %] - [% IF ( resultsloo.onholdcount ) %] Waiting on hold ([% resultsloo.onholdcount | html %])[% END %] - - - [% IF ( resultsloo.other_items_loop ) %] - [% FOREACH items_loo IN resultsloo.other_items_loop %] - [% IF ( items_loo.notforloan ) %][% items_loo.notforloan | html %] ([% items_loo.count | html %])
[% END %] - [% END %] + [% IF ( resultsloo.isbn ) %] - [% resultsloo.isbn | html %] [% END %] + [% IF ( resultsloo.publicationyear ) %] - [% resultsloo.publicationyear | html %][% END %] + [% IF ( resultsloo.publishercode ) %]- [% resultsloo.publishercode | html %][% END %] + [% IF ( resultsloo.copyrightdate ) %] - [% resultsloo.copyrightdate | html %][% END %] + [% IF ( resultsloo.edition ) %]Edition: [% resultsloo.edition | html %][% END %] + [% IF ( resultsloo.place ) %] ; [% resultsloo.place | html %][% END %] + [% IF ( resultsloo.pages ) %] - [% resultsloo.pages | html %][% END %] + [% IF ( resultsloo.item('size') ) %] ; [% resultsloo.item('size') | html %][% END %] + [% IF ( resultsloo.timestamp ) %] (modified on [% resultsloo.timestamp | html %])[% END %] +

[% END %] - - 		-
- - Actions - -
+ [% IF ( resultsloo.available_items_loop ) %] + + [% FOREACH items_loo IN resultsloo.available_items_loop %] + [% items_loo.count | html %] [% items_loo.branchname | html %] + [% IF ( items_loo.location ) %][% items_loo.location | html %][% END %] + [% IF ( items_loo.itemcallnumber ) %][% items_loo.itemcallnumber | html %][% END %] + [% IF ( items_loo.classification ) %] + + [% items_loo.classification | html %] + + [% END %] +
+ [% END %] + + [% END %] + + [% IF ( resultsloo.onloancount ) %] Checked out ([% resultsloo.onloancount | html %]),
[% END %] + [% IF ( resultsloo.withdrawncount ) %] Withdrawn ([% resultsloo.withdrawncount | html %]),
[% END %] + [% IF ( resultsloo.itemlostcount ) %] Lost ([% resultsloo.itemlostcount | html %])
[% END %] + [% IF ( resultsloo.recalledcount ) %] Waiting to fill recall ([% resultsloo.recalled | html %])[% END %] + [% IF ( resultsloo.onholdcount ) %] Waiting on hold ([% resultsloo.onholdcount | html %])[% END %] + + + [% IF ( resultsloo.other_items_loop ) %] + [% FOREACH items_loo IN resultsloo.other_items_loop %] + [% IF ( items_loo.notforloan ) %][% items_loo.notforloan | html %] ([% items_loo.count | html %])
[% END %] + [% END %] [% END %] - - -
-
[% pagination_bar | $raw %]
-
+ + + +
+ + Actions + + +
+ + + [% END # /FOREACH resultsloo %] + +
[% pagination_bar | $raw %]
+
+ [% ELSE # IF total %] [% IF ( query ) %] [% IF ( error ) %] @@ -204,8 +206,9 @@ [% IF ( query ) %] -
+

Records found in the reservoir

+
[% IF ( breeding_loop ) %] @@ -247,6 +250,7 @@ [% ELSE %]

No results found

[% END # /IF breeding_loop %] + [% END # /IF query %] -- 2.39.5