[dw-free] Set Manage Filters to Subscriptions in the 'Organize' Menu

[afuna]

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

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

Set "Manage Filters" in the menu to manage subscription filters. Link from
subscription filters page to access filters page. Clarify page title for
"Manage Access Filters" page.

Patch by hotlevel4.

Files modified:

• cgi-bin/DW/Logic/MenuNav.pm
• htdocs/manage/circle/editfilters.bml.text
• htdocs/manage/subscriptions/filters.bml

--------------------------------------------------------------------------------
diff -r 98f0ace7d49d -r cc0c17592000 cgi-bin/DW/Logic/MenuNav.pm
--- a/cgi-bin/DW/Logic/MenuNav.pm	Mon Feb 22 19:46:07 2010 +0000
+++ b/cgi-bin/DW/Logic/MenuNav.pm	Thu Feb 25 12:57:46 2010 +0000
@@ -117,7 +117,7 @@ sub get_menu_navigation {
                     display => $loggedin,
                 },
                 {
-                    url => "$LJ::SITEROOT/manage/circle/editfilters",
+                    url => "$LJ::SITEROOT/manage/subscriptions/filters",
                     text => "menunav.organize.managefilters",
                     display => $loggedin,
                 },
diff -r 98f0ace7d49d -r cc0c17592000 htdocs/manage/circle/editfilters.bml.text
--- a/htdocs/manage/circle/editfilters.bml.text	Mon Feb 22 19:46:07 2010 +0000
+++ b/htdocs/manage/circle/editfilters.bml.text	Thu Feb 25 12:57:46 2010 +0000
@@ -53,6 +53,6 @@
 
 .text.sec=<strong>Security note:</strong> If you wish to delete an access filter and make a new access filter, do <strong>not</strong> do this by renaming one access filter and then editing it. If you do this, all your old entries which are accessible to the old access filter will then be accessible to the new access filter.
 
-.title2=Manage Filters
+.title2=Manage Access Filters
 
 .yourgroups=Your access filters:
diff -r 98f0ace7d49d -r cc0c17592000 htdocs/manage/subscriptions/filters.bml
--- a/htdocs/manage/subscriptions/filters.bml	Mon Feb 22 19:46:07 2010 +0000
+++ b/htdocs/manage/subscriptions/filters.bml	Thu Feb 25 12:57:46 2010 +0000
@@ -34,6 +34,9 @@ body<=
               "DW.currentUser = '" . $remote->user . "';\n" .
               "DW.userIsPaid = " . ( $remote->is_paid ? 'true' : 'false' ) . ";\n" .
               "</script>\n";
+
+    # redirect to managing access filters
+    $ret .= "<?standout " . BML::ml( '.accessfilters', { aopts => "href='$LJ::SITEROOT/manage/circle/editfilters'" } ) . " standout?>\n\n"; 
 
     # and now the main page HTML
     $ret .= <<EOF;
--------------------------------------------------------------------------------

Comments

[ninetydegrees]

\o/

[yvi]

Heh, one click less :)