[ljcom] r10082: LJSUP-7445: TrynBuy

U   trunk/bin/upgrading/en_LJ.dat
U   trunk/htdocs/stc/shop/shop.css
U   trunk/templates/Shop/MainPage.tmpl

Modified: trunk/bin/upgrading/en_LJ.dat
===================================================================
--- trunk/bin/upgrading/en_LJ.dat	2011-02-18 10:28:39 UTC (rev 10081)
+++ trunk/bin/upgrading/en_LJ.dat	2011-02-18 10:47:02 UTC (rev 10082)
@@ -5597,6 +5597,10 @@
 
 shop.view.promo.paidaccount.text=Get access to all great features of a pad account
 
+shop.view.promo.trynbuy.title=Try&Buy
+
+shop.view.promo.trynbuy.text=Sign up for FREE two-week trial of a Paid account
+
 shop.view.promo.userpics.title=Extra Userpics
 
 shop.view.promo.userpics.text=Get up to 210 additional userpics.
@@ -6303,8 +6307,6 @@
 
 userapps.app_install.desc=This application «[[name]]» must have following permissions: [[list]] 
 
-userapps.app_additional_permissions=You can set up additional game permissions below: 
-
 userapps.app_request_permissions.desc=The application «[[name]]» requests following additional permissions: [[list]]
 
 userapps.app_request_permissions.reason=The following reason is specified: [[reason]]

Modified: trunk/htdocs/stc/shop/shop.css
===================================================================
--- trunk/htdocs/stc/shop/shop.css	2011-02-18 10:28:39 UTC (rev 10081)
+++ trunk/htdocs/stc/shop/shop.css	2011-02-18 10:47:02 UTC (rev 10082)
@@ -361,6 +361,13 @@
 		height: 123px;
 		background: url(/img/shop/promo/promo-givemore-gm.png?v=1) no-repeat 0 0;
 		}
+	.b-promo-givemore-tnb .b-promo-givemore-bg {
+		top: 16px;
+		left: 36px;
+		width: 92px;
+		height: 107px;
+		background: url(/img/shop/promo/promo-givemore-tnb.png?v=1) no-repeat 0 0;
+		}
 	.b-promo-givemore .title {
 		display: block;
 		margin: 0;
@@ -373,6 +380,9 @@
 	.b-promo-givemore-pa .title {
 		font-size: 24px;
 		}
+	.b-promo-givemore-tnb .title {
+		font-size: 24px;
+		}
 	.b-promo-givemore-gm .title {
 		padding: 30px 28px 8px 160px;
 		}
@@ -387,6 +397,11 @@
 		padding: 0 28px 10px 160px;
 		font-size: 15px;
 		}
+	.b-promo-givemore .b-promo-givemore-tnb .desc {
+		display: block;
+		padding: 0 28px 40px 160px;
+		font-size: 15px;
+		}
 		.b-promo-givemore .desc P {
 			margin: 0;
 			}

Modified: trunk/templates/Shop/MainPage.tmpl
===================================================================
--- trunk/templates/Shop/MainPage.tmpl	2011-02-18 10:28:39 UTC (rev 10081)
+++ trunk/templates/Shop/MainPage.tmpl	2011-02-18 10:47:02 UTC (rev 10082)
@@ -1,8 +1,14 @@
-<TMPL_IF show_givemore>
+<TMPL_IF show_trynbuy>
 <div class="b-promo-givemore">
 	<a href="/shop/paidaccount.bml" class="b-promo-givemore-pa"><i class="b-promo-givemore-bg"></i><strong class="title"><TMPL_VAR expr="ml('shop.view.promo.paidaccount.title')"></strong><br class="i-promo-givemore-br" /><span class="desc"><TMPL_VAR expr="ml('shop.view.promo.paidaccount.text')"></span></a><br class="i-promo-givemore-br" />
+	<a href="/free-trial" class="b-promo-givemore-tnb"><i class="b-promo-givemore-bg"></i><strong class="title"><TMPL_VAR expr="ml('shop.view.promo.trynbuy.title')"></strong><br class="i-promo-givemore-br" /><span class="desc"><TMPL_VAR expr="ml('shop.view.promo.trynbuy.text')"></span><br class="i-promo-givemore-br" /></a>
+</div>
+<TMPL_IF 0>
+<div class="b-promo-givemore">
+	<a href="/shop/paidaccount.bml" class="b-promo-givemore-pa"><i class="b-promo-givemore-bg"></i><strong class="title"><TMPL_VAR expr="ml('shop.view.promo.paidaccount.title')"></strong><br class="i-promo-givemore-br" /><span class="desc"><TMPL_VAR expr="ml('shop.view.promo.paidaccount.text')"></span></a><br class="i-promo-givemore-br" />
 	<a href="/shop/paidaccount.bml?form=3" class="b-promo-givemore-gm"><i class="b-promo-givemore-bg"></i><strong class="title"><TMPL_VAR expr="ml('shop.view.promo.givemore.title')"></strong><br class="i-promo-givemore-br" /><span class="desc"><TMPL_VAR expr="ml('shop.view.promo.givemore.text')"></span><br class="i-promo-givemore-br" /><small class="sign"><TMPL_VAR expr="ml('shop.view.promo.givemore.sign')"></small></a>
 </div>
+</TMPL_IF>
 <TMPL_ELSE>
 <div class="b-promo-paidaccount">
 	<a href="/shop/paidaccount.bml"><span class="title"><TMPL_VAR expr="ml('shop.view.promo.paidaccount.title')"></span><span><TMPL_VAR expr="ml('shop.view.promo.paidaccount.text')"></span></a>