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

---
 themes/default/_head.twig | 38 ++++++++++++++++++++++++++++++--------
 1 file changed, 30 insertions(+), 8 deletions(-)

(limited to 'themes/default')

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


From 7a0f454d39e891c15afa7fc1912c81b6d4bfd9dc Mon Sep 17 00:00:00 2001
From: Jay Sitter <jsitter@gmail.com>
Date: Mon, 17 Nov 2014 16:51:38 -0500
Subject: Removing app icons from previous locations

---
 .../default/img/apple-touch-icon-144x144-precomposed.png | Bin 2361 -> 0 bytes
 .../default/img/apple-touch-icon-72x72-precomposed.png   | Bin 1375 -> 0 bytes
 themes/default/img/apple-touch-icon.png                  | Bin 1174 -> 0 bytes
 themes/default/img/favicon.ico                           | Bin 346 -> 0 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 themes/default/img/apple-touch-icon-144x144-precomposed.png
 delete mode 100644 themes/default/img/apple-touch-icon-72x72-precomposed.png
 delete mode 100644 themes/default/img/apple-touch-icon.png
 delete mode 100644 themes/default/img/favicon.ico

(limited to 'themes/default')

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
Binary files a/themes/default/img/apple-touch-icon-144x144-precomposed.png and /dev/null differ
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
Binary files a/themes/default/img/apple-touch-icon-72x72-precomposed.png and /dev/null differ
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
Binary files a/themes/default/img/apple-touch-icon.png and /dev/null differ
diff --git a/themes/default/img/favicon.ico b/themes/default/img/favicon.ico
deleted file mode 100644
index 0e9ff779..00000000
Binary files a/themes/default/img/favicon.ico and /dev/null differ
-- 
cgit v1.2.3


From 9d2140c9a10233b92281201e02d6298d7e241662 Mon Sep 17 00:00:00 2001
From: Jay Sitter <jsitter@gmail.com>
Date: Mon, 17 Nov 2014 16:54:15 -0500
Subject: Fixing earlier commit wherein I lowercased some JS calls

---
 themes/default/_head.twig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'themes/default')

diff --git a/themes/default/_head.twig b/themes/default/_head.twig
index 23620688..d2a637fb 100755
--- a/themes/default/_head.twig
+++ b/themes/default/_head.twig
@@ -30,7 +30,7 @@
         <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>
+        <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