From e7a202ffd896487a55c7bed625d6c50338ab2c0c Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 19 Apr 2022 15:31:41 +0000 Subject: [PATCH] Bug 30566: Incorporate link handling in OPAC's biblio-title include This patch modifies the biblio-title include so that it can be used to link to the bibliographic record using the default biblio view. On pages where the biblio-title include was wrapped in an anchor tag, a link parameter is added: [% INCLUDE 'biblio-title.inc' link=> 1 %] To test, apply the patch and view the following pages in the OPAC to confirm that titles are displayed correctly and that the link to the bibliographic record is correct: - Log in to the OPAC: On the "your summary" page, check checkouts, overdues, holds, and article requests. - Check the "your holds history" page. - Locate a bibliographic record and click "Save to your lists." In the popup, the title should be displayed correctly without a link. - Place a hold, and check the hold confirmation page. - Check the "Recent comments" page. - Locate a record which has a local cover image attached, and view the image. Signed-off-by: David Nind Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 3bd3ec4805047412f25a93712dd06ea2de70608b) Signed-off-by: Lucas Gass --- .../opac-tmpl/bootstrap/en/includes/biblio-title.inc | 8 ++++++++ .../opac-tmpl/bootstrap/en/includes/holds-table.inc | 6 ++---- .../bootstrap/en/modules/opac-addbybiblionumber.tt | 4 ++-- .../bootstrap/en/modules/opac-holdshistory.tt | 2 +- .../bootstrap/en/modules/opac-imageviewer.tt | 7 ++----- .../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 5 ++--- .../bootstrap/en/modules/opac-showreviews.tt | 4 +--- .../opac-tmpl/bootstrap/en/modules/opac-tags.tt | 4 +--- .../opac-tmpl/bootstrap/en/modules/opac-user.tt | 12 +++++------- 9 files changed, 24 insertions(+), 28 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/biblio-title.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/biblio-title.inc index 3bf0b488aa..bc8d70e0e9 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/biblio-title.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/biblio-title.inc @@ -1,3 +1,7 @@ +[% IF ( link ) %] + +[% END %] + [% IF ( biblio.title ) %] [% biblio.title | html %] [% ELSE %] @@ -18,3 +22,7 @@ [% END %] [% i = i + 1 %] [% END %] + +[% IF ( link ) %] + +[% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc index 1e956323c1..8280c1e904 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc @@ -47,10 +47,8 @@ [% END %] [% IF ! onlyinfo %] - - [% INCLUDE 'biblio-title.inc' biblio=HOLD.biblio %] - [% HOLD.item.enumchron | html %] - + [% INCLUDE 'biblio-title.inc' biblio=HOLD.biblio link=> 1 %] + [% HOLD.item.enumchron | html %] [% ELSE %] [% INCLUDE 'biblio-title.inc' biblio=HOLD.biblio %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-addbybiblionumber.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-addbybiblionumber.tt index 8b8cb42576..25b997f3ec 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-addbybiblionumber.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-addbybiblionumber.tt @@ -18,8 +18,8 @@ [% END %]
    [% FOREACH biblio IN biblios %] -
  • [% INCLUDE 'biblio-title.inc' %] - [% IF ( biblio.author ) %] [% biblio.author | html %] [% END %] +
  • [% INCLUDE 'biblio-title.inc' %] + [% IF ( biblio.author ) %] [% biblio.author | html %][% END %]
    • [% END %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt index 24d521d383..d42eb7f18f 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt @@ -118,7 +118,7 @@ [% FOREACH hold IN holds %] - [% INCLUDE 'biblio-title.inc' biblio=hold.biblio %] + [% INCLUDE 'biblio-title.inc' biblio=hold.biblio link=>1 %] [% hold.biblio.author | html %] [% hold.item.barcode | html %] [% Branches.GetName( hold.branchcode ) | html %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt index 33ba901cda..597d88c360 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt @@ -45,8 +45,7 @@ Home
  • - - [% INCLUDE 'biblio-title.inc' %] + [% INCLUDE 'biblio-title.inc' %]
  • Images @@ -69,9 +68,7 @@
    -

    Images for - - [% INCLUDE 'biblio-title.inc' %] [% biblio.author | html %] +

    Images for [% INCLUDE 'biblio-title.inc' link=> 1 %] [% biblio.author | html %]

    diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt index 28e8b64eec..e16095740e 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt @@ -189,9 +189,8 @@ [% END # / bibitemloo.holdable %] - - [% INCLUDE 'biblio-title.inc' biblio=bibitemloo %] - + [% INCLUDE 'biblio-title.inc' biblio=bibitemloo link=> 1%] + [% IF ( bibitemloo.author ) %], by [% bibitemloo.author | html %][% END %]

    diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt index 7821e5099f..e307d688ef 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt @@ -44,9 +44,7 @@

    - - [% INCLUDE 'biblio-title.inc' biblio=review %] - + [% INCLUDE 'biblio-title.inc' biblio=review link=> 1 %] [% IF ( review.author ) %] by [% review.author | html %] [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt index eb77c4ffc9..60319529e6 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt @@ -163,9 +163,7 @@ [% MY_TAG.XSLTBloc | $raw %] [% ELSE %] Title: - - [% INCLUDE 'biblio-title.inc' biblio=MY_TAG %] - + [% INCLUDE 'biblio-title.inc' biblio=MY_TAG link=> 1 %] [% IF ( MY_TAG.author ) %] by [% MY_TAG.author | html %] [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt index 61acfac28d..42fbcfdb40 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -312,7 +312,7 @@ [% END # / IF JacketImages %] - [% INCLUDE 'biblio-title.inc' biblio=ISSUE %] + [% INCLUDE 'biblio-title.inc' biblio=ISSUE link=> 1 %] [% IF ( ISSUE.enumchron ) %] [% ISSUE.enumchron | html %][% END %] [% IF ( ISSUE.onsite_checkout ) %] (On-site checkout)[% END %] @@ -682,7 +682,7 @@ [% END # /IF jacketcell %] - [% INCLUDE 'biblio-title.inc' biblio=OVERDUE %] + [% INCLUDE 'biblio-title.inc' biblio=OVERDUE link=> 1 %] [% OVERDUE.author | html %] @@ -767,7 +767,7 @@ [% FOREACH RECALL IN RECALLS %] - [% INCLUDE 'biblio-title.inc' biblio=RECALL.biblio %] [% IF RECALL.item_level %]

    Item recalled: [% RECALL.item.barcode | html %]

    [% END %] + [% INCLUDE 'biblio-title.inc' biblio=RECALL.biblio link=> 1 %] [% IF RECALL.item_level %]

    Item recalled: [% RECALL.item.barcode | html %]

    [% END %] @@ -849,10 +849,8 @@ [% FOREACH ar IN current_article_requests %] - - [% INCLUDE 'biblio-title.inc' biblio=ar.biblio %] - [% ar.item.enumchron | html %] - + [% INCLUDE 'biblio-title.inc' biblio=ar.biblio link=> 1 %] + [% ar.item.enumchron | html %] [% ar.biblio.author | html %] [% IF ar.itemnumber %] (only [% ar.item.barcode | html %])[% END %] -- 2.39.5