Created apple-touch-icon and added to wind and admin_wind themes.

8 files changed, 21 insertions, 4 deletions

diff --git a/installer/install.sql b/installer/install.sql
index 77cda72b..06d2fcde 100644
--- a/installer/install.sql
+++ b/installer/install.sql
@@ -406,6 +406,7 @@ INSERT INTO {vars} VALUES (NULL,'gallery','admin_area_timeout','5400');
 INSERT INTO {vars} VALUES (NULL,'gallery','maintenance_mode','0');
 INSERT INTO {vars} VALUES (NULL,'gallery','visible_title_length','15');
 INSERT INTO {vars} VALUES (NULL,'gallery','favicon_url','lib/images/favicon.ico');
+INSERT INTO {vars} VALUES (NULL,'gallery','apple_touch_url','lib/images/apple-touch-icon.png');
 INSERT INTO {vars} VALUES (NULL,'gallery','email_from','unknown@unknown.com');
 INSERT INTO {vars} VALUES (NULL,'gallery','email_reply_to','unknown@unknown.com');
 INSERT INTO {vars} VALUES (NULL,'gallery','email_line_length','70');
diff --git a/lib/images/apple-touch-icon.png b/lib/images/apple-touch-icon.png
new file mode 100644
index 00000000..d15ce1a6
--- /dev/null
+++ b/lib/images/apple-touch-icon.png
diff --git a/modules/gallery/controllers/admin_theme_options.php b/modules/gallery/controllers/admin_theme_options.php
index 055e063c..840b3b3d 100644
--- a/modules/gallery/controllers/admin_theme_options.php
+++ b/modules/gallery/controllers/admin_theme_options.php
@@ -59,6 +59,7 @@ class Admin_Theme_Options_Controller extends Admin_Controller {
       module::set_var("gallery", "footer_text", $form->edit_theme->footer_text->value);
       module::set_var("gallery", "show_credits", $form->edit_theme->show_credits->value);
       module::set_var("gallery", "favicon_url", $form->edit_theme->favicon_url->value);
+      module::set_var("gallery", "apple_touch_url", $form->edit_theme->apple_touch_url->value);
 
       module::event("theme_edit_form_completed", $form);
 
@@ -93,6 +94,9 @@ class Admin_Theme_Options_Controller extends Admin_Controller {
     $group->input("favicon_url")->label(t("URL (or relative path) to your favicon.ico"))
       ->id("g-favicon")
       ->value(module::get_var("gallery", "favicon_url"));
+    $group->input("apple_touch_url")->label(t("URL (or relative path) to your Apple Touch icon"))
+      ->id("g-apple-touch")
+      ->value(module::get_var("gallery", "apple_touch_url"));
     $group->textarea("header_text")->label(t("Header text"))->id("g-header-text")
       ->value(module::get_var("gallery", "header_text"));
     $group->textarea("footer_text")->label(t("Footer text"))->id("g-footer-text")
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 01c59eaa..cd9526b1 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -304,6 +304,7 @@ class gallery_installer {
     module::set_var("gallery", "maintenance_mode", 0);
     module::set_var("gallery", "visible_title_length", 15);
     module::set_var("gallery", "favicon_url", "lib/images/favicon.ico");
+    module::set_var("gallery", "apple_touch_url", "lib/images/apple-touch-icon.png");
     module::set_var("gallery", "email_from", "");
     module::set_var("gallery", "email_reply_to", "");
     module::set_var("gallery", "email_line_length", 70);
@@ -311,7 +312,7 @@ class gallery_installer {
     module::set_var("gallery", "show_user_profiles_to", "registered_users");
     module::set_var("gallery", "extra_binary_paths", "/usr/local/bin:/opt/local/bin:/opt/bin");
 
-    module::set_version("gallery", 46);
+    module::set_version("gallery", 47);
   }
 
   static function upgrade($version) {
@@ -677,6 +678,11 @@ class gallery_installer {
       module::set_var("gallery", "upgrade_checker_auto_enabled", true);
       module::set_version("gallery", $version = 46);
     }
+
+    if ($version == 46) {
+      module::set_var("gallery", "apple_touch_url", "lib/images/apple-touch-icon.png");
+      module::set_version("gallery", $version = 47);
+    }
   }
 
   static function uninstall() {
diff --git a/modules/gallery/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php
index c4a82390..aa3fb7bb 100644
--- a/modules/gallery/helpers/gallery_theme.php
+++ b/modules/gallery/helpers/gallery_theme.php
@@ -60,11 +60,14 @@ class gallery_theme_Core {
     if ($session->get("debug")) {
       $buf .= $theme->css("debug.css");
     }
+    if (in_array(URI::instance()->segment(1), array("admin", "admin/dashboard"))) {
+      $buf .= $theme->script("jquery.jcarousel.min.js");
+    }
 
     if ($session->get("l10n_mode", false)) {
       $buf .= $theme->css("l10n_client.css");
       $buf .= $theme->script("jquery.cookie.js");
-      $buf .=$theme->script("l10n_client.js");
+      $buf .= $theme->script("l10n_client.js");
     }
     return $buf;
   }
diff --git a/modules/gallery/module.info b/modules/gallery/module.info
index 4c0c8866..aa1dc341 100644
--- a/modules/gallery/module.info
+++ b/modules/gallery/module.info
@@ -1,3 +1,3 @@
 name = "Gallery 3"
 description = "Gallery core application"
-version = 46
+version = 47
diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php
index a56b6f41..0d35ac97 100644
--- a/themes/admin_wind/views/admin.html.php
+++ b/themes/admin_wind/views/admin.html.php
@@ -15,6 +15,8 @@
     <link rel="shortcut icon"
           href="<?= url::file(module::get_var("gallery", "favicon_url")) ?>"
           type="image/x-icon" />
+    <link rel="apple-touch-icon-precomposed"
+          href="<?= url::file(module::get_var("gallery", "apple_touch_url")) ?>" />
 
     <?= $theme->script("jquery.js") ?>
     <?= $theme->script("jquery.form.js") ?>
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index 2b86556d..8b9ddf8a 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -21,7 +21,8 @@
     <link rel="shortcut icon"
           href="<?= url::file(module::get_var("gallery", "favicon_url")) ?>"
           type="image/x-icon" />
-
+    <link rel="apple-touch-icon-precomposed"
+          href="<?= url::file(module::get_var("gallery", "apple_touch_url")) ?>" />
     <? if ($theme->page_type == "collection"): ?>
       <? if ($thumb_proportion != 1): ?>
         <? $new_width = round($thumb_proportion * 213) ?>