[dw-free] Navbar uses inconsistent URL for read page

[afuna]

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

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

Link to /read, not /read/

Patch by kareila.

Files modified:

• cgi-bin/bml/scheme/lynx.look
• cgi-bin/weblib.pl
• htdocs/login.bml
• htdocs/register.bml

--------------------------------------------------------------------------------
diff -r f4abc4222b73 -r 821fcf9a8057 cgi-bin/bml/scheme/lynx.look
--- a/cgi-bin/bml/scheme/lynx.look	Sun Aug 09 01:41:20 2009 +0000
+++ b/cgi-bin/bml/scheme/lynx.look	Sun Aug 09 01:44:07 2009 +0000
@@ -53,7 +53,7 @@ _code?>
 
     if ( $remote ) {
          my $baseurl = $remote->journal_base();
-         $ret .= "<a href='$baseurl/'>$ML{'lynx.nav.recent'}</a> | <a href='$baseurl/read/'>$ML{'lynx.nav.friends'}</a> | ";
+         $ret .= "<a href='$baseurl/'>$ML{'lynx.nav.recent'}</a> | <a href='$baseurl/read'>$ML{'lynx.nav.friends'}</a> | ";
          $ret .= "<a href='<?siteroot?>/logout'><?_ml lynx.nav.logout _ml?></a> " . $remote->ljuser_display . " | ";
     } else {
          $ret .= "<a href='<?siteroot?>/login'><?_ml lynx.nav.login _ml?></a> | ";
diff -r f4abc4222b73 -r 821fcf9a8057 cgi-bin/weblib.pl
--- a/cgi-bin/weblib.pl	Sun Aug 09 01:41:20 2009 +0000
+++ b/cgi-bin/weblib.pl	Sun Aug 09 01:44:07 2009 +0000
@@ -2512,7 +2512,7 @@ sub control_strip
         $links{inbox} .= " ($unread)" if $unread;
         $links{inbox} .= "</a>";
 
-        $links{'view_friends_page'} = "<a href='" . $remote->journal_base . "/read/'>$BML::ML{'web.controlstrip.links.viewreadingpage'}</a>";
+        $links{'view_friends_page'} = "<a href='" . $remote->journal_base . "/read'>$BML::ML{'web.controlstrip.links.viewreadingpage'}</a>";
         $links{'add_friend'} = "<a href='$LJ::SITEROOT/manage/circle/add?user=$journal->{user}'>$BML::ML{'web.controlstrip.links.addtocircle'}</a>";
         $links{'edit_friend'} = "<a href='$LJ::SITEROOT/manage/circle/add?user=$journal->{user}'>$BML::ML{'web.controlstrip.links.modifycircle'}</a>";
         $links{'track_user'} = "<a href='$LJ::SITEROOT/manage/subscriptions/user?journal=$journal->{user}'>$BML::ML{'web.controlstrip.links.trackuser'}</a>";
diff -r f4abc4222b73 -r 821fcf9a8057 htdocs/login.bml
--- a/htdocs/login.bml	Sun Aug 09 01:41:20 2009 +0000
+++ b/htdocs/login.bml	Sun Aug 09 01:44:07 2009 +0000
@@ -141,7 +141,7 @@
             $body .= "<div style='float: left; padding: 5px 10px 0px 10px'>";
             $body .= "<img src='/img/silk/identity/user.png'></div>\n";
             $body .= "<div style='margin-left: 36px'>";
-            $body .= "<?h2 <a href='$base/read/'>";
+            $body .= "<?h2 <a href='$base/read'>";
             $body .= "$ML{'.loggedin.suggesthead2'}</a> h2?>\n";
             $body .= "$ML{'.loggedin.suggest2'}<br />&nbsp;</div>\n";
             $body .= "<br />\n";
diff -r f4abc4222b73 -r 821fcf9a8057 htdocs/register.bml
--- a/htdocs/register.bml	Sun Aug 09 01:41:20 2009 +0000
+++ b/htdocs/register.bml	Sun Aug 09 01:44:07 2009 +0000
@@ -123,7 +123,7 @@ body<=
          $ret .= "$ML{'.new.101.journal.answer'}</p>";
          $ret .= "<p><strong><a href='" . $u->profile_url . "'>$ML{'.new.101.profile.question'}</a></strong><br />";
          $ret .= "$ML{'.new.101.profile.answer'}</p>";
-         $ret .= "<p><strong><a href='" . $u->journal_base . "/read/'>$ML{'.new.101.reading.question'}</a></strong><br />";
+         $ret .= "<p><strong><a href='" . $u->journal_base . "/read'>$ML{'.new.101.reading.question'}</a></strong><br />";
 
          $ret .= "$ML{'.new.101.reading.answer'}</p>";
          $ret .= "<p><strong><a href='$LJ::SITEROOT/community/search'>$ML{'.new.101.community.question'}</a></strong><br />";
--------------------------------------------------------------------------------