Merge pull request #937 from jsit/favicons

Moving favicons to new _global theme dir and adjusting <link> tags

21 files changed, 83 insertions, 15 deletions

diff --git a/inc/poche/Template.class.php b/inc/poche/Template.class.php
index b686f2ec..20e9c54a 100644
--- a/inc/poche/Template.class.php
+++ b/inc/poche/Template.class.php
@@ -181,7 +181,7 @@ class Template extends Twig_Environment
         while (($theme = readdir($handle)) !== false) {
             # Themes are stored in a directory, so all directory names are themes
             # @todo move theme installation data to database
-            if (!is_dir(THEME . '/' . $theme) || in_array($theme, array('.', '..'))) {
+            if (!is_dir(THEME . '/' . $theme) || in_array($theme, array('.', '..', '_global'))) {
                 continue;
             }
 
@@ -232,4 +232,4 @@ class Template extends Twig_Environment
         Tools::emptyCache();
         Tools::redirect('?view=config');
     }
-}
\ No newline at end of file
+}
diff --git a/themes/baggy/img/apple-touch-icon-114.png b/themes/_global/img/appicon/apple-touch-icon-114.png
index 0e96edd5..0e96edd5 100755
--- a/themes/baggy/img/apple-touch-icon-114.png
+++ b/themes/_global/img/appicon/apple-touch-icon-114.png
diff --git a/themes/baggy/img/apple-touch-icon-120.png b/themes/_global/img/appicon/apple-touch-icon-120.png
index dc5aab1c..dc5aab1c 100755
--- a/themes/baggy/img/apple-touch-icon-120.png
+++ b/themes/_global/img/appicon/apple-touch-icon-120.png
diff --git a/themes/baggy/img/apple-touch-icon-144.png b/themes/_global/img/appicon/apple-touch-icon-144.png
index 1d005db6..1d005db6 100755
--- a/themes/baggy/img/apple-touch-icon-144.png
+++ b/themes/_global/img/appicon/apple-touch-icon-144.png
diff --git a/themes/baggy/img/apple-touch-icon-152.png b/themes/_global/img/appicon/apple-touch-icon-152.png
index f915231f..f915231f 100755
--- a/themes/baggy/img/apple-touch-icon-152.png
+++ b/themes/_global/img/appicon/apple-touch-icon-152.png
diff --git a/themes/baggy/img/apple-touch-icon-57.png b/themes/_global/img/appicon/apple-touch-icon-57.png
index 5aa19ed9..5aa19ed9 100755
--- a/themes/baggy/img/apple-touch-icon-57.png
+++ b/themes/_global/img/appicon/apple-touch-icon-57.png
diff --git a/themes/baggy/img/apple-touch-icon-72.png b/themes/_global/img/appicon/apple-touch-icon-72.png
index b8b48e1b..b8b48e1b 100755
--- a/themes/baggy/img/apple-touch-icon-72.png
+++ b/themes/_global/img/appicon/apple-touch-icon-72.png
diff --git a/themes/baggy/img/apple-touch-icon-76.png b/themes/_global/img/appicon/apple-touch-icon-76.png
index 9f9dba27..9f9dba27 100755
--- a/themes/baggy/img/apple-touch-icon-76.png
+++ b/themes/_global/img/appicon/apple-touch-icon-76.png
diff --git a/themes/baggy/img/apple-touch-icon.png b/themes/_global/img/appicon/apple-touch-icon.png
index 9cf29e2b..9cf29e2b 100755
--- a/themes/baggy/img/apple-touch-icon.png
+++ b/themes/_global/img/appicon/apple-touch-icon.png
diff --git a/themes/baggy/img/favicon.ico b/themes/_global/img/appicon/favicon.ico
index 0346558b..0346558b 100755
--- a/themes/baggy/img/favicon.ico
+++ b/themes/_global/img/appicon/favicon.ico
diff --git a/themes/baggy/_head.twig b/themes/baggy/_head.twig
index be11673f..5e1f5ba3 100755
--- a/themes/baggy/_head.twig
+++ b/themes/baggy/_head.twig
@@ -1,12 +1,35 @@
-        <link rel="shortcut icon" type="image/x-icon" href="{{ poche_url }}themes/{{theme}}/img/favicon.ico" />
-        <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-144x144-precomposed.png">
-        <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-72x72-precomposed.png">
-        <link rel="apple-touch-icon-precomposed" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-precomposed.png">
+        <link rel="shortcut icon" type="image/x-icon" href="{{ poche_url }}themes/_global/img/appicon/favicon.ico">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-152.png" sizes="152x152">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-152.png" sizes="152x152">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-144.png" sizes="144x144">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-144.png" sizes="144x144">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-120.png" sizes="120x120">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-120.png" sizes="120x120">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-114.png" sizes="114x114">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-114.png" sizes="114x114">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-76.png" sizes="76x76">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-76.png" sizes="76x76">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-72.png" sizes="72x72">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-72.png" sizes="72x72">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-57.png" sizes="57x57">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-57.png" sizes="57x57">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon.png">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon.png">
+
         <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/ratatouille.css" media="all">
         <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/font.css" media="all">
         <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/main.css" media="all">
         <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/messages.css" media="all">
         <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/print.css" media="print">
+
         <script src="{{ poche_url }}themes/default/js/jquery-2.0.3.min.js"></script>
         <script src="{{ poche_url }}themes/default/js/autoClose.js"></script>
         <script src="{{ poche_url }}themes/{{theme}}/js/jquery.cookie.js"></script>
diff --git a/themes/courgette/_head.twig b/themes/courgette/_head.twig
index 059936d9..c20dcf67 100755
--- a/themes/courgette/_head.twig
+++ b/themes/courgette/_head.twig
@@ -1,11 +1,34 @@
-        <link rel="shortcut icon" type="image/x-icon" href="{{ poche_url }}themes/{{theme}}/img/favicon.ico" />
-        <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-144x144-precomposed.png">
-        <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-72x72-precomposed.png">
-        <link rel="apple-touch-icon-precomposed" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-precomposed.png">
+        <link rel="shortcut icon" type="image/x-icon" href="{{ poche_url }}themes/_global/img/appicon/favicon.ico">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-152.png" sizes="152x152">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-152.png" sizes="152x152">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-144.png" sizes="144x144">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-144.png" sizes="144x144">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-120.png" sizes="120x120">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-120.png" sizes="120x120">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-114.png" sizes="114x114">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-114.png" sizes="114x114">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-76.png" sizes="76x76">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-76.png" sizes="76x76">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-72.png" sizes="72x72">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-72.png" sizes="72x72">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-57.png" sizes="57x57">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-57.png" sizes="57x57">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon.png">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon.png">
+
         <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/font.css" media="all">
         <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/style.css" media="all">
         <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/messages.css" media="all">
         <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/print.css" media="print">
         <link href='//fonts.googleapis.com/css?family=Roboto' rel='stylesheet' type='text/css'>
+
         <script src="//codeorigin.jquery.com/jquery-2.0.3.min.js"></script>
         <script src="{{ poche_url }}themes/{{theme}}/js/init.js"></script>
diff --git a/themes/courgette/img/apple-touch-icon-144x144-precomposed.png b/themes/courgette/img/apple-touch-icon-144x144-precomposed.png
deleted file mode 100755
index 557b479c..00000000
--- a/themes/courgette/img/apple-touch-icon-144x144-precomposed.png
+++ /dev/null
diff --git a/themes/courgette/img/apple-touch-icon-72x72-precomposed.png b/themes/courgette/img/apple-touch-icon-72x72-precomposed.png
deleted file mode 100755
index e167d3a4..00000000
--- a/themes/courgette/img/apple-touch-icon-72x72-precomposed.png
+++ /dev/null
diff --git a/themes/courgette/img/apple-touch-icon.png b/themes/courgette/img/apple-touch-icon.png
deleted file mode 100755
index 4d222fba..00000000
--- a/themes/courgette/img/apple-touch-icon.png
+++ /dev/null
diff --git a/themes/courgette/img/favicon.ico b/themes/courgette/img/favicon.ico
deleted file mode 100755
index 0e9ff779..00000000
--- a/themes/courgette/img/favicon.ico
+++ /dev/null
diff --git a/themes/default/_head.twig b/themes/default/_head.twig
index 8c939e30..d2a637fb 100755
--- a/themes/default/_head.twig
+++ b/themes/default/_head.twig
@@ -1,7 +1,29 @@
-        <link rel="shortcut icon" type="image/x-icon" href="{{ poche_url }}themes/default/img/favicon.ico" />
-        <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ poche_url }}themes/default/img/apple-touch-icon-144x144-precomposed.png">
-        <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ poche_url }}themes/default/img/apple-touch-icon-72x72-precomposed.png">
-        <link rel="apple-touch-icon-precomposed" href="{{ poche_url }}themes/default/img/apple-touch-icon-precomposed.png">
+        <link rel="shortcut icon" type="image/x-icon" href="{{ poche_url }}themes/_global/img/appicon/favicon.ico">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-152.png" sizes="152x152">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-152.png" sizes="152x152">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-144.png" sizes="144x144">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-144.png" sizes="144x144">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-120.png" sizes="120x120">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-120.png" sizes="120x120">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-114.png" sizes="114x114">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-114.png" sizes="114x114">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-76.png" sizes="76x76">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-76.png" sizes="76x76">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-72.png" sizes="72x72">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-72.png" sizes="72x72">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-57.png" sizes="57x57">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-57.png" sizes="57x57">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon.png">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon.png">
+
         <link rel="stylesheet" href="{{ poche_url }}themes/default/css/knacss.css" media="all">
         <link rel="stylesheet" href="{{ poche_url }}themes/default/css/style.css" media="all">
         <link rel="stylesheet" href="{{ poche_url }}themes/{{ theme }}/css/style-{{ theme }}.css" media="all" title="{{ theme }} theme">
@@ -11,4 +33,4 @@
         <script src="{{ poche_url }}themes/default/js/autoClose.js"></script>
         <script src="{{ poche_url }}themes/default/js/closeMessage.js"></script>
         <script src="{{ poche_url }}themes/default/js/saveLink.js"></script>
-        <script src="{{ poche_url }}themes/default/js/popupForm.js"></script>
\ No newline at end of file
+        <script src="{{ poche_url }}themes/default/js/popupForm.js"></script>
diff --git a/themes/default/img/apple-touch-icon-144x144-precomposed.png b/themes/default/img/apple-touch-icon-144x144-precomposed.png
deleted file mode 100644
index 9e951230..00000000
--- a/themes/default/img/apple-touch-icon-144x144-precomposed.png
+++ /dev/null
diff --git a/themes/default/img/apple-touch-icon-72x72-precomposed.png b/themes/default/img/apple-touch-icon-72x72-precomposed.png
deleted file mode 100644
index 263419b1..00000000
--- a/themes/default/img/apple-touch-icon-72x72-precomposed.png
+++ /dev/null
diff --git a/themes/default/img/apple-touch-icon.png b/themes/default/img/apple-touch-icon.png
deleted file mode 100644
index ac8a1cf0..00000000
--- a/themes/default/img/apple-touch-icon.png
+++ /dev/null
diff --git a/themes/default/img/favicon.ico b/themes/default/img/favicon.ico
deleted file mode 100644
index 0e9ff779..00000000
--- a/themes/default/img/favicon.ico
+++ /dev/null