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

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-08-22 11:57:16 UTC (rev 12521)
+++ trunk/htdocs/stc/shop/shop.css	2012-08-22 13:13:14 UTC (rev 12522)
@@ -1098,17 +1098,19 @@
 		padding: 10px 0 10px 10px;
 		vertical-align: top;
 		}
-	.b-tokens-items TH {
-		
+	.b-tokens-items THEAD TH {
+		padding: 12px 5px 9px 10px;
 		}
 	.b-tokens-items TD,
 	.b-tokens-items TH {
 		padding: 7px 5px 9px 10px;
 		text-align: left;
 		vertical-align: top;
+		font-size: 12px;
 		}
 	.b-tokens-items .b-tokens-items-amount {
 		text-align: right;
+		width: 80px;
 		}
 	.b-tokens-items .b-tokens-items-button {
 		vertical-align: middle !important;
@@ -1118,6 +1120,15 @@
 		text-align: right;
 		vertical-align: middle !important;
 		}
+	.b-tokens-items-subject .b-tokens-check {
+		float: left;
+		margin: 0 10px 0 0;
+		}
+	.b-tokens-items-subject LABEL {
+		display: block;
+		overflow: hidden;
+		line-height: 16px;
+		}
 .b-tokens-items P {
 	margin: 0;
 	font-size: 10px;

Modified: trunk/templates/Shop/Wallet.tmpl
===================================================================
--- trunk/templates/Shop/Wallet.tmpl	2012-08-22 11:57:16 UTC (rev 12521)
+++ trunk/templates/Shop/Wallet.tmpl	2012-08-22 13:13:14 UTC (rev 12522)
@@ -154,7 +154,7 @@
 							<TMPL_IF tab_reserved_active>
 	    						<TMPL_LOOP accounts>
 	        						<tr class="<TMPL_IF disabled> b-disabled-row</TMPL_IF> <TMPL_IF __odd__> odd </TMPL_IF>">
-		        						<td class="b-tokens-items-subject"><input type="checkbox" name="account_id" value="<TMPL_VAR id>" <TMPL_IF disabled>disabled="disabled"</TMPL_IF> /><tmpl_var desc></td>
+		        						<td class="b-tokens-items-subject"><input class="b-tokens-check" type="checkbox" id="account-id-<TMPL_VAR id>" name="account_id" value="<TMPL_VAR id>" <TMPL_IF disabled>disabled="disabled"</TMPL_IF> /><label for="account-id-<TMPL_VAR id>"><tmpl_var desc></label></td>
 			        					<td class="b-tokens-items-amount"><tmpl_var blocked></td>
 				        				<td class="b-tokens-items-amount"><tmpl_var balance></td>
 					         		</tr>
@@ -172,7 +172,10 @@
 						</tbody>
 		        		<tfoot class="b-tokens-reserved b-tokens-items">
 	        				<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-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-total b-total-refunded"><tmpl_var total_blocked></td>
 				        		<td class="b-tokens-items-total b-total-amount"><tmpl_var total_balance></td>
 					        </tr>