Савинцев Егор 🚶 (savintsev_egor) wrote in changelog,
Савинцев Егор 🚶
savintsev_egor
changelog

[ljcom] r11551: LJSUP-11099: LJ Shop. Change LJ Tokens m...

Committer: esavintcev
LJSUP-11099: LJ Shop. Change LJ Tokens mechanics
U   trunk/htdocs/stc/shop/shop.css
U   trunk/templates/Shop/Wallet.tmpl
Modified: trunk/htdocs/stc/shop/shop.css
===================================================================
--- trunk/htdocs/stc/shop/shop.css	2012-03-02 06:58:58 UTC (rev 11550)
+++ trunk/htdocs/stc/shop/shop.css	2012-03-02 09:19:39 UTC (rev 11551)
@@ -806,6 +806,12 @@
 			text-align:center;
 			font-size:10px;
 			}
+		.s-lanzelot .m-buy-types-item A:visited {
+			color: #3F5F9E !important;
+			}
+		.s-horizon .m-buy-types-item A:visited {
+			color: #0000CC !important;
+			}
 		.m-buy-types .current A:link,
 		.m-buy-types .current A:visited,
 		.m-buy-types .current A:hover,
@@ -851,6 +857,13 @@
 		padding:0;
 		list-style:none;
 		}
+		.b-buy-goods-inner {
+			margin: 0;
+			padding: 10px;
+			}
+			.b-buy-goods-inner P {
+				margin: 0 0 10px;
+				}
 		.b-buy-goods FIELDSET {
 			margin:0;
 			padding:0;
@@ -1260,9 +1273,6 @@
 			text-align: center;
 			font: bold 15px/1 Arial,sans-serif;
 			}
-.b-wallet-send {
-	padding: 1px 10px;
-	}
 
 /* Userpics
 ------------------------------------------------------------------------*/
@@ -1790,11 +1800,11 @@
 	}
 .b-wallet-tokens-free-amount {
 	display: inline-block;
-	min-width: 4em;
+	min-width: 2.5em;
 	padding: 0 40px 0 0;
 	background: url(/img/shop/tokens-icon.png) no-repeat 100% 50%;
 	vertical-align: middle;
-	text-align: center;
+	text-align: right;
 	font-size: x-large;
 	}
 .b-ribbon {

Modified: trunk/templates/Shop/Wallet.tmpl
===================================================================
--- trunk/templates/Shop/Wallet.tmpl	2012-03-02 06:58:58 UTC (rev 11550)
+++ trunk/templates/Shop/Wallet.tmpl	2012-03-02 09:19:39 UTC (rev 11551)
@@ -34,7 +34,7 @@
 			</a>
 		</li>
 		<TMPL_IF free_tokens_enabled>
-			<li class="m-buy-types-item
+			<li class="m-buy-types-item last
 						<TMPL_IF tab_tokens_free> current</TMPL_IF>
 						">
 				<a href="<TMPL_VAR self_uri>?show=free">
@@ -89,7 +89,7 @@
 				<fieldset>
 					<TMPL_VAR form_auth>
 					<input type="hidden" name="act" value="send">
-					<div class="b-wallet-send">
+					<div class="b-buy-goods-inner">
 						<p>
 							<TMPL_VAR amt_input>
 							<label for="send_to"><TMPL_VAR expr="ml('wallet.bml.landing.label.send_tokens.to')"></label>
@@ -109,32 +109,36 @@
 			</form>
 		</li>
 
-		<li class="b-buy-goods-item
-					<TMPL_IF tab_tokens_free> current</TMPL_IF>
-					" data-href="<TMPL_VAR ftp_url>">
-			<div class="b-wallet-send">
-    			<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">
-    					<img src="${Logo}" alt="${Name}" width="70" />
-    				</div>
-    				<div class="b-wallet-tokens-free-content">
-    	 				{{if Step}}<p class="b-ribbon b-ribbon-paid"><span>Paid</span></p>{{else}}<p class="b-ribbon"><span>Free</span></p>{{/if}}
-    					<h2>${Name}</h2>
-    					<p>${Description}</p>
-    					<p>
-    						<span class="b-btn">Получить</span>
-    	 					<span class="b-wallet-tokens-free-amount">${VCPayout}</span>
-    					</p>
-    				</div>
-    			</form>
-    			</script>
-			</div>
-		</li>
+		<TMPL_IF free_tokens_enabled>
+			<li class="b-buy-goods-item
+						<TMPL_IF tab_tokens_free> current</TMPL_IF>
+						" data-href="<TMPL_VAR ftp_url>">
+				<div class="b-buy-goods-inner">
+					<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>
+					<div class="b-wallet-tokens-free">
+						<script type="text/x-jquery-tmpl" id="ljshop_freetopay">
+						<form action="${URL}" method="post">
+							<div class="b-wallet-tokens-free-icon">
+								<img src="${Logo}" alt="${Name}" width="70" />
+							</div>
+							<div class="b-wallet-tokens-free-content">
+								{{if Step}}<p class="b-ribbon b-ribbon-paid"><span>Paid</span></p>{{else}}<p class="b-ribbon"><span>Free</span></p>{{/if}}
+								<h2>${Name}</h2>
+								<p>${Description}</p>
+								<p>
+									<span class="b-btn">Получить</span>
+									<span class="b-wallet-tokens-free-amount">${VCPayout}</span>
+								</p>
+							</div>
+						</form>
+						</script>
+					</div>
+				</div>
+			</li>
+		</TMPL_IF>
 	</ul>
 			<script>
 				setTimeout(function() {

Tags: css, esavintcev, ljcom, savintsev_egor, tmpl
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