From 5accf575c02ef6ea2f8bfa89127c01206e97d321 Mon Sep 17 00:00:00 2001
From: Tomas Cohen Arazi <tomascohen@gmail.com>
Date: Wed, 2 Oct 2013 15:42:13 -0300
Subject: [PATCH] Bug 10987: Too many 'see also' and 'see from' labels
 occurences

If an authority record has more than one 4xx$a (or 5xx$a) entries the
corresponding labels 'see also' and 'used for/see from' are repeated.

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

Regards
To+

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>
---
 .../intranet-tmpl/prog/en/css/staff-global.css     |    6 ++++--
 .../en/includes/authorities-search-results.inc     |   21 ++++++++++----------
 koha-tmpl/opac-tmpl/ccsr/en/css/opac.css           |    6 ++++--
 koha-tmpl/opac-tmpl/prog/en/css/opac.css           |    6 ++++--
 .../en/includes/authorities-search-results.inc     |   21 ++++++++++----------
 5 files changed, 32 insertions(+), 28 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 755a02a..1a6cfef 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 bb8e3f6..3d2cd26 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
@@ -14,13 +14,6 @@
             <span class="RT">RT: [% heading | html %]</span>
         [% END %]
     [% ELSE %]
-        <span class="label">
-        [% IF ( type=='seefrom' ) %]
-            used for/see from:
-        [% ELSIF  ( type=='seealso' ) %]
-            see also:
-        [% END %]
-        </span>
         <span class="heading">
         [% IF ( type=='seealso' ) %]
             [% IF ( authid ) %]
@@ -91,9 +84,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
                         type=seefro.type
@@ -101,10 +96,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
                         type=seeals.type
@@ -112,6 +110,7 @@
                     %]
                     </div>
                 [% END %]
+            </div>
             [% END %]
         [% END %]
     [% END %]
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
--- 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 c2902c1..c977b62 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 b3371aa..8865846 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
@@ -13,13 +13,6 @@
             <span class="RT">RT: [% heading | html %]</span>
         [% END %]
     [% ELSE %]
-        <span class="label">
-        [% IF ( type=='seefrom' ) %]
-            used for/see from:
-        [% ELSIF  ( type=='seealso' ) %]
-            see also:
-        [% END %]
-        </span>
         <span class="heading">
         [% IF ( type=='seealso' ) %]
             [% IF ( authid ) %]
@@ -90,19 +83,24 @@
               </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
                         type=seefro.type
                     %]
                     </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
                         type=seeals.type
@@ -110,6 +108,7 @@
                     %]
                     </div>
                 [% END %]
+            </div>
             [% END %]
         [% END %]
     [% END %]
-- 
1.7.10.4