From 70d15772c9074d8f10b7bb5d589e13aead805008 Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Mon, 15 Jul 2013 15:44:12 +0000 Subject: [PATCH] [PASSED QA] Bug 10592: fix display of favicon Move the favicon files for OPAC and staff so that they are not blocked by the Apache configuration change introduced by the patch for bug 9812. Note that this patch makes the favicon customizable by theme, not both theme and language. To test, after applying the patch. [1] Open pages in the OPAC and staff client. Verify that the favicon is displayed in the usual place in your web browser. Specific pages to test include - circulation receipts and slips - help - lists view - web-based self-checkout [2] Verify that the Apache logs do not contain entries like this: client denied by server configuration: {...}/prog/en/includes/favicon.ico Signed-off-by: Galen Charlton Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Verified that the favicon displays correctly. Also tried changing favicons for staff and OPAC using the system preferences for those. This still works, where the system preferences are correctly supported in the templates. --- .../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 +- .../intranet-tmpl/prog/en/modules/basket/basket.tt | 2 +- .../prog/en/modules/circ/printslip.tt | 2 +- .../prog/en/modules/members/moremember-print.tt | 2 +- .../prog/en/modules/members/moremember-receipt.tt | 2 +- .../prog/en/modules/members/printfeercpt.tt | 2 +- .../prog/en/modules/members/printinvoice.tt | 2 +- .../prog/{en/includes => img}/favicon.ico | Bin 1406 -> 1406 bytes .../opac-tmpl/ccsr/en/includes/doc-head-close.inc | 2 +- .../opac-tmpl/prog/en/includes/doc-head-close.inc | 2 +- koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tt | 2 +- koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt | 2 +- .../opac-tmpl/prog/en/modules/sco/printslip.tt | 2 +- .../opac-tmpl/prog/en/modules/sco/sco-main.tt | 2 +- .../prog/{en/includes => images}/favicon.ico | Bin 1406 -> 1406 bytes 17 files changed, 15 insertions(+), 15 deletions(-) rename koha-tmpl/intranet-tmpl/prog/{en/includes => img}/favicon.ico (100%) rename koha-tmpl/opac-tmpl/prog/{en/includes => images}/favicon.ico (100%) 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 7f51639..31d9a47 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 @@ - + 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 ff4cca9..5eabb6f 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 @@ - + 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 a530854..54fe5a6 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 @@ [% INCLUDE 'doc-head-open.inc' %] Online Help - + [% INCLUDE intranetstylesheet.inc %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt index cb1f573..c07cc74 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt @@ -3,7 +3,7 @@ [% IF ( print_basket ) %] - + [% END %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/sco/printslip.tt b/koha-tmpl/opac-tmpl/prog/en/modules/sco/printslip.tt index eaa0d30..4708384 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/sco/printslip.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/sco/printslip.tt @@ -1,7 +1,7 @@ [% INCLUDE 'doc-head-open.inc' %] [% title %] - + [% IF stylesheet %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt index bfd71a2..b672725 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt @@ -2,7 +2,7 @@ [% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha [% END %] › Self checkout - + diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/favicon.ico b/koha-tmpl/opac-tmpl/prog/images/favicon.ico similarity index 100% rename from koha-tmpl/opac-tmpl/prog/en/includes/favicon.ico rename to koha-tmpl/opac-tmpl/prog/images/favicon.ico -- 1.7.9.5