[ljcom] r9680: LJSUP-7297: November header 2010
Committer: gariev
LJSUP-7297: November header 2010U trunk/cgi-bin/LJ/Hooks/Homepage.pm
Modified: trunk/cgi-bin/LJ/Hooks/Homepage.pm
===================================================================
--- trunk/cgi-bin/LJ/Hooks/Homepage.pm 2010-11-09 04:25:20 UTC (rev 9679)
+++ trunk/cgi-bin/LJ/Hooks/Homepage.pm 2010-11-09 04:46:17 UTC (rev 9680)
@@ -44,57 +44,15 @@
return 1;
}
-## halloween 2010, non-cyr, 2010-10-25 04:00:00Z - 2010-11-01 12:00:00Z
-sub _is_halloween_reskining_active {
- my $params = shift;
- return if LJ::SUP->is_remote_sup;
- my $time = time;
- return 1287979200 < $time && $time < 1288612800;
-}
-
-## autumn, non-cyr, no condition on time
-sub _is_october2010_reskining_active {
- my $params = shift;
- return ! LJ::SUP->is_remote_sup;
-}
-
-# halloween, cyr, 2010-10-25 20:00:00Z - 2010-11-01 04:00:00Z
-sub _is_cyr_halloween_reskining_active {
- my $params = shift;
- return unless LJ::SUP->is_remote_sup;
- my $time = time;
- return 1288036800 < $time && $time < 1288584000;
-}
-
-## autumn, cyr, no condition on time
-sub _is_cyr_autumn_reskining_active {
- my $params = shift;
- return LJ::SUP->is_remote_sup;
-}
-
LJ::register_hook("service_page_reskining", sub {
my $params = shift || {};
-
- if (_is_halloween_reskining_active($params)) {
- # Halloween
- LJ::need_res("stc/reskining/halloween2010/noncyr/halloween2010.css");
- my $text = LJ::Lang::ml('reskining.halloween2010');
+
+ if (1) {
+ ## November 2010: for all users, no start/end dates
+ LJ::need_res("stc/reskining/november2010/november2010.css");
+ my $text = LJ::Lang::ml('reskining.november2010');
LJ::CleanHTML::clean(\$text); ## to expand <lj-user> tags
return qq[<dl class="b-reskining-about"><dt></dt><dd>$text</dd></dl>];
- } elsif (_is_october2010_reskining_active($params)) {
- ## Non-cyrillic october heading
- LJ::need_res("stc/reskining/october2010/october2010.css");
- my $text = LJ::Lang::ml('reskining.october2010');
- LJ::CleanHTML::clean(\$text); ## to expand <lj-user> tags
- return qq[<dl class="b-reskining-about"><dt></dt><dd>$text</dd></dl>];
- } elsif (_is_cyr_halloween_reskining_active($params)) {
- # Halloween for cyr
- LJ::need_res("stc/reskining/halloween2010/cyr/halloween2010.css");
- return '';
- } elsif (_is_cyr_autumn_reskining_active($params)) {
- ## October reskining for Cyrillic
- LJ::need_res("stc/reskining/october2010/cyr/october2010.css");
- return '';
}
return '';
});
