[ljcom] r11049: LJSUP-9933: Remove header for non cyr us...
Committer: gariev
LJSUP-9933: Remove header for non cyr usersU trunk/cgi-bin/LJ/Hooks/Homepage.pm
Modified: trunk/cgi-bin/LJ/Hooks/Homepage.pm
===================================================================
--- trunk/cgi-bin/LJ/Hooks/Homepage.pm 2011-09-28 09:56:50 UTC (rev 11048)
+++ trunk/cgi-bin/LJ/Hooks/Homepage.pm 2011-09-28 10:03:32 UTC (rev 11049)
@@ -119,41 +119,27 @@
## LJSUP-9541: Desert header
## enable it for sup users right now
## Non sup - start at '01.09.2011 00:00 GMT'
- if ($is_sup){
- LJ::need_res("stc/reskining/2011/desert/header.css");
- return;
- } elsif ($time >= 1314835200){
- LJ::need_res("stc/reskining/2011/desert/header.css");
- return;
+ ## End date - Oct 1, 2011 MSK
+ if ($time < 1317412800) {
+ if ($is_sup){
+ LJ::need_res("stc/reskining/2011/desert/header.css");
+ return;
+ } elsif ($time >= 1314835200){
+ LJ::need_res("stc/reskining/2011/desert/header.css");
+ return;
+ }
}
-
- if (!$is_sup) {
- ## LJSUP-9245: August 2011 header for non cyr users
- LJ::need_res("stc/reskining/2011/august/noncyr/header.css");
- my $text = LJ::Lang::ml('reskining.august2011.noncyr');
- LJ::CleanHTML::clean(\$text, { allow => [ 'a' ] }); ## to expand <lj-user> tags and to add <a> tags
- return qq[<dl class="b-reskining-about"><dt></dt><dd>$text</dd></dl>];
- } else {
- ## LJSUP-9228: Kiss day header
- ## Only for cyr users
- ## Start 06.07.2011 00:00 Moscow time
- ## End 09.07.2011 00:00 Moscow time
- if ($time > 1309896000 and $time < 1310155200){
- LJ::need_res("stc/reskining/2011/july/kiss/header.css");
- my $text = LJ::Lang::ml('reskining.july2011.kiss');
- LJ::CleanHTML::clean(\$text, { allow => [ 'a' ] }); ## to add <a> tags
- return qq[<dl class="b-reskining-about"><dt></dt><dd>$text</dd></dl>];
- }
+ ##
+ ## The commented code below is left as an example
+ ##
- ## LJSUP-9257: July 2011 header for cyr users
- LJ::need_res("stc/reskining/2011/july/cyr/header.css");
- #my $text = LJ::Lang::ml('reskining.june2011.cyr');
- #LJ::CleanHTML::clean(\$text, { allow => [ 'a' ] }); ## to add <a> tags
- #return qq[<dl class="b-reskining-about"><dt></dt><dd>$text</dd></dl>];
- return '';
- }
-
+ ## LJSUP-9245: August 2011 header for non cyr users
+ ## LJ::need_res("stc/reskining/2011/august/noncyr/header.css");
+ ## my $text = LJ::Lang::ml('reskining.august2011.noncyr');
+ ## LJ::CleanHTML::clean(\$text, { allow => [ 'a' ] }); ## to expand <lj-user> tags and to add <a> tags
+ ##return qq[<dl class="b-reskining-about"><dt></dt><dd>$text</dd></dl>];
+
return '';
});
