Committer: esavintcev
LJSUP-7373: GiveMore PromoBlockU trunk/bin/upgrading/en_LJ.dat U trunk/htdocs/stc/shop/shop.css U trunk/templates/Shop/MainPage.tmpl U trunk/templates/Shop/PaidAccount.tmpl
Modified: trunk/bin/upgrading/en_LJ.dat =================================================================== --- trunk/bin/upgrading/en_LJ.dat 2010-11-17 10:18:33 UTC (rev 9727) +++ trunk/bin/upgrading/en_LJ.dat 2010-11-18 03:40:36 UTC (rev 9728) @@ -5502,7 +5502,7 @@ shop.view.promo.givemore.title=Give more! -shop.view.promo.givemore.text=<p>Give your friends a Paid Account, and they'll receive 1,000 LJ Tokens to sweeten their holidays.</p><p>That's enough to buy 70 extra userpics for a year!</p><p>Happy holidays from your friends at LiveJournal</p> +shop.view.promo.givemore.text=Give your friends a Paid Account, and they'll receive 1,000 LJ Tokens to sweeten their holidays.<br /><br />That's enough to buy 70 extra userpics for a year!<br /><br />Happy holidays from your friends at LiveJournal shop.view.promo.paidaccount.title=Paid Account Modified: trunk/htdocs/stc/shop/shop.css =================================================================== --- trunk/htdocs/stc/shop/shop.css 2010-11-17 10:18:33 UTC (rev 9727) +++ trunk/htdocs/stc/shop/shop.css 2010-11-18 03:40:36 UTC (rev 9728) @@ -310,7 +310,18 @@ .b-promo-givemore-paid { margin: -33px 0 17px; } - .b-promo-givemore H3 { + .b-promo-givemore-all:link, + .b-promo-givemore-all:visited, + .b-promo-givemore-all:hover, + .b-promo-givemore-all:active { + display: block; + border-bottom: 0 !important; + color: #FFF !important; + text-decoration: none; + cursor: pointer; + } + .b-promo-givemore .title { + display: block; margin: 0; padding: 20px 28px 0; font-size: 18px; @@ -319,16 +330,23 @@ color: #FFF; text-transform: uppercase; } + .b-promo-givemore .title A:link, + .b-promo-givemore .title A:visited, + .b-promo-givemore .title A:active, + .b-promo-givemore .title A:hover { + color: #FFF; + } .b-promo-givemore .desc { + display: block; min-height: 140px; - padding: 10px 118px 10px 28px; + padding: 10px 118px 20px 28px; -webkit-border-bottom-right-radius: 5px; -moz-border-radius-bottomright: 5px; border-bottom-right-radius: 5px; background: url(/img/shop/promo/promo-givemore-gift.jpg?v=1) no-repeat 100% 100%; } .b-promo-givemore .desc P { - margin: 0 0 10px; + margin: 0; } .b-promo-givemore .desc A:link, .b-promo-givemore .desc A:visited, Modified: trunk/templates/Shop/MainPage.tmpl =================================================================== --- trunk/templates/Shop/MainPage.tmpl 2010-11-17 10:18:33 UTC (rev 9727) +++ trunk/templates/Shop/MainPage.tmpl 2010-11-18 03:40:36 UTC (rev 9728) @@ -6,10 +6,7 @@ </div> <tmpl_if show_givemore> <div class="b-promo-givemore"> - <h3><TMPL_VAR expr="ml('shop.view.promo.givemore.title')"></h3> - <div class="desc"> - <TMPL_VAR expr="ml('shop.view.promo.givemore.text')"> - </div> + <a href="/shop/paidaccount.bml?form=3" class="b-promo-givemore-all"><strong class="title"><TMPL_VAR expr="ml('shop.view.promo.givemore.title')"></strong><span class="desc"><TMPL_VAR expr="ml('shop.view.promo.givemore.text')"></span></a> </div> </tmpl_if> <tmpl_if is_remote_sup> Modified: trunk/templates/Shop/PaidAccount.tmpl =================================================================== --- trunk/templates/Shop/PaidAccount.tmpl 2010-11-17 10:18:33 UTC (rev 9727) +++ trunk/templates/Shop/PaidAccount.tmpl 2010-11-18 03:40:36 UTC (rev 9728) @@ -23,10 +23,8 @@ <tmpl_if show_givemore> <div class="b-promo-givemore b-promo-givemore-paid"> - <h3><TMPL_VAR expr="ml('shop.view.promo.givemore.title')"></h3> - <div class="desc"> - <TMPL_VAR expr="ml('shop.view.promo.givemore.text')"> - </div> + <h3 class="title"><TMPL_VAR expr="ml('shop.view.promo.givemore.title')"></h3> + <div class="desc"><TMPL_VAR expr="ml('shop.view.promo.givemore.text')"></div> </div> </tmpl_if>