From 2395ebb2ae431d877c7389853b6d63bcc7340557 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Wed, 2 Oct 2013 15:42:13 -0300 Subject: [PATCH] Bug 10987: remove duplicate 'see also' and 'see from' labels from authority search results If an authority record has more than one 4xx$a (or 5xx$a) entries the corresponding labels 'see also' and 'used for/see from' werwe repeated. This patch removes duplicate instances of the labels, improving readability. To test: - Have authority records with more than one entry on the 4xx (or 5xx) fields. - Do a search, check "see also:" (or 'used for/see from') appear more than once. - Apply the patch - Reload and check it looks nicer :-D - Repeat for: staff auth search, OPAC using ccsr, OPAC using prog - Signoff Sponsored-by: Universidad Nacional de Cordoba Signed-off-by: Bernardo Gonzalez Kriegel Work as decribed. No koha-qa errors Nice view on staff and both opac Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 910dff28254b8a93ed03884b0e768fd7c013f449) Signed-off-by: Fridolin Somers --- .../prog/en/css/staff-global.css | 6 ++++-- .../includes/authorities-search-results.inc | 21 +++++++++---------- .../includes/authorities-search-results.inc | 8 ++----- koha-tmpl/opac-tmpl/ccsr/en/css/opac.css | 6 ++++-- koha-tmpl/opac-tmpl/prog/en/css/opac.css | 6 ++++-- .../includes/authorities-search-results.inc | 21 +++++++++---------- 6 files changed, 34 insertions(+), 34 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css index 1f8ea3f562..ba49c8861d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -2267,11 +2267,13 @@ ul.ui-tabs-nav li { } .authref { - text-indent: 2em; + font-style: normal; + text-indent: 4em; } -.authref .label { +.seefrom, .seealso { font-style: italic; + text-indent: 2em; } #authfinderops { 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 c78480198d..9b7bf1008b 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 @@ -21,13 +21,6 @@ RT: [% heading | html %] [% END %] [% ELSE %] - - [% IF ( linkType=='seefrom' ) %] - used for/see from: - [% ELSIF ( linkType=='seealso' ) %] - see also: - [% END %] - [% IF ( linkType=='seealso' ) %] [% IF ( authid ) %] @@ -98,9 +91,11 @@ [% END %] [% ELSE %] - [% IF ( summary.seefrom ) %] + [% IF ( summary.seefrom.size > 1 ) %] +
+ used for/see from: [% FOREACH seefro IN summary.seefrom %] -
+
[% PROCESS showreference heading=seefro.heading linkType='seefrom' @@ -109,10 +104,13 @@ %]
[% END %] +
[% END %] - [% IF ( summary.seealso ) %] + [% IF ( summary.seealso.size > 1 ) %] +
+ see also: [% FOREACH seeals IN summary.seealso %] -
+
[% PROCESS showreference heading=seeals.heading linkType='seealso' @@ -121,6 +119,7 @@ %]
[% END %] +
[% END %] [% END %] [% END %] 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 5a88ca2212..8a1df83678 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 @@ -20,12 +20,6 @@ RT: [% heading | html %] [% END %] [% ELSE %] - - [% IF ( linkType=='seefrom' ) %] - used for/see from: - [% ELSIF ( linkType=='seealso' ) %] - see also: - [% END %] [% IF ( linkType=='seealso' ) %] [% IF ( authid ) %] @@ -90,6 +84,7 @@ [% END %] [% ELSE %] [% IF ( summary.seefrom ) %] + used for/see from: [% FOREACH seefro IN summary.seefrom %]
[% PROCESS showreference @@ -101,6 +96,7 @@ [% END %] [% END %] [% IF ( summary.seealso ) %] + see also: [% FOREACH seeals IN summary.seealso %]
[% PROCESS showreference diff --git a/koha-tmpl/opac-tmpl/ccsr/en/css/opac.css b/koha-tmpl/opac-tmpl/ccsr/en/css/opac.css index 0901d6b883..f0b8744951 100644 --- a/koha-tmpl/opac-tmpl/ccsr/en/css/opac.css +++ b/koha-tmpl/opac-tmpl/ccsr/en/css/opac.css @@ -2640,11 +2640,13 @@ ul.ui-tabs-nav li { } .authref { - text-indent: 2em; + font-style: normal; + text-indent: 4em; } -.authref .label { +.seefrom, .seealso { font-style: italic; + text-indent: 2em; } .authstanza { diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css index b7cf025170..7cbd7ec881 100644 --- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css +++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css @@ -2779,11 +2779,13 @@ ul.ui-tabs-nav li { } .authref { - text-indent: 2em; + font-style: normal; + text-indent: 4em; } -.authref .label { +.seefrom, .seealso { font-style: italic; + text-indent: 2em; } .authstanza { 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 a6acc099ce..97e7c038d5 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 @@ -20,13 +20,6 @@ RT: [% heading | html %] [% END %] [% ELSE %] - - [% IF ( linkType=='seefrom' ) %] - used for/see from: - [% ELSIF ( linkType=='seealso' ) %] - see also: - [% END %] - [% IF ( linkType=='seealso' ) %] [% IF ( authid ) %] @@ -97,9 +90,11 @@
[% END %] [% ELSE %] - [% IF ( summary.seefrom ) %] + [% IF ( summary.seefrom.size > 1 ) %] +
+ used for/see from: [% FOREACH seefro IN summary.seefrom %] -
+
[% PROCESS showreference heading=seefro.heading linkType='seefrom' @@ -108,10 +103,13 @@ %]
[% END %] +
[% END %] - [% IF ( summary.seealso ) %] + [% IF ( summary.seealso.size > 1 ) %] +
+ see also: [% FOREACH seeals IN summary.seealso %] -
+
[% PROCESS showreference heading=seeals.heading linkType='seealso' @@ -120,6 +118,7 @@ %]
[% END %] +
[% END %] [% END %] [% END %] -- 2.39.5