[ljcom] r6967: LJSUP-3592

U   trunk/cgi-bin/LJ/Hooks/Settings.pm
U   trunk/cgi-bin/LJ/Nav.pm
U   trunk/cgi-bin/bml/scheme/lanzelot.look
U   trunk/cgi-bin/redirect-local.dat

Modified: trunk/cgi-bin/LJ/Hooks/Settings.pm
===================================================================
--- trunk/cgi-bin/LJ/Hooks/Settings.pm	2009-01-05 19:55:52 UTC (rev 6966)
+++ trunk/cgi-bin/LJ/Hooks/Settings.pm	2009-01-07 21:12:33 UTC (rev 6967)
@@ -144,9 +144,6 @@
     my $u = shift;
     my $ret;
 
-    my $remote = LJ::get_remote();
-    return "" unless $remote && $remote->is_in_beta('settings2008');
-
     my $is_plus = $u->in_class('plus') && !$u->in_class('paid');
     my $sponsored_text = LJ::Lang::ml('ljcom.extra_privacy_options.vgifts.disable.sponsored');
     $sponsored_text = "$sponsored_text*" if $is_plus;
@@ -174,9 +171,6 @@
     my $u = shift;
     my $post = shift;
 
-    my $remote = LJ::get_remote();
-    return unless $remote && $remote->is_in_beta('settings2008');
-
     my $posted_val = $post->{opt_disable_vgifts};
     if (defined $posted_val) {
         my $val = $posted_val;

Modified: trunk/cgi-bin/LJ/Nav.pm
===================================================================
--- trunk/cgi-bin/LJ/Nav.pm	2009-01-05 19:55:52 UTC (rev 6966)
+++ trunk/cgi-bin/LJ/Nav.pm	2009-01-07 21:12:33 UTC (rev 6967)
@@ -186,7 +186,7 @@
         # I hate Mac IE.  They can't pick languages up here.  -- Brad.
         my $ua = BML::get_client_header("User-Agent");
         unless ($ua =~~ /MSIE 5.+Mac/) {
-            push @{$nav[-1]{links}}, { 'url' => "$siteroot/manage/settings/",
+            push @{$nav[-1]{links}}, { 'url' => "$siteroot/manage/settings/?cat=display",
                                     'text' => "English • Español • Deutsch • Русский • →",
                                        'id' => "Setlang", },
         }
@@ -265,7 +265,7 @@
                                'text' => BML::ml('xcolibur.nav.help.faq'), },
                              { 'url' => "$siteroot/site/",
                                'text' => BML::ml('xcolibur.nav.footer.sitemap'), },
-                             { 'url' => "$siteroot/manage/settings/",
+                             { 'url' => "$siteroot/manage/settings/?cat=display",
                                'text' => BML::ml('xcolibur.nav.siteopts'), },
                              { 'url' => "$siteroot/feedback/",
                                'text' => BML::ml('xcolibur.nav.help.contact'), },
@@ -343,7 +343,7 @@
                                 'text' => BML::ml('horizon.nav.journal.comments'), },
                               { 'url' => "$siteroot/manage/tags.bml",
                                 'text' => BML::ml('horizon.nav.journal.managetags'), },
-                              { 'url' => "$siteroot/manage/settings/",
+                              { 'url' => "$siteroot/manage/settings/?cat=display",
                                 'text' => BML::ml('horizon.nav.journal.settings'), },
                               ],
              };
@@ -524,7 +524,7 @@
     if ($opts->{'horizontal'}) {
         push @nav, { 'name' => BML::ml('vertigo.header.home'), 'url' => "$siteroot/" };
         push @nav, { 'name' => BML::ml('vertigo.header.sitemap'), 'url' => "$siteroot/site/" };
-        push @nav, { 'name' => BML::ml('vertigo.header.viewing'), 'url' => "$siteroot/manage/settings/" };
+        push @nav, { 'name' => BML::ml('vertigo.header.viewing'), 'url' => "$siteroot/manage/settings/?cat=display" };
         return @nav;
     }
 

Modified: trunk/cgi-bin/bml/scheme/lanzelot.look
===================================================================
--- trunk/cgi-bin/bml/scheme/lanzelot.look	2009-01-05 19:55:52 UTC (rev 6966)
+++ trunk/cgi-bin/bml/scheme/lanzelot.look	2009-01-07 21:12:33 UTC (rev 6967)
@@ -13,7 +13,7 @@
     my $advertising_url = LJ::run_hook("get_advertising_url") || "http://www.sixapart.com/about/advertising/";
     return qq[<li><a href="$advertising_url"><?_ml horizon.footer.advertise _ml?></a></li>];
 _code?>
-    <li><a href="<?siteroot?>/manage/settings/"><?_ml horizon.footer.options _ml?></a></li>
+    <li><a href="<?siteroot?>/manage/settings/?cat=display"><?_ml horizon.footer.options _ml?></a></li>
     <li class="last"><a href="<?siteroot?>/create.bml"><?_ml horizon.footer.create _ml?></a></li>
 </ul>
 <!-- End Footer -->
@@ -241,7 +241,7 @@
         <div id="genres">
                 <ul>
                         <li><a href="http://ljmob.ru/"><?_ml lanzelot.mobile.LJ _ml?></a></li>
-                        <li><a href="<?siteroot?>/manage/mobile.bml"><?_ml lanzelot.mobile.settings _ml?></a></li>
+                        <li><a href="<?siteroot?>/manage/settings/?cat=mobile"><?_ml lanzelot.mobile.settings _ml?></a></li>
                         <li class="last"><a href="http://www.livejournal.ru/ratings/"><?_ml lanzelot.item.all_stats _ml?></a></li>
                 </ul>
                 </div>

Modified: trunk/cgi-bin/redirect-local.dat
===================================================================
--- trunk/cgi-bin/redirect-local.dat	2009-01-05 19:55:52 UTC (rev 6966)
+++ trunk/cgi-bin/redirect-local.dat	2009-01-07 21:12:33 UTC (rev 6967)
@@ -89,3 +89,13 @@
 /chat/download                   /chat/
 /chat/download/                  /chat/
 /chat/download/index.bml         /chat/
+/manage/account/adsettings.bml   /manage/settings/?cat=advertising
+/manage/comments                 /manage/settings/?cat=privacy
+/manage/comments/                /manage/settings/?cat=privacy
+/manage/comments/index.bml       /manage/settings/?cat=privacy
+/manage/horizon.bml              /manage/settings/
+/manage/mobile.bml               /manage/settings/?cat=mobile
+/manage/subscriptions            /manage/settings/?cat=notifications
+/manage/subscriptions/           /manage/settings/?cat=notifications
+/manage/subscriptions/index.bml  /manage/settings/?cat=notifications
+/manage/settings/index2.bml      /manage/settings/