Bug 10987: remove duplicate 'see also' and 'see from' labels from authority search...

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 <bgkriegel@gmail.com>
Work as decribed. No koha-qa errors
Nice view on staff and both opac

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>

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 1f8ea3f..ba49c88 100644 (file)
--- 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 c784801..9b7bf10 100644 (file)
--- 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 @@
             <span class="RT">RT: [% heading | html %]</span>
         [% END %]
     [% ELSE %]
-        <span class="label">
-        [% IF ( linkType=='seefrom' ) %]
-            used for/see from:
-        [% ELSIF  ( linkType=='seealso' ) %]
-            see also:
-        [% END %]
-        </span>
         <span class="heading">
         [% IF ( linkType=='seealso' ) %]
             [% IF ( authid ) %]
@@ -98,9 +91,11 @@
               </div>
             [% END %]
         [% ELSE %]
-            [% IF ( summary.seefrom ) %]
+            [% IF ( summary.seefrom.size > 1 ) %]
+            <div class="seefrom">
+                <span class="seefrom">used for/see from:</span>
                 [% FOREACH seefro IN summary.seefrom %]
-                    <div class="seefrom authref">
+                    <div class="authref">
                     [% PROCESS showreference
                         heading=seefro.heading
                         linkType='seefrom'
@@ -109,10 +104,13 @@
                     %]
                     </div>
                 [% END %]
+            </div>
             [% END %]
-            [% IF ( summary.seealso ) %]
+            [% IF ( summary.seealso.size > 1 ) %]
+            <div class="seealso">
+                <span class="seealso">see also:</span>
                 [% FOREACH seeals IN summary.seealso %]
-                    <div class="seealso authref">
+                    <div class="authref">
                     [% PROCESS showreference
                         heading=seeals.heading
                         linkType='seealso'
@@ -121,6 +119,7 @@
                     %]
                     </div>
                 [% END %]
+            </div>
             [% 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 5a88ca2..8a1df83 100644 (file)
--- 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 @@
               <span class="RT">RT: [% heading | html %]</span>
         [% END %]
     [% ELSE %]
-        <span class="label">
-        [% IF ( linkType=='seefrom' ) %]
-            used for/see from:
-        [% ELSIF ( linkType=='seealso' ) %]
-            see also:
-        [% END %]
         <span class="heading">
         [% IF ( linkType=='seealso' ) %]
             [% IF ( authid ) %]
@@ -90,6 +84,7 @@
             [% END %]
         [% ELSE %]
             [% IF ( summary.seefrom ) %]
+                    <span class="seefrom">used for/see from:</span>
                 [% FOREACH seefro IN summary.seefrom %]
                     <div class="seefrom authref">
                     [% PROCESS showreference
@@ -101,6 +96,7 @@
                 [% END %]
             [% END %]
             [% IF ( summary.seealso ) %]
+                    <span class="seealso">see also:</span>
                 [% FOREACH seeals IN summary.seealso %]
                     <div class="seealso authref">
                     [% 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 0901d6b..f0b8744 100644 (file)
--- 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 b7cf025..7cbd7ec 100644 (file)
--- 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 a6acc09..97e7c03 100644 (file)
--- 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 @@
             <span class="RT">RT: [% heading | html %]</span>
         [% END %]
     [% ELSE %]
-        <span class="label">
-        [% IF ( linkType=='seefrom' ) %]
-            used for/see from:
-        [% ELSIF  ( linkType=='seealso' ) %]
-            see also:
-        [% END %]
-        </span>
         <span class="heading">
         [% IF ( linkType=='seealso' ) %]
             [% IF ( authid ) %]
@@ -97,9 +90,11 @@
               </div>
             [% END %]
         [% ELSE %]
-            [% IF ( summary.seefrom ) %]
+            [% IF ( summary.seefrom.size > 1 ) %]
+            <div class="seefrom">
+                <span class="seefrom">used for/see from:</span>
                 [% FOREACH seefro IN summary.seefrom %]
-                    <div class="seefrom authref">
+                    <div class="authref">
                     [% PROCESS showreference
                         heading=seefro.heading
                         linkType='seefrom'
@@ -108,10 +103,13 @@
                     %]
                     </div>
                 [% END %]
+            </div>
             [% END %]
-            [% IF ( summary.seealso ) %]
+            [% IF ( summary.seealso.size > 1 ) %]
+            <div class="seealso">
+                <span class="seealso">see also:</span>
                 [% FOREACH seeals IN summary.seealso %]
-                    <div class="seealso authref">
+                    <div class="authref">
                     [% PROCESS showreference
                         heading=seeals.heading
                         linkType='seealso'
@@ -120,6 +118,7 @@
                     %]
                     </div>
                 [% END %]
+            </div>
             [% END %]
         [% END %]
     [% END %]