Committer: egeraskin
LJSUP-12917: Add RESERVED and INCOMING tabs to user wallet pageU 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-17 07:31:44 UTC (rev 12297) +++ trunk/htdocs/stc/shop/shop.css 2012-07-17 08:33:07 UTC (rev 12298) @@ -1081,9 +1081,13 @@ padding: 10px 0 10px 10px; vertical-align: top; } + .b-tokens-items TH { + font-size: 12px; + vertical-align: top; + } .b-tokens-items TD, .b-tokens-items TH { - padding: 5px 5px 5px 10px; + padding: 7px 5px 9px 10px; text-align: left; } .b-tokens-items TD.b-tokens-items-amount { @@ -1095,7 +1099,8 @@ font-weight: normal; color: #666; } -.b-tokens-items INPUT { +.b-input-tokens-total { + float: left; margin-left: 0; } .b-shop-tokens-total STRONG { Modified: trunk/templates/Shop/Wallet.tmpl =================================================================== --- trunk/templates/Shop/Wallet.tmpl 2012-07-17 07:31:44 UTC (rev 12297) +++ trunk/templates/Shop/Wallet.tmpl 2012-07-17 08:33:07 UTC (rev 12298) @@ -151,7 +151,7 @@ </tr> </TMPL_LOOP> <tr class="b-shop-tokens-total"> - <td class="b-tokens-items-button"><input type="submit" value="<tmpl_var expr="ml('wallet.bml.reserved.takeoff')">" /> <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-amount"><tmpl_var total_blocked></td> <td class="b-tokens-items-amount"><tmpl_var total_balance></td> </tr> @@ -159,7 +159,32 @@ </form> </li> </TMPL_IF> - + <TMPL_UNLESS wallet_ext_disabled> + <TMPL_IF tab_incoming_active> + <li class="<TMPL_IF tab_send_active> current</TMPL_IF>"> + <form action="" method="post" id="shop_incoming_token"> + <table class="b-tokens-incoming b-tokens-items"> + <tr> + <th><tmpl_var expr="ml('wallet.bml.incoming.date')"></th> + <th><tmpl_var expr="ml('wallet.bml.incoming.subject')"></th> + <th> + <tmpl_var expr="ml('wallet.bml.incoming.amount')"> + <p><tmpl_var expr="ml('wallet.bml.reserved.tokens')"></p> + </th> + </tr> + <TMPL_LOOP blockings> + <tr> + <td><tmpl_var date></td> + <td><tmpl_var desc></td> + <td class="b-tokens-items-amount"><tmpl_var qty></td> + </tr> + </TMPL_LOOP> + </table> + <div class="b-buy-total"></div> + </form> + </li> + </TMPL_IF> + </TMPL_UNLESS> <TMPL_IF free_tokens_enabled> <li class="b-buy-goods-item <TMPL_IF tab_tokens_free> current</TMPL_IF> @@ -210,19 +235,4 @@ ml_confirm_transfer = '<tmpl_var expr="ml('shop.view.wallet.confirm_xfer')">'; </script> <tmpl_var js_complete> - -<TMPL_UNLESS wallet_ext_disabled> -<TMPL_IF tab_incoming_active> - <tmpl_var expr="ml('wallet.bml.incoming.date')"> | - <tmpl_var expr="ml('wallet.bml.incoming.subject')"> | - <tmpl_var expr="ml('wallet.bml.incoming.amount')"> - <br> - <TMPL_LOOP blockings> - <tmpl_var date> | <tmpl_var desc> | <tmpl_var qty> <br> - </TMPL_LOOP> -</TMPL_IF> - - -</TMPL_UNLESS> - </div>