Committer: esavintcev
LJSUP-11099: LJ Shop. Change LJ Tokens mechanicsU trunk/bin/upgrading/en_LJ.dat U trunk/htdocs/stc/shop/shop.css U trunk/templates/Shop/Wallet.tmpl
Modified: trunk/bin/upgrading/en_LJ.dat =================================================================== --- trunk/bin/upgrading/en_LJ.dat 2012-02-17 14:22:09 UTC (rev 11491) +++ trunk/bin/upgrading/en_LJ.dat 2012-02-17 14:46:01 UTC (rev 11492) @@ -8475,6 +8475,8 @@ shop.view.wallet.buy.desc= +shop.view.wallet.buy.tokens=Custom LJ Tokens, multiply 100 + shop.view.wallet.confirm_xfer=Confirm your purchase: {{tokens}} tokens will be deducted from your balance. shop.view.wallet.offeral.desc=You can buy tokens via Offerpal, instead. Offerpal is a multiple payment service you can use to make payments using credit cards, PayPal, Amazon payments, PayByCash, and other payment methods. Modified: trunk/htdocs/stc/shop/shop.css =================================================================== --- trunk/htdocs/stc/shop/shop.css 2012-02-17 14:22:09 UTC (rev 11491) +++ trunk/htdocs/stc/shop/shop.css 2012-02-17 14:46:01 UTC (rev 11492) @@ -1201,9 +1201,9 @@ background-image: url(/img/shop/tokens-afew.png?v=9085); } .b-wallet-balance { - margin:0 0 4px; - padding:3px 0 5px 30px; - background:url(/img/shop/wallet-balance.png?v=1) no-repeat 0 0; + margin: 0 0 25px; + padding: 3px 0 5px 30px; + background: url(/img/shop/wallet-balance.png?v=1) no-repeat 0 0; } .b-wallet-history { margin:0 0 24px; @@ -1233,6 +1233,31 @@ .b-wallet-offerpal P A { text-decoration: none; } +.b-wallet2 { + position: relative; + margin: 30px 10px 50px; + } + .b-wallet2-tokens { + position: absolute; + top: 27px; + right: 0; + display: block; + width: 100px; + margin: 0; + text-align: center; + color: #999; + } + .b-wallet2-tokens SPAN { + display: block; + margin: 5px 0 0; + font-size: 11px; + } + .b-wallet2-amount { + width: 90px; + margin: 0; + text-align: center; + font: bold 15px/1 Arial,sans-serif; + } /* Userpics ------------------------------------------------------------------------*/ Modified: trunk/templates/Shop/Wallet.tmpl =================================================================== --- trunk/templates/Shop/Wallet.tmpl 2012-02-17 14:22:09 UTC (rev 11491) +++ trunk/templates/Shop/Wallet.tmpl 2012-02-17 14:46:01 UTC (rev 11492) @@ -16,96 +16,124 @@ </TMPL_IF> <p class="b-wallet-balance"><TMPL_VAR expr="ml('wallet.bml.landing.text.balance', 'qty', balance)"></p> -<p class="b-wallet-history"><a href="<tmpl_var siteroot>/shop/history.bml?tab=tokens"><tmpl_var expr="ml('wallet.bml.langing.text.history.link')"></a></p> -<ul class="m-shop-tabs"> -<TMPL_IF name="tab_buy_active"> - <li class="current"><a href="<TMPL_VAR self_uri>?show=buy"> <TMPL_VAR expr="ml('wallet.bml.landing.tab.buy')"></a></li> - <li><a href="<TMPL_VAR self_uri>?show=send"><TMPL_VAR expr="ml('wallet.bml.landing.tab.send')"></a></li> - <TMPL_IF free_tokens_enabled> - <li><a href="<TMPL_VAR self_uri>?show=free"><TMPL_VAR expr="ml('wallet.bml.landing.tab.free')"></a></li> - </TMPL_IF> -<TMPL_ELSIF name="tab_send_active"> - <li><a href="<TMPL_VAR self_uri>?show=buy"><TMPL_VAR expr="ml('wallet.bml.landing.tab.buy')"></a></li> - <li class="current"><a href="<TMPL_VAR self_uri>?show=send"><TMPL_VAR expr="ml('wallet.bml.landing.tab.send')"></a></li> - <TMPL_IF free_tokens_enabled> - <li><a href="<TMPL_VAR self_uri>?show=free"><TMPL_VAR expr="ml('wallet.bml.landing.tab.free')"></a></li> - </TMPL_IF> -<TMPL_ELSE> - <li><a href="<TMPL_VAR self_uri>?show=free"><TMPL_VAR expr="ml('wallet.bml.landing.tab.buy')"></a></li> - <li><a href="<TMPL_VAR self_uri>?show=send"><TMPL_VAR expr="ml('wallet.bml.landing.tab.send')"></a></li> - <TMPL_IF free_tokens_enabled> - <li class="current"><a href="<TMPL_VAR self_uri>?show=free"><TMPL_VAR expr="ml('wallet.bml.landing.tab.free')"></a></li> - </TMPL_IF> -</TMPL_IF> -</ul> +<div class="b-buy"> + <ul class="m-buy-types"> + <li class="m-buy-types-item + <TMPL_IF tab_buy_active> current</TMPL_IF> + "> + <a href="<TMPL_VAR self_uri>?show=buy"> + <TMPL_VAR expr="ml('wallet.bml.landing.tab.buy')"> + </a> + </li> + <li class="m-buy-types-item + <TMPL_IF tab_send_active> current</TMPL_IF> + "> + <a href="<TMPL_VAR self_uri>?show=send"> + <TMPL_VAR expr="ml('wallet.bml.landing.tab.send')"> + </a> + </li> + <TMPL_IF free_tokens_enabled> + <li class="m-buy-types-item + <TMPL_IF tab_tokens_free> current</TMPL_IF> + "> + <a href="<TMPL_VAR self_uri>?show=free"> + <TMPL_VAR expr="ml('wallet.bml.landing.tab.free')"> + </a> + </li> + </TMPL_IF> + </ul> -<ul class="b-wallet-tokens"> - <li class="b-wallet-tokens-item b-wallet-tokens-buy<TMPL_IF name='tab_buy_active'> current</TMPL_IF>"> - <form action="<TMPL_VAR self_uri>" method="post"> - <TMPL_VAR form_auth> - <input type="hidden" name="act" value="buy"> + <ul class="b-buy-goods"> + <li class="b-buy-goods-item + <TMPL_IF tab_buy_active> current</TMPL_IF> + "> + <form action="<TMPL_VAR self_uri>" method="post"> + <fieldset> + <TMPL_VAR form_auth> + <input type="hidden" name="act" value="buy"> - <tmpl_if ljtokens_slider> - <ul class="b-wallet-tokens-select"> - <TMPL_LOOP name="buy_select_options"> - <li class="b-wallet-tokens-select-item b-wallet-tokens-select-<TMPL_VAR value><TMPL_IF __first__> current</TMPL_IF>"><label for="buy_select_<TMPL_VAR value>"><i></i><strong><TMPL_VAR text></strong><input type="radio" name="buy_select" id="buy_select_<TMPL_VAR value>" value="<TMPL_VAR value>"<TMPL_IF __first__> checked="checked"</TMPL_IF> /></label></li> - </TMPL_LOOP> - </ul> - <tmpl_else> - <input type="text" name="buy_select"> - </tmpl_if> - <TMPL_VAR buy_select> - <p><TMPL_VAR proceed_buy_btn></p> - </form> - <TMPL_UNLESS offerpal_disabled> - <div class="b-wallet-offerpal"> - <form action="<TMPL_VAR offerpal_url>" method="get" onsubmit="return Shop.walletOfferpalSubmit()"> - <div class="b-wallet-offerpal-logo"><a href="http://www.offerpalmedia.com/">Offerpal</a></div> - <p class="b-shop-desc"><TMPL_VAR expr="ml('shop.view.wallet.offeral.desc')"></p> - <p><TMPL_VAR proceed_offerpal_btn></p> - </form> - </div> - </TMPL_UNLESS> - </li> - <li class="b-wallet-tokens-item b-wallet-tokens-send<TMPL_IF name='tab_send_active'> current</TMPL_IF>"> - <form action="<TMPL_VAR self_uri>" method="post" id="shop_send_token"> - <TMPL_VAR form_auth> - <input type="hidden" name="act" value="send"> - <p> - <TMPL_VAR amt_input> - <label for="send_to"><TMPL_VAR expr="ml('wallet.bml.landing.label.send_tokens.to')"></label> - <TMPL_VAR to_input> - </p> - <p class="b-shop-desc"><TMPL_VAR expr="ml('shop.view.wallet.send.desc')"></p> - <p><input type="checkbox" name="wallet_gift_anon" id="wallet_gift_anon" value="1" class="checkbox" /><label for="wallet_gift_anon"><TMPL_VAR expr="ml('shop.view.wallet.anon')"></label></p> - <p><TMPL_VAR proceed_xfer_btn></p> - </form> - </li> - <li class="b-wallet-tokens-item b-wallet-tokens-free<TMPL_IF name='tab_tokens_free'> current</TMPL_IF>" - data-href="<TMPL_VAR ftp_url>"> - <div class="b-wallet-tokens-free-about"> - <h4><TMPL_VAR expr="ml('wallet.bml.landing.free.tokens.title')"></h4> - <p><TMPL_VAR expr="ml('wallet.bml.landing.free.tokens.text')"></p> - </div> - <script type="text/x-jquery-tmpl" id="ljshop_freetopay"> - <form action="${URL}" method="post"> - <div class="b-wallet-tokens-free-icon"> - <img src="${Logo}" alt="${Name}" width="70" /> + <div class="b-wallet2"> + <TMPL_INCLUDE templates/Widgets/range.tmpl> + <label for="buy_select" class="b-wallet2-tokens"> + <input type="text" name="buy_select" id="buy_select" value="100" maxlength="10" tabindex="50" class="b-wallet2-amount"> + <span><TMPL_VAR expr="ml('shop.view.wallet.buy.tokens')"></span> + </label> + </div> + + <div class="b-buy-total canyon"> + <p class="canyon-section"><TMPL_VAR EXPR="ml('/shop/paidaccount.bml.total')">: <strong>$<span class="i-total"></span></strong></p> + <p class="canyon-side"> + <a href="<TMPL_VAR siteroot>/shop/history.bml?tab=tokens"><TMPL_VAR EXPR="ml('wallet.bml.langing.text.history.link')"></a> + <TMPL_VAR proceed_buy_btn> + </p> + </div> + </fieldset> + </form> + + <TMPL_UNLESS offerpal_disabled> + <div class="b-wallet-offerpal"> + <form action="<TMPL_VAR offerpal_url>" method="get" onsubmit="return Shop.walletOfferpalSubmit()"> + <div class="b-wallet-offerpal-logo"><a href="http://www.offerpalmedia.com/">Offerpal</a></div> + <p class="b-shop-desc"><TMPL_VAR expr="ml('shop.view.wallet.offeral.desc')"></p> + <p><TMPL_VAR proceed_offerpal_btn></p> + </form> + </div> + </TMPL_UNLESS> + </li> + + <li class="b-buy-goods-item + <TMPL_IF tab_send_active> current</TMPL_IF> + "> + <form action="<TMPL_VAR self_uri>" method="post" id="shop_send_token"> + <fieldset> + <TMPL_VAR form_auth> + <input type="hidden" name="act" value="send"> + + <p> + <TMPL_VAR amt_input> + <label for="send_to"><TMPL_VAR expr="ml('wallet.bml.landing.label.send_tokens.to')"></label> + <TMPL_VAR to_input> + </p> + + <p class="b-shop-desc"><TMPL_VAR expr="ml('shop.view.wallet.send.desc')"></p> + + <p><input type="checkbox" name="wallet_gift_anon" id="wallet_gift_anon" value="1" class="checkbox" /><label for="wallet_gift_anon"><TMPL_VAR expr="ml('shop.view.wallet.anon')"></label></p> + + <div class="b-buy-total canyon"> + <p class="canyon-section">Total: <strong>$<span class="i-total"></span></strong></p> + <p class="canyon-side"><TMPL_VAR proceed_xfer_btn></p> + </div> + </fieldset> + </form> + </li> + + <li class="b-buy-goods-item + <TMPL_IF tab_tokens_free> current</TMPL_IF> + " data-href="<TMPL_VAR ftp_url>"> + <div class="b-wallet-tokens-free-about"> + <h4><TMPL_VAR expr="ml('wallet.bml.landing.free.tokens.title')"></h4> + <p><TMPL_VAR expr="ml('wallet.bml.landing.free.tokens.text')"></p> </div> - <div class="b-wallet-tokens-free-content"> - {{if Step}}<p class="b-ribbon b-ribbon-paid"><span>Paid</span></p>{{else}}<p class="b-ribbon"><span>Free</span></p>{{/if}} - <h2>${Name}</h2> - <p>${Description}</p> - <p> - <span class="b-btn">Получить</span> - <span class="b-wallet-tokens-free-amount">${VCPayout} шт.</span> - </p> - </div> - </form> - </script> - </li> -</ul> + <script type="text/x-jquery-tmpl" id="ljshop_freetopay"> + <form action="${URL}" method="post"> + <div class="b-wallet-tokens-free-icon"> + <img src="${Logo}" alt="${Name}" width="70" /> + </div> + <div class="b-wallet-tokens-free-content"> + {{if Step}}<p class="b-ribbon b-ribbon-paid"><span>Paid</span></p>{{else}}<p class="b-ribbon"><span>Free</span></p>{{/if}} + <h2>${Name}</h2> + <p>${Description}</p> + <p> + <span class="b-btn">Получить</span> + <span class="b-wallet-tokens-free-amount">${VCPayout} шт.</span> + </p> + </div> + </form> + </script> + </li> + </ul> +</div> <script type="text/javascript"> var ml_wallet_errors = {