Типа я (zilogic) wrote in changelog,
Типа я
zilogic
changelog

[ljcom] r10785: LJSUP-9366: Change Interstitial dialog f...

Committer: amyshkin
LJSUP-9366: Change Interstitial dialog for Singapore
U   trunk/bin/upgrading/update-db-local.pl
U   trunk/cgi-bin/LJ/Widget/HomepageEN.pm
U   trunk/cgi-bin/LJ/Widget/HomepageRU.pm
U   trunk/templates/Homepage/index_en.tmpl
U   trunk/templates/Homepage/index_ru.tmpl
Modified: trunk/bin/upgrading/update-db-local.pl
===================================================================
--- trunk/bin/upgrading/update-db-local.pl	2011-08-01 07:20:41 UTC (rev 10784)
+++ trunk/bin/upgrading/update-db-local.pl	2011-08-02 09:00:48 UTC (rev 10785)
@@ -4,7 +4,18 @@
 
 mark_clustered(@LJ::USER_TABLES_LOCAL);
 
+register_tablecreate("sg_invites", <<EOC);
+CREATE TABLE `sg_invites` (
+    `email` VARCHAR(80) NOT NULL,
+    `age`   INT(3),
+    `sex`   CHAR(1),
+    `name`  VARCHAR(50) default NULL,
+    `time`  INT(13) default 0,
+    PRIMARY KEY (`time`)
+)
+EOC
 
+
 register_tablecreate("paid_invites", <<EOC);
 CREATE TABLE `paid_invites` (
   `invite_id` int(11) NOT NULL auto_increment,

Modified: trunk/cgi-bin/LJ/Widget/HomepageEN.pm
===================================================================
--- trunk/cgi-bin/LJ/Widget/HomepageEN.pm	2011-08-01 07:20:41 UTC (rev 10784)
+++ trunk/cgi-bin/LJ/Widget/HomepageEN.pm	2011-08-02 09:00:48 UTC (rev 10785)
@@ -25,24 +25,24 @@
         siteroot      => $LJ::SITEROOT,
         sitenameshort => $LJ::SITENAMESHORT,
     );
-    
+
     ## Remote user
     my $remote = LJ::get_remote();
     if ( $remote ) {
         $result{remote} = 1;
         $result{remote_display_username} = $remote->display_username;
-        
+
         ## Get the last updated time of $remote
         my $secondsago = time() - $remote->timeupdate;
         $result{lastupdated} = LJ::TimeUtil->ago_text($secondsago);
     }
-    
+
     ## Error Bar
     if ($GET->{returnto} || $GET->{errmsg}) {
         $result{errorbar} = '';
         $result{errorbar} .= BML::ml('.loggedout.' . LJ::ehtml($GET->{errmsg})) . ' '
             if $GET->{errmsg};
-        $result{errorbar} .= BML::ml('.loggedout.loginnote') 
+        $result{errorbar} .= BML::ml('.loggedout.loginnote')
             if $GET->{returnto};
     }
 
@@ -61,7 +61,7 @@
         BML::ml('.windowtitle', {'sitename' => $LJ::SITENAME});
 
     ## Title
-    $result{title} = $remote ? 
+    $result{title} = $remote ?
                      BML::ml('.loggedin.heading2', {'user' => $remote->display_username}) :
                      '';
 
@@ -79,44 +79,44 @@
         $result{news_href} = 'href="'.$news->journal_base.'/"';
         $result{news_ljuser_display} = $news->ljuser_display;
     }
-    
+
     ## Country blocks
     $result{country} = LJ::GeoLocation->get_country_info_by_ip;
-    $result{uk_block} = 
-        (    
+    $result{uk_block} =
+        (
             ## viewer is from UK
-            ($result{country} eq 'UK' || $result{country} eq 'GB') && 
+            ($result{country} eq 'UK' || $result{country} eq 'GB') &&
             ## and viewer is either anonymous, or plus (non-paid/perm/sponsored and non-basic) account
             (!$remote || $remote->in_class('force_ads') || !$remote->get_cap('paid') && $remote->in_class('plus'))
-        ) ? 
+        ) ?
         LJ::Widget::ExtBlock->render(id=>'homepage.uk') : '';
 
     ## Info box
-    $result{info_box} = 
+    $result{info_box} =
         (
-            LJ::SUP->is_sup_ip_class && 
+            LJ::SUP->is_sup_ip_class &&
             !($remote and $remote->get_cap('paid'))
         ) ?
         LJ::Widget::ExtBlock->render(id=>'homepage.gazeta') : '';
 
     ## Widget SUP1MillionPromo
     $result{widget_sup1millionpromo} = LJ::Widget::SUP1MillionPromo->render;
-    
+
     ## Widget QotD
-    
-    $result{widget_qotd} = $remote ? 
+
+    $result{widget_qotd} = $remote ?
         LJ::Widget::QotD->render( domain => "homepage" ) :
         LJ::Widget::QotD->render( stylesheet => "stc/widgets/qotd-loggedout.css", domain => "homepage" );
 
     ## Widget GameList
-    $result{widget_gamelist} = LJ::Widget::GameList->render 
+    $result{widget_gamelist} = LJ::Widget::GameList->render
         unless $LJ::DISABLED{'userapps'};
 
     ## Widget PromoText
     $result{widget_promotext} = LJ::Widget::PromoText->render( domain => "mini" );
 
     ## Widget JournalSpotlight
-    $result{widget_journalspotlight} = $remote ? 
+    $result{widget_journalspotlight} = $remote ?
         LJ::Widget::JournalSpotlight->render( stylesheet_override => 'stc/widgets/journalspotlight-home.css' ) :
         LJ::Widget::JournalSpotlight->render( stylesheet_override => 'stc/widgets/journalspotlight.css', spotlight_comm_in_header => 0 );
 
@@ -125,16 +125,16 @@
 
     ## Widget SearchJournals
     $result{widget_searchjournals} = LJ::Widget::SearchJournals->render;
-    
+
     ## Widget News
     $result{widget_news} = LJ::Widget::News->render();
-    
+
     ## Widget MarqueeFeatures
     $result{widget_marqueefeatures} = LJ::Widget::MarqueeFeatures->render();
 
     ## Widget Photos2Homepage
     $result{widget_photos2homepage} = LJ::Widget::Photos2Homepage->render();
-    
+
     ## Widget PollOfTheDay
     $result{widget_polloftheday} = LJ::Widget::PollOfTheDay->render;
 
@@ -146,20 +146,20 @@
     $result{widget_updatesforuser} = LJ::Widget::UpdatesForUser->render;
 
     ## Widget FeaturedStyles
-    $result{widget_featuredstyles} = LJ::Widget::FeaturedStyles->render(get => $GET) 
+    $result{widget_featuredstyles} = LJ::Widget::FeaturedStyles->render(get => $GET)
         unless $LJ::DISABLED{'featured_styles'};
 
-    ## Widget SettingProdDisplay
-    $result{widget_settingproddisplay} = LJ::Widget::SettingProdDisplay->render;
+    ## Widget SettingWindow
+    $result{widget_settingwindow} = LJ::Widget::SettingWindow->render;
 
     ## Widget PublicStats
     $result{widget_publicstats} = LJ::Widget::PublicStats->render( show_latest_posts => 0, short_numbers => 1 );
-    
+
     ## Widget Trynbuy
     if(LJ::TryNBuy->can_enable($remote) || LJ::TryNBuy->active($remote)) {
         $result{widget_trynbuy} = LJ::Widget::Trynbuy->render(stage => 'simple');
     }
-    
+
     ## Strings
     $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 });

Modified: trunk/cgi-bin/LJ/Widget/HomepageRU.pm
===================================================================
--- trunk/cgi-bin/LJ/Widget/HomepageRU.pm	2011-08-01 07:20:41 UTC (rev 10784)
+++ trunk/cgi-bin/LJ/Widget/HomepageRU.pm	2011-08-02 09:00:48 UTC (rev 10785)
@@ -14,7 +14,7 @@
 
     my $GET = $opts{GET};
 
-    LJ::need_res('stc/lj_base.css', 'stc/home.css', 'stc/lanzelot/css/index.bml.sup.css'); 
+    LJ::need_res('stc/lj_base.css', 'stc/home.css', 'stc/lanzelot/css/index.bml.sup.css');
     LJ::need_res('stc/widgets/index-stats.css') unless LJ::is_enabled('personal_stats_ratings');
     LJ::need_res('stc/statistics/statistics.css') if LJ::is_enabled('personal_stats_ratings');
     LJ::need_res('js/stats.js') if LJ::is_enabled('personal_stats_ratings');
@@ -27,18 +27,18 @@
         sitenameshort => $LJ::SITENAMESHORT,
         rndkey        => int(rand(1e9)),
     );
-    
+
     ## Remote user
     my $remote = LJ::get_remote();
     if ( $remote ) {
         $result{remote} = 1;
         $result{remote_display_username} = $remote->display_username;
-        
+
         ## Get the last updated time of $remote
         my $secondsago = time() - $remote->timeupdate;
         $result{lastupdated} = LJ::TimeUtil->ago_text($secondsago);
     }
-    
+
     ## Meta tags
     $result{meta} = '
         <meta name="description" content="' . LJ::ehtml(BML::ml('.meta.desc')) . '" />
@@ -54,7 +54,7 @@
         BML::ml('.windowtitle', {'sitename' => $LJ::SITENAME});
 
     ## Title
-    $result{title} = $remote ? 
+    $result{title} = $remote ?
         BML::ml('.loggedin.heading2', {'user' => $remote->display_username}) :
         BML::ml('.loggedout.heading', { 'sitename' => "$LJ::SITENAMESHORT" });
 
@@ -68,8 +68,8 @@
                     if !$remote || !$remote->in_class('paid') || $remote->in_class('force_ads');
 
     ## Info box
-    $result{info_box} = (!LJ::SUP->is_sup_ip_class || ($remote and $remote->get_cap('paid'))) ? 
-                            '' : 
+    $result{info_box} = (!LJ::SUP->is_sup_ip_class || ($remote and $remote->get_cap('paid'))) ?
+                            '' :
                             LJ::Widget::ExtBlock->render(id=>'homepage.gazeta');
 
     ## Realtime SMS
@@ -79,44 +79,44 @@
     if (LJ::is_enabled('personal_stats_ratings')) {
         $result{personalstats} = LJ::PersonalStats->get_result_html($remote, { widget => 1, unique_journals => 1 }, '/ratings/posts/');
     }
-    
+
     ## Widget SUP1MillionPromo
     $result{widget_sup1millionpromo} = LJ::Widget::SUP1MillionPromo->render;
-    
+
     ## Widget PromoText
     my $promos = LJ::SUP->sup_promos('App-Home', 4);
     if ($promos) {
         $result{widget_promotext} = "<div class='homepage-promo pkg'><div class='appwidget appwidget-promotext'>$promos</div></div>";
-    } 
+    }
     else {
         $result{widget_promotext} = LJ::Widget::PromoText->render( domain => "main", small_version => 1 );
     }
 
     ## Widget recent posts
     $result{widget_recent_posts} = LJ::Widget::RecentPosts->render;
-    
+
     ## Widget QotD
     $result{widget_qotd} = LJ::Widget::QotD->render(domain => "homepage");
-    
+
     ## Widget GameList
-    $result{widget_gamelist} = LJ::Widget::GameList->render 
+    $result{widget_gamelist} = LJ::Widget::GameList->render
         if LJ::is_enabled('userapps');
-    
+
     ## Widget RecentComments
     $result{widget_recentcomments} = LJ::Widget::RecentComments->render;
-    
+
     ## Widget JournalSpotlight
     $result{widget_journalspotlight} = LJ::Widget::JournalSpotlight->render( stylesheet_override => 'stc/widgets/journalspotlight-home.css' );
-    
+
     ## Widget FriendBirthdays
     $result{widget_friendbirthdays} = LJ::Widget::FriendBirthdays->render(get => $GET);
-    
+
     ## Widget VGifts
     $result{widget_vgifts} = LJ::Widget::VGifts->render(get => $GET)
         if $remote || LJ::is_enabled('vgift_on_homepage_unlogged_sup');
 
     ## Widget FeaturedStyles
-    $result{widget_featuredstyles} = LJ::Widget::FeaturedStyles->render(get => $GET) 
+    $result{widget_featuredstyles} = LJ::Widget::FeaturedStyles->render(get => $GET)
         if LJ::is_enabled('featured_styles');
 
     ## Widget FriendUpdates
@@ -124,10 +124,10 @@
 
     ## Widget RatingTop10
     $result{widget_ratingtop10} = LJ::Widget::RatingTop10->render;
-    
-    ## Widget SettingProdDisplay
-    $result{widget_settingproddisplay} = LJ::Widget::SettingProdDisplay->render;
-    
+
+    ## Widget SettingWindow
+    $result{widget_settingwindow} = LJ::Widget::SettingWindow->render;
+
     ## Widget Trynbuy
     if(LJ::TryNBuy->can_enable($remote) || LJ::TryNBuy->active($remote)) {
         $result{widget_trynbuy} = LJ::Widget::Trynbuy->render(stage => 'simple');

Modified: trunk/templates/Homepage/index_en.tmpl
===================================================================
--- trunk/templates/Homepage/index_en.tmpl	2011-08-01 07:20:41 UTC (rev 10784)
+++ trunk/templates/Homepage/index_en.tmpl	2011-08-02 09:00:48 UTC (rev 10785)
@@ -1,7 +1,7 @@
 <tmpl_if remote>
-    
+
     <!-- ### Logged-in Homepage ## -->
-    
+
     <tmpl_var adt>
     <div class="homepage-loggedin pkg" style="padding-right: 320px;">
         <div style='float: left; position: relative; width: 100%'>
@@ -47,7 +47,7 @@
                 </div>
             </div>
         </div>
-        
+
         <div style="float: left; position: relative; width: 300px; padding-left: 20px; margin-right: -320px;">
             <tmpl_var ad>
             <tmpl_var uk_block>
@@ -59,20 +59,18 @@
         </div>
     </div><!-- end .homepage-loggedin  -->
 
-    <tmpl_var widget_settingproddisplay>
-
 <tmpl_else>
 
     <!-- ### Logged-out Homepage ## -->
     <div class="homepage-loggedout">
         <tmpl_if errorbar>
             <div style="margin-bottom: 10px;"><?errorbar <strong><tmpl_var errorbar></strong> errorbar?></div>
-        </tmpl_if>        
+        </tmpl_if>
 
         <tmpl_if adt>
             <tmpl_var adt>
         </tmpl_if>
-        
+
         <!-- # The new layout for Logged-out Homepage -->
         <div class="l-body">
             <div class="l-content">
@@ -95,7 +93,7 @@
 
                 <!-- #Old spotlight -->
                 <tmpl_var widget_journalspotlight>
-                
+
                 <!-- #Search Journals widget -->
                 <tmpl_var widget_searchjournals>
 
@@ -109,7 +107,7 @@
                     </div>
                 </div>
             </div><!-- end .l-content -->
-        
+
             <div class="l-sidebar">
                 <tmpl_if ad>
                     <!-- #AD 300*250 -->
@@ -117,7 +115,7 @@
                         <tmpl_var ad>
                     </div>
                 </tmpl_if>
-            
+
 	            <tmpl_if uk_block>
                     <!-- start UK -->
                     <div class="homepage-ad" style="clear: right;">
@@ -125,11 +123,11 @@
                     </div>
                     <!-- end UK -->
                 </tmpl_if>
-	    
+	
 	            <tmpl_if vgift_on_homepage_unlogged_nonsup>
                     <tmpl_var widget_vgifts>
                 </tmpl_if>
-  
+
                 <!-- #The block About -->
                 <div class="homepage-stats">
                     <div class="b-box-container">
@@ -144,14 +142,16 @@
                 </div><!-- end .homepage-stats -->
 
                 <tmpl_var widget_trynbuy>
-        
+
                 <tmpl_var widget_photos2homepage>
                 <tmpl_var widget_polloftheday>
 
             </div><!-- end .l-sidebar -->
-        
+
         </div><!-- end .l-body -->
-        
+
     </div><!-- end .homepage-loggedout -->
 
 </tmpl_if>
+
+<tmpl_var widget_settingwindow>

Modified: trunk/templates/Homepage/index_ru.tmpl
===================================================================
--- trunk/templates/Homepage/index_ru.tmpl	2011-08-01 07:20:41 UTC (rev 10784)
+++ trunk/templates/Homepage/index_ru.tmpl	2011-08-02 09:00:48 UTC (rev 10785)
@@ -5,10 +5,10 @@
     <!-- ### Logged-in Homepage ### -->
 
     <tmpl_var adt>
-    
+
     <div class="homepage-loggedin pkg" style="padding-right: 320px;padding-left:0px;">
         <div style="float: left; position: relative; width: 100%;">
-        
+
             <tmpl_var widget_sup1millionpromo>
 
             <div class="homepage-account appwidget pkg b-qotd">
@@ -23,7 +23,7 @@
                     <tmpl_var widget_qotd>
                 </div><!-- end .homepage-account-right -->
             </div><!-- end .homepage-account -->
-            
+
             <tmpl_var widget_recentcomments>
 
             <tmpl_var widget_journalspotlight>
@@ -34,9 +34,9 @@
                 <h2><span><tmpl_var expr="ml('.loggedout.facts', 'sitename', sitenameshort)"></span></h2>
                 <tmpl_var widget_promotext>
             </div>
-        
+
         </div>
-        
+
         <div style="float: left; position: relative; width: 300px; padding-left: 20px; margin-right: -320px;">
 
             <tmpl_var ad>
@@ -53,35 +53,33 @@
 
             <tmpl_var widget_friendupdates>
 
-            <tmpl_var real_time_sms>       
+            <tmpl_var real_time_sms>
 
             <tmpl_var widget_ratingtop10>
 
         </div>
     </div>
-    
-    <tmpl_var widget_settingproddisplay>
-    
+
     <!-- end .homepage-loggedin  -->
 
 <tmpl_else>
 
     <!-- ### Logged-out Homepage ## -->
-        
+
     <tmpl_var adt>
-    
+
     <div class="lz-body">
         <div id="lz-wrapper">
             <div id="lz-content">
-                
+
                 <div class="join">
                     <div class="new_acc">
                         <iframe id="areyou_<tmpl_var rndkey>" frameborder="0" scrolling="no" allowtransparency="true" src="<tmpl_var string_join_lj_url>" style="width:230px;height:120px;"></iframe>
                     </div>
-                                        
+
                     <h1>Живой Журнал &mdash;</h1> это возможность выразить себя, поделиться своей жизнью и связаться с друзьями в сети.</h1>
                 </div>
-                
+
                 <p>Вы можете использовать LiveJournal разными способами: как личный дневник, блог, дискуссионный форум, социальную сеть и так далее.</p>
 
                 <div class="actions">
@@ -103,9 +101,9 @@
                     </div>
 
                     <div class="homepage-account appwidget pkg b-qotd">
-                    
+
                     <h2><span><tmpl_var expr="ml('.loggedin.qotd.title')"></span></h2>
-		    
+		
 		    <ul class="i-qotd-menu">
         	        <li><a href="<tmpl_var siteroot>/misc/qotdarchive.bml"><tmpl_var expr="ml('widget.qotd.archivelink')"></a></li>
         	        <li><a href="<tmpl_var siteroot>/misc/suggest_qotd.bml"><tmpl_var expr="ml('widget.qotd.suggestions')"></a></li>
@@ -113,17 +111,17 @@
         	        <li><a href="http://community.livejournal.com/wb_unplugged_ru/"><tmpl_var expr="ml('widget.qotd.unplugged')"></a></li>
 		    </ul>
 
-                    <tmpl_var widget_qotd>		    
+                    <tmpl_var widget_qotd>
                 </div>
 
                 <tmpl_var personalstats>
-                
+
             </div> <!-- / content -->
         </div> <!-- / wrapper -->
-                
+
         <div id="lz-side">
 
-            <div class="adv-block"><div><tmpl_var ad></div></div>             
+            <div class="adv-block"><div><tmpl_var ad></div></div>
 
             <tmpl_var info_box>
 
@@ -136,3 +134,5 @@
         </div> <!-- / side -->
     </div><!--body-->
 </tmpl_if>
+
+<tmpl_var widget_settingwindow>

Tags: ljcom, pl, pm, tmpl, zilogic
Subscribe
  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 0 comments