[ljcom] r9559: LJSUP-6993: October Header: Removing old...

U   trunk/cgi-bin/LJ/Hooks/Homepage.pm
U   trunk/htdocs/index.bml
U   trunk/htdocs/index.bml.sup

Modified: trunk/cgi-bin/LJ/Hooks/Homepage.pm
===================================================================
--- trunk/cgi-bin/LJ/Hooks/Homepage.pm	2010-09-28 11:07:20 UTC (rev 9558)
+++ trunk/cgi-bin/LJ/Hooks/Homepage.pm	2010-09-29 02:27:18 UTC (rev 9559)
@@ -81,84 +81,6 @@
     return 1;
 }
 
-## April2010
-sub _is_april2010_reskining_active { 
-    my $params = shift;
-
-    # Only for horizon & vertigo schemes, both are 'horizon' somehow :)
-    return 0 if 'horizon' ne $params->{'scheme'};
-    
-    # till 2010-06-01 00:00:00Z
-    my $time = time();
-    return 0 if $time > 1275350400; 
-
-    return 1;
-}
-
-## Rainbow2010
-sub _is_rainbow2010_reskining_active { 
-    my $params = shift;
- 
-    ## special hack: to allow members of lj_core view
-    ## reskined pages
-    if (LJ::Request->is_inited) {
-        my %args = LJ::Request->args;
-        if ($args{rainbow_reskining}) {
-            if ($LJ::IS_DEV_SERVER) {
-                return 1;
-            } else {
-                my $remote = LJ::get_remote();
-                my $lj_core = LJ::load_user('lj_core');
-                return $remote && $lj_core && $lj_core->has_friend($remote);
-            }
-        }
-    }
-
-    # Only for horizon & vertigo schemes, both are 'horizon' somehow :)
-    return 0 if 'horizon' ne $params->{'scheme'};
-    
-    # Since Friday, June 25th through Monday, June 28th.
-    my $time = time();
-    return 0 if $time < 1280016000 || $time > 1280361600;
-
-    ## Only US-users are affected
-    my ($ip_class, $country) = LJ::GeoLocation->ip_class();
-    return unless $country eq 'US';
-
-    return 1;
-}
-
-## june2010
-sub _is_june2010_reskining_active { 
-    my $params = shift;
-
-    # till 2010-07-22 00:00:00
-    my $time = time();
-    return 0 if $time > 1279756800;
-
-    return 1;
-}
-
-
-
-
-## july2010
-sub _is_july2010_reskining_active { 
-    my $params = shift;
-
-    return 1;
-}
-
-
-
-## september2010
-sub _is_september2010_reskining_active { 
-    my $params = shift;
-
-    return 1;
-}
-
-
 ## october2010
 sub _is_october2010_reskining_active { 
     my $params = shift;
@@ -166,8 +88,6 @@
     return 1;
 }
 
-
-
 LJ::register_hook("service_page_reskining", sub {
     my $params = shift || {};
     if(_is_october2010_reskining_active($params)){
@@ -177,14 +97,7 @@
         LJ::CleanHTML::clean(\$text); ## to expand <lj-user> tags 
         return qq[<dl class="b-reskining-about"><dt></dt><dd>$text</dd></dl>];
 
-    } elsif (_is_july2010_reskining_active($params)) {
-        ## Jul 2010
-        LJ::need_res("stc/reskining/july2010/july2010.css");
-        my $text = LJ::Lang::ml('reskining.july2010');
-        LJ::CleanHTML::clean(\$text); ## to expand <lj-user> tags 
-        return qq[<dl class="b-reskining-about"><dt></dt><dd>$text</dd></dl>];
     } 
-
     return '';
 });
 

Modified: trunk/htdocs/index.bml
===================================================================
--- trunk/htdocs/index.bml	2010-09-28 11:07:20 UTC (rev 9558)
+++ trunk/htdocs/index.bml	2010-09-29 02:27:18 UTC (rev 9559)
@@ -45,9 +45,6 @@
             !($remote and $remote->get_cap('paid'))
         ) ?
         LJ::Widget::ExtBlock->render(id=>'homepage.gazeta') : '';
-	my $reskining_box = 
-        (LJ::LJcom::is_nokia_reskining_active()) ? 
-            LJ::Widget::ExtBlock->render(id=>'reskining') : '';
  
     if ($country eq 'US') {
         $ret .= "<div id='adnectar_container'></div>
@@ -152,8 +149,6 @@
 
 	   	$ret .= $uk_block;
         
-		$ret .= $reskining_box;
-
         $ret .= $info_box;
 
         #$ret .= LJ::Widget::FriendBirthdays->render(get => \%GET);

Modified: trunk/htdocs/index.bml.sup
===================================================================
--- trunk/htdocs/index.bml.sup	2010-09-28 11:07:20 UTC (rev 9558)
+++ trunk/htdocs/index.bml.sup	2010-09-29 02:27:18 UTC (rev 9559)
@@ -49,9 +49,6 @@
     my $info_box     = (!LJ::SUP->is_sup_ip_class || ($remote and $remote->get_cap('paid'))) 
                     ? ''
                     : LJ::Widget::ExtBlock->render(id=>'homepage.gazeta');
-    my $reskining_box = 
-        (LJ::LJcom::is_nokia_reskining_active()) ? 
-            LJ::Widget::ExtBlock->render(id=>'reskining') : '';
 
     ### Logged-in Homepage ###
     if ($remote) {
@@ -154,8 +151,6 @@
         #    $ret .= "</div>";
         # }
 
-        $ret .= $reskining_box;
-
         $ret .= $info_box;
             
         $ret .= LJ::Widget::FriendBirthdays->render(get => \%GET);
@@ -281,8 +276,6 @@
 
                         <div class="adv-block"><div>$ad</div></div>             
 
-               	$reskining_box       
-
                 $info_box       
 
                 $real_time_sms