Valerii Vasin (valerii) wrote in changelog,
Valerii Vasin
valerii
changelog

[ljcom] r12474: LJSUP-12917: Add RESERVED and INCOMING t...

Committer: vvasin
LJSUP-12917: Add RESERVED and INCOMING tabs to user wallet page. Fix templates for correct tabs functionality.
U   trunk/templates/Shop/Wallet.tmpl
Modified: trunk/templates/Shop/Wallet.tmpl
===================================================================
--- trunk/templates/Shop/Wallet.tmpl	2012-08-15 13:36:56 UTC (rev 12473)
+++ trunk/templates/Shop/Wallet.tmpl	2012-08-15 13:49:42 UTC (rev 12474)
@@ -127,46 +127,47 @@
 				</fieldset>
 			</form>
 		</li>
+
 		<TMPL_UNLESS wallet_ext_disabled>
+        	<li class="b-buy-goods-item <TMPL_IF tab_reserved_active>current</TMPL_IF>">
         		<TMPL_IF tab_reserved_active>
-	        		<li class="current">
-		        		<form action="" method="post" id="shop_reserved_token">
-			        		<table class="b-tokens-reserved b-tokens-items">
-				        		<tr>
-					        		<th>
-						        		<tmpl_var expr="ml('wallet.bml.reserved.subject')">
-							        	<p><tmpl_var expr="ml('wallet.bml.reserved.reservation')"></p>
-	        						</th>
-		        					<th>
-			        					<tmpl_var expr="ml('wallet.bml.reserved.blocked')">
-				        				<p><tmpl_var expr="ml('wallet.bml.reserved.tokens')"></p>
-					        		</th>
-						        	<th>
-							        	<tmpl_var expr="ml('wallet.bml.reserved.balance')">
-								        <p><tmpl_var expr="ml('wallet.bml.reserved.tokens')"></p>
-							        </th>
-						        </tr>
-        						<TMPL_LOOP accounts>
-	        						<tr <TMPL_IF __odd__> class="odd" </TMPL_IF>>
-		        						<td class="b-tokens-items-subject"><input type="checkbox" /><tmpl_var desc></td>
-			        					<td class="b-tokens-items-amount"><tmpl_var blocked></td>
-				        				<td class="b-tokens-items-amount"><tmpl_var balance></td>
-					         		</tr>
-						        </TMPL_LOOP>
-								<tr class="b-tokens-items-paging">
-									<td colspan="3"><TMPL_INCLUDE 'Paging.tmpl'></td>
-								</tr>
-		        				<tr class="b-shop-tokens-total">
-			        				<td class="b-tokens-items-button"><input type="submit" value="<tmpl_var expr="ml('wallet.bml.reserved.takeoff')">" class="b-input-tokens-total" /> <strong><tmpl_var expr="ml('wallet.bml.reserved.total')"></strong></td>
-				        			<td class="b-tokens-items-amount"><tmpl_var total_blocked></td>
-					        		<td class="b-tokens-items-amount"><tmpl_var total_balance></td>
-						        </tr>
-					        </table>
-				        </form>
-			        </li>
+	        		<form action="" method="post" id="shop_reserved_token">
+		        		<table class="b-tokens-reserved b-tokens-items">
+			        		<tr>
+				        		<th>
+					        		<tmpl_var expr="ml('wallet.bml.reserved.subject')">
+						        	<p><tmpl_var expr="ml('wallet.bml.reserved.reservation')"></p>
+        						</th>
+	        					<th>
+		        					<tmpl_var expr="ml('wallet.bml.reserved.blocked')">
+			        				<p><tmpl_var expr="ml('wallet.bml.reserved.tokens')"></p>
+				        		</th>
+					        	<th>
+						        	<tmpl_var expr="ml('wallet.bml.reserved.balance')">
+							        <p><tmpl_var expr="ml('wallet.bml.reserved.tokens')"></p>
+						        </th>
+					        </tr>
+    						<TMPL_LOOP accounts>
+        						<tr <TMPL_IF __odd__> class="odd" </TMPL_IF>>
+	        						<td class="b-tokens-items-subject"><input type="checkbox" /><tmpl_var desc></td>
+		        					<td class="b-tokens-items-amount"><tmpl_var blocked></td>
+			        				<td class="b-tokens-items-amount"><tmpl_var balance></td>
+				         		</tr>
+					        </TMPL_LOOP>
+							<tr class="b-tokens-items-paging">
+								<td colspan="3"><TMPL_INCLUDE 'Paging.tmpl'></td>
+							</tr>
+	        				<tr class="b-shop-tokens-total">
+		        				<td class="b-tokens-items-button"><input type="submit" value="<tmpl_var expr="ml('wallet.bml.reserved.takeoff')">" class="b-input-tokens-total" /> <strong><tmpl_var expr="ml('wallet.bml.reserved.total')"></strong></td>
+			        			<td class="b-tokens-items-amount"><tmpl_var total_blocked></td>
+				        		<td class="b-tokens-items-amount"><tmpl_var total_balance></td>
+					        </tr>
+				        </table>
+			        </form>
 		        </TMPL_IF>
-			<TMPL_IF tab_incoming_active>
-				<li class=" current">
+			</li>
+			<li class="b-buy-goods-item <TMPL_IF tab_incoming_active>current</TMPL_IF>">
+				<TMPL_IF tab_incoming_active>
 					<form action="" method="post" id="shop_incoming_token">
 						<table class="b-tokens-incoming b-tokens-items">
 							<tr>
@@ -177,22 +178,23 @@
 									<p><tmpl_var expr="ml('wallet.bml.reserved.tokens')"></p>
 								</th>
 							</tr>
-		      				<TMPL_LOOP blockings>
+							<TMPL_LOOP blockings>
 								<tr <TMPL_IF __odd__> class="odd" </TMPL_IF>>
 									<td><tmpl_var date></td>
 									<td><tmpl_var desc></td>
 									<td class="b-tokens-items-amount"><tmpl_var qty></td>
 								</tr>
-				         	</TMPL_LOOP>
+							</TMPL_LOOP>
 							<tr class="b-tokens-items-paging">
 								<td colspan="3"><TMPL_INCLUDE 'Paging.tmpl'></td>
 							</tr>
 						</table>
 						<div class="b-buy-total"></div>
 					</form>
-				</li>
-			</TMPL_IF>
+				</TMPL_IF>
+			</li>
 		</TMPL_UNLESS>
+
 		<TMPL_IF free_tokens_enabled>
 			<li class="b-buy-goods-item
 						<TMPL_IF tab_tokens_free> current</TMPL_IF>

Tags: invis89, ljcom, tmpl, vvasin
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