Attachment 3925 Details for Bug 6192 – Proposed fix

[patch] Proposed fix

0001-Fix-for-Bug-6192-Path-to-theme-directory-scoped-inco.patch (text/plain), 18.73 KB, created by Owen Leonard on 2011-04-14 13:38:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2011-04-14 13:38:48 UTC

Size: 18.73 KB

patch

obsolete

>From 531a323029a94145837ce9227f4e025a5392cfa6 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Thu, 14 Apr 2011 09:37:19 -0400
>Subject: [PATCH] Fix for Bug 6192 - Path to theme directory scoped incorrectly
>Content-Type: text/plain; charset="utf-8"
>
>---
> .../prog/en/modules/authorities/detail.tt          |    2 +-
> .../prog/en/modules/catalogue/MARCdetail.tt        |   20 ++++++++++----------
> .../value_builder/unimarc_field_210c.tt            |    2 +-
> .../prog/en/modules/reserve/request.tt             |   20 ++++++++++----------
> .../opac-tmpl/prog/en/modules/opac-reserve.tt      |    2 +-
> 5 files changed, 23 insertions(+), 23 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt
>index 0390cd9..24d200b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt
>@@ -139,7 +139,7 @@ function searchauthority() {
>                 [% subfiel.marc_value %]
>                 [% IF ( subfiel.link ) %]
>                     <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;marclist=[% subfiel.link %]&amp;operator==&amp;type=intranet&amp;value=[% subfiel.marc_value |url %]">
>-                        <img border="0" src="[% subfiel.interface %]/[% subfiel.theme %]/images/filefind.png" height="15" title="Search on [% subfiel.marc_value %]">
>+                        <img border="0" src="[% interface %]/[% theme %]/images/filefind.png" height="15" title="Search on [% subfiel.marc_value %]">
>                     </a>
>                 [% END %]
>                 [% IF ( subfiel.authority ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt
>index 838367b..8ae54b4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt
>@@ -97,7 +97,7 @@ function Changefwk(FwkList) {
>                     [% IF ( subfiel.is_url ) %]<a href="[% subfiel.marc_value %]">[% subfiel.marc_value |html %]</a>[% ELSE %][% subfiel.marc_value |html %][% END %]
>                     [% IF ( subfiel.link ) %]
>                         <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=[% subfiel.link %],phr&amp;type=intranet&amp;q=[% subfiel.marc_value |url %]">
>-                            <img border="0" src="[% subfiel.interface %]/[% subfiel.theme %]/img/filefind.png" height="15" title="Search on [% subfiel.marc_value |html %]" alt="Search on [% subfiel.marc_value |html %]" />
>+                            <img border="0" src="[% interface %]/[% theme %]/img/filefind.png" height="15" title="Search on [% subfiel.marc_value |html %]" alt="Search on [% subfiel.marc_value |html %]" />
>                         </a>
>                     [% END %]
>                     [% IF ( subfiel.authority ) %]
>@@ -127,7 +127,7 @@ function Changefwk(FwkList) {
>                     [% IF ( subfiel.is_url ) %]<a href="[% subfiel.marc_value %]">[% subfiel.marc_value |html %]</a>[% ELSE %][% subfiel.marc_value |html %][% END %]
>                     [% IF ( subfiel.link ) %]
>                         <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=[% subfiel.link %],phr&amp;type=intranet&amp;q=[% subfiel.marc_value |url %]">
>-                            <img border="0" src="[% subfiel.interface %]/[% subfiel.theme %]/img/filefind.png" height="15" title="Search on [% subfiel.marc_value |html %]" alt="Search on [% subfiel.marc_value |html %]" />
>+                            <img border="0" src="[% interface %]/[% theme %]/img/filefind.png" height="15" title="Search on [% subfiel.marc_value |html %]" alt="Search on [% subfiel.marc_value |html %]" />
>                         </a>
>                     [% END %]
>                     [% IF ( subfiel.authority ) %]
>@@ -157,7 +157,7 @@ function Changefwk(FwkList) {
>                     [% IF ( subfiel.is_url ) %]<a href="[% subfiel.marc_value %]">[% subfiel.marc_value |html %]</a>[% ELSE %][% subfiel.marc_value |html %][% END %]
>                     [% IF ( subfiel.link ) %]
>                         <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=[% subfiel.link %],phr&amp;type=intranet&amp;q=[% subfiel.marc_value |url %]">
>-                            <img border="0" src="[% subfiel.interface %]/[% subfiel.theme %]/img/filefind.png" height="15" title="Search on [% subfiel.marc_value |html %]" alt="Search on [% subfiel.marc_value |html %]" />
>+                            <img border="0" src="[% interface %]/[% theme %]/img/filefind.png" height="15" title="Search on [% subfiel.marc_value |html %]" alt="Search on [% subfiel.marc_value |html %]" />
>                         </a>
>                     [% END %]
>                     [% IF ( subfiel.authority ) %]
>@@ -187,7 +187,7 @@ function Changefwk(FwkList) {
>                     [% IF ( subfiel.is_url ) %]<a href="[% subfiel.marc_value %]">[% subfiel.marc_value |html %]</a>[% ELSE %][% subfiel.marc_value |html %][% END %]
>                     [% IF ( subfiel.link ) %]
>                         <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=[% subfiel.link %],phr&amp;type=intranet&amp;q=[% subfiel.marc_value |url %]">
>-                            <img border="0" src="[% subfiel.interface %]/[% subfiel.theme %]/img/filefind.png" height="15" title="Search on [% subfiel.marc_value |html %]" alt="Search on [% subfiel.marc_value |html %]" />
>+                            <img border="0" src="[% interface %]/[% theme %]/img/filefind.png" height="15" title="Search on [% subfiel.marc_value |html %]" alt="Search on [% subfiel.marc_value |html %]" />
>                         </a>
>                     [% END %]
>                     [% IF ( subfiel.authority ) %]
>@@ -217,7 +217,7 @@ function Changefwk(FwkList) {
>                     [% IF ( subfiel.is_url ) %]<a href="[% subfiel.marc_value %]">[% subfiel.marc_value |html %]</a>[% ELSE %][% subfiel.marc_value |html %][% END %]
>                     [% IF ( subfiel.link ) %]
>                         <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=[% subfiel.link %],phr&amp;type=intranet&amp;q=[% subfiel.marc_value |url %]">
>-                            <img border="0" src="[% subfiel.interface %]/[% subfiel.theme %]/img/filefind.png" height="15" title="Search on [% subfiel.marc_value |html %]" alt="Search on [% subfiel.marc_value |html %]" />
>+                            <img border="0" src="[% interface %]/[% theme %]/img/filefind.png" height="15" title="Search on [% subfiel.marc_value |html %]" alt="Search on [% subfiel.marc_value |html %]" />
>                         </a>
>                     [% END %]
>                     [% IF ( subfiel.authority ) %]
>@@ -247,7 +247,7 @@ function Changefwk(FwkList) {
>                     [% IF ( subfiel.is_url ) %]<a href="[% subfiel.marc_value %]">[% subfiel.marc_value |html %]</a>[% ELSE %][% subfiel.marc_value |html %][% END %]
>                     [% IF ( subfiel.link ) %]
>                         <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=[% subfiel.link %],phr&amp;type=intranet&amp;q=[% subfiel.marc_value |url %]">
>-                            <img border="0" src="[% subfiel.interface %]/[% subfiel.theme %]/img/filefind.png" height="15" title="Search on [% subfiel.marc_value |html %]" alt="Search on [% subfiel.marc_value |html %]" />
>+                            <img border="0" src="[% interface %]/[% theme %]/img/filefind.png" height="15" title="Search on [% subfiel.marc_value |html %]" alt="Search on [% subfiel.marc_value |html %]" />
>                         </a>
>                     [% END %]
>                     [% IF ( subfiel.authority ) %]
>@@ -277,7 +277,7 @@ function Changefwk(FwkList) {
>                     [% IF ( subfiel.is_url ) %]<a href="[% subfiel.marc_value %]">[% subfiel.marc_value |html %]</a>[% ELSE %][% subfiel.marc_value |html %][% END %]
>                     [% IF ( subfiel.link ) %]
>                         <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=[% subfiel.link %],phr&amp;type=intranet&amp;q=[% subfiel.marc_value |url %]">
>-                            <img border="0" src="[% subfiel.interface %]/[% subfiel.theme %]/img/filefind.png" height="15" title="Search on [% subfiel.marc_value |html %]" alt="Search on [% subfiel.marc_value |html %]" />
>+                            <img border="0" src="[% interface %]/[% theme %]/img/filefind.png" height="15" title="Search on [% subfiel.marc_value |html %]" alt="Search on [% subfiel.marc_value |html %]" />
>                         </a>
>                     [% END %]
>                     [% IF ( subfiel.authority ) %]
>@@ -307,7 +307,7 @@ function Changefwk(FwkList) {
>                     [% IF ( subfiel.is_url ) %]<a href="[% subfiel.marc_value %]">[% subfiel.marc_value |html %]</a>[% ELSE %][% subfiel.marc_value |html %][% END %]
>                     [% IF ( subfiel.link ) %]
>                         <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=[% subfiel.link %],phr&amp;type=intranet&amp;q=[% subfiel.marc_value |url %]">
>-                            <img border="0" src="[% subfiel.interface %]/[% subfiel.theme %]/img/filefind.png" height="15" title="Search on [% subfiel.marc_value |html %]" alt="Search on [% subfiel.marc_value |html %]" />
>+                            <img border="0" src="[% interface %]/[% theme %]/img/filefind.png" height="15" title="Search on [% subfiel.marc_value |html %]" alt="Search on [% subfiel.marc_value |html %]" />
>                         </a>
>                     [% END %]
>                     [% IF ( subfiel.authority ) %]
>@@ -337,7 +337,7 @@ function Changefwk(FwkList) {
>                     [% IF ( subfiel.is_url ) %]<a href="[% subfiel.marc_value %]">[% subfiel.marc_value |html %]</a>[% ELSE %][% subfiel.marc_value |html %][% END %]
>                     [% IF ( subfiel.link ) %]
>                         <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=[% subfiel.link %],phr&amp;type=intranet&amp;q=[% subfiel.marc_value |url %]">
>-                            <img border="0" src="[% subfiel.interface %]/[% subfiel.theme %]/img/filefind.png" height="15" title="Search on [% subfiel.marc_value |html %]" alt="Search on [% subfiel.marc_value |html %]" />
>+                            <img border="0" src="[% interface %]/[% theme %]/img/filefind.png" height="15" title="Search on [% subfiel.marc_value |html %]" alt="Search on [% subfiel.marc_value |html %]" />
>                         </a>
>                     [% END %]
>                     [% IF ( subfiel.authority ) %]
>@@ -367,7 +367,7 @@ function Changefwk(FwkList) {
>                     [% IF ( subfiel.is_url ) %]<a href="[% subfiel.marc_value %]">[% subfiel.marc_value |html %]</a>[% ELSE %][% subfiel.marc_value |html %][% END %]
>                     [% IF ( subfiel.link ) %]
>                         <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=[% subfiel.link %],phr&amp;type=intranet&amp;q=[% subfiel.marc_value |url %]">
>-                            <img border="0" src="[% subfiel.interface %]/[% subfiel.theme %]/img/filefind.png" height="15" title="Search on [% subfiel.marc_value |html %]" alt="Search on [% subfiel.marc_value |html %]" />
>+                            <img border="0" src="[% interface %]/[% theme %]/img/filefind.png" height="15" title="Search on [% subfiel.marc_value |html %]" alt="Search on [% subfiel.marc_value |html %]" />
>                         </a>
>                     [% END %]
>                     [% IF ( subfiel.authority ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt
>index 0eb20eb..3e61f92 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt
>@@ -63,7 +63,7 @@
>                         <td>[% resul.used %] times</td>
>                         <td>
>                 [% IF ( resul.to_report ) %]
>-                            <a href="javascript:report('[% resul.to_report |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]')"><img alt="choose" src="[% resul.interface %]/[% resul.theme %]/images/arrow.gif" width="32" hspace="0" vspace="0" border="0"></a>
>+                            <a href="javascript:report('[% resul.to_report |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]')"><img alt="choose" src="[% interface %]/[% theme %]/images/arrow.gif" width="32" /></a>
>                 [% END %]
>                         </td>
>                     </tr>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>index 2c392b0..66c9235 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>@@ -398,10 +398,10 @@ function checkMultiHold() {
>                 <input type="radio" name="checkitem" value="[% itemloo.itemnumber %]" />
>             [% ELSIF ( itemloo.override ) %]
>                 <input type="radio" name="checkitem" class="needsoverride" value="[% itemloo.itemnumber %]" />
>-                <img src="/intranet-tmpl/[% itemloo.theme %]/img/famfamfam/silk/error.png" alt="Requires override of hold policy" />
>+                <img src="/intranet-tmpl/[% theme %]/img/famfamfam/silk/error.png" alt="Requires override of hold policy" />
>             [% ELSE %]
>                 <input disabled="disabled" type="radio" name="checkitem" value="[% itemloo.itemnumber %]" />
>-                <img src="/intranet-tmpl/[% itemloo.theme %]/img/famfamfam/silk/cross.png" alt="Cannot be put on hold" />
>+                <img src="/intranet-tmpl/[% theme %]/img/famfamfam/silk/cross.png" alt="Cannot be put on hold" />
>             [% END %]
>             </td>
>             [% IF ( item_level_itypes ) %]
>@@ -583,7 +583,7 @@ function checkMultiHold() {
>         <th>Pick up Library</th>
>         <th>Details</th>
>         [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]
>-            <th><img src="/intranet-tmpl/[% biblioloo.theme %]/img/go-bottom.png" border="0" alt="Toggle Set to Lowest Priority" /></th>
>+            <th><img src="/intranet-tmpl/[% theme %]/img/go-bottom.png" border="0" alt="Toggle Set to Lowest Priority" /></th>
>         [% END %]
> 	<th>&nbsp;</th>
>       </tr>
>@@ -610,19 +610,19 @@ function checkMultiHold() {
>      [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]
>         <td style="white-space:nowrap;">
> 	        <a title="Move Hold Up" href="request.pl?action=move&amp;where=up&amp;borrowernumber=[% reserveloo.borrowernumber %]&amp;biblionumber=[% reserveloo.biblionumber %]&amp;date=[% reserveloo.date %]">
>-			<img src="/intranet-tmpl/[% reserveloo.theme %]/img/go-up.png" border="0" alt="Go up" />
>+            <img src="/intranet-tmpl/[% theme %]/img/go-up.png" border="0" alt="Go up" />
>                 </a>
> 
> 		<a title="Move Hold To Top" href="request.pl?action=move&amp;where=top&amp;borrowernumber=[% reserveloo.borrowernumber %]&amp;biblionumber=[% reserveloo.biblionumber %]&amp;date=[% reserveloo.date %]">
>-                	<img src="/intranet-tmpl/[% reserveloo.theme %]/img/go-top.png" border="0" alt="Go top" />
>+                    <img src="/intranet-tmpl/[% theme %]/img/go-top.png" border="0" alt="Go top" />
>                 </a>
> 
>                 <a title="Move Hold To Bottom" href="request.pl?action=move&amp;where=bottom&amp;borrowernumber=[% reserveloo.borrowernumber %]&amp;biblionumber=[% reserveloo.biblionumber %]&amp;date=[% reserveloo.date %]">
>-                	<img src="/intranet-tmpl/[% reserveloo.theme %]/img/go-bottom.png" border="0" alt="Go bottom" />
>+                    <img src="/intranet-tmpl/[% theme %]/img/go-bottom.png" border="0" alt="Go bottom" />
>                 </a>
> 
>                 <a title="Move Hold Down" href="request.pl?action=move&amp;where=down&amp;borrowernumber=[% reserveloo.borrowernumber %]&amp;biblionumber=[% reserveloo.biblionumber %]&amp;date=[% reserveloo.date %]">
>-                	<img src="/intranet-tmpl/[% reserveloo.theme %]/img/go-down.png" border="0" alt="Go down" />
>+                    <img src="/intranet-tmpl/[% theme %]/img/go-down.png" border="0" alt="Go down" />
>                 </a>
>         </td>
>     [% END %]
>@@ -703,9 +703,9 @@ function checkMultiHold() {
> 	<td>
> 		<a title="Toggle Lowest Priority" href="request.pl?action=setLowestPriority&amp;borrowernumber=[% reserveloo.borrowernumber %]&amp;biblionumber=[% reserveloo.biblionumber %]&amp;date=[% reserveloo.date %]"> 
> 			[% IF ( reserveloo.lowestPriority ) %]
>-	                	<img src="/intranet-tmpl/[% reserveloo.theme %]/img/go-bottom.png" border="0" alt="Unset Lowest Priority" />
>+                        <img src="/intranet-tmpl/[% theme %]/img/go-bottom.png" border="0" alt="Unset Lowest Priority" />
> 		        [% ELSE %]
>-		                <img src="/intranet-tmpl/[% reserveloo.theme %]/img/go-down.png" border="0" alt="Set To Lowest Priority" />
>+                        <img src="/intranet-tmpl/[% theme %]/img/go-down.png" border="0" alt="Set To Lowest Priority" />
> 		        [% END %]
> 		</a>
> 	</td> 
>@@ -713,7 +713,7 @@ function checkMultiHold() {
> 
> 	<td>
> 		<a title="Cancel Hold" href="request.pl?action=cancel&amp;borrowernumber=[% reserveloo.borrowernumber %]&amp;biblionumber=[% reserveloo.biblionumber %]&amp;date=[% reserveloo.date %]">
>-                	<img src="/intranet-tmpl/[% reserveloo.theme %]/img/x.png" border="0" alt="Cancel" />
>+                    <img src="/intranet-tmpl/[% theme %]/img/x.png" border="0" alt="Cancel" />
>                 </a>
> 	</td>
> 
>diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
>index 4b72bc9..bc46b28 100644
>--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
>+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
>@@ -470,7 +470,7 @@
>                                          value="[% itemLoo.itemnumber %]" />
>                                 [% ELSE %]
>                                   <input disabled="disabled" type="radio" class="checkitem" name="checkitem" value="[% itemLoo.itemnumber %]" />
>-                                  <img src="/opac-tmpl/[% itemLoo.theme %]/famfamfam/silk/cross.png" alt="Cannot be put on hold" title="Cannot be put on hold" />
>+                                  <img src="/opac-tmpl/[% theme %]/famfamfam/silk/cross.png" alt="Cannot be put on hold" title="Cannot be put on hold" />
>                                 [% END %] [% IF ( itemLoo.copynumber ) %][% itemLoo.copynumber %][% END %]
>                               </td>
>                               [% IF ( item_level_itypes ) %]
>-- 
>1.7.3
>

Actions: View | Diff | Splinter Review

Attachments on bug 6192: 3922 | 3925