Bugzilla – Attachment 19677 Details for
Bug 10592
Apache configuration is blocking fetch of certain icons and XML files
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
bug 10592: fix display of favicon
bug-10592-fix-display-of-favicon.patch (text/plain), 16.85 KB, created by
Galen Charlton
on 2013-07-15 15:48:32 UTC
(
hide
)
Description:
bug 10592: fix display of favicon
Filename:
MIME Type:
Creator:
Galen Charlton
Created:
2013-07-15 15:48:32 UTC
Size:
16.85 KB
patch
obsolete
>From b2f56ae687a6e8d876feed985d56184078fa484e Mon Sep 17 00:00:00 2001 >From: Galen Charlton <gmc@esilibrary.com> >Date: Mon, 15 Jul 2013 15:44:12 +0000 >Subject: [PATCH] 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 <gmc@esilibrary.com> >--- > koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close-receipt.inc | 2 +- > koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc | 2 +- > koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt | 2 +- > .../intranet-tmpl/prog/en/modules/members/moremember-receipt.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/{en/includes => img}/favicon.ico | Bin 1406 -> 1406 bytes > koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc | 2 +- > koha-tmpl/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 +- > koha-tmpl/opac-tmpl/prog/en/modules/sco/printslip.tt | 2 +- > koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt | 2 +- > koha-tmpl/opac-tmpl/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 @@ > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> >-<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% themelang %]/includes/favicon.ico[% END %]" type="image/x-icon" /> >+<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" /> > <link rel="stylesheet" type="text/css" media="print" href="[% themelang %]/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 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 @@ > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> >-<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% themelang %]/includes/favicon.ico[% END %]" type="image/x-icon" /> >+<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" /> > <link rel="stylesheet" type="text/css" href="[% interface %]/lib/jquery/jquery-ui.css" /> > <link rel="stylesheet" type="text/css" href="[% interface %]/lib/bootstrap/bootstrap.min.css" /> > <link rel="stylesheet" type="text/css" media="print" href="[% themelang %]/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 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' %] > <title>Online Help</title> > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> >-<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% themelang %]/includes/favicon.ico[% END %]" type="image/x-icon" /> >+<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" /> > <link rel="stylesheet" type="text/css" href="[% interface %]/lib/jquery/jquery-ui.css" /> > <link rel="stylesheet" type="text/css" media="print" href="[% themelang %]/css/print.css" /> > [% 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 ) %] > > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> >-<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% themelang %]/includes/favicon.ico[% END %]" type="image/x-icon" /> >+<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/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-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt >index 52aa07b..9c60023 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt >@@ -1,7 +1,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>[% title %]</title> > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> >-<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% themelang %]/includes/favicon.ico[% END %]" type="image/x-icon" /> >+<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" /> > <link rel="stylesheet" type="text/css" href="[% themelang %]/css/print.css" /> > [% IF stylesheet %] > <link rel="stylesheet" type="text/css" href="[% stylesheet %]" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt >index e3dc214..4642628 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt >+++ b/koha-tmpl/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="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% themelang %]/includes/favicon.ico[% END %]" type="image/x-icon" /> >+<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" /> > <link rel="stylesheet" type="text/css" href="[% themelang %]/css/print.css" /> > <script type="text/javascript"> > function printThenClose() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt >index f118a24..80d3dc0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt >+++ b/koha-tmpl/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="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% themelang %]/includes/favicon.ico[% END %]" type="image/x-icon" /> >+<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" /> > <link rel="stylesheet" type="text/css" href="[% themelang %]/css/print.css" /> > > <script type="text/javascript"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt >index c1c8c95..26be3f4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt >+++ b/koha-tmpl/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="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% themelang %]/includes/favicon.ico[% END %]" type="image/x-icon" /> >+<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" /> > <link rel="stylesheet" type="text/css" href="[% themelang %]/css/printreceiptinvoice.css" /> > <script type="text/javascript"> > function printThenClose() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt >index 2fec5bd..762fc11 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt >+++ b/koha-tmpl/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="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% themelang %]/includes/favicon.ico[% END %]" type="image/x-icon" /> >+<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" /> > <link rel="stylesheet" type="text/css" href="[% themelang %]/css/printreceiptinvoice.css" /> > <script type="text/javascript"> > function printThenClose() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/favicon.ico b/koha-tmpl/intranet-tmpl/prog/img/favicon.ico >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/includes/favicon.ico >rename to koha-tmpl/intranet-tmpl/prog/img/favicon.ico >diff --git a/koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc >index fcbab2a..88b3ff8 100644 >--- a/koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc >+++ b/koha-tmpl/opac-tmpl/ccsr/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="[% IF ( OpacFavicon ) %][% OpacFavicon %][% ELSE %][% themelang %]/includes/favicon.ico[% END %]" type="image/x-icon" /> >+<link rel="shortcut icon" href="[% IF ( OpacFavicon ) %][% OpacFavicon %][% ELSE %][% interface %]/[% theme %]/images/favicon.ico[% END %]" type="image/x-icon" /> > <link rel="stylesheet" type="text/css" href="[% themelang %]/lib/jquery/jquery-ui.css" /> > <link rel="stylesheet" type="text/css" href="/opac-tmpl/lib/yui/reset-fonts-grids.css" /> > <link rel="stylesheet" type="text/css" href="/opac-tmpl/lib/yui/skin.css" /> >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 147b82c..9311d5a 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 [% Version %]" /> <!-- leave this for stats --> >-<link rel="shortcut icon" href="[% IF ( OpacFavicon ) %][% OpacFavicon %][% ELSE %][% themelang %]/includes/favicon.ico[% END %]" type="image/x-icon" /> >+<link rel="shortcut icon" href="[% IF ( OpacFavicon ) %][% OpacFavicon %][% ELSE %][% interface %]/[% theme %]/images/favicon.ico[% END %]" type="image/x-icon" /> > <link rel="stylesheet" type="text/css" href="[% themelang %]/lib/jquery/jquery-ui.css" /> > [% SET opaclayoutstylesheet='opac.css' UNLESS opaclayoutstylesheet %] > [% IF (opaclayoutstylesheet.match('^https?:|^\/')) %] >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tt >index 09993af..1ca4e9f 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tt >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tt >@@ -4,7 +4,7 @@ > [% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Your cart > [% IF ( print_basket ) %]</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="[% interface %]/[% theme %]/images/favicon.ico" type="image/x-icon" /> > <meta http-equiv="Content-Language" content="en-us" /> > <script type="text/javascript" src="[% themelang %]/lib/jquery/jquery.js"></script> > <script type="text/javascript"> >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt b/koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt >index b0d2445..bf05f6f 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt >@@ -1,7 +1,7 @@ > [% INCLUDE 'doc-head-open.inc' %][% LibraryName %] › Self checkout</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="[% interface %]/[% theme %]/images/favicon.ico" type="image/x-icon" /> > > <link rel="stylesheet" type="text/css" href="[% themelang %]/css/sco.css" /> > [% IF ( SCOUserCSS ) %]<style type="text/css">[% SCOUserCSS %]</style>[% 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>[% title %]</title> > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> >-<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% themelang %]/includes/favicon.ico[% END %]" type="image/x-icon" /> >+<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/images/favicon.ico[% END %]" type="image/x-icon" /> > <link rel="stylesheet" type="text/css" href="[% themelang %]/css/print.css" /> > [% IF stylesheet %] > <link rel="stylesheet" type="text/css" href="[% 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 </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="[% interface %]/[% theme %]/images/favicon.ico" type="image/x-icon" /> > <!-- yui js --> > <script type="text/javascript" src="[% yuipath %]/utilities/utilities.js"></script> > <script type="text/javascript" src="[% yuipath %]/container/container-min.js"></script> >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.10.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 10592
:
19676
|
19677
|
19815
|
19816
|
19830
|
19831