From 44aff60fa2f9169d50e85f95b9bd3a0b9a064120 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 20 Sep 2023 15:10:17 +0000 Subject: [PATCH] Bug 34852: Use template wrapper for breadcrumbs: OPAC part 2 This patch updates several OPAC templates so that they use a new WRAPPER for displaying breadcrumbs. Apply the patch and log in to the OPAC. Test each of the following pages and their variations. Breadcrumbs should look correct, and each link should be correct: - Navigate to /cgi-bin/koha/ilsdi.pl - Check a variety of links in the list - Advanced search - Locate a bibliographic record and view the ISBD detail page - View the MARC detail page - Locate a serial record which has a patron notification notice defined in its subscription details - On the detail view under the "Subscriptions" tab, click the "Subscribe to email notification on new issues" button. - Confirm the subscription, then when you return to the detail page, click "Cancel email notification" to check that view as well. - Authority search - Perform a search which will return results - Click the "Details" link on one of the results - Also view the "MARC view" tab (note that I didn't address the breadcrumb inconsistency between the normal and MARC view in this patch). - Try to view a bibliographic record which is suppressed in the OPAC. Requires OpacSuppression enabled and OpacSuppressionRedirect set to "An explanatory page" - Set the value of 942$n to 1 to suppress it in the OPAC. - In a system with ElasticSearch enabled, go to "Browse search" (or navigate directly to /cgi-bin/koha/opac-browse.pl - With OpacBrowser enabled, go to "Browse by hierarchy." Signed-off-by: Philip Orr Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi --- .../opac-tmpl/bootstrap/en/modules/ilsdi.tt | 134 ++++++++++++------ .../bootstrap/en/modules/opac-ISBDdetail.tt | 15 +- .../bootstrap/en/modules/opac-MARCdetail.tt | 16 +-- .../bootstrap/en/modules/opac-advsearch.tt | 15 +- .../en/modules/opac-alert-subscribe.tt | 32 ++--- .../en/modules/opac-auth-MARCdetail.tt | 21 ++- .../bootstrap/en/modules/opac-auth-detail.tt | 21 ++- .../en/modules/opac-authorities-home.tt | 16 +-- .../opac-authoritiessearchresultlist.tt | 21 ++- .../bootstrap/en/modules/opac-blocked.tt | 15 +- .../bootstrap/en/modules/opac-browse.tt | 15 +- .../bootstrap/en/modules/opac-browser.tt | 16 +-- 12 files changed, 166 insertions(+), 171 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt index 5af7fdf14f..c08fa7e97f 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt @@ -1,3 +1,4 @@ +[% USE raw %] [% USE Koha %] [% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %] [% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %] @@ -39,50 +40,97 @@ [% INCLUDE 'masthead.inc' %]
- + [% END %] + [% END #/ WRAPPER breadcrumbs %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-ISBDdetail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-ISBDdetail.tt index 3876988b4c..3259fdb845 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-ISBDdetail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-ISBDdetail.tt @@ -9,16 +9,11 @@ [% INCLUDE 'masthead.inc' %]
- + [% WRAPPER breadcrumbs %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + ISBD view for: [% biblio.title | html %] + [% END %] + [% END #/ WRAPPER breadcrumbs %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt index 5090bc6b4a..0a0d42e0e5 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt @@ -8,16 +8,12 @@ [% INCLUDE 'bodytag.inc' bodyid='opac-marcdetail' bodyclass='scrollto' %] [% INCLUDE 'masthead.inc' %]
- + + [% WRAPPER breadcrumbs %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + MARC view: [% bibliotitle | html %] + [% END %] + [% END #/ WRAPPER breadcrumbs %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt index eb1edd78bc..133b352c66 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt @@ -12,16 +12,11 @@
- + [% WRAPPER breadcrumbs %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Advanced search + [% END %] + [% END #/ WRAPPER breadcrumbs %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt index 802c5f6f13..7ab3b0a25c 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt @@ -1,3 +1,4 @@ +[% USE raw %] [% USE Koha %] [% INCLUDE 'doc-head-open.inc' %] [% IF ( typeissue ) %]Subscribe to a subscription alert [% ELSIF ( typeissuecancel ) %] Unsubscribe from a subscription alert [% END %] › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog @@ -8,25 +9,18 @@ [% INCLUDE 'masthead.inc' %]
- + [% WRAPPER breadcrumbs %] + [% WRAPPER breadcrumb_item %] + Details for [% bibliotitle | html %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + [% IF ( typeissue ) %] + Subscribe to a subscription alert + [% ELSIF ( typeissuecancel ) %] + Unsubscribe from a subscription alert + [% END %] + [% END %] + [% END #/ WRAPPER breadcrumbs %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt index bb37926648..6518040de7 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt @@ -18,19 +18,14 @@ [% INCLUDE 'masthead.inc' %]
- + [% WRAPPER breadcrumbs %] + [% WRAPPER breadcrumb_item %] + Authority search + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Entry [% authtypetext | html %] + [% END %] + [% END #/ WRAPPER breadcrumbs %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt index 82c219fede..661a9bc2b2 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt @@ -21,19 +21,14 @@ [% INCLUDE 'masthead.inc' %]
- + [% WRAPPER breadcrumbs %] + [% WRAPPER breadcrumb_item %] + Authority search + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + [% summary.mainentry | html %][% IF authtypetext %] ([% authtypetext | html %])[% END %] + [% END %] + [% END #/ WRAPPER breadcrumbs %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authorities-home.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authorities-home.tt index 6214b41468..f51909adc8 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authorities-home.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authorities-home.tt @@ -1,3 +1,4 @@ +[% USE raw %] [% USE Koha %] [% USE AdditionalContents %] [% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %] @@ -11,16 +12,11 @@ [% INCLUDE 'masthead.inc' %]
- + [% WRAPPER breadcrumbs %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Authority search + [% END %] + [% END #/ WRAPPER breadcrumbs %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt index d02d8f09e6..af67fadacc 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt @@ -46,19 +46,14 @@ [% INCLUDE 'masthead.inc' %]
- + [% WRAPPER breadcrumbs %] + [% WRAPPER breadcrumb_item %] + Authority search + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Results + [% END %] + [% END #/ WRAPPER breadcrumbs %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-blocked.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-blocked.tt index 8520a26186..b20a8c677e 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-blocked.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-blocked.tt @@ -14,16 +14,11 @@ [% INCLUDE 'bodytag.inc' bodyid='opac-blocked' %] [% INCLUDE 'masthead.inc' %]
- + [% WRAPPER breadcrumbs %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Blocked record + [% END %] + [% END #/ WRAPPER breadcrumbs %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt index 3f14c10576..d401191fb1 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt @@ -12,16 +12,11 @@ [% INCLUDE 'masthead.inc' %]
- + [% WRAPPER breadcrumbs %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Browse search + [% END %] + [% END #/ WRAPPER breadcrumbs %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt index f23f45f583..37dc42dac5 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt @@ -1,3 +1,4 @@ +[% USE raw %] [% USE Koha %] [% USE AdditionalContents %] [% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %] @@ -11,16 +12,11 @@ [% INCLUDE 'masthead.inc' %]
- + [% WRAPPER breadcrumbs %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Browse our catalog + [% END %] + [% END #/ WRAPPER breadcrumbs %]
-- 2.20.1