Committer: nnikulochkina
LJSUP-13376: Show inactive rows in "reserved" tabU trunk/bin/upgrading/en_LJ.dat U trunk/templates/Shop/Wallet.tmpl
Modified: trunk/bin/upgrading/en_LJ.dat =================================================================== --- trunk/bin/upgrading/en_LJ.dat 2012-08-21 15:21:14 UTC (rev 12513) +++ trunk/bin/upgrading/en_LJ.dat 2012-08-22 07:23:21 UTC (rev 12514) @@ -16420,6 +16420,9 @@ wallet.bml.incoming.date|staleness=1 wallet.bml.incoming.date=Date/Time +wallet.bml.incoming.notfound|staleness=1 +wallet.bml.incoming.notfound=Not found + wallet.bml.incoming.repost|staleness=1 wallet.bml.incoming.repost=Incoming for paid reposting <a href="[[url]]">[[subject]]</a> @@ -16536,6 +16539,9 @@ wallet.bml.reserved.blocked|staleness=1 wallet.bml.reserved.blocked=Refunded LJ Tokens +wallet.bml.reserved.notfound|staleness=1 +wallet.bml.reserved.notfound=Not found + wallet.bml.reserved.repost|staleness=1 wallet.bml.reserved.repost=Paid repost <a href="[[url]]">[[subject]]</a> Modified: trunk/templates/Shop/Wallet.tmpl =================================================================== --- trunk/templates/Shop/Wallet.tmpl 2012-08-21 15:21:14 UTC (rev 12513) +++ trunk/templates/Shop/Wallet.tmpl 2012-08-22 07:23:21 UTC (rev 12514) @@ -132,7 +132,8 @@ <li class="b-buy-goods-item b-reserved-item <TMPL_IF tab_reserved_active>current</TMPL_IF>"> <form action="<TMPL_VAR self_uri>?show=reserved" method="post" id="shop_reserved_token"> <input type="hidden" name="act" value="revoke_account"> - <TMPL_VAR form_auth> + <TMPL_VAR form_auth> + <TMPL_IF accounts> <table class="b-tokens-reserved b-tokens-items"> <thead> <tr> @@ -154,7 +155,7 @@ <TMPL_IF tab_reserved_active> <TMPL_LOOP accounts> <tr <TMPL_IF __odd__> class="odd" </TMPL_IF>> - <td class="b-tokens-items-subject"><input type="checkbox" name="account_id" value="<TMPL_VAR id>" /><tmpl_var desc></td> + <td class="b-tokens-items-subject"><input type="checkbox" name="account_id" value="<TMPL_VAR id>" <TMPL_IF disabled>disabled</TMPL_IF> /><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> @@ -178,10 +179,14 @@ </tr> </tfoot> </table> + <TMPL_ELSE> + <tmpl_var expr="ml('wallet.bml.reserved.notfound')"> + </TMPL_IF> </form> </li> <li class="b-buy-goods-item b-incoming-item <TMPL_IF tab_incoming_active>current</TMPL_IF>"> <form action="" method="post" id="shop_incoming_token"> + <TMPL_IF blockings> <table class="b-tokens-incoming b-tokens-items"> <thead> <tr> @@ -219,6 +224,9 @@ </tr> </tfoot> </table> + <TMPL_ELSE> + <tmpl_var expr="ml('wallet.bml.incoming.notfound')"> + </TMPL_IF> </form> </li> </TMPL_UNLESS>