[ljcom] r11399: LJSUP-11115: There are strictly differen...

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

Modified: trunk/bin/upgrading/en_LJ.dat
===================================================================
--- trunk/bin/upgrading/en_LJ.dat	2012-02-02 14:24:29 UTC (rev 11398)
+++ trunk/bin/upgrading/en_LJ.dat	2012-02-02 14:39:12 UTC (rev 11399)
@@ -12160,6 +12160,10 @@
 wallet.bml.landing.heading.history.none|staleness=1
 wallet.bml.landing.heading.history.none=No payments found.
 
+wallet.bml.landing.free.tokens.title=Free Tokens Title
+
+wallet.bml.landing.free.tokens.text=Free Tokens text
+
 wallet.bml.landing.label.buy_tokens|staleness=1
 wallet.bml.landing.label.buy_tokens=Buy tokens:
 

Modified: trunk/htdocs/stc/shop/shop.css
===================================================================
--- trunk/htdocs/stc/shop/shop.css	2012-02-02 14:24:29 UTC (rev 11398)
+++ trunk/htdocs/stc/shop/shop.css	2012-02-02 14:39:12 UTC (rev 11399)
@@ -1688,6 +1688,18 @@
 
 /* Free tokens
 ------------------------------------------------------------------------*/
+.b-wallet-tokens-free-about {
+	padding: 0;
+	margin: 0 0 20px;
+	}
+	.b-wallet-tokens-free-about H4 {
+		padding: 0;
+		margin: 0 0 5px 0;
+		}
+	.b-wallet-tokens-free-about P {
+		margin: 0;
+		}
+
 .b-wallet-tokens-free-content {
 	padding: 0 0 0 100px;
 	margin: 0;
@@ -1720,7 +1732,7 @@
 	position: relative;
 	overflow: hidden;
 	margin: 0 0 10px;
-	padding: 20px 60px 20px 17px;
+	padding: 20px 60px 10px 17px;
 	border: 1px solid #E5E5E5;
 	background-color: #F6F6F6;
 	-moz-border-radius: 6px;

Modified: trunk/templates/Shop/Wallet.tmpl
===================================================================
--- trunk/templates/Shop/Wallet.tmpl	2012-02-02 14:24:29 UTC (rev 11398)
+++ trunk/templates/Shop/Wallet.tmpl	2012-02-02 14:39:12 UTC (rev 11399)
@@ -79,6 +79,10 @@
 	</li>
 	<li class="b-wallet-tokens-item b-wallet-tokens-free<TMPL_IF name='tab_tokens_free'> current</TMPL_IF>"
 					data-href="<TMPL_VAR ftp_url>">
+		<div class="b-wallet-tokens-free-about">
+			<h4><TMPL_VAR expr="ml('wallet.bml.landing.free.tokens.title')"></h4>
+			<p><TMPL_VAR expr="ml('wallet.bml.landing.free.tokens.text')"></p>
+		</div>
 		<script type="text/x-jquery-tmpl" id="ljshop_freetopay">
 		<form action="${URL}" method="post">
 			<div class="b-wallet-tokens-free-icon">