From 4d3cb760deead35d070b2277e5e564623de7fa23 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Fri, 5 Jun 2009 01:14:09 -0600 Subject: Move watch notification menu from the view menu to under the Options menu. --- modules/notification/helpers/notification_menu.php | 16 +++++++++------- themes/default/images/ico-notify-add.png | Bin 1469 -> 0 bytes themes/default/images/ico-notify-remove.png | Bin 1500 -> 0 bytes 3 files changed, 9 insertions(+), 7 deletions(-) delete mode 100644 themes/default/images/ico-notify-add.png delete mode 100644 themes/default/images/ico-notify-remove.png diff --git a/modules/notification/helpers/notification_menu.php b/modules/notification/helpers/notification_menu.php index 87927874..696aad62 100644 --- a/modules/notification/helpers/notification_menu.php +++ b/modules/notification/helpers/notification_menu.php @@ -18,19 +18,21 @@ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ class notification_menu_Core { - static function album($menu, $theme) { + static function site($menu, $theme) { if (!user::active()->guest) { $item = $theme->item(); - - if ($item) { + + if ($item && $item->is_album()) { $watching = notification::is_watching($item); - $menu + $watching ? $label = t("Remove notifications") : $label = t("Enable notifications"); + + $menu->get("options_menu") ->append(Menu::factory("link") ->id("watch") - ->label(t("Enable notifications for this album")) - ->url(url::site("notification/watch/$item->id?csrf=" . access::csrf_token())) - ->css_id($watching ? "gRemoveNotifyLink" : "gAddNotifyLink")); + ->label($label) + ->css_id("gNotifyLink") + ->url(url::site("notification/watch/$item->id?csrf=" . access::csrf_token()))); } } } diff --git a/themes/default/images/ico-notify-add.png b/themes/default/images/ico-notify-add.png deleted file mode 100644 index 937bfd4f..00000000 Binary files a/themes/default/images/ico-notify-add.png and /dev/null differ diff --git a/themes/default/images/ico-notify-remove.png b/themes/default/images/ico-notify-remove.png deleted file mode 100644 index 8c0f29ca..00000000 Binary files a/themes/default/images/ico-notify-remove.png and /dev/null differ -- cgit v1.2.3