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

LJSUP-12917: Add RESERVED and INCOMING tabs to user wallet page

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-07-19 11:15:39 UTC (rev 12314)
+++ trunk/htdocs/stc/shop/shop.css	2012-07-19 11:36:46 UTC (rev 12315)
@@ -1099,6 +1099,18 @@
 	font-weight: normal;
 	color: #666;
 	}
+.b-tokens-items-paging TD {
+	text-align: center;
+	}
+	.b-tokens-items-paging .b-history-paging-prev,
+	.b-tokens-items-paging .b-history-paging-next {
+		color: #829DBF;
+		text-decoration: underline;
+		}
+		.b-tokens-items-paging .b-history-paging-prev:hover,
+		.b-tokens-items-paging .b-history-paging-next:hover {
+			text-decoration: none;
+			}
 .b-input-tokens-total {
 	float: left;
 	margin-left: 0;

Modified: trunk/templates/Shop/Wallet.tmpl
===================================================================
--- trunk/templates/Shop/Wallet.tmpl	2012-07-19 11:15:39 UTC (rev 12314)
+++ trunk/templates/Shop/Wallet.tmpl	2012-07-19 11:36:46 UTC (rev 12315)
@@ -153,6 +153,9 @@
 				        				<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>
@@ -161,7 +164,6 @@
 					        </table>
 				        </form>
 			        </li>
-                                <TMPL_INCLUDE 'Paging.tmpl'>
 		        </TMPL_IF>
 			<TMPL_IF tab_incoming_active>
 				<li class=" current">
@@ -186,7 +188,6 @@
 						<div class="b-buy-total"></div>
 					</form>
 				</li>
-                                <TMPL_INCLUDE 'Paging.tmpl'>
 			</TMPL_IF>
 		</TMPL_UNLESS>
 		<TMPL_IF free_tokens_enabled>
@@ -227,7 +228,6 @@
 
 			</script>
 </div>
-
 <script type="text/javascript">
 	jQuery('#mTabsShop').tabsChanger();