[dw-free] circle updates in inbox url should have 'friendplus' removed

[afuna]

[commit: http://hg.dwscoalition.org/dw-free/rev/f419e6a73ac0]

http://bugs.dwscoalition.org/show_bug.cgi?id=748

Circle updates folder view now named circle, instead of friendplus
(http://www.dreamwidth.org/inbox?view=circle)

Patch by seven.

Files modified:

• cgi-bin/LJ/NotificationInbox.pm
• cgi-bin/LJ/Widget/InboxFolderNav.pm
• htdocs/js/esn_inbox.js
• htdocs/tools/endpoints/esn_inbox.bml

--------------------------------------------------------------------------------
diff -r db4d076be069 -r f419e6a73ac0 cgi-bin/LJ/NotificationInbox.pm
--- a/cgi-bin/LJ/NotificationInbox.pm	Sat Jan 02 03:55:00 2010 +0000
+++ b/cgi-bin/LJ/NotificationInbox.pm	Sat Jan 02 13:53:33 2010 +0000
@@ -98,10 +98,10 @@ sub friend_items {
 }
 
 # returns a list of friend-related notificationitems
-sub friendplus_items {
+sub circle_items {
     my $self = shift;
 
-    my @friend_events = friendplus_event_list();
+    my @friend_events = circle_event_list();
 
     my %friend_events = map { "LJ::Event::" . $_ => 1 } @friend_events;
     return grep { $friend_events{$_->event->class} } $self->items;
@@ -548,8 +548,8 @@ sub delete_all {
         push @items, $self->usermsg_sent_items;
     } elsif ( $view eq 'usermsg_recvd' ) {
         @items = $self->usermsg_recvd_items;
-    } elsif ( $view eq 'friendplus' ) {
-        @items = $self->friendplus_items;
+    } elsif ( $view eq 'circle' ) {
+        @items = $self->circle_items;
         push @items, $self->birthday_items;
         push @items, $self->befriended_items;
     } elsif ( $view eq 'birthday' ) {
@@ -594,8 +594,8 @@ sub mark_all_read {
         push @items, $self->usermsg_sent_items;
     } elsif ( $view eq 'usermsg_recvd' ) {
         @items = $self->usermsg_recvd_items;
-    } elsif ( $view eq 'friendplus' ) {
-        @items = $self->friendplus_items;
+    } elsif ( $view eq 'circle' ) {
+        @items = $self->circle_items;
         push @items, $self->birthday_items;
         push @items, $self->befriended_items;
     } elsif ( $view eq 'birthday' ) {
@@ -677,9 +677,9 @@ sub friend_event_count {
     return $self->subset_unread_count(friend_event_list());
 }
 
-sub friendplus_event_count {
+sub circle_event_count {
     my $self = shift;
-    return $self->subset_unread_count(friendplus_event_list());
+    return $self->subset_unread_count(circle_event_list());
 }
 
 sub entrycomment_event_count {
@@ -712,7 +712,7 @@ sub friend_event_list {
     return @events;
 }
 
-sub friendplus_event_list {
+sub circle_event_list {
     my @events = qw(
                     AddedToCircle
                     RemovedFromCircle
diff -r db4d076be069 -r f419e6a73ac0 cgi-bin/LJ/Widget/InboxFolderNav.pm
--- a/cgi-bin/LJ/Widget/InboxFolderNav.pm	Sat Jan 02 03:55:00 2010 +0000
+++ b/cgi-bin/LJ/Widget/InboxFolderNav.pm	Sat Jan 02 13:53:33 2010 +0000
@@ -53,7 +53,7 @@ sub render_body {
     $alert_plural .= $unread_count ? '!' : '.';
     my $unread_all = $unread_html->($unread_count);
     my $unread_usermsg_recvd = $unread_html->($inbox->usermsg_recvd_event_count);
-    my $unread_friend = $unread_html->($inbox->friendplus_event_count);
+    my $unread_friend = $unread_html->($inbox->circle_event_count);
     my $unread_entrycomment = $unread_html->($inbox->entrycomment_event_count);
     my $unread_usermsg_sent = $unread_html->($inbox->usermsg_sent_event_count);
     my $message_button = "";
@@ -68,7 +68,7 @@ sub render_body {
             <div class="folders"><p>
             <a href="." id="esn_folder_all"><?_ml inbox.menu.all _ml?>$unread_all</a>};
     $body .= qq{<a href=".?view=usermsg_recvd" class="subs" id="esn_folder_usermsg_recvd"><?_ml inbox.menu.messages _ml?>$unread_usermsg_recvd</a>} if LJ::is_enabled('user_messaging');
-    $body .= qq{<a href=".?view=friendplus" class="subs" id="esn_folder_friendplus"><?_ml inbox.menu.friend_updates _ml?>$unread_friend</a>
+    $body .= qq{<a href=".?view=circle" class="subs" id="esn_folder_friendplus"><?_ml inbox.menu.friend_updates _ml?>$unread_friend</a>
             <a href=".?view=birthday" class="subsubs" id="esn_folder_birthday"><?_ml inbox.menu.birthdays _ml?></a>
             <a href=".?view=befriended" class="subsubs" id="esn_folder_befriended"><?_ml inbox.menu.new_friends _ml?></a><a href=".?view=entrycomment" class="subs" id="esn_folder_entrycomment"><?_ml inbox.menu.entries_and_comments _ml?>$unread_entrycomment</a>
             <span class="subs">---</span>
diff -r db4d076be069 -r f419e6a73ac0 htdocs/js/esn_inbox.js
--- a/htdocs/js/esn_inbox.js	Sat Jan 02 03:55:00 2010 +0000
+++ b/htdocs/js/esn_inbox.js	Sat Jan 02 13:53:33 2010 +0000
@@ -353,7 +353,7 @@ ESN_Inbox.finishedUpdate = function (inf
 
     ESN_Inbox.refresh_count("esn_folder_all", info.unread_all);
     ESN_Inbox.refresh_count("esn_folder_usermsg_recvd", info.unread_usermsg_recvd);
-    ESN_Inbox.refresh_count("esn_folder_friendplus", info.unread_friend);
+    ESN_Inbox.refresh_count("esn_folder_circle", info.unread_friend);
     ESN_Inbox.refresh_count("esn_folder_entrycomment", info.unread_entrycomment);
     ESN_Inbox.refresh_count("esn_folder_usermsg_sent", info.unread_usermsg_sent);
 
diff -r db4d076be069 -r f419e6a73ac0 htdocs/tools/endpoints/esn_inbox.bml
--- a/htdocs/tools/endpoints/esn_inbox.bml	Sat Jan 02 03:55:00 2010 +0000
+++ b/htdocs/tools/endpoints/esn_inbox.bml	Sat Jan 02 13:53:33 2010 +0000
@@ -110,7 +110,7 @@
         success => $success,
         unread_all => $inbox->all_event_count,
         unread_usermsg_recvd => $inbox->usermsg_recvd_event_count,
-        unread_friend => $inbox->friendplus_event_count,
+        unread_friend => $inbox->circle_event_count,
         unread_entrycomment => $inbox->entrycomment_event_count,
         unread_usermsg_sent => $inbox->usermsg_sent_event_count,
         %ret,
--------------------------------------------------------------------------------