[dw-free] Link between Manage Circle and My Account Settings: Notifications

[fu]

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

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

Add interlinkage.

Patch by wyntarvox.

Files modified:

• htdocs/manage/circle/edit.bml
• htdocs/manage/circle/edit.bml.text
• htdocs/manage/settings/index.bml
• htdocs/manage/settings/index.bml.text

--------------------------------------------------------------------------------
diff -r 21d02a514f23 -r a8c46e5beb1d htdocs/manage/circle/edit.bml
--- a/htdocs/manage/circle/edit.bml	Tue Mar 08 14:33:42 2011 +0800
+++ b/htdocs/manage/circle/edit.bml	Tue Mar 08 14:41:55 2011 +0800
@@ -61,7 +61,7 @@ body<=
 
         $ret .= "<form method='post' name='editFriends' action='edit$getextra'>\n";
         $ret .= LJ::form_auth();
-        $ret .= "<p>" . BML::ml( '.circle.intro', { aopts1 => "href='#editpeople'", aopts2 => "href='#editcomms'", aopts3 => "href='#editfeeds'" }) . "</p>\n\n";
+        $ret .= "<p>" . BML::ml( '.circle.intro', { aopts1 => "href='#editpeople'", aopts2 => "href='#editcomms'", aopts3 => "href='#editfeeds'", aopts4 => "href='$LJ::SITEROOT/manage/settings/?cat=notifications'" }) . "</p>\n\n";
         $ret .= "<?h2 $ML{'.circle.header'} h2?>\n";
 
         # little standout box to repeat before each section:
diff -r 21d02a514f23 -r a8c46e5beb1d htdocs/manage/circle/edit.bml.text
--- a/htdocs/manage/circle/edit.bml.text	Tue Mar 08 14:33:42 2011 +0800
+++ b/htdocs/manage/circle/edit.bml.text	Tue Mar 08 14:41:55 2011 +0800
@@ -30,7 +30,7 @@
 
 .circle.header=Current Relationships
 
-.circle.intro=Here are the <a [[aopts1]]>people</a>, <a [[aopts2]]>communities</a>, and <a [[aopts3]]>feeds</a> that are in your circle.  You can change who appears on your Reading Page and who you give access to by using the check boxes.
+.circle.intro=Here are the <a [[aopts1]]>people</a>, <a [[aopts2]]>communities</a>, and <a [[aopts3]]>feeds</a> that are in your circle.  You can change who appears on your Reading Page and who you give access to by using the check boxes.  You can also <a [[aopts4]]>edit your notification tracking options</a>.
 
 .circle.intro.people=Here are the people in your circle:
 
diff -r 21d02a514f23 -r a8c46e5beb1d htdocs/manage/settings/index.bml
--- a/htdocs/manage/settings/index.bml	Tue Mar 08 14:33:42 2011 +0800
+++ b/htdocs/manage/settings/index.bml	Tue Mar 08 14:41:55 2011 +0800
@@ -97,7 +97,7 @@ body<=
             visible => 1,
             disabled => !$u || $u->is_community ? 1 : 0,
             form => 1,
-            desc => $ML{'.cat.notifications.desc'},
+            desc => BML::ml( '.cat.notifications.desc', { aopts => "href='$LJ::SITEROOT/manage/circle/edit'" } ),
             settings => [qw(
                 LJ::Setting::CommentEmailNotify
                 LJ::Setting::SelfCommentEmail
diff -r 21d02a514f23 -r a8c46e5beb1d htdocs/manage/settings/index.bml.text
--- a/htdocs/manage/settings/index.bml.text	Tue Mar 08 14:33:42 2011 +0800
+++ b/htdocs/manage/settings/index.bml.text	Tue Mar 08 14:41:55 2011 +0800
@@ -38,7 +38,7 @@
 
 .cat.notifications=Notifications
 
-.cat.notifications.desc=Notification and subscription tracking options
+.cat.notifications.desc=Notification and subscription tracking options. You can also <a [[aopts]]>edit your reading page subscriptions to specific users, communities, and feeds</a>.
 
 .cat.othersites=Other Sites
 
--------------------------------------------------------------------------------