Committer: slobin
LJSUP-10271: Add new blocks to non-cyr homepages and remove two widgetsM cgi-bin/LJ/Widget/HomepageEN.pm
M templates/Homepage/index_en.tmpl
U trunk/cgi-bin/LJ/Widget/HomepageEN.pm U trunk/templates/Homepage/index_en.tmpl
Modified: trunk/cgi-bin/LJ/Widget/HomepageEN.pm =================================================================== --- trunk/cgi-bin/LJ/Widget/HomepageEN.pm 2011-11-10 07:37:17 UTC (rev 11171) +++ trunk/cgi-bin/LJ/Widget/HomepageEN.pm 2011-11-10 08:42:19 UTC (rev 11172) @@ -164,6 +164,19 @@ $result{string_loggedout_facts_open} = BML::ml('.loggedout.facts.open', { aopts => "href='http://www.livejournal.org/'" }); $result{string_loggedout_facts_volunteer} = BML::ml('.loggedout.facts.volunteer', { aopts => "href='$LJ::HELPURL{how_to_help}'", sitename => $LJ::SITENAMEABBREV }); + # LJToday + $result{widget_ljtoday} = LJ::Widget::LJToday->render(); + + # Charity + $result{widget_charity} = LJ::Widget::Charity->render(); + + # Featured Communities + $result{widget_featured_communities} = LJ::Widget::FeaturedCommunities->render(); + + # + $result{facebooksearchus} = "$ENV{'LJHOME'}/templates/Widgets/facebooksearchus.tmpl"; + $result{followusontwitter} = "$ENV{'LJHOME'}/templates/Widgets/followusontwitter.tmpl"; + return %result; } Modified: trunk/templates/Homepage/index_en.tmpl =================================================================== --- trunk/templates/Homepage/index_en.tmpl 2011-11-10 07:37:17 UTC (rev 11171) +++ trunk/templates/Homepage/index_en.tmpl 2011-11-10 08:42:19 UTC (rev 11172) @@ -36,7 +36,6 @@ <tmpl_var widget_marqueefeatures> </div> </div> - <!-- #Photos2Homepage & PollOfTheDay --> <div class="l-wrap l-col2-50"> <div class="l-col-1"> @@ -46,6 +45,11 @@ <tmpl_var widget_polloftheday> </div> </div> + <tmpl_var widget_ljtoday> + <tmpl_include expr="facebooksearchus"> + <tmpl_include expr="followusontwitter"> + <tmpl_var widget_charity> + <tmpl_var widget_featured_communities> </div> <div style="float: left; position: relative; width: 300px; padding-left: 20px; margin-right: -320px;"> @@ -145,7 +149,6 @@ <tmpl_var widget_photos2homepage> <tmpl_var widget_polloftheday> - </div><!-- end .l-sidebar --> </div><!-- end .l-body -->