From d5b717dc7782335f5983a1d76d4bcf9956901d73 Mon Sep 17 00:00:00 2001
From: Jay Sitter <jsitter@gmail.com>
Date: Mon, 17 Nov 2014 16:49:34 -0500
Subject: Moving app icon images to /themes/_global/img/appicon/, updating
 Baggy and Default themes to point there

---
 .../_global/img/appicon/apple-touch-icon-114.png   | Bin 0 -> 2281 bytes
 .../_global/img/appicon/apple-touch-icon-120.png   | Bin 0 -> 2318 bytes
 .../_global/img/appicon/apple-touch-icon-144.png   | Bin 0 -> 2718 bytes
 .../_global/img/appicon/apple-touch-icon-152.png   | Bin 0 -> 2835 bytes
 themes/_global/img/appicon/apple-touch-icon-57.png | Bin 0 -> 1582 bytes
 themes/_global/img/appicon/apple-touch-icon-72.png | Bin 0 -> 1709 bytes
 themes/_global/img/appicon/apple-touch-icon-76.png | Bin 0 -> 1838 bytes
 themes/_global/img/appicon/apple-touch-icon.png    | Bin 0 -> 1579 bytes
 themes/_global/img/appicon/favicon.ico             | Bin 0 -> 34494 bytes
 themes/baggy/_head.twig                            |  34 +++++++++---------
 themes/default/_head.twig                          |  38 ++++++++++++++++-----
 11 files changed, 47 insertions(+), 25 deletions(-)
 create mode 100755 themes/_global/img/appicon/apple-touch-icon-114.png
 create mode 100755 themes/_global/img/appicon/apple-touch-icon-120.png
 create mode 100755 themes/_global/img/appicon/apple-touch-icon-144.png
 create mode 100755 themes/_global/img/appicon/apple-touch-icon-152.png
 create mode 100755 themes/_global/img/appicon/apple-touch-icon-57.png
 create mode 100755 themes/_global/img/appicon/apple-touch-icon-72.png
 create mode 100755 themes/_global/img/appicon/apple-touch-icon-76.png
 create mode 100755 themes/_global/img/appicon/apple-touch-icon.png
 create mode 100755 themes/_global/img/appicon/favicon.ico

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
Binary files /dev/null and b/themes/_global/img/appicon/apple-touch-icon-114.png differ
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
Binary files /dev/null and b/themes/_global/img/appicon/apple-touch-icon-120.png differ
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
Binary files /dev/null and b/themes/_global/img/appicon/apple-touch-icon-144.png differ
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
Binary files /dev/null and b/themes/_global/img/appicon/apple-touch-icon-152.png differ
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
Binary files /dev/null and b/themes/_global/img/appicon/apple-touch-icon-57.png differ
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
Binary files /dev/null and b/themes/_global/img/appicon/apple-touch-icon-72.png differ
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
Binary files /dev/null and b/themes/_global/img/appicon/apple-touch-icon-76.png differ
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
Binary files /dev/null and b/themes/_global/img/appicon/apple-touch-icon.png differ
diff --git a/themes/_global/img/appicon/favicon.ico b/themes/_global/img/appicon/favicon.ico
new file mode 100755
index 00000000..0346558b
Binary files /dev/null and b/themes/_global/img/appicon/favicon.ico differ
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>
-- 
cgit v1.2.3