Committer: esavintcev
LJSUP-7479: Shop GiveMoreU trunk/bin/upgrading/en_LJ.dat A trunk/htdocs/img/shop/promo/promo-givemore-bg-paid.png A trunk/htdocs/img/shop/promo/promo-givemore-gm.png A trunk/htdocs/img/shop/promo/promo-givemore-pa.png A trunk/htdocs/img/shop/promo/promo-givemore-sign.gif U trunk/htdocs/stc/shop/ie.css 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-30 04:40:00 UTC (rev 9766) +++ trunk/bin/upgrading/en_LJ.dat 2010-11-30 07:57:49 UTC (rev 9767) @@ -5500,10 +5500,12 @@ shop.view.vgifts.paybysms=pay by sms -shop.view.promo.givemore.title=Give more! +shop.view.promo.givemore.sign=Happy holidays from your friends at LiveJournal -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.givemore.title=Give your friends a Paid Account for one year +shop.view.promo.givemore.text=And they'll receive 1,000 LJ Tokens to sweeten their holidays - that's enough to buy 70 extra userpics for a year! + shop.view.promo.paidaccount.title=Paid Account shop.view.promo.paidaccount.text=Get access to all great features of a pad account Added: trunk/htdocs/img/shop/promo/promo-givemore-bg-paid.png =================================================================== (Binary files differ) Property changes on: trunk/htdocs/img/shop/promo/promo-givemore-bg-paid.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/htdocs/img/shop/promo/promo-givemore-gm.png =================================================================== (Binary files differ) Property changes on: trunk/htdocs/img/shop/promo/promo-givemore-gm.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/htdocs/img/shop/promo/promo-givemore-pa.png =================================================================== (Binary files differ) Property changes on: trunk/htdocs/img/shop/promo/promo-givemore-pa.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/htdocs/img/shop/promo/promo-givemore-sign.gif =================================================================== (Binary files differ) Property changes on: trunk/htdocs/img/shop/promo/promo-givemore-sign.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/htdocs/stc/shop/ie.css =================================================================== --- trunk/htdocs/stc/shop/ie.css 2010-11-30 04:40:00 UTC (rev 9766) +++ trunk/htdocs/stc/shop/ie.css 2010-11-30 07:57:49 UTC (rev 9767) @@ -127,8 +127,17 @@ height: 208px; } -* HTML .b-promo-givemore .desc { - position:relative; - height: 140px; +* HTML .b-promo-givemore .b-promo-givemore-pa { + height: 130px; } - +* HTML .b-promo-givemore .b-promo-givemore-gm { + height: 180px; + } +* HTML .b-promo-givemore-pa .b-promo-givemore-bg { + background: none; + filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(enabled=true,sizingMethod=crop,src=/img/shop/promo/promo-givemore-pa.png?v=1); + } +* HTML .b-promo-givemore-gm .b-promo-givemore-bg { + background: none; + filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(enabled=true,sizingMethod=crop,src=/img/shop/promo/promo-givemore-gm.png?v=1); + } Modified: trunk/htdocs/stc/shop/shop.css =================================================================== --- trunk/htdocs/stc/shop/shop.css 2010-11-30 04:40:00 UTC (rev 9766) +++ trunk/htdocs/stc/shop/shop.css 2010-11-30 07:57:49 UTC (rev 9767) @@ -299,37 +299,83 @@ /* GiveMore promo block -------------------------------------- */ .b-promo-givemore { + position: relative; margin: 0 0 17px 0; padding: 0; -webkit-border-radius: 5px; -moz-border-radius: 5px; border-radius: 5px; - background: #207953 url(/img/shop/promo/promo-givemore-bg.png?v=1) repeat-x 0 100%; + background: #3B92C2 url(/img/shop/promo/promo-givemore-bg.png?v=2) repeat-x 0 0; color: #FFF; + font-size: 15px; } .b-promo-givemore-paid { margin: -33px 0 17px; + background: #3B92C2 url(/img/shop/promo/promo-givemore-bg-paid.png?v=1) repeat-x 0 0; } - .b-promo-givemore-all:link, - .b-promo-givemore-all:visited, - .b-promo-givemore-all:hover, - .b-promo-givemore-all:active { + .i-promo-givemore-br { + display: none; + } + .b-promo-givemore A:link, + .b-promo-givemore A:visited, + .b-promo-givemore A:hover, + .b-promo-givemore A:active { display: block; + position: relative; border-bottom: 0 !important; color: #FFF !important; text-decoration: none; cursor: pointer; } + .b-promo-givemore .b-promo-givemore-pa:link, + .b-promo-givemore .b-promo-givemore-pa:visited, + .b-promo-givemore .b-promo-givemore-pa:hover, + .b-promo-givemore .b-promo-givemore-pa:active { + min-height: 130px; + border-bottom: 1px solid #234E7C !important; + } + .b-promo-givemore .b-promo-givemore-gm:link, + .b-promo-givemore .b-promo-givemore-gm:visited, + .b-promo-givemore .b-promo-givemore-gm:hover, + .b-promo-givemore .b-promo-givemore-gm:active { + min-height: 180px; + border-top: 1px solid #3D84B8 !important; + } + .b-promo-givemore-bg { + display: block; + overflow: hidden; + position: absolute; + font: 0/0 serif; + } + .b-promo-givemore-pa .b-promo-givemore-bg { + top: 16px; + left: 36px; + width: 88px; + height: 100px; + background: url(/img/shop/promo/promo-givemore-pa.png?v=1) no-repeat 0 0; + } + .b-promo-givemore-gm .b-promo-givemore-bg { + top: 24px; + left: 11px; + width: 129px; + height: 123px; + background: url(/img/shop/promo/promo-givemore-gm.png?v=1) no-repeat 0 0; + } .b-promo-givemore .title { display: block; margin: 0; - padding: 20px 28px 0; + padding: 20px 28px 8px 160px; font-size: 18px; font-style: normal; font-weight: normal; color: #FFF; - text-transform: uppercase; } + .b-promo-givemore-pa .title { + font-size: 24px; + } + .b-promo-givemore-gm .title { + padding: 30px 28px 8px 160px; + } .b-promo-givemore .title A:link, .b-promo-givemore .title A:visited, .b-promo-givemore .title A:active, @@ -338,12 +384,8 @@ } .b-promo-givemore .desc { display: block; - min-height: 140px; - 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%; + padding: 0 28px 10px 160px; + font-size: 15px; } .b-promo-givemore .desc P { margin: 0; @@ -354,6 +396,13 @@ .b-promo-givemore .desc A:active { color: #FFF !important; } + .b-promo-givemore .sign { + display: block; + margin: 0; + padding: 0 28px 20px 252px; + background: url(/img/shop/promo/promo-givemore-sign.gif?v=1) no-repeat 225px 0; + font-size: 12px; + } /* Book promo block Modified: trunk/templates/Shop/MainPage.tmpl =================================================================== --- trunk/templates/Shop/MainPage.tmpl 2010-11-30 04:40:00 UTC (rev 9766) +++ trunk/templates/Shop/MainPage.tmpl 2010-11-30 07:57:49 UTC (rev 9767) @@ -1,14 +1,13 @@ -<div class="b-promo-paidaccount"> - <a href="/shop/paidaccount.bml"> - <span class="title"><TMPL_VAR expr="ml('shop.view.promo.paidaccount.title')"></span> - <span><TMPL_VAR expr="ml('shop.view.promo.paidaccount.text')"></span> - </a> -</div> -<tmpl_if show_givemore> +<TMPL_IF show_givemore> <div class="b-promo-givemore"> - <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> + <a href="/shop/paidaccount.bml" class="b-promo-givemore-pa"><i class="b-promo-givemore-bg"></i><strong class="title"><TMPL_VAR expr="ml('shop.view.promo.paidaccount.title')"></strong><br class="i-promo-givemore-br" /><span class="desc"><TMPL_VAR expr="ml('shop.view.promo.paidaccount.text')"></span></a><br class="i-promo-givemore-br" /> + <a href="/shop/paidaccount.bml?form=3" class="b-promo-givemore-gm"><i class="b-promo-givemore-bg"></i><strong class="title"><TMPL_VAR expr="ml('shop.view.promo.givemore.title')"></strong><br class="i-promo-givemore-br" /><span class="desc"><TMPL_VAR expr="ml('shop.view.promo.givemore.text')"></span><br class="i-promo-givemore-br" /><small class="sign"><TMPL_VAR expr="ml('shop.view.promo.givemore.sign')"></small></a> </div> -</tmpl_if> +<TMPL_ELSE> +<div class="b-promo-paidaccount"> + <a href="/shop/paidaccount.bml"><span class="title"><TMPL_VAR expr="ml('shop.view.promo.paidaccount.title')"></span><span><TMPL_VAR expr="ml('shop.view.promo.paidaccount.text')"></span></a> +</div> +</TMPL_IF> <tmpl_if is_remote_sup> <div class="b-promo-book"> <div class="pic"> Modified: trunk/templates/Shop/PaidAccount.tmpl =================================================================== --- trunk/templates/Shop/PaidAccount.tmpl 2010-11-30 04:40:00 UTC (rev 9766) +++ trunk/templates/Shop/PaidAccount.tmpl 2010-11-30 07:57:49 UTC (rev 9767) @@ -22,9 +22,11 @@ </div> <tmpl_if show_givemore> -<div class="b-promo-givemore b-promo-givemore-paid"> +<div class="b-promo-givemore b-promo-givemore-gm b-promo-givemore-paid"> + <i class="b-promo-givemore-bg"></i> <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> + <p class="sign"><TMPL_VAR expr="ml('shop.view.promo.givemore.sign')"></p> </div> </tmpl_if>