From b1a6bed36d5d4acdfbb5372f467a49c7ab29bc5c Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sun, 31 May 2009 23:52:08 -0600
Subject: Update notify/watch eyeglasses icon with bullhorn icon. Rename
 css/image names from watch to notify.

---
 modules/notification/helpers/notification_menu.php |   2 +-
 themes/default/css/screen.css                      |   8 ++++----
 themes/default/images/ico-watch-add.png            | Bin 1160 -> 0 bytes
 themes/default/images/ico-watch-remove.png         | Bin 1172 -> 0 bytes
 4 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 themes/default/images/ico-watch-add.png
 delete mode 100644 themes/default/images/ico-watch-remove.png

diff --git a/modules/notification/helpers/notification_menu.php b/modules/notification/helpers/notification_menu.php
index 1c04aa89..87927874 100644
--- a/modules/notification/helpers/notification_menu.php
+++ b/modules/notification/helpers/notification_menu.php
@@ -30,7 +30,7 @@ class notification_menu_Core {
             ->id("watch")
             ->label(t("Enable notifications for this album"))
             ->url(url::site("notification/watch/$item->id?csrf=" . access::csrf_token()))
-            ->css_id($watching ? "gRemoveWatchLink" : "gAddWatchLink"));
+            ->css_id($watching ? "gRemoveNotifyLink" : "gAddNotifyLink"));
       }
     }
   }
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index fd9f64df..165112ca 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -606,12 +606,12 @@ form .gError,
   background-image: url('../images/ico-view-album.png');
 }
 
-#gViewMenu #gAddWatchLink {
-  background-image: url('../images/ico-watch-add.png');
+#gViewMenu #gAddNotifyLink {
+  background-image: url('../images/ico-notify-add.png');
 }
 
-#gViewMenu #gRemoveWatchLink {
-  background-image: url('../images/ico-watch-remove.png');
+#gViewMenu #gRemoveNotifyLink {
+  background-image: url('../images/ico-notify-remove.png');
 }
 
 #gViewMenu #gHybridLink {
diff --git a/themes/default/images/ico-watch-add.png b/themes/default/images/ico-watch-add.png
deleted file mode 100644
index 9bb40b4d..00000000
Binary files a/themes/default/images/ico-watch-add.png and /dev/null differ
diff --git a/themes/default/images/ico-watch-remove.png b/themes/default/images/ico-watch-remove.png
deleted file mode 100644
index 0c5e7cf0..00000000
Binary files a/themes/default/images/ico-watch-remove.png and /dev/null differ
-- 
cgit v1.2.3


From 2bd8051c28621f6c25a3f85b73da2f94d62440f2 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sun, 31 May 2009 23:55:42 -0600
Subject: Forgot these in last commit

---
 themes/default/images/ico-notify-add.png    | Bin 0 -> 1469 bytes
 themes/default/images/ico-notify-remove.png | Bin 0 -> 1500 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 themes/default/images/ico-notify-add.png
 create mode 100644 themes/default/images/ico-notify-remove.png

diff --git a/themes/default/images/ico-notify-add.png b/themes/default/images/ico-notify-add.png
new file mode 100644
index 00000000..937bfd4f
Binary files /dev/null and b/themes/default/images/ico-notify-add.png differ
diff --git a/themes/default/images/ico-notify-remove.png b/themes/default/images/ico-notify-remove.png
new file mode 100644
index 00000000..8c0f29ca
Binary files /dev/null and b/themes/default/images/ico-notify-remove.png differ
-- 
cgit v1.2.3


From 0746e7e10dd94d005f0a45da7634dbf82eff722f Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Wed, 3 Jun 2009 19:04:44 -0600
Subject: Show an "add photos" message on empty albums for those who can.

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

diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php
index 7d4a6f54..b74c6d86 100644
--- a/themes/default/views/album.html.php
+++ b/themes/default/views/album.html.php
@@ -7,6 +7,7 @@
 </div>
 
 <ul id="gAlbumGrid">
+<? if (count($children)): ?>
   <? foreach ($children as $i => $child): ?>
     <? $item_class = "gPhoto"; ?>
     <? if ($child->is_album()): ?>
@@ -24,6 +25,14 @@
     </ul>
   </li>
   <? endforeach ?>
+<? else: ?>
+  <? if ($user->admin || access::can("add", $item)): ?>
+  <? $addurl = url::file("index.php/simple_uploader/app/$item->id") ?>
+  <li><?= t("There aren't any photos here yet! <a href=\"$addurl\" class=\"gDialogLink\">Add some</a>.") ?></li>
+  <? else: ?>
+  <li><?= t("There aren't any photos here yet!") ?></li>
+  <? endif; ?>
+<? endif; ?>
 </ul>
 <?= $theme->album_bottom() ?>
 
-- 
cgit v1.2.3