Committer: ailyin
LJSUP-8798 (Kill http://www.livejournal.com/news.bml page with redirect to news.livejournal.com)U trunk/cgi-bin/LJ/Hooks/Login.pm U trunk/cgi-bin/LJ/Nav.pm U trunk/cgi-bin/LJ/Widget/OfficialJournals.pm U trunk/cgi-bin/redirect-local.dat U trunk/htdocs/news/index.bml U trunk/htdocs/news.bml U trunk/htdocs/site/index.bml
Modified: trunk/cgi-bin/LJ/Hooks/Login.pm
===================================================================
--- trunk/cgi-bin/LJ/Hooks/Login.pm 2011-05-11 09:43:14 UTC (rev 10497)
+++ trunk/cgi-bin/LJ/Hooks/Login.pm 2011-05-12 02:23:18 UTC (rev 10498)
@@ -16,7 +16,7 @@
} else {
my $ret = "<div style='width: 300px; border: 1px solid #9cf; padding: 0;'>";
$ret .= "<h3 style='margin: 0; padding: 0; width: 100%; background-color: #9cf'> ";
- $ret .= "<a href='/news.bml'>" . BML::ml('ljcom.login.post_login_news.header') . "</a></h3>";
+ $ret .= "<a href='http://news.livejournal.com/'>" . BML::ml('ljcom.login.post_login_news.header') . "</a></h3>";
$ret .= "<div style='padding-left: .25em;'>" . BML::ml('ljcom.login.post_login_news') . "</div>";
$ret .= "</div>";
return $ret;
Modified: trunk/cgi-bin/LJ/Nav.pm
===================================================================
--- trunk/cgi-bin/LJ/Nav.pm 2011-05-11 09:43:14 UTC (rev 10497)
+++ trunk/cgi-bin/LJ/Nav.pm 2011-05-12 02:23:18 UTC (rev 10498)
@@ -251,7 +251,7 @@
'text' => BML::ml('xcolibur.nav.about.press'), },
{ 'url' => "$siteroot/download/",
'text' => BML::ml('xcolibur.nav.about.download'), },
- { 'url' => "$siteroot/news.bml",
+ { 'url' => "http://news.livejournal.com/",
'text' => BML::ml("xcolibur.nav.about.sitenews"), },
{ 'url' => "$siteroot/paidaccounts/",
'text' => BML::ml('xcolibur.nav.about.paidaccounts'), },
Modified: trunk/cgi-bin/LJ/Widget/OfficialJournals.pm
===================================================================
--- trunk/cgi-bin/LJ/Widget/OfficialJournals.pm 2011-05-11 09:43:14 UTC (rev 10497)
+++ trunk/cgi-bin/LJ/Widget/OfficialJournals.pm 2011-05-12 02:23:18 UTC (rev 10498)
@@ -52,7 +52,7 @@
my $ret;
$ret .= "<h2><span>" . $class->ml('widget.officialjournals.title', {'sitename' => $LJ::SITENAMESHORT}) . "</span></h2>";
- $ret .= "<a href='$LJ::SITEROOT/news.bml' class='more-link'>" . $class->ml('widget.officialjournals.viewall') . "</a>";
+ $ret .= "<a href='http://news.livejournal.com/' class='more-link'>" . $class->ml('widget.officialjournals.viewall') . "</a>";
my $print_news = LJ::is_enabled("homepagenews") && !$opts{"no_news"};
my $news_printed = 0;
Modified: trunk/cgi-bin/redirect-local.dat
===================================================================
--- trunk/cgi-bin/redirect-local.dat 2011-05-11 09:43:14 UTC (rev 10497)
+++ trunk/cgi-bin/redirect-local.dat 2011-05-12 02:23:18 UTC (rev 10498)
@@ -104,3 +104,6 @@
/ontd/ http://community.livejournal.com/ohnotheydidnt/
/ohnotheydidnt http://community.livejournal.com/ohnotheydidnt/
/ohnotheydidnt/ http://community.livejournal.com/ohnotheydidnt/
+/news/ http://news.livejournal.com/
+/news http://news.livejournal.com/
+/news.bml http://news.livejournal.com/
Modified: trunk/htdocs/news/index.bml
===================================================================
--- trunk/htdocs/news/index.bml 2011-05-11 09:43:14 UTC (rev 10497)
+++ trunk/htdocs/news/index.bml 2011-05-12 02:23:18 UTC (rev 10498)
@@ -1,5 +1,3 @@
-<?_code
-
- return BML::redirect("http://www.livejournal.com/news.bml");
-
-_code?>
+<?_code {
+ return LJ::Request->redirect("http://news.livejournal.com");
+} _code?>
Modified: trunk/htdocs/news.bml
===================================================================
--- trunk/htdocs/news.bml 2011-05-11 09:43:14 UTC (rev 10497)
+++ trunk/htdocs/news.bml 2011-05-12 02:23:18 UTC (rev 10498)
@@ -1,69 +1,3 @@
-<?page
-title=>News
-body<=
-
-Welcome to LiveJournal news. If you crave more frequent and detailed news, check out the following communities:
-
-<p><center>
-<table cellspacing=4>
-<?_code
-{
- my $ret = "";
- my @accts = (
- [ "news", "New features, site changes, overall news. (this page)" ],
- [ "lj_maintenance", "Server status and planned downtime announcements." ],
- [ "lj_releases", "Release info on code updates and new features." ],
- [ "feedback", "Provide feedback in staff polls and surveys." ],
- [ "lj_design", "Be part of the creative discussion at LiveJournal." ],
- [ "lj_dev", "LiveJournal technical development community." ],
- [ "changelog", "Every little code change, as it happens."],
- );
-
- foreach my $acct (@accts) {
- my $u = LJ::load_user($acct->[0]);
- my $base;
- if ($u) {
- $base = $u->journal_base;
- } else {
- $base = "#no-exist#";
- }
- $ret .= "<tr align='left'><td>" . LJ::ljuser($u || $acct->[0]) . "</td><td>$acct->[1]</td><td>
-<a href='$base/data/rss'><img src='<?imgprefix?>/xml.gif' width='36' height='14' border='0' alt='RSS Feed' /></a></td></tr>";
- }
- return $ret;
-}
-_code?>
-</table>
-</center>
-
-<p><hr /><p>
-
-<?_code
-{
- LJ::set_active_crumb('news');
-
- return LJ::make_journal("news", "", undef, {
- 'vhost' => 'customview',
- 'styleid' => 5624,
- });
-}
-_code?>
-
-<=body
-# since make_journal might include the control strip CSS,
-# add in more CSS to prevent site schemes from being affected.
-head<=
-<style type= "text/css">
-html body {
- padding-top: 0 !important;
-}
-
-#lj_controlstrip,
-#lj_controlstrip + .b-message-mobile {
- display: none !important;
-}
-</style>
-<=head
-page?><?_c <LJDEP>
-link: htdocs/customview.cgi
-</LJDEP> _c?>
+<?_code {
+ return LJ::Request->redirect("http://news.livejournal.com");
+} _code?>
Modified: trunk/htdocs/site/index.bml
===================================================================
--- trunk/htdocs/site/index.bml 2011-05-11 09:43:14 UTC (rev 10497)
+++ trunk/htdocs/site/index.bml 2011-05-12 02:23:18 UTC (rev 10498)
@@ -124,7 +124,7 @@
return "<li><a href=\"$advertising_url\"><?_ml .otherlinks.advertise _ml?></a></li>";
} _code?>
<li><a href="http://www.livejournalinc.com/jobs/"><?_ml .otherlinks.jobs _ml?></a></li>
- <li><a href="/news.bml"><?_ml .otherlinks.site_news _ml?></a></li>
+ <li><a href="http://news.livejournal.com/"><?_ml .otherlinks.site_news _ml?></a></li>
<li><a href="/stats.bml"><?_ml .otherlinks.stats _ml?></a></li>
</ul>
</dd>