From 4c8445852d0657d8c598d38096852b49e4672638 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 29 Aug 2010 16:26:27 -0700
Subject: Bump gallery module to v36 and add a favicon_url variable, which we
 expose in Admin > Appearance > Theme Options and defaults to
 lib/images/favicon.ico.

Thix fixes ticket #1312.
---
 themes/admin_wind/views/admin.html.php | 2 +-
 themes/wind/views/page.html.php        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'themes')

diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php
index 6b0c3fe5..c4b51f41 100644
--- a/themes/admin_wind/views/admin.html.php
+++ b/themes/admin_wind/views/admin.html.php
@@ -11,7 +11,7 @@
         <?= t("Admin dashboard") ?>
       <? endif ?>
     </title>
-    <link rel="shortcut icon" href="<?= url::file("lib/images/favicon.ico") ?>" type="image/x-icon" />
+    <link rel="shortcut icon" href="<?= url::file(module::get_var("gallery", "favicon_url")) ?>" type="image/x-icon" />
 
     <?= $theme->css("yui/reset-fonts-grids.css") ?>
     <?= $theme->css("themeroller/ui.base.css") ?>
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index 3c4f6ef5..4938ed60 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -23,7 +23,7 @@
         <? endif ?>
       <? endif ?>
     </title>
-    <link rel="shortcut icon" href="<?= url::file("lib/images/favicon.ico") ?>" type="image/x-icon" />
+    <link rel="shortcut icon" href="<?= url::file(module::get_var("gallery", "favicon_url")) ?>" type="image/x-icon" />
     <?= $theme->css("yui/reset-fonts-grids.css") ?>
     <?= $theme->css("superfish/css/superfish.css") ?>
     <?= $theme->css("themeroller/ui.base.css") ?>
-- 
cgit v1.2.3


From bc0d5e79cbf02a2b51c196c0105677a316e0c8bc Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 29 Aug 2010 23:09:52 -0700
Subject: Revert "Change the theme option page to display using tabs if the
 site theme has an admin page."

This reverts commit d66c496fb1007bbd0b1640496808000c573d95fd.

Conflicts:

	modules/gallery/helpers/theme.php
	modules/gallery/views/admin_theme_options.html.php
	themes/admin_wind/css/screen.css
---
 .../gallery/controllers/admin_theme_options.php    |  3 +--
 modules/gallery/views/admin_theme_options.html.php | 31 ----------------------
 themes/admin_wind/css/screen.css                   | 20 --------------
 3 files changed, 1 insertion(+), 53 deletions(-)

(limited to 'themes')

diff --git a/modules/gallery/controllers/admin_theme_options.php b/modules/gallery/controllers/admin_theme_options.php
index 58ed723e..57f32f96 100644
--- a/modules/gallery/controllers/admin_theme_options.php
+++ b/modules/gallery/controllers/admin_theme_options.php
@@ -102,8 +102,7 @@ class Admin_Theme_Options_Controller extends Admin_Controller {
 
     module::event("theme_edit_form", $form);
 
-    $group = $form->group("buttons")
-      ->set_attr("style","border: none");
+    $group = $form->group("buttons");
     $group->submit("")->value(t("Save"));
     return $form;
   }
diff --git a/modules/gallery/views/admin_theme_options.html.php b/modules/gallery/views/admin_theme_options.html.php
index b4a90682..e452913e 100644
--- a/modules/gallery/views/admin_theme_options.html.php
+++ b/modules/gallery/views/admin_theme_options.html.php
@@ -1,35 +1,4 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<script type="text/javascript">
-  $("#g-theme-options-form").ready(function() {
-     var contents = $("#g-theme-options-form fieldset:not(:last-child)");
-     if (contents.length > 1) {
-       $("<div id='g-theme-options-form-tabs'>" +
-         "  <ul class='tabnav'></ul>" +
-         "</div>").insertBefore("#g-theme-options-form fieldset:last-child");
-       $(contents).each(function(index) {
-         var text = $("legend", this).text();
-         var tabId = "tab_" + index;
-         var tabContentId = "tab_content_" + index;
-         if (text == "") {
-           text = <?= t("Tab_")->for_js() ?> + index;
-         }
-         $(".tabnav").append(
-           "<li><a id='" + tabId + "' href='#" + tabContentId + "'>" + text + "</a></li>");
-         $("#g-theme-options-form-tabs").append(
-           "<div id='" + tabContentId + "' class='tabdiv'></div>");
-         if ($("li.g-error", this).length > 0) {
-           $("#" + tabId).addClass("g-error");
-         }
-         $("#" + tabContentId).append($("ul", this));
-         $(this).remove();
-       });
-       $("#g-theme-options-form-tabs").tabs({});
-     } else {
-       $("#g-theme-options-form fieldset:first legend").hide();
-     }
-  });
-</script>
-
 <div class="g-block">
   <h1> <?= t("Theme options") ?> </h1>
   <div class="g-block-content">
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index 2ea60402..81b1a896 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -399,26 +399,6 @@ th {
   background-color: #FFF;
 }
 
-/* Theme options  ~~~~~~~~~~~~~~~~~~~~~~~~ */
-#g-theme-options-form {
-  border: 1px solid #a6c9e2;
-}
-#g-theme-options-form-tabs {
-  border: none !important;
-}
-#g-theme-options-form fieldset {
-  border: none;
-}
-
-.ui-tabs .ui-tabs-nav li a {
-  padding: 0 1em;
-}
-
-.ui-tabs .ui-tabs-nav li a.g-error {
-  background: none no-repeat scroll 0 0 transparent;
-  color: #FF0000 !important;
-}
-
 /* Language options  ~~~~~~~~~~~~~~~~~~~~~~~~ */
 #g-share-translations-form fieldset {
   border: 0px;
-- 
cgit v1.2.3


From d5ebcb91ad8401df8a393f84ade82150467dbf33 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 30 Aug 2010 20:49:14 -0700
Subject: Don't put in an <img> tag for non-existent thumbnails.  Fixes ticket
 #1211.

---
 themes/wind/views/album.html.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'themes')

diff --git a/themes/wind/views/album.html.php b/themes/wind/views/album.html.php
index de196be0..1a56af67 100644
--- a/themes/wind/views/album.html.php
+++ b/themes/wind/views/album.html.php
@@ -16,7 +16,9 @@
   <li id="g-item-id-<?= $child->id ?>" class="g-item <?= $item_class ?>">
     <?= $theme->thumb_top($child) ?>
     <a href="<?= $child->url() ?>">
+      <? if ($child->has_thumb()): ?>
       <?= $child->thumb_img(array("class" => "g-thumbnail")) ?>
+      <? endif ?>
     </a>
     <?= $theme->thumb_bottom($child) ?>
     <?= $theme->context_menu($child, "#g-item-id-{$child->id} .g-thumbnail") ?>
-- 
cgit v1.2.3