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/wind/views/page.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'themes/wind')

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 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/wind')

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