[dw-free] move /syn to /feeds

[kareila]

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

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

Rename /syn links on site to use new /feed URLs. Old /syn links are
redirected, but we want to standardize on the new link scheme.

Patch by denise.

Files modified:

• cgi-bin/DW/Logic/MenuNav.pm
• cgi-bin/LJ/CProd/Feeds.pm
• cgi-bin/LJ/Widget/Feeds.pm
• cgi-bin/weblib.pl
• htdocs/feeds/index.bml
• htdocs/site/index.bml

--------------------------------------------------------------------------------
diff -r a8493c11bfce -r 5a4af5b06631 cgi-bin/DW/Logic/MenuNav.pm
--- a/cgi-bin/DW/Logic/MenuNav.pm	Sun Jun 13 22:44:34 2010 +0800
+++ b/cgi-bin/DW/Logic/MenuNav.pm	Sun Jun 13 20:13:02 2010 -0500
@@ -163,7 +163,7 @@ sub get_menu_navigation {
                     display => $loggedin,
                 },
                 {
-                    url => "$LJ::SITEROOT/syn/",
+                    url => "$LJ::SITEROOT/feeds/",
                     text => "menunav.read.syndicatedfeeds",
                     display => $loggedin,
                 },
diff -r a8493c11bfce -r 5a4af5b06631 cgi-bin/LJ/CProd/Feeds.pm
--- a/cgi-bin/LJ/CProd/Feeds.pm	Sun Jun 13 22:44:34 2010 +0800
+++ b/cgi-bin/LJ/CProd/Feeds.pm	Sun Jun 13 20:13:02 2010 -0500
@@ -45,7 +45,7 @@ sub render {
 }
 
 sub ml { "cprod.feeds.text" }
-sub link { "$LJ::SITEROOT/syn/list" }
+sub link { "$LJ::SITEROOT/feeds/list" }
 sub button_text { "View feeds" }
 
 1;
diff -r a8493c11bfce -r 5a4af5b06631 cgi-bin/LJ/Widget/Feeds.pm
--- a/cgi-bin/LJ/Widget/Feeds.pm	Sun Jun 13 22:44:34 2010 +0800
+++ b/cgi-bin/LJ/Widget/Feeds.pm	Sun Jun 13 20:13:02 2010 -0500
@@ -28,7 +28,7 @@ sub render_body {
     my $get = $class->get_args;
     my $body;
     $body .= "<h2 class='solid-neutral'>" . $class->ml('widget.feeds.title') . "</h2>";
-    $body .= "<a href='$LJ::SITEROOT/syn/list' class='more-link'>" .
+    $body .= "<a href='$LJ::SITEROOT/feeds/list' class='more-link'>" .
              $class->ml('widget.feeds.viewall') . "</a>";
 
     # get user IDs of most popular feeds
@@ -54,7 +54,7 @@ sub render_body {
 
     # Form to add or find feeds
     if ($remote) {
-        $body .= "<form method='post' action='$LJ::SITEROOT/syn/'>";
+        $body .= "<form method='post' action='$LJ::SITEROOT/feeds/'>";
         $body .= LJ::html_hidden('userid', $remote->userid);
         $body .= "<b>" . $class->ml('widget.feeds.find') . "</b> ";
         my $prompt = $class->ml('widget.feeds.enterRSS');
diff -r a8493c11bfce -r 5a4af5b06631 cgi-bin/weblib.pl
--- a/cgi-bin/weblib.pl	Sun Jun 13 22:44:34 2010 +0800
+++ b/cgi-bin/weblib.pl	Sun Jun 13 20:13:02 2010 -0500
@@ -2661,7 +2661,7 @@ sub control_strip
                  'manage_entries'    => "<a href='$LJ::SITEROOT/editjournal'>$BML::ML{'web.controlstrip.links.manageentries'}</a>",
                  'invite_friends'    => "<a href='$LJ::SITEROOT/manage/circle/invite'>$BML::ML{'web.controlstrip.links.invitefriends'}</a>",
                  'create_account'    => $create_link,
-                 'syndicated_list'   => "<a href='$LJ::SITEROOT/syn/list'>$BML::ML{'web.controlstrip.links.popfeeds'}</a>",
+                 'syndicated_list'   => "<a href='$LJ::SITEROOT/feeds/list'>$BML::ML{'web.controlstrip.links.popfeeds'}</a>",
                  'learn_more'        => LJ::Hooks::run_hook('control_strip_learnmore_link') || "<a href='$LJ::SITEROOT/'>$BML::ML{'web.controlstrip.links.learnmore'}</a>",
                  'explore'           => "<a href='$LJ::SITEROOT/explore/'>" . BML::ml('web.controlstrip.links.explore', { sitenameabbrev => $LJ::SITENAMEABBREV }) . "</a>",
                  'confirm'           => "<a href='$LJ::SITEROOT/register'>$BML::ML{'web.controlstrip.links.confirm'}</a>",
diff -r a8493c11bfce -r 5a4af5b06631 htdocs/feeds/index.bml
--- a/htdocs/feeds/index.bml	Sun Jun 13 22:44:34 2010 +0800
+++ b/htdocs/feeds/index.bml	Sun Jun 13 20:13:02 2010 -0500
@@ -21,7 +21,7 @@ body<=
 
     my $error = sub {
         return "<?h1 $ML{'Error'} h1?><?p $_[0] p?><?p " .
-                BML::ml('Backlink', {'link' => '/syn/', 'text' => $ML{'.back'}}) . " p?>";
+                BML::ml('Backlink', {'link' => '/feeds/', 'text' => $ML{'.back'}}) . " p?>";
     };
 
     # add custom feed
@@ -201,7 +201,7 @@ body<=
     # intro paragraph
     my $title = BML::ml('.using.title', {'sitename' => $LJ::SITENAME});
     my $ret = "<?h1 $title h1?><?p $ML{'.using.text'} p?>";
-    $ret .= "<?p " . BML::ml('.top1000.text', {'aopts' => "href='$LJ::SITEROOT/syn/list'"}) . " p?>";
+    $ret .= "<?p " . BML::ml('.top1000.text', {'aopts' => "href='$LJ::SITEROOT/feeds/list'"}) . " p?>";
 
     $ret .= "<form method='post' action='./'>";
     $ret .= LJ::html_hidden("userid", $u->{'userid'});
diff -r a8493c11bfce -r 5a4af5b06631 htdocs/site/index.bml
--- a/htdocs/site/index.bml	Sun Jun 13 22:44:34 2010 +0800
+++ b/htdocs/site/index.bml	Sun Jun 13 20:13:02 2010 -0500
@@ -50,7 +50,7 @@ body<=
    <li><a href='/manage/circle/'><?_ml .maplinks.manage-readlist _ml?></a></li>
    <li><a href='/manage/circle/editfilters'><?_ml .maplinks.manage-groups _ml?></a></li>
    <li><a href='/manage/circle/filter'><?_ml .maplinks.filter-readlist  _ml?></a></li>
-   <li><a href='/syn'><?_ml .maplinks.synfeeds _ml?></a></li>
+   <li><a href='/feeds'><?_ml .maplinks.synfeeds _ml?></a></li>
   </ul></dd>
  </dt></dl>
 
--------------------------------------------------------------------------------