From eed43e42683afda4f4c01acae7a01d4c87938c86 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Wed, 11 Dec 2013 11:14:47 -0300 Subject: [PATCH] Bug 10691: (follow-up) restore behaviour for control field ($w) As noted by Jared, on the presence of 4XX$w or 5XX$w the display got broken by this refactoring. This patch restores de previous behaviour in that front. The OPAC themes get fixed too, and the Bootstrap one gets this enhancement too. Regards To+ Sponsored-by: Universidad Nacional de Cordoba --- .../en/includes/authorities-search-results.inc | 19 +++++++--- .../en/includes/authorities-search-results.inc | 42 ++++++++++++++++++---- .../en/includes/authorities-search-results.inc | 20 ++++++++--- 3 files changed, 65 insertions(+), 16 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc index bb8e3f6..7d96264 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc @@ -1,4 +1,11 @@ [% BLOCK showreference %] + [% SET authidurl = '/cgi-bin/koha/authorities/detail.pl?authid=' %] [% SET searchurl = '/cgi-bin/koha/authorities/authorities-home.pl?op=do_search&type=intranet&marclist=any&operator=contains&orderby=HeadingAsc&value=' %] @@ -15,14 +22,14 @@ [% END %] [% ELSE %] - [% IF ( type=='seefrom' ) %] + [% IF ( linkType=='seefrom' ) %] used for/see from: - [% ELSIF ( type=='seealso' ) %] + [% ELSIF ( linkType=='seealso' ) %] see also: [% END %] - [% IF ( type=='seealso' ) %] + [% IF ( linkType=='seealso' ) %] [% IF ( authid ) %] [% heading | html %] [% ELSE %] @@ -68,7 +75,7 @@ [% IF summary.seefrom %]
[% FOREACH see IN summary.seefrom %] - [% PROCESS showreference heading=see.heading label="" type=see.type search='' %] + [% PROCESS showreference heading=see.heading linkType="" type=see.type search='' %] [% IF ! loop.last %] ; [% END %] [% END %]
@@ -76,7 +83,7 @@ [% IF summary.seealso %]
[% FOREACH see IN summary.seealso %] - [% PROCESS showreference heading=see.heading label="" type=see.type search='' %] + [% PROCESS showreference heading=see.heading linkType="" type=see.type search='' %] [% IF ! loop.last %] ; [% END %] [% END %]
@@ -96,6 +103,7 @@
[% PROCESS showreference heading=seefro.heading + linkType='seefrom' type=seefro.type authid=seefro.authid %] @@ -107,6 +115,7 @@
[% PROCESS showreference heading=seeals.heading + linkType='seealso' type=seeals.type authid=seeals.authid %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/authorities-search-results.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/authorities-search-results.inc index 61bd900..d6b132e 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/authorities-search-results.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/authorities-search-results.inc @@ -1,4 +1,13 @@ [% BLOCK showreference %] + + [% SET authidurl = '/cgi-bin/koha/opac-authoritiesdetail.pl?authid=' %] + [% SET searchurl = '/cgi-bin/koha/opac-authorities-home.pl?op=do_search&type=opac&operatorc=contains&marclistc=mainentry&and_orc=and&orderby=HeadingAsc&value=' %] [% IF marcflavour == 'UNIMARC' %] [% SWITCH type %] [% CASE 'broader' %] @@ -11,10 +20,22 @@ RT: [% heading | html %] [% END %] [% ELSE %] - [% IF ( label ) %][% label | html %][% END %] + + [% IF ( linkType=='seefrom' ) %] + used for/see from: + [% ELSIF ( linkType=='seealso' ) %] + see also: + [% END %] - [% IF ( linkpath && search ) %][% heading | html %] - [% ELSE %][% heading | html %][% END %] + [% IF ( linkType=='seealso' ) %] + [% IF ( authid ) %] + [% heading | html %] + [% ELSE %] + [% heading | html %] + [% END %] + [% ELSE %] + [% heading | html %] + [% END %] [% UNLESS ( type=='seefrom' || type=='seealso' ) %] @@ -53,7 +74,7 @@ [% IF summary.seealso %]
[% FOREACH see IN summary.seealso %] - [% PROCESS showreference heading=see.heading label="" type=see.type search='' %] + [% PROCESS showreference heading=see.heading linkType="" type=see.type search='' %] [% IF ! loop.last %] ; [% END %] [% END %]
@@ -71,14 +92,23 @@ [% IF ( summary.seefrom ) %] [% FOREACH seefro IN summary.seefrom %]
- [% PROCESS showreference heading=seefro.heading label="used for/see from:" type=seefro.type search='' %] + [% PROCESS showreference + heading=seefro.heading + linkType='seefrom' + type=seefro.type + %]
[% END %] [% END %] [% IF ( summary.seealso ) %] [% FOREACH seeals IN summary.seealso %]
- [% PROCESS showreference heading=seeals.heading label="see also:" type=seeals.type linkpath=link search=seeals.search %] + [% PROCESS showreference + heading=seeals.heading + linkType='seealso' + type=seeals.type + authid=seeals.authid + %]
[% END %] [% END %] diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/authorities-search-results.inc b/koha-tmpl/opac-tmpl/prog/en/includes/authorities-search-results.inc index b3371aa..014d109 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/authorities-search-results.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/authorities-search-results.inc @@ -1,4 +1,11 @@ [% BLOCK showreference %] + [% SET authidurl = '/cgi-bin/koha/opac-authoritiesdetail.pl?authid=' %] [% SET searchurl = '/cgi-bin/koha/opac-authorities-home.pl?op=do_search&type=opac&operatorc=contains&marclistc=mainentry&and_orc=and&orderby=HeadingAsc&value=' %] [% IF marcflavour == 'UNIMARC' %] @@ -14,14 +21,14 @@ [% END %] [% ELSE %] - [% IF ( type=='seefrom' ) %] + [% IF ( linkType=='seefrom' ) %] used for/see from: - [% ELSIF ( type=='seealso' ) %] + [% ELSIF ( linkType=='seealso' ) %] see also: [% END %] - [% IF ( type=='seealso' ) %] + [% IF ( linkType=='seealso' ) %] [% IF ( authid ) %] [% heading | html %] [% ELSE %] @@ -67,7 +74,7 @@ [% IF summary.seefrom %]
[% FOREACH see IN summary.seefrom %] - [% PROCESS showreference heading=see.heading label="" type=see.type search='' %] + [% PROCESS showreference heading=see.heading linkType="" type=see.type search='' %] [% IF ! loop.last %] ; [% END %] [% END %]
@@ -75,7 +82,7 @@ [% IF summary.seealso %]
[% FOREACH see IN summary.seealso %] - [% PROCESS showreference heading=see.heading label="" type=see.type search='' %] + [% PROCESS showreference heading=see.heading linkType="" type=see.type search='' %] [% IF ! loop.last %] ; [% END %] [% END %]
@@ -95,7 +102,9 @@
[% PROCESS showreference heading=seefro.heading + linkType='seefrom' type=seefro.type + authid=seefro.authid %]
[% END %] @@ -105,6 +114,7 @@
[% PROCESS showreference heading=seeals.heading + linkType='seealso' type=seeals.type authid=seeals.authid %] -- 1.8.3.2