Moving app icon images to /themes/_global/img/appicon/, updating Baggy and Default themes to point there

11 files changed, 47 insertions, 25 deletions

diff --git a/themes/_global/img/appicon/apple-touch-icon-114.png b/themes/_global/img/appicon/apple-touch-icon-114.png
new file mode 100755
index 00000000..0e96edd5
--- /dev/null
+++ b/themes/_global/img/appicon/apple-touch-icon-114.png
diff --git a/themes/_global/img/appicon/apple-touch-icon-120.png b/themes/_global/img/appicon/apple-touch-icon-120.png
new file mode 100755
index 00000000..dc5aab1c
--- /dev/null
+++ b/themes/_global/img/appicon/apple-touch-icon-120.png
diff --git a/themes/_global/img/appicon/apple-touch-icon-144.png b/themes/_global/img/appicon/apple-touch-icon-144.png
new file mode 100755
index 00000000..1d005db6
--- /dev/null
+++ b/themes/_global/img/appicon/apple-touch-icon-144.png
diff --git a/themes/_global/img/appicon/apple-touch-icon-152.png b/themes/_global/img/appicon/apple-touch-icon-152.png
new file mode 100755
index 00000000..f915231f
--- /dev/null
+++ b/themes/_global/img/appicon/apple-touch-icon-152.png
diff --git a/themes/_global/img/appicon/apple-touch-icon-57.png b/themes/_global/img/appicon/apple-touch-icon-57.png
new file mode 100755
index 00000000..5aa19ed9
--- /dev/null
+++ b/themes/_global/img/appicon/apple-touch-icon-57.png
diff --git a/themes/_global/img/appicon/apple-touch-icon-72.png b/themes/_global/img/appicon/apple-touch-icon-72.png
new file mode 100755
index 00000000..b8b48e1b
--- /dev/null
+++ b/themes/_global/img/appicon/apple-touch-icon-72.png
diff --git a/themes/_global/img/appicon/apple-touch-icon-76.png b/themes/_global/img/appicon/apple-touch-icon-76.png
new file mode 100755
index 00000000..9f9dba27
--- /dev/null
+++ b/themes/_global/img/appicon/apple-touch-icon-76.png
diff --git a/themes/_global/img/appicon/apple-touch-icon.png b/themes/_global/img/appicon/apple-touch-icon.png
new file mode 100755
index 00000000..9cf29e2b
--- /dev/null
+++ b/themes/_global/img/appicon/apple-touch-icon.png
diff --git a/themes/_global/img/appicon/favicon.ico b/themes/_global/img/appicon/favicon.ico
new file mode 100755
index 00000000..0346558b
--- /dev/null
+++ b/themes/_global/img/appicon/favicon.ico
diff --git a/themes/baggy/_head.twig b/themes/baggy/_head.twig
index d5f16fbb..5e1f5ba3 100755
--- a/themes/baggy/_head.twig
+++ b/themes/baggy/_head.twig
@@ -1,28 +1,28 @@
-        <link rel="shortcut icon" type="image/x-icon" href="{{ poche_url }}themes/{{theme}}/img/favicon.ico">
+        <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/{{theme}}/img/apple-touch-icon-152.png" sizes="152x152">
-        <link rel="icon" type="image/png" href="{{ poche_url }}themes/{{theme}}/img/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-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/{{theme}}/img/apple-touch-icon-144.png" sizes="144x144">
-        <link rel="icon" type="image/png" href="{{ poche_url }}themes/{{theme}}/img/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-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/{{theme}}/img/apple-touch-icon-120.png" sizes="120x120">
-        <link rel="icon" type="image/png" href="{{ poche_url }}themes/{{theme}}/img/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-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/{{theme}}/img/apple-touch-icon-114.png" sizes="114x114">
-        <link rel="icon" type="image/png" href="{{ poche_url }}themes/{{theme}}/img/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-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/{{theme}}/img/apple-touch-icon-76.png" sizes="76x76">
-        <link rel="icon" type="image/png" href="{{ poche_url }}themes/{{theme}}/img/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-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/{{theme}}/img/apple-touch-icon-72.png" sizes="72x72">
-        <link rel="icon" type="image/png" href="{{ poche_url }}themes/{{theme}}/img/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-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/{{theme}}/img/apple-touch-icon-57.png" sizes="57x57">
-        <link rel="icon" type="image/png" href="{{ poche_url }}themes/{{theme}}/img/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-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/{{theme}}/img/apple-touch-icon.png">
-        <link rel="icon" type="image/png" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon.png">
+        <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">
diff --git a/themes/default/_head.twig b/themes/default/_head.twig
index 8c939e30..23620688 100755
--- a/themes/default/_head.twig
+++ b/themes/default/_head.twig
@@ -1,14 +1,36 @@
-        <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">
         <link rel="stylesheet" href="{{ poche_url }}themes/default/css/messages.css" media="all">
         <link rel="stylesheet" href="{{ poche_url }}themes/default/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/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/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>