From 4d3cb760deead35d070b2277e5e564623de7fa23 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Fri, 5 Jun 2009 01:14:09 -0600
Subject: [PATCH] Move watch notification menu from the view menu to under the
 Options menu.

---
 .../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 937bfd4faebbc7366e66a90d09355cf74560442a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1469
zcmds$=~Gh&0K}gcMFg}|r%-574i&9OX;ErXg9D?WL?M*w$Y`JmVu3~w4@8t`<i0{6
zN`U|h$RUV<QV1|2A{bH$Bq1b$TrVfd%Rvrqu=zW>GrK$c{kPc{;HT|uzOexSz%J-a
zK$xZ7EOxfuV9A3}OR1$cUh@y}2LLvQb^fBaWjiGYUQ9+{Vv_GfC7}U-6eb$IGbkbI
z8afOeg-S`JqWu71{gn&n!UH33mz30XFR!c^Omm+<e~x=hnwy)WG5Kb*d7LBGXf)Tc
zm5WQu$dsq^^YgLk6`ccggTb({u#j5R@PW?l9cGf>elnWpXJ%$hCX+-WSz20>%jE)r
zp!mf<T%lZVk-;ogYCr`flBv7ik6|)uaL-!n`^vO>6S1Ds(LY-Byc3gAy|}oD$lF`e
zhBF$Cmy!xapwv9Scrp|{$(Kz{O>sCJkw}zY`YNA-qS0t97HfEnr-bxJ<D6z^XXh7}
z;&G(L&LRJso(WH?j^Ef>Q2lpRYd@J$`jF7Py1ItCU&iN87xrFLX=WjvVM?Tst8@a9
z_*QOhW;b$@GuhrpHJVKLR;&inV4I_K`q`}VH&4k~Dz&=0rRNR1SSpjrq_T&_jRK(n
z6oVir7K37qR&%eQuCV8iiHV6$R)t!n{;lx9%F4>8@rk@%G@s9hAT_yXh}1-B?)s=w
zsZS=lr4t%Qs8p?1$Dih_)oS{r=mEZAghs1rdq=0!)9?+^xxsbqgS~^FAPAC5r8l!*
zBxXH-!z|M4bvzzVrkIJzLGie}TuQV^3@VgLonGJdo}NU!GDKqtMZ(q9)tG|wO&xFV
z7uLV-p)#4wmu(bs*E=Q;9FtR`a)Py5twg3^FqosGqYMT^sZh3dz1L~A3Wc(RReC4C
z{#@!0VzHRZ<xWov9uZsC*4CDnm)UH#!C({$1nqqvg(7h#1!**zBp?W>p=rJ#4c{o1
z$fQ!)_}G|GqSWbhF%SN-;1tz^*=oUYBsmO@u+0C50Q&R+uH`>lg97}+@A9I3gSH(O
z5y8;i4IWv-f}&zV@U&r}B#Q!UhO=RQ!GjY{*jm*tSC?QY1x`YRy#~mgP0^tP|2lqj
zhgz&rrnV|SFS-s_gFBvzR|b)8`-D_?I5Vk)V@<Ka&z!zaa$&9a?&!lZl6bHx4D8o|
z6PPVqwv-<n%iiPk0Zy`&TQwmNF|Z@i2VH6L*J}cH6y;tDfs?{9z9|d@P=o99L0zu-
z$u$#+cg$+`yl1GrXrvO{@@#Lov)d9TC4}vMqduPY9y`HALv7gvm9TH%f+v)pS!d>W
zY}(PK@<iRjzDx4%w`(YLcFb6@-R3^xi-Xw^WiJoJHhEpO-TpiHB&x_^jwOR_%CM;<
zcJIGj&`Pe{oa4IZD$XHhh>wqV$%rifK7ymQ7RGD$^qh8V@bKOK=a;GGjVB6X8z1Bb
z$#0Q~Gs^^Y#M$KB7rsZ`h|SG|n8{bRjqctE&wXdR+3=ecm@no!hVp(s>yu6*3GiN}
zZtZY4F)SjXN-~<}5`X{Hu-|#B8|ATsudWs&4u_`um#wotmk;xJjQ85Gu>rfnWtR_z
zK|1?vcPr;J`u<pJ&a>fx0Z;~nCJk`PzACY=%umCYgog-d4pu(~p3Woei1pk5veUk}
z_-<O<p}5t(Sq`2N>yX~RH16$h!c`oxjr=y!4!IeDu#eBF*xgxTyA25(`VKlaj`cQK
PfCqvC;Q_6ukdOWYE_kRK

diff --git a/themes/default/images/ico-notify-remove.png b/themes/default/images/ico-notify-remove.png
deleted file mode 100644
index 8c0f29ca5fb558fa453e9dee7f884d2729055d06..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1500
zcmds$_gB*g6vcxOkl~<u1U0ovrPZE_gZ7l7Rl+KyfQVXwMhleSL=;m%1tF}06d498
zf`|yn5Q?mZp^`8(M6!X9#rK;HNl3^b5LV;A;eF@bd+x9Ad|qyF(9auecGy55kPZHR
z-XW%RGVRXw<|cPhG?$pd;vzf{4uOobm?uMznEH0KPbm6yTnsufG9CqiN5@5>cKgRh
zUPOhUBBO8LB%+Q%AnR@g2b}RiCSb9(-Al{M8r}TWjLP}>c@l%Swzj6%>uD^|U@%<9
zJW(o@i^iph+yCfvI<4MtDXn69dU|1DL8H-h5h!hMNADKa_q}5bQ6`N>WAXF<L^5S*
zT~D7Ew4<La6bjX9HJ{Iq%YG)2NG7KwfLJb&DrVI>+yFK6QA=TUms+C-1fqtnVHS(U
zWHNbm*&GfhF1so=>*?a+Vpx2^%E~G}><a(@IDj;*<fTlZCXq-y9#?Nzd`D#)7LAe_
z)zg;#8ReWwTCH}1C%%?h`Jk#ZI=QT*5P9MhD)nKLLZxYcO(dLmHgx8%j^ij4%Aa{P
ziTQOaD=R{QK&#V<#A5a&yU!C^)!Zu-OZhKyRI{^Ene5+QBG~jdWdgYKpjIRj<&?jY
z&&WZ+$C>>o)#_*qc*&d>Z8kPGrb>03oSYmX68Ten`F)S}*Y9Og8J$kAZ0uRf-Xlre
zqfjVBA~Az4c+uMP=A_k!*n_$!f2dTdrnERNmtWgHNTX6yit3-W;t9wv=R5ON>N!v-
z<^y2b!-ktV)l#V}=HBDvg1QOT#7N9OGMT)V>PV+Erhuto5?!fKuCA`C)he+_tejQ0
z;qW6Q(psWDkH=dp4jdmJ?;9Ltv)SpT&GdwynsD!D6CnLzyQTn8qtV{VeJ*S*QK{7_
zMGYVbw%`U73VCXALtF3g^78VOP`0$R#O3kt71i^&Jlp_9ES+xbc&pXw<Z{zJ<Zr^A
z_4V-pD44ko9i@%U%*X`-kbvB~kN}zD^BD|=LaxAv?>3>;)%xI}iBTFlB<QrMeo}&L
zLD;EHzxA2FH~dTzI|}Eq`4CVlIQw<|AcBf1EVezuZCt?m$;_;Sww*YJu;_5a)JS}9
z!4TJy4k9Dy;nvXyCI+iB%V-7XxaX|i%P#ibfS;w>ds+WBlALSX*F3Vr<MNg|TZfMC
zY1l)q<2Mz>&?BN044tm=c=}iMH<9H`0-1cp4lRKCzOr?wz+q;vW7`Y!S(Kq&Upd2`
zTgD&GTgkEwCpx&e<vC$nI}K#M%h1rCc%<E6NeS)-{H2fp_4l>J*_VeUK8~Nu`)&>v
zXm0Iy=K>D6o&u&nb~|IunccPj^so2qeJV3N5ySlv-9Xej=DQ7cUU17CdyZQs+@_75
zM{(KLSP#8_cn*Ka&zdtHTD9(np(~{227Ij8(iJ`@lw}1IK7{VTkATDN{;56qVq%tW
z0^;f*22tS&Y<s0w3I&g9TLVsvTq-C=#U#}r%Bb#UTcyTCZH-IYQCDG&XFejGntR~b
z+)m_{&-*LqkHb=qZ<I~H{>62xq%mN#JNo*CdDuj!m0M_cW}@5gH^45#1$#$y&9g8p
z{E6B6<PRQuGs-rZTkOkN-cIdIibN6j`@s&gJkzawz0!~yj~=~?fq4_X&u<C}cGpq$
zo*_{*H>IwTJGR-G9aZtIhcL`d+*yR(8`$7pdM<ALDW?G^n}8Sxw0Br^A!FDW^rNj;
mD1ljMS?<(~IpAz=;Rp#XS&>rF-K8e<A^tu=-YuRH>Hh<E8^tI9