Committer: akanashin
LJSUP-14128: Welcome post & style of the created journalU trunk/bin/upgrading/en_LJ.dat U trunk/cgi-bin/LJ/Hooks/CreatePage.pm U trunk/cgi-bin/ljcom.pl
Modified: trunk/bin/upgrading/en_LJ.dat =================================================================== --- trunk/bin/upgrading/en_LJ.dat 2012-11-07 11:28:13 UTC (rev 12869) +++ trunk/bin/upgrading/en_LJ.dat 2012-11-07 13:32:53 UTC (rev 12870) @@ -5115,6 +5115,15 @@ </ul> . + +ljcom.lj-replace.first_post.friends2<< + +<h1>Welcome to Livejournal!</h1> + +<a href="[[journal_base]]/feed/">Url to friends feed</a> + +. + ljcom.login.post_login_news<< <p><a href="/support/faqbrowse.bml?faqid=272">Set your notifications!</a></p> <p><a href="/support/faqbrowse.bml?faqid=270">Chat with your friends using LJ Talk</a></p> Modified: trunk/cgi-bin/LJ/Hooks/CreatePage.pm =================================================================== --- trunk/cgi-bin/LJ/Hooks/CreatePage.pm 2012-11-07 11:28:13 UTC (rev 12869) +++ trunk/cgi-bin/LJ/Hooks/CreatePage.pm 2012-11-07 13:32:53 UTC (rev 12870) @@ -25,8 +25,8 @@ 'hour' => 00, 'min' => 00, 'security' => 'private', - 'prop_current_moodid' => '107', - 'prop_current_music' => 'FRNK Radio', + 'prop_current_moodid' => LJ::is_enabled('create_controller') ? '' : '107', + 'prop_current_music' => LJ::is_enabled('create_controller') ? '' : 'FRNK Radio', 'prop_taglist' => 'livejournal, welcome', 'subject' => BML::ml('web.lj-replace.first_post.subject', {'sitename' => $LJ::SITENAMESHORT}), 'event' => '<lj-replace name="first_post">', Modified: trunk/cgi-bin/ljcom.pl =================================================================== --- trunk/cgi-bin/ljcom.pl 2012-11-07 11:28:13 UTC (rev 12869) +++ trunk/cgi-bin/ljcom.pl 2012-11-07 13:32:53 UTC (rev 12870) @@ -1820,33 +1820,42 @@ my $ret; return unless LJ::is_web_context(); + + my $remote = LJ::get_remote(); + # Friends pages has a different message for first post - if (LJ::Request->notes('view') eq "friends") { - $ret .= BML::ml('ljcom.lj-replace.first_post.friends', { - 'addfriend' => "src='$LJ::IMGPREFIX/btn_addfriend.gif'", - 'userhead' => "src='$LJ::IMGPREFIX/userinfo.gif'", - 'interest' => "href='$LJ::SITEROOT/interests.bml'", - 'school' => "href='$LJ::SITEROOT/schools/'", - 'commicon' => "src='$LJ::IMGPREFIX/community.gif'", - 'feedicon' => "src='$LJ::IMGPREFIX/syndicated.gif'", - 'feeds' => "href='$LJ::SITEROOT/syn/'", - 'spotlight' => "href='" . LJ::journal_base('lj_spotlight') . "'", - 'invite' => "href='$LJ::SITEROOT/friends/invite.bml'", - }); - } else { - $ret .= BML::ml('ljcom.lj-replace.first_post', { - 'update_link' => "href='$LJ::SITEROOT/update.bml'", - 'custom_link' => "href='$LJ::SITEROOT/customize/'", - 'editpics' => "href='$LJ::SITEROOT/editpics.bml'", - 'private_img' => "src='$LJ::IMGPREFIX/icon_private.gif'", - 'lockicon_img' => "src='$LJ::IMGPREFIX/icon_protected.gif'", - 'lj-cut_link' => "href='$LJ::HELPURL{'lj-cut'}'", - 'voice_link' => "href='$LJ::SITEROOT/voicepost/'", - 'mobile_link' => "href='$LJ::SITEROOT/devices'", - 'sms_link' => "href='$LJ::SITEROOT/manage/sms/'", - 'talk_link' => "href='$LJ::SITEROOT/chat/'", - 'interest' => "href='$LJ::SITEROOT/interests.bml'", - }); + if (LJ::is_enabled('create_controller')) { + $ret .= BML::ml('ljcom.lj-replace.first_post.friends2', { + journal_base => $remote && $remote->journal_base, + }); + } else { + if (LJ::Request->notes('view') eq "friends") { + $ret .= BML::ml('ljcom.lj-replace.first_post.friends', { + 'addfriend' => "src='$LJ::IMGPREFIX/btn_addfriend.gif'", + 'userhead' => "src='$LJ::IMGPREFIX/userinfo.gif'", + 'interest' => "href='$LJ::SITEROOT/interests.bml'", + 'school' => "href='$LJ::SITEROOT/schools/'", + 'commicon' => "src='$LJ::IMGPREFIX/community.gif'", + 'feedicon' => "src='$LJ::IMGPREFIX/syndicated.gif'", + 'feeds' => "href='$LJ::SITEROOT/syn/'", + 'spotlight' => "href='" . LJ::journal_base('lj_spotlight') . "'", + 'invite' => "href='$LJ::SITEROOT/friends/invite.bml'", + }); + } else { + $ret .= BML::ml('ljcom.lj-replace.first_post', { + 'update_link' => "href='$LJ::SITEROOT/update.bml'", + 'custom_link' => "href='$LJ::SITEROOT/customize/'", + 'editpics' => "href='$LJ::SITEROOT/editpics.bml'", + 'private_img' => "src='$LJ::IMGPREFIX/icon_private.gif'", + 'lockicon_img' => "src='$LJ::IMGPREFIX/icon_protected.gif'", + 'lj-cut_link' => "href='$LJ::HELPURL{'lj-cut'}'", + 'voice_link' => "href='$LJ::SITEROOT/voicepost/'", + 'mobile_link' => "href='$LJ::SITEROOT/devices'", + 'sms_link' => "href='$LJ::SITEROOT/manage/sms/'", + 'talk_link' => "href='$LJ::SITEROOT/chat/'", + 'interest' => "href='$LJ::SITEROOT/interests.bml'", + }); + } } return $ret;