Attachment 24463 Details for Bug 10691 – Bug 10691: (follow-up) restore behaviour for control field ($w)

[patch] Bug 10691: (follow-up) restore behaviour for control field ($w)

Bug-10691-follow-up-restore-behaviour-for-control-.patch (text/plain), 12.05 KB, created by Jonathan Druart on 2014-01-16 15:58:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2014-01-16 15:58:31 UTC

Size: 12.05 KB

patch

obsolete

>From 095080f61ee587addffbf0545e436719114392d9 Mon Sep 17 00:00:00 2001
>From: Tomas Cohen Arazi <tomascohen@gmail.com>
>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 fix too.
>
>Applied the fix that Galen proposed on comment #30 regarding Zeno's fix in bug 11174.
>
>Regards
>To+
>
>Sponsored-by: Universidad Nacional de Cordoba
>Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
>
>Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
>---
> .../en/includes/authorities-search-results.inc     |   19 ++++++---
> .../en/includes/authorities-search-results.inc     |   42 +++++++++++++++++---
> .../en/modules/opac-authoritiessearchresultlist.tt |    4 +-
> .../en/includes/authorities-search-results.inc     |   22 +++++++---
> 4 files changed, 68 insertions(+), 19 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 %]
>         <span class="label">
>-        [% IF ( type=='seefrom' ) %]
>+        [% IF ( linkType=='seefrom' ) %]
>             used for/see from:
>-        [% ELSIF  ( type=='seealso' ) %]
>+        [% ELSIF  ( linkType=='seealso' ) %]
>             see also:
>         [% END %]
>         </span>
>         <span class="heading">
>-        [% IF ( type=='seealso' ) %]
>+        [% IF ( linkType=='seealso' ) %]
>             [% IF ( authid ) %]
>             <a href="[% authidurl | url %][% authid | url %]">[% heading | html %]</a>
>             [% ELSE %]
>@@ -68,7 +75,7 @@
>           [% IF summary.seefrom %]
>             <div class="authres_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 %]
>             </div>
>@@ -76,7 +83,7 @@
>             [% IF summary.seealso %]
>               <div class="authres_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 %]
>               </div>
>@@ -96,6 +103,7 @@
>                     <div class="seefrom authref">
>                     [% PROCESS showreference
>                         heading=seefro.heading
>+                        linkType='seefrom'
>                         type=seefro.type
>                         authid=seefro.authid
>                     %]
>@@ -107,6 +115,7 @@
>                     <div class="seealso authref">
>                     [% 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..6a9f9d0 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&operator=contains&marclist=mainentry&and_or=and&orderby=HeadingAsc&value=' %]
>     [% IF marcflavour == 'UNIMARC' %]
>         [% SWITCH type %]
>             [% CASE 'broader' %]
>@@ -11,10 +20,22 @@
>               <span class="RT">RT: [% heading | html %]</span>
>         [% END %]
>     [% ELSE %]
>-        [% IF ( label ) %]<span class="label">[% label | html %]</span>[% END %]
>+        <span class="label">
>+        [% IF ( linkType=='seefrom' ) %]
>+            used for/see from:
>+        [% ELSIF ( linkType=='seealso' ) %]
>+            see also:
>+        [% END %]
>         <span class="heading">
>-            [% IF ( linkpath && search ) %]<a href="[% link | url %][% search | url %]">[% heading | html %]</a>
>-            [% ELSE %][% heading | html %][% END %]
>+        [% 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">
>@@ -53,7 +74,7 @@
>             [% IF summary.seealso %]
>                 <div class="authres_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 %]
>                 </div>
>@@ -71,14 +92,23 @@
>             [% IF ( summary.seefrom ) %]
>                 [% FOREACH seefro IN summary.seefrom %]
>                     <div class="seefrom authref">
>-                    [% PROCESS showreference heading=seefro.heading label="used for/see from:" type=seefro.type search='' %]
>+                    [% PROCESS showreference
>+                        heading=seefro.heading
>+                        linkType='seefrom'
>+                        type=seefro.type
>+                    %]
>                     </div>
>                 [% END %]
>             [% END %]
>             [% IF ( summary.seealso ) %]
>                 [% FOREACH seeals IN summary.seealso %]
>                     <div class="seealso authref">
>-                    [% 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
>+                    %]
>                     </div>
>                 [% END %]
>             [% END %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt
>index 6256f18..262d7f0 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt
>@@ -85,7 +85,7 @@
>                                     <tbody>
>                                         [% FOREACH resul IN result %]
>                                             <tr>
>-                                                <td>[% PROCESS authresult summary=resul.summary link="/cgi-bin/koha/opac-authorities-home.pl?op=do_search&type=opac&operatorc=contains&marclistc=mainentry&and_orc=and&orderby=HeadingAsc&value=" %]</td>
>+                                                <td>[% PROCESS authresult summary=resul.summary %]</td>
>                                                 <td>[% resul.authtype %]</td>
>                                                 [% UNLESS ( resul.isEDITORS ) %]
>                                                     <td>
>@@ -111,4 +111,4 @@
>     </div> 
> 
> [% INCLUDE 'opac-bottom.inc' %]
>-[% BLOCK jsinclude %][% END %]
>\ No newline at end of file
>+[% BLOCK jsinclude %][% 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..dcd2efc 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,6 +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=' %]
>+    [% SET searchurl = '/cgi-bin/koha/opac-authorities-home.pl?op=do_search&type=opac&operator=contains&marclist=mainentry&and_or=and&orderby=HeadingAsc&value=' %]
>     [% IF marcflavour == 'UNIMARC' %]
>         [% SWITCH type %]
>         [% CASE 'broader' %]
>@@ -14,14 +21,14 @@
>         [% END %]
>     [% ELSE %]
>         <span class="label">
>-        [% IF ( type=='seefrom' ) %]
>+        [% IF ( linkType=='seefrom' ) %]
>             used for/see from:
>-        [% ELSIF  ( type=='seealso' ) %]
>+        [% ELSIF  ( linkType=='seealso' ) %]
>             see also:
>         [% END %]
>         </span>
>         <span class="heading">
>-        [% IF ( type=='seealso' ) %]
>+        [% IF ( linkType=='seealso' ) %]
>             [% IF ( authid ) %]
>             <a href="[% authidurl | url %][% authid | url %]">[% heading | html %]</a>
>             [% ELSE %]
>@@ -67,7 +74,7 @@
>             [% IF summary.seefrom %]
>               <div class="authres_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 %]
>               </div>
>@@ -75,7 +82,7 @@
>             [% IF summary.seealso %]
>               <div class="authres_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 %]
>               </div>
>@@ -95,7 +102,9 @@
>                     <div class="seefrom authref">
>                     [% PROCESS showreference
>                         heading=seefro.heading
>+                        linkType='seefrom'
>                         type=seefro.type
>+                        authid=seefro.authid
>                     %]
>                     </div>
>                 [% END %]
>@@ -105,6 +114,7 @@
>                     <div class="seealso authref">
>                     [% PROCESS showreference
>                         heading=seeals.heading
>+                        linkType='seealso'
>                         type=seeals.type
>                         authid=seeals.authid
>                     %]
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 10691: 21210 | 21212 | 21716 | 21717 | 21727 | 21728 | 21893 | 21894 | 21895 | 22211 | 22212 | 22213 | 22214 | 22215 | 22785 | 22786 | 22787 | 23393 | 23394 | 23528 | 23529 | 23530 | 24232 | 24233 | 24234 | 24461 | 24462 | 24463