From b9d296b198ee5c1ead2176ea2e09c4ae0461672b Mon Sep 17 00:00:00 2001
From: Chris Cormack <chrisc@catalyst.net.nz>
Date: Wed, 23 Mar 2011 21:47:56 +1300
Subject: [PATCH] Bug 5917 template changes

---
 .../intranet-tmpl/prog/en/includes/doc-head-close-receipt.inc | 2 +-
 koha-tt/intranet-tmpl/prog/en/includes/doc-head-close.inc     | 2 +-
 koha-tt/intranet-tmpl/prog/en/includes/help-top.inc           | 2 +-
 koha-tt/intranet-tmpl/prog/en/modules/basket/basket.tt        | 2 +-
 .../intranet-tmpl/prog/en/modules/members/moremember-print.tt | 2 +-
 .../prog/en/modules/members/moremember-receipt.tt             | 2 +-
 koha-tt/intranet-tmpl/prog/en/modules/members/printfeercpt.tt | 4 ++--
 koha-tt/intranet-tmpl/prog/en/modules/members/printinvoice.tt | 2 +-
 koha-tt/opac-tmpl/prog/en/includes/doc-head-close.inc         | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/koha-tt/intranet-tmpl/prog/en/includes/doc-head-close-receipt.inc b/koha-tt/intranet-tmpl/prog/en/includes/doc-head-close-receipt.inc
index e6325633cc..7f51639a13 100644
--- a/koha-tt/intranet-tmpl/prog/en/includes/doc-head-close-receipt.inc
+++ b/koha-tt/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="[% themelang %]/includes/favicon.ico" type="image/x-icon" />
+<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% themelang %]/includes/favicon.ico[% END %]" type="image/x-icon" />
 <link rel="stylesheet" type="text/css" media="print" href="[% themelang %]/css/print.css" />
 
diff --git a/koha-tt/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tt/intranet-tmpl/prog/en/includes/doc-head-close.inc
index 6da98d2aa3..6a2dae0971 100644
--- a/koha-tt/intranet-tmpl/prog/en/includes/doc-head-close.inc
+++ b/koha-tt/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="[% themelang %]/includes/favicon.ico" type="image/x-icon" />
+<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% themelang %]/includes/favicon.ico[% END %]" type="image/x-icon" />
 <link rel="stylesheet" type="text/css" href="[% themelang %]/lib/jquery/plugins/ui.tabs.css" />
 <link rel="stylesheet" type="text/css" media="print" href="[% themelang %]/css/print.css" />
 [% IF ( intranetstylesheet ) %]
diff --git a/koha-tt/intranet-tmpl/prog/en/includes/help-top.inc b/koha-tt/intranet-tmpl/prog/en/includes/help-top.inc
index 3b98c9dc16..13ec5cfc4c 100644
--- a/koha-tt/intranet-tmpl/prog/en/includes/help-top.inc
+++ b/koha-tt/intranet-tmpl/prog/en/includes/help-top.inc
@@ -1,7 +1,7 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Online Help</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<link rel="shortcut icon" href="[% themelang %]/includes/favicon.ico" type="image/x-icon" />
+<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% themelang %]/includes/favicon.ico[% END %]" type="image/x-icon" />
 <link rel="stylesheet" type="text/css" media="print" href="[% themelang %]/css/print.css" />
 [% IF ( intranetstylesheet ) %]
 <link rel="stylesheet" type="text/css" href="[% intranetstylesheet %]" />
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/basket/basket.tt b/koha-tt/intranet-tmpl/prog/en/modules/basket/basket.tt
index 2db12c268e..84504b4308 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/basket/basket.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/basket/basket.tt
@@ -3,7 +3,7 @@
     [% IF ( print_basket ) %]
 
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<link rel="shortcut icon" href="[% themelang %]/includes/favicon.ico" type="image/x-icon" />
+<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% themelang %]/includes/favicon.ico[% END %]" type="image/x-icon" />
 <meta http-equiv="Content-Language" content="en-us" />
 <style type="text/css">
     @import url([% themelang %]/css/print.css);
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/members/moremember-print.tt b/koha-tt/intranet-tmpl/prog/en/modules/members/moremember-print.tt
index 68d0f455ec..a25931875b 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/members/moremember-print.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/members/moremember-print.tt
@@ -1,7 +1,7 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Summary for [% firstname %] [% surname %] ([% cardnumber %])</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<link rel="shortcut icon" href="[% themelang %]/includes/favicon.ico" type="image/x-icon" />
+<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% themelang %]/includes/favicon.ico[% END %]" type="image/x-icon" />
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/print.css" />
 </head>
 <body>
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt b/koha-tt/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt
index eacae572a3..aa76755c18 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt
@@ -1,7 +1,7 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Print Receipt for [% cardnumber %]</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<link rel="shortcut icon" href="[% themelang %]/includes/favicon.ico" type="image/x-icon" />
+<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% themelang %]/includes/favicon.ico[% END %]" type="image/x-icon" />
  <link rel="stylesheet" type="text/css" href="[% themelang %]/css/print.css" />
 
 <script language="javascript">
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/members/printfeercpt.tt b/koha-tt/intranet-tmpl/prog/en/modules/members/printfeercpt.tt
index 91aa3adbc1..f1a661deb7 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/members/printfeercpt.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/members/printfeercpt.tt
@@ -1,7 +1,7 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Print Receipt for [% cardnumber %]</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<link rel="shortcut icon" href="[% themelang %]/includes/favicon.ico" type="image/x-icon" />
+<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% themelang %]/includes/favicon.ico[% END %]" type="image/x-icon" />
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/printreceiptinvoice.css" />
 <script language="javascript">
         window.print();
@@ -58,4 +58,4 @@
   </tfoot>
 </table>
 </div>
-[% INCLUDE 'intranet-bottom.inc' %]
\ No newline at end of file
+[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/members/printinvoice.tt b/koha-tt/intranet-tmpl/prog/en/modules/members/printinvoice.tt
index 42f58bfc08..d2933dfffe 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/members/printinvoice.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/members/printinvoice.tt
@@ -1,7 +1,7 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Print Receipt for [% cardnumber %]</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<link rel="shortcut icon" href="[% themelang %]/includes/favicon.ico" type="image/x-icon" />
+<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% themelang %]/includes/favicon.ico[% END %]" type="image/x-icon" />
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/printreceiptinvoice.css" />
 <script language="javascript">
         window.print();
diff --git a/koha-tt/opac-tmpl/prog/en/includes/doc-head-close.inc b/koha-tt/opac-tmpl/prog/en/includes/doc-head-close.inc
index 18b0f261ab..4e773de23b 100644
--- a/koha-tt/opac-tmpl/prog/en/includes/doc-head-close.inc
+++ b/koha-tt/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 [% Version %]" /> <!-- leave this for stats -->
-<link rel="shortcut icon" href="[% themelang %]/includes/favicon.ico" type="image/x-icon" />
+<link rel="shortcut icon" href="[% IF ( OpacFavicon ) %][% OpacFavicon %][% ELSE %][% themelang %]/includes/favicon.ico[% END %]" type="image/x-icon" />
 [% IF ( opacstylesheet ) %]<link rel="stylesheet" type="text/css" href="[% opacstylesheet %]" />[% ELSE %]
 [% IF ( opaclayoutstylesheet ) %]<link rel="stylesheet" type="text/css" href="[% themelang %]/css/[% opaclayoutstylesheet %]" />[% ELSE %]<link rel="stylesheet" type="text/css" href="[% themelang %]/css/opac.css" />[% END %][% END %]
 [% IF ( opaccolorstylesheet ) %]
-- 
2.39.5