Bug 9811: Fix wording branch vs library

[koha_fer] / koha-tmpl / intranet-tmpl / prog / en / includes / authorities-search-results.inc

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 92314b1..ceff1a4 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
@@ -1,59 +1,147 @@
 [% BLOCK showreference %]
+[%#
+    Parameters:
+    heading: the heading itself
+    linkType: currently 'seefrom' or 'seealso', controls the label for the entry
+    type:
+    authid: if it is a linked authority, its authid
+%]
+    [% 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=' %]
+
     [% IF marcflavour == 'UNIMARC' %]
         [% SWITCH type %]
         [% CASE 'broader' %]
-            <span class="BT">[% heading %]</span> --
+            <span class="BT">BT: [% heading | html %]</span>
         [% CASE 'narrower' %]
-            <span class="NT">[% heading %]</span> --
-        [% CASE 'narrower' %]
-            <span class="NT">[% heading %]</span> --
+            <span class="NT">NT: [% heading | html %]</span>
         [% CASE 'seefrom' %]
-            <span class="UF">[% heading %]</span> --
+            <span class="UF">UF: [% heading | html %]</span>
         [% CASE 'seealso' %]
-            <span class="RT">[% heading %]</span> --
+            <span class="RT">RT: [% heading | html %]</span>
         [% END %]
     [% ELSE %]
-        [% IF ( label ) %]<span class="label">[% label %]</span>[% END %]
-        <span class="heading">[% heading %]</span>
-        [% UNLESS ( type=='seefrom' || type=='seealso' ) %]<span class="type">[% SWITCH type %]
-        [% CASE 'earlier' %](Earlier heading)
-        [% CASE 'later' %](Later heading)
-        [% CASE 'acronym' %](Acronym)
-        [% CASE 'musical' %](Musical composition)
-        [% CASE 'broader' %](Broader heading)
-        [% CASE 'narrower' %](Narrower heading)
-        [% CASE %]([% type %])
-        [% END %]</span>[% END %]
+        <span class="heading">
+        [% IF ( linkType=='seealso' ) %]
+            [% IF ( authid ) %]
+            <a href="[% authidurl | url %][% authid | url %]">[% heading | html %]</a>
+            [% ELSE %]
+            <a href="[% searchurl | url %][% heading | html %]">[% heading | html %]</a>
+            [% END %]
+        [% ELSE %]
+            [% heading | html %]
+        [% END %]
+        </span>
+        [% UNLESS ( type=='seefrom' || type=='seealso' ) %]
+        <span class="type">
+            [% SWITCH type %]
+            [% CASE 'earlier' %](Earlier heading)
+            [% CASE 'later' %](Later heading)
+            [% CASE 'acronym' %](Acronym)
+            [% CASE 'musical' %](Musical composition)
+            [% CASE 'broader' %](Broader heading)
+            [% CASE 'narrower' %](Narrower heading)
+            [% CASE 'parent' %](Immediate parent body)
+            [% CASE %][% IF type %]([% type | html %])
+            [% END %]
+        [% END %]
+        </span>
+        [% END %]
     [% END %]
 [% END %]
 [% BLOCK authresult %]
-    [% IF ( summary.summary ) %][% summary.summary %]:[% END %]
+    [% IF ( summary.summary ) %][% summary.summary | html %]:[% END %]
+    <div class="authres_repet">
+      [% FOREACH repet IN summary.repets %]
+        <span>[% repet | html %]</span>
+        [% UNLESS loop.last %] | [% END %]
+      [% END %]
+    </div>
     [% UNLESS ( summary.summaryonly ) %]
-        [% FOREACH authorize IN summary.authorized %]
-            <span class="authorizedheading">[% authorize %]</span>
-        [% END %]
+        <div class="authorizedheading">
+          [% FOREACH authorize IN summary.authorized %]
+            <span class="authorizedheading">[% authorize.heading | html %]</span>
+            [% UNLESS loop.last %] | [% END %]
+          [% END %]
+        </div>
         [% IF ( marcflavour == 'UNIMARC' ) %]
-            [% FOREACH note IN summary.notes %]
-                <span class="note">[% note %]</span>
+          [% IF summary.notes %]
+           <div class="authres_notes">
+           [% FOREACH note IN summary.notes %]
+             <span>[% note.note | html %]</span>
+           [% END %]
+           </div>
+          [% END %]
+          [% IF summary.seefrom %]
+            <div class="authres_seefrom">
+            [% FOREACH see IN summary.seefrom %]
+              [% PROCESS showreference heading=see.heading linkType="" type=see.type search='' %]
+              [% IF ! loop.last %] ; [% END %]
             [% END %]
-            [% FOREACH seefro IN summary.seefrom %]
-                [% PROCESS showreference heading=seefro.heading label="" type=seefro.type %]
+            </div>
+          [% END %]
+            [% IF summary.seealso %]
+              <div class="authres_seealso">
+              [% FOREACH see IN summary.seealso %]
+                 [% PROCESS showreference heading=see.heading linkType="" type=see.type search='' %]
+                 [% IF ! loop.last %] ; [% END %]
+              [% END %]
+              </div>
+            [% END %]
+            [% IF summary.otherscript %]
+              <div class="authres_otherscript">
+              [% FOREACH other IN summary.otherscript %]
+                [% PROCESS language lang=other.lang | trim %]:
+                [% other.term %]
+                [% IF ! loop.last %] ; [% END %]
+              [% END %]
+              </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">
-                    [% PROCESS showreference heading=seefro.heading label="used for/see from:" type=seefro.type %]
+                    <div class="authref">
+                    [% PROCESS showreference
+                        heading=seefro.heading
+                        linkType='seefrom'
+                        type=seefro.type
+                        authid=seefro.authid
+                    %]
                     </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">
-                    [% PROCESS showreference heading=seeals.heading label="see also:" type=seeals.type %]
+                    <div class="authref">
+                    [% PROCESS showreference
+                        heading=seeals.heading
+                        linkType='seealso'
+                        type=seeals.type
+                        authid=seeals.authid
+                    %]
                     </div>
                 [% END %]
+            </div>
             [% END %]
         [% END %]
     [% END %]
 [% END %]
+[% BLOCK language %]
+  [% SWITCH lang %]
+   [% CASE ['en', 'eng'] %]English
+   [% CASE ['fr', 'fre'] %]French
+   [% CASE ['it', 'ita'] %]Italian
+   [% CASE ['de', 'ger', 'deu'] %]German
+   [% CASE ['es', 'spa'] %]Spanish
+   [% CASE ['heb'] %]Hebrew
+   [% CASE ['ara'] %]Arabic
+   [% CASE ['gre'] %]Greek (modern)
+   [% CASE ['grc'] %]Greek (to 1453)
+   [% CASE %][% lang %]
+  [% END %]
+[% END %]