[ljcom] r11039: LJSUP-9908 (LJ SHOP 2011 update)

U   trunk/bin/upgrading/en_LJ.dat
U   trunk/bin/upgrading/proplists-local.dat
U   trunk/cgi-bin/LJ/Router.pm
U   trunk/cgi-bin/LJ/Widget/Shop.pm
U   trunk/templates/Shop/index.tmpl

Modified: trunk/bin/upgrading/en_LJ.dat
===================================================================
--- trunk/bin/upgrading/en_LJ.dat	2011-09-27 09:44:37 UTC (rev 11038)
+++ trunk/bin/upgrading/en_LJ.dat	2011-09-27 09:48:48 UTC (rev 11039)
@@ -6375,6 +6375,30 @@
 
 shop.widget.wallet_status.link.history=History
 
+shop3.ui.frame.menu.index=Showcase
+
+shop3.ui.frame.menu.vgifts=Gifts
+
+shop3.ui.frame.menu.userheads=Userheads
+
+shop3.ui.frame.menu.addons=Extensions
+
+shop3.ui.frame.menu.account=Account
+
+shop3.ui.frame.menu.traffic=Traffic
+
+shop3.ui.frame.title=LiveJournal Shop
+
+shop3.ui.frame.tokens.available=[[amount]] [[?amount|LJ Token|LJ Tokens|LJ Tokens]]
+
+shop3.ui.frame.tokens.available.title=Available balance:
+
+shop3.ui.frame.tokens.link_tokens=Manage LJ Tokens
+
+shop3.ui.frame.tokens.link_history=History
+
+shop3.ui.index.title=LiveJournal Shop
+
 sms.verification_code.send_message=The verification code for your phone number: [[code]]
 
 splus.link=Plus account

Modified: trunk/bin/upgrading/proplists-local.dat
===================================================================
--- trunk/bin/upgrading/proplists-local.dat	2011-09-27 09:44:37 UTC (rev 11038)
+++ trunk/bin/upgrading/proplists-local.dat	2011-09-27 09:48:48 UTC (rev 11039)
@@ -813,3 +813,12 @@
   prettyname: User banned from selfpromo
   des: If set to true, the user's journal and all user's community entries are banned from SelfPromo
   sortorder: 105
+
+userproplist.shop3_beta:
+  datatype: bool
+  prettyname: Whether to show shop3 beta to this user
+  des: (note that it only works if shop3 is disabled but shop3_beta is enabled)
+  indexed: 0
+  multihomed: 0
+  cldversion: 8
+

Modified: trunk/cgi-bin/LJ/Router.pm
===================================================================
--- trunk/cgi-bin/LJ/Router.pm	2011-09-27 09:44:37 UTC (rev 11038)
+++ trunk/cgi-bin/LJ/Router.pm	2011-09-27 09:48:48 UTC (rev 11039)
@@ -3,9 +3,11 @@
 use warnings;
 
 use LJ::Mob::Router;
+use LJ::Shop::Router;
 
 my @routers = qw(
     LJ::Mob::Router
+    LJ::Shop::Router
 );
 
 sub match_controller {

Modified: trunk/cgi-bin/LJ/Widget/Shop.pm
===================================================================
--- trunk/cgi-bin/LJ/Widget/Shop.pm	2011-09-27 09:44:37 UTC (rev 11038)
+++ trunk/cgi-bin/LJ/Widget/Shop.pm	2011-09-27 09:48:48 UTC (rev 11039)
@@ -165,6 +165,7 @@
         'upgrade_account' => LJ::Widget::UpgradeAccount->render,
         'payment_methods' => LJ::Widget::Shop::PaymentMethods->render,
         'wallet_status' => LJ::Widget::Shop::WalletStatus->render,
+        'shop3_beta_switch' => LJ::Widget::Shop3Beta->render,
     );
 
     $self->need_res;

Modified: trunk/templates/Shop/index.tmpl
===================================================================
--- trunk/templates/Shop/index.tmpl	2011-09-27 09:44:37 UTC (rev 11038)
+++ trunk/templates/Shop/index.tmpl	2011-09-27 09:48:48 UTC (rev 11039)
@@ -1,3 +1,5 @@
+<TMPL_VAR shop3_beta_switch>
+
 <div class="l-body">
     <div class="b-shop">
         <div class="l-aside">