Attachment 3401 Details for Bug 5641 – patch

[patch] patch

bug5641.patch (text/plain), 25.25 KB, created by Nicole C. Engard on 2011-03-22 19:16:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nicole C. Engard

Created: 2011-03-22 19:16:19 UTC

Size: 25.25 KB

patch

obsolete

>From: Jared Camins-Esakov <jcamins@bywatersolutions.com>
>To: dev@bywatersolutions.com
>Cc: Jared Camins-Esakov <jcamins@bywatersolutions.com>
>Subject: [PATCH] Bug 5641: Replace Favicon through staff client
>Date: Tue, 22 Mar 2011 13:37:59 -0400
>Message-Id: <1300815479-10120-1-git-send-email-jcamins@bywatersolutions.com>
>X-Mailer: git-send-email 1.7.2.3
>X-Original-Sender: jcamins@bywatersolutions.com
>X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com:
> 209.85.216.170 is neither permitted nor denied by best guess record for
> domain of jcamins@bywatersolutions.com) smtp.mail=jcamins@bywatersolutions.com
>Precedence: list
>Mailing-list: list dev@bywatersolutions.com; contact dev+owners@bywatersolutions.com
>List-ID: <dev.bywatersolutions.com>
>X-Google-Group-Id: 274270250429
>List-Help: <http://www.google.com/support/a/bywatersolutions.com/bin/static.py?hl=en_US&page=groups.cs>,
> <mailto:dev+help@bywatersolutions.com>
>Content-Type: text/plain; charset="utf-8"
>
>This patch adds two sysprefs:
>OpacFavicon
>IntranetFavicon
>
>The two sysprefs take full URLs to an alternate favicon.ico file for the OPAC
>and Staff Client, respectively. Leaving them blank will use the favicon.ico file
>that is included with Koha.
>---
> C4/Auth.pm                                         |    3 +++
> installer/data/mysql/de-DE/mandatory/sysprefs.sql  |    2 ++
> installer/data/mysql/en/mandatory/sysprefs.sql     |    2 ++
> .../1-Obligatoire/unimarc_standard_systemprefs.sql |    2 ++
> installer/data/mysql/it-IT/necessari/sysprefs.sql  |    3 ++-
> installer/data/mysql/pl-PL/mandatory/sysprefs.sql  |    3 ++-
> ...m_preferences_full_optimal_for_install_only.sql |    2 ++
> ...m_preferences_full_optimal_for_install_only.sql |    2 ++
> installer/data/mysql/updatedatabase.pl             |    7 +++++++
> .../prog/en/includes/doc-head-close-receipt.inc    |    2 +-
> .../prog/en/includes/doc-head-close.inc            |    2 +-
> .../intranet-tmpl/prog/en/includes/help-top.inc    |    2 +-
> .../prog/en/modules/admin/preferences/opac.pref    |    5 +++++
> .../en/modules/admin/preferences/staff_client.pref |    5 +++++
> .../prog/en/modules/basket/basket.tmpl             |    2 +-
> .../prog/en/modules/members/moremember-print.tmpl  |    2 +-
> .../en/modules/members/moremember-receipt.tmpl     |    2 +-
> .../prog/en/modules/members/printfeercpt.tmpl      |    4 ++--
> .../prog/en/modules/members/printinvoice.tmpl      |    2 +-
> .../opac-tmpl/prog/en/includes/doc-head-close.inc  |    2 +-
> 20 files changed, 44 insertions(+), 12 deletions(-)
>
>diff --git a/C4/Auth.pm b/C4/Auth.pm
>index fecdf85..5f28d5c 100644
>--- a/C4/Auth.pm
>+++ b/C4/Auth.pm
>@@ -359,6 +359,7 @@ sub get_template_and_user {
>             advancedMARCEditor          => C4::Context->preference("advancedMARCEditor"),
>             canreservefromotherbranches => C4::Context->preference('canreservefromotherbranches'),
>             intranetcolorstylesheet     => C4::Context->preference("intranetcolorstylesheet"),
>+            IntranetFavicon             => C4::Context->preference("IntranetFavicon"),
>             intranetreadinghistory      => C4::Context->preference("intranetreadinghistory"),
>             intranetstylesheet          => C4::Context->preference("intranetstylesheet"),
>             IntranetUserCSS             => C4::Context->preference("IntranetUserCSS"),
>@@ -428,6 +429,7 @@ sub get_template_and_user {
>             opacstylesheet            => "" . C4::Context->preference("opacstylesheet"),
>             opacbookbag               => "" . C4::Context->preference("opacbookbag"),
>             opaccredits               => "" . C4::Context->preference("opaccredits"),
>+            OpacFavicon               => C4::Context->preference("OpacFavicon"),
>             opacheader                => "" . C4::Context->preference("opacheader"),
>             opaclanguagesdisplay      => "" . C4::Context->preference("opaclanguagesdisplay"),
>             opacreadinghistory        => C4::Context->preference("opacreadinghistory"),
>@@ -920,6 +922,7 @@ sub checkauth {
>         opacuserlogin        => C4::Context->preference("opacuserlogin"),
>         OpacNav              => C4::Context->preference("OpacNav"),
>         opaccredits          => C4::Context->preference("opaccredits"),
>+        OpacFavicon          => C4::Context->preference("OpacFavicon"),
>         opacreadinghistory   => C4::Context->preference("opacreadinghistory"),
>         opacsmallimage       => C4::Context->preference("opacsmallimage"),
>         opaclayoutstylesheet => C4::Context->preference("opaclayoutstylesheet"),
>diff --git a/installer/data/mysql/de-DE/mandatory/sysprefs.sql b/installer/data/mysql/de-DE/mandatory/sysprefs.sql
>index 26e71a3..da1fe98 100644
>--- a/installer/data/mysql/de-DE/mandatory/sysprefs.sql
>+++ b/installer/data/mysql/de-DE/mandatory/sysprefs.sql
>@@ -294,3 +294,5 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
> INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OPACAllowUserToChooseBranch', 1,       'Allow the user to choose the branch they want to pickup their hold from','1','YesNo');
> INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('displayFacetCount', '0', NULL, NULL, 'YesNo');
> INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxRecordsForFacets', '20', NULL, NULL, 'Integer');
>+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the OPAC','','free');
>+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','','free');
>diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql b/installer/data/mysql/en/mandatory/sysprefs.sql
>index 98e9b36..3fd9e17 100644
>--- a/installer/data/mysql/en/mandatory/sysprefs.sql
>+++ b/installer/data/mysql/en/mandatory/sysprefs.sql
>@@ -294,3 +294,5 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
> INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OPACAllowUserToChooseBranch', 1,       'Allow the user to choose the branch they want to pickup their hold from','1','YesNo');
> INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('displayFacetCount', '0', NULL, NULL, 'YesNo');
> INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxRecordsForFacets', '20', NULL, NULL, 'Integer');
>+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the OPAC','','free');
>+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','','free');
>diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
>index 6ba05d3..299e023 100644
>--- a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
>+++ b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
>@@ -296,3 +296,5 @@ INSERT INTO systempreferences (variable,value,explanation,options,type)   VALUES
> INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('displayFacetCount', '0', NULL, NULL, 'YesNo');
> INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxRecordsForFacets', '20', NULL, NULL, 'Integer');
> INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('FacetLabelTruncationLength',20,'Specify the facet max length in OPAC',NULL,'Integer');
>+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the OPAC','','free');
>+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','','free');
>diff --git a/installer/data/mysql/it-IT/necessari/sysprefs.sql b/installer/data/mysql/it-IT/necessari/sysprefs.sql
>index dd8ab7c..63aae4e 100644
>--- a/installer/data/mysql/it-IT/necessari/sysprefs.sql
>+++ b/installer/data/mysql/it-IT/necessari/sysprefs.sql
>@@ -281,4 +281,5 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
> INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OPACAllowUserToChooseBranch', 1,       'Allow the user to choose the branch they want to pickup their hold from','1','YesNo');
> INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('displayFacetCount', '0', NULL, NULL, 'YesNo');
> INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxRecordsForFacets', '20', NULL, NULL, 'Integer');
>-
>+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the OPAC','','free');
>+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','','free');
>diff --git a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql b/installer/data/mysql/pl-PL/mandatory/sysprefs.sql
>index bcd9715..4318f01 100644
>--- a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql
>+++ b/installer/data/mysql/pl-PL/mandatory/sysprefs.sql
>@@ -293,4 +293,5 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
> INSERT INTO systempreferences (variable,value,explanation,options,type)   VALUES ('OPACAllowUserToChooseBranch', 1,       'Allow the user to choose the branch they want to pickup their hold from','1','YesNo');
> INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('displayFacetCount', '0', NULL, NULL, 'YesNo');
> INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxRecordsForFacets', '20', NULL, NULL, 'Integer');
>-
>+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the OPAC','','free');
>+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','','free');
>diff --git a/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql b/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql
>index fc6e2a5..a116f81 100644
>--- a/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql
>+++ b/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql
>@@ -348,3 +348,5 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
> INSERT INTO systempreferences (variable,value,explanation,options,type)   VALUES ('OPACAllowUserToChooseBranch', 1,       'Allow the user to choose the branch they want to pickup their hold from','1','YesNo');
> INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('displayFacetCount', '0', NULL, NULL, 'YesNo');
> INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxRecordsForFacets', '20', NULL, NULL, 'Integer');
>+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the OPAC','','free');
>+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','','free');
>diff --git a/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql b/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql
>index 7040139..8359422 100644
>--- a/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql
>+++ b/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql
>@@ -373,3 +373,5 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
> INSERT INTO systempreferences (variable,value,explanation,options,type)   VALUES ('OPACAllowUserToChooseBranch', 1,       'Allow the user to choose the branch they want to pickup their hold from','1','YesNo');
> INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('displayFacetCount', '0', NULL, NULL, 'YesNo');
> INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxRecordsForFacets', '20', NULL, NULL, 'Integer');
>+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the OPAC','','free');
>+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','','free');
>diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
>index 084fad4..8ef68b7 100755
>--- a/installer/data/mysql/updatedatabase.pl
>+++ b/installer/data/mysql/updatedatabase.pl
>@@ -4105,6 +4105,13 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
>     SetVersion ($DBversion);
> }
> 
>+$DBversion = "3.03.00.XXX";
>+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
>+    $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the OPAC','','free')");
>+    $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','','free')");
>+    print "Upgrade to $DBversion done (Add sysprefs to control custom favicons)\n";
>+    SetVersion ($DBversion);
>+}
> 
> =head1 FUNCTIONS
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close-receipt.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close-receipt.inc
>index 0491a89..03087c2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close-receipt.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close-receipt.inc
>@@ -1,4 +1,4 @@
> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
>-<link rel="shortcut icon" href="/includes/favicon.ico" type="image/x-icon" />
>+<link rel="shortcut icon" href="/includes/favicon.ico" type="image/x-icon" />
> <link rel="stylesheet" type="text/css" media="print" href="/css/print.css" />
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
>index 39be321..3ea2381 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
>@@ -1,5 +1,5 @@
> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
>-<link rel="shortcut icon" href="/includes/favicon.ico" type="image/x-icon" />
>+<link rel="shortcut icon" href="/includes/favicon.ico" type="image/x-icon" />
> <link rel="stylesheet" type="text/css" href="/lib/jquery/plugins/ui.tabs.css" />
> <link rel="stylesheet" type="text/css" media="print" href="/css/print.css" />
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc
>index aa71d73..1ae7de5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc
>@@ -1,7 +1,7 @@
> 
> <title>Online Help</title>
> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
>-<link rel="shortcut icon" href="/includes/favicon.ico" type="image/x-icon" />
>+<link rel="shortcut icon" href="/includes/favicon.ico" type="image/x-icon" />
> <link rel="stylesheet" type="text/css" media="print" href="/css/print.css" />
> 
> <link rel="stylesheet" type="text/css" href="" />
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
>index 3014e63..b09a69d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
>@@ -97,6 +97,11 @@ OPAC:
>               class: url
>             - in the OPAC header, instead of the Koha logo. If this image is a different size than the Koha logo, you will need to customize the CSS. (This should be a complete URL, starting with <code>http://</code>.)
>         -
>+            - Use the image at
>+            - pref: OpacFavicon
>+              class: url
>+            - for the OPAC's favicon. (This should be a complete URL, starting with <code>http://</code>.)
>+        -
>             - "Include the following JavaScript on all pages in the OPAC:"
>             - pref: opacuserjs
>               type: textarea
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref
>index 0d7fedc..50dae66 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref
>@@ -46,6 +46,11 @@ Staff Client:
>               type: textarea
>               class: code
>         -
>+            - Use the image at
>+            - pref: IntranetFavicon
>+              class: url
>+            - for the Staff Client's favicon. (This should be a complete URL, starting with <code>http://</code>.)
>+        -
>             - Show biblio records on result page in the staff client
>             - pref: XSLTResultsDisplay
>               choices:
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tmpl
>index d3d83ac..5048839 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tmpl
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tmpl
>@@ -3,7 +3,7 @@
>     
> 
> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
>-<link rel="shortcut icon" href="/includes/favicon.ico" type="image/x-icon" />
>+<link rel="shortcut icon" href="/includes/favicon.ico" type="image/x-icon" />
> <meta http-equiv="Content-Language" content="en-us" />
> <style type="text/css">
>     @import url(/css/print.css);
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl
>index a45b8ff..df517f4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl
>@@ -1,7 +1,7 @@
> 
> <title>Summary for   ()</title>
> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
>-<link rel="shortcut icon" href="/includes/favicon.ico" type="image/x-icon" />
>+<link rel="shortcut icon" href="/includes/favicon.ico" type="image/x-icon" />
> <link rel="stylesheet" type="text/css" href="/css/print.css" />
> </head>
> <body>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl
>index 4a4d23a..c6535cf 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl
>@@ -1,7 +1,7 @@
> 
> <title>Print Receipt for </title>
> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
>-<link rel="shortcut icon" href="/includes/favicon.ico" type="image/x-icon" />
>+<link rel="shortcut icon" href="/includes/favicon.ico" type="image/x-icon" />
>  <link rel="stylesheet" type="text/css" href="/css/print.css" />
> 
> <script language="javascript">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tmpl
>index 9f93dd9..b5155b9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tmpl
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tmpl
>@@ -1,7 +1,7 @@
> 
> <title>Print Receipt for </title>
> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
>-<link rel="shortcut icon" href="/includes/favicon.ico" type="image/x-icon" />
>+<link rel="shortcut icon" href="/includes/favicon.ico" type="image/x-icon" />
> <link rel="stylesheet" type="text/css" href="/css/printreceiptinvoice.css" />
> <script language="javascript">
>         window.print();
>@@ -58,4 +58,4 @@
>   </tfoot>
> </table>
> </div>
>-
>\ No newline at end of file
>+
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tmpl
>index 6f2a3e6..62ebab1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tmpl
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tmpl
>@@ -1,7 +1,7 @@
> 
> <title>Print Receipt for </title>
> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
>-<link rel="shortcut icon" href="/includes/favicon.ico" type="image/x-icon" />
>+<link rel="shortcut icon" href="/includes/favicon.ico" type="image/x-icon" />
> <link rel="stylesheet" type="text/css" href="/css/printreceiptinvoice.css" />
> <script language="javascript">
>         window.print();
>diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
>index d8a4423..a0869b2 100644
>--- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
>+++ b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
>@@ -1,7 +1,7 @@
> </title>
> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
> <meta name="generator" content="Koha " /> 
>-<link rel="shortcut icon" href="/includes/favicon.ico" type="image/x-icon" />
>+<link rel="shortcut icon" href="/includes/favicon.ico" type="image/x-icon" />
> <link rel="stylesheet" type="text/css" href="" />
> <link rel="stylesheet" type="text/css" href="/css/" /><link rel="stylesheet" type="text/css" href="/css/opac.css" />
> 
>-- 
>1.7.2.3
>

Actions: View | Diff | Splinter Review

Attachments on bug 5641: 3401