From 3e699d52533bf18a78e709970046cb5845a75bb8 Mon Sep 17 00:00:00 2001 From: Chad Birch Date: Mon, 19 Aug 2013 11:30:15 -0600 Subject: [PATCH] Gold partners: add UPS --- r2/r2/public/static/css/goldinfo.less | 13 ++++++++---- r2/r2/public/static/gold/partner-ups.png | Bin 0 -> 11279 bytes r2/r2/public/static/js/gold.js | 12 +++++++---- r2/r2/templates/goldinfopage.html | 5 +++-- r2/r2/templates/goldpartnerspage.html | 25 ++++++++++++++++++----- 5 files changed, 40 insertions(+), 15 deletions(-) create mode 100644 r2/r2/public/static/gold/partner-ups.png diff --git a/r2/r2/public/static/css/goldinfo.less b/r2/r2/public/static/css/goldinfo.less index 83b1f3e1c..cdd86707d 100644 --- a/r2/r2/public/static/css/goldinfo.less +++ b/r2/r2/public/static/css/goldinfo.less @@ -309,13 +309,18 @@ section#about-gold, section#about-gold-partners { line-height: @section-height; margin: 0 45px; padding: 30px 25px; - border-bottom: 1px solid rgba(255,255,255,.65); - &.last { - border-bottom: none; + border-top: 1px solid rgba(255,255,255,.65); + &.first { + border-top: none; + } + + &.ups { + border-bottom: 1px solid; + border-color: rgba(90, 63, 26, 0.7); } h1 { - font-size: 24px; + font-size: 2.2em; font-weight: normal; margin: 0; margin-bottom: .25em; diff --git a/r2/r2/public/static/gold/partner-ups.png b/r2/r2/public/static/gold/partner-ups.png new file mode 100644 index 0000000000000000000000000000000000000000..e417e228f33726638e97f04b8b15ea20a344ceef GIT binary patch literal 11279 zcmchd<5wkKxW{vojmhp*Q%#etlXPJw&tV&gZ!ZT()|fPqG?1DIuTYBy*~m>Cu7~~`APflb)?M|-TEI#YlWlwQ_=4ZHrMR|oA!U-k~*sIth-So zcr&{1tq8h1N0AgF@zxyJyt*dOpE>5uwdJxs@dekch_2So`@HUYP&yUP8zQ>g=?+wl zw6qAU8EFEcm;y7&5gFZipVl3xJ>!m2x?5(o1zBV;sLyuvjhlW@_GQ+T-=w7 zLsIA-2mQekgZbyNGbHHx#E|I74*zJA%q~)R9rx`Ieh{GpA6s> zYE!=A1y&7eMFcw-xQ^6GP$Td%H`Z(zO=ZdH*_a};+E0B>G2PknhmmTIB;4sS`K_gu zjNN2uId?Q?`nQiicKF}j#$$%=zYzkA`X2094S<*uV2BbhYPYF?@>Gj+s4)7e1m{BS zsLi*3T>C|rzw52v{|eEDxAqsF211Dt8#_Du`B3Y2Cz8INuH-JiB$!ibRaEbSvKq}v z>R;;s|9&ec`T+$o46r+F;uV)o>i2O^a~J?z{dgPR1P=G&z|d~R#h$G+o8}u(s|qN| z=vC%?`{M%4X<6{vRpMW5C5RrjbDgSa?r>bEqZ6p=X~He{fJ_WP1VU#HzlEnt7%j(} z%kLM`O5Nk!d4_kOQdOhI75MIlpy8eMirMYMY`PCvaUFKw;@Z`OgmoQYk>5l`jD@vPLkVojg>)Y?MURG3yP zKnmy)Mb?SGdnDIAqt0XKn58}mxOQl~`mI?d@NCd+K8T=2n)qtc|{<%^4zPMheL)&{=U0{3eU|bD9KY zp?wL@wTkjoQD&j4t;AIoG%iiSpbM&ZG6Kp(%1Vz>S`|&AGp2Sn2rX;jfF%NsF`1^K z2kZ;g?3^Gxoqu)ki*9C9+sh}Y4@?bL{UejI~*AK1Bm3J&RCK(O#+@KDyasH=1`H6(-n`dIj^rF?N5HaJ%xGv@tx7^ zQFjZWJsHg&rfQuCKRu{(D>8O7!VY0)32l2tMjrMh3k<_`Evw8cYKW-=DI_|+;>zop$ z5&!-|Ju-zC=t#=&;P}}LIv$mJUzm9^k{+;?AFU$TCdV}Bu$A0&zx^IivwJ|eppUZD zwDVxC>^&Uxz`_$%yq3CHvoiYER5v1BAxQ0$T$Hbvt>8z7$f(s^Q=XZh9axXw;{ zn<~~8h~*Zm4u33kf1!Cj+S!@tVShxoT#EO|mAP)WXV2?<)<^z#zO9O2&FQ3uW(ivM z=-#eJyHzodvQoN#;KICYcKmymg65u@V)iNp>z`&LW(--KYq}CeGA(6YlQLblIRr<% zLneBMjRrDxF5YmaVqp;3%L{}QcW)q>+vw6qrt@xRujRtdXo;q8x4OKe7hCUy zH14_dE)IL1zIh^N3Kt^8V)00F#WJ@{hVwL5J(~M8SYsu-2yCaAp%6#Yh?6hdbxq_Yoj;Ro! z;xgpftp!!YAzObRTH4Cd_M?4gL~g!>^#{sSyMx6jzV`R_(`rl*jP5qm>OJGqL)r9J z%A+k@+Dy(2xLN+ifXwTUYu;75RMp)}WzK@%$#s##{w>XA0jlcIj7~`WPXe3^TNpg1 z2Q>1QJ_)t$rle~+)>=n``VwWXz-(%2p`_b!_{<{BT#a1K4g0RTU4gLsNKKVanyZOGnWHxAas~RObU_C#>32^=aCO5#P}Mm`=-DF zmY0inZ1*1Mk=l>2$WsHYHe=Ovu;dUwL?lESiqWS{AB)S0T8&95TuT-7GeRaybhiPf zw`J019%_8mh}q7r5m13GnJM@~fd{86K8tsXGk!g85~2KQ<*|ByP2%-jxuRdVGU zcUzWC;gi=Wzw=@7P*K^zhR(Wow^+7aA?l*vOm5V4*`Y0hZO!Z+CD$?_c^{PGqR zHN3=x?9BacKQd1DSZ4+)oiD963XGfcGNb*X`-6<8jH7vobo-(J�bZwcB@0DLIOD z_ffiav|Ii(pBC|WzR~iFd$df( zoEVtn?7-mLuOY75fOA3yZjzi)vII1#xoUZ4atp#PJ|2p) zcJ7q>0cY+0IbvNU<%)?c2PX}0TS7oLf*t*GB`YU#D1YEQ>pI)1OY-F74LkR{eJE)@ zbf=%}6*Zr&P0j0xgU1)AmU>=oU+6g*A4#$_TVjhSqRDV`b0-H(1YTLlZJ7z`6H^67 z8vXZi2UEUKhk5150!&=LVC~#9(loKACR$YSfkL{Q6A6*#cm;cGK63G&|Au9lJdCz21p&S^Ex585w{$$PuK>d zrncBF7^G?_(FhZ~T?>YNMQ_*BgI@NaJq<-k@Xeq82GT|7%au-vgF-BN4491KmS5fe zotx`AoQ`j34Q*%-@@st1TdaT{3%za3J(#}k@RhUT?F{fcZIjsTUsgw;;j^@vhG_Di zb@H*tv~%!ZjG0{CYA{&xJ_r@91YR}_PUX;+zU97!J}TIT*mJ=={5?3`ZW~n5#riZXJf(WHKrq*>Qa}-+d)Y{ z&vD+@>jYT#4#tS{w1Z}luas5LSbM1u+v|)0lh4lIR@+w&+0K?$Qg?T1cYop^hY3t8 zLLn~|*~eW5GewpcU*?V}vsxuGTEYnRhzPjHq}OcQsPUkH=8o#`he5;6!uc(cqJEiI zDPBeYQn0cFNbNqhdXwRgI2RNiw+NB}KFftG^Nj39I%VR#=0ezs0(F%JdQI2%LM~DW zFErv;`kKP4X)_Xe>ZWpa5@85!erg6`q?0V*a)!7>jY0ESyR7%Qoeu~wVB0V+bf1CG z_Eq=fM6n*qX006^y}V=FHpD$x#KWOoKM1g}Q3d(cPWUFF7w3wXTRMsIWjo;2T3$`s zGuUF46O)ru2Fg@(^7M)}zu>O}ZWI`C_UF&JzKZ5aOW5WMv7>jD5P|ic5Z*3Cy(o>y z1b{k|5$kajFBd_+;iD172VgrWbuqYdHkQs0m=rqZkga+2{h1{I$W)-4Qz8<=A@X{jWsJr<0AR<9p()} z)Xvcn0s3jL*Dpdc4}}Q1@Q;n9RQIoLQB@S|I$PgcEG_Jsja#)D6Gh@Q9N3uSVH2xW zsh2{62XVx~_LO~RoxeN6I6fleq}k+)>Mgl4tWGveu4xcIbE6j4L%Mdyr!7JF#3|>1 z)7SaFpqARK=of?gJ|-NY4Mm2ZT53TSN?e+S47N}@4vz*eB_6K3ldz&*)87ZR7CKSb zaZS)NrOf0afcGP;{RbnX$L^d! zlD7Jyg>LK2Zg$%T@g+dK;bHAXtdN|#58-BW>rEi%VXV#AyLTG_| zs#*Of8UcsIX5pD%3mf`-?*r5U<-M!Rx8K@NP}s1s82ACLt^b8!GmfK7Gtkx}79Z-4BmqkRGYa*d@HX+hPlWz1XZzbUDsQD`i z4D&Z(v=1Wi2z*T?Ej3~c~_S zk{EVS$07ZNM#dy{e8`r9#|gl3v5X2N+vG4?_IFa-L;^G&To3> zdl`=!s+eN&D(?~x4lc>RQE{74WWC{vN`9yy4;Pq--h!}4?Is<^vF|}RnYNnbFFewR zjfLWrY0~Rg-RK~X2qRj01LguaP4(b!%)s+VtjBnh1ez6%-{(vcRch+URwhe+@U+NxTe&D39;WR}wpHxS8+5L?;*R1V{yv1E%)mm6q_TogOfqJqlb z)=e}U206D`uck1EBhQrR*HVPY?&z##f)O&Ltrf3_p8mXxoHrO(TL<)b~SIHKTW)%U?x+{vEU+-~CcvP#RZCu0vZA)mdb`n3YK(oN8Hg`n_nk z6AX{q)NY8ox+N&^INulAZ$0CPrx5}B&{X}mn7VSaZHw|;VbTboE^F2EAQhJ(G%d~o z?e-7KYLd4JX{Y@@L_Ij8I5lz@Tt8?$8&S`DW>EF@2QE5BBS0PCr_Ml@UWXQ*F6d}K zQ}TO=oj3Bnwq#S(yEB53-c(*UH=O5)>iBjX1H~=zFQW(9Q;@;$ZA)OaleKV|6}|3{ zx=M;jfUIe-?Gx%Rj6|Ejx1ss=GVq_QgiAI|^ud^$Aarrl8g&0Sz=%teUmGdO20_?OValj zee#P!vx>xwSa{@SVzuL0Dnc$%aNNovFHym5CgRw|AMPCP;V%zwZpKA>KxLCr`1bolJEnun z3W!34BixFd1xP7>B=|JV$N4ZloFm4HpXn%%#DB&W`yGSm+%HH^8QOkCwDTS2MDwJs zQfRWsD!XiT_P0YbD!pdVT-n`^4YxG=A*43?5?D!aFJn?lr#wfxEC{zyuXn}YasA{8 zv2>fY7fK|38eOe@g6S8-kF5)lkI?|AYS!suT|K!otK1WE1LF{#4T1`ES#0)@dbHKF zj1Fk{6hi?9$?QKpmqBxsIMY4;DD}!79xlE~mN9~X04sRo>~17<93%C0I`PY7)c+hlt}@eCtaG7k=fO-sx0V95Snx3*}ujIh?3rg?N~^R`rwi&&KTKvbCd-)@!S#d5o42~SCXSL7on3k}+J4^LNXfjANYq0$x zQr13vC>z{p%v;6b`8x!b*z|29#CF0rPo;6g77lU33!6UG$OG|!Q6kI5Jl*?*u)Dy^ z?Xp-MD7?#nAMS% zp*#zXxADFCNHI6#$n$7+9`yK;ebKIsiKy(=JmXuCBDhZX*Wg|u5CRyTtAKG~!9N&r zlG*&YuVy+{JSPDGuFshg{(97ct`G_w-qOPjLs~7uNWdRlU^bC5A+kV^aq;jlhP}pu zl8kKYwD`=N&KTU#HS>%xTy)FeXq48yvQZAL)guL+xBL-xeYqmn9sBktROfq67B6P0 ze?5;%Ky~=kCQ~4WVHJt6@VxWm6h)O9k$npLr_MLT3GphQQ9 zErXc2h@dB#Jtm3JAPqyT8^cBy+2Y0x-KW*ZDi{%{FO4Aa(bKVSgWJ*q(~jXWV#;pb zHKOq8?{VDNR9&@(E*{m#0pY^PP$$>GO^PZ80c0Ib{vsg@sWXtOy^6$CojZScNEi*t z09J*512@`ooczijlemQkBMsC@5++A2Vw8Vp(I8`J; z%Eh-VH4KE6$=YT1$tXUr^x+vS-=$ePR_`=f$%zLW{6#gKoMlN$XE@FQ~6x%H4t$?MXoHAes1)PY1BgC6pN zcvSz5`%JU z`8-xkG<<_bzJ=9tI%}Is(Tzf`41CT!iS5;TV|Lrd@k`<~*)=yhmd+eTVR_gCYia6v zOb5m3cu3M2OBZHQ=+a^=ep?+V*}B{sG2BaTX4Fv!yY0)YOdcnhslrluM3QB2_4=A* zvGf5psKLw3obH8Z4nO#eVfs}i9Kbh<+59V=4J14>K$U8xG}#ZxxWv6c-Ew zYzjaHOA+CUuBnyUY5D8PS5Ilc;6{ zzY2F9+E{nnka;DnROvWcI-J3e+mV0#%<=PGywKpF>Ri8H zI_y*l5=6-u@dP01Re#Tq385hr}o-%X%pN|(Sb+G zMCXWJR*FqV2ONJ>(TSW?ySb1ZutnSg^*wnQ7?0p;$=2bW{Gw(3@v-(~1= zL5c_GBe+caU=vea+{SdQH>=bfu38B0LR#y*v5!9w(}^rLznA_ufSK=a6~p(|Ci|8g2p*LzJl;5YuI`y)iF+)eIB$VQh&7v&Nozi$Cj5TB3C}Y z>DW)8!sev*zis8AGP^a)-`i)^sqc=+-G?GBk}g-UT>*HS{-DnT^E2uB8>)T0br0a1 zR85`-WK)upA~{PHzxCB(PBOhL)5FjGbR3bu#v%FQ)R&ylsN#=0TTvB*VJW`{{?c|0 z8^JX~ieBZTYNjQ=N&f4f$he_=%=&=i4vXKY59oIZhLjqYY38P6R1q#^IJI`-=Mq^V z)ZNYQr&GopMw%@ml@2nHq#)v6?FsK^lwEt^sw)RtgfGWF(!#-f3lRG{oF1%U_uR{lL-n{wqQo>r?td`@2~T1Sgi9!d1(AuZX6g=P21+fy?Uc;z-zKU zrxVgSxp^*}3rkaVBU25>l<)EoS#lFjqPwohL_|+UaFTmxUtISjN7%V5#O9N5S+$t& z6aYXbA3%t!3Hs9IGFL-D+|xrG1On@*(TZVnlsyU2q>o*{@%yKQg zW@SQt{(4AXemRN_0O%31WhlH-DL#mZaMQ;OLI#H=PR<@21Z~4lhALEt=m5u-?TXH;M5asSNPF<@#AH^r#U_2P9hmeywWsgXLA}NPQlnv}^!lw2@^8$@u$w^cU!{ z!(8$o5iWx7QYP~^*?LI=CWq8|AZ8e+5G{l4H)q(im>%SM^Vk_QXJRk3kHHo#58EAB zs&&{e2-XBQ&HZGGPq;jahMy0Uu!D|Rk>Com2BiJaGP(&{aYl43+yW|h=J#kW3~~!L z7_F};fjD`w%ps1Y4%VqR7IZtMKRyE6Kgxm%BaDXPN;Vgw5+lJ-vxH&9n{aNv-UVC1 z$yyrN?kBlz2Z3i+>=zQXmxg7Dc`tRDJRfw@V?3qQuHj-rug& zF|^T)(DVa-*(TQXY^5fz?rA5H7#FfnfHm}uqwHQzvrZ*B?{rt1UhvMO?!(c!-t!K!T>gW77gu0dF?NFvLN1+wzFVyT!ux zrf(-|sM%}FT}2L?H0R$ljS5F8(>;y*&dIDaYk`T@lh<-M{CF;VDs37c_Z-F#42qbF zQ5ITSt5VC32wjue|C+v%I{4w^ZipMA7&9 zI$*z?V^b(qx$c6KPRaNS*;nXS?xw( zlA=lLO;sDZ{qa+sgs}&63=94pqOCGl#C1EhkT8ewSSK{>F2wxJT>A_PWOYElDxlJe z3!76OrZRlE{%GqO%_aA&oDsMfDMiMBV1fk7^r7xy^eR7z%$j7XWVh6AbVzV=iDAuF z?VZ&B!E?~fHUCuO7)%oMc+yA#~x1}UL@Hml!=Su_7rp&`5 z?fFPS8t=DB)CAQvtu$GCIQa6YqjIl_fbY?cpkuQE^p(BB2@2bA-sl1%EP163nX{Qw)2tQ&jI+W(b7QTV2(h3 z;#NKaJ3Q2@m454PcNwTrVd;rIv6$ZI=}BM{4mz0&Z6PE94E?l4EiB6$ki2R>Q8|!H zE!#p5M#0fpVpx=Kktyg)2xLusxDI_7t2}StP9gxnIHQbciHZMOpBoQ@V@K_a z`9+@slf^eO@RA%{`S*Q^%Uxm#P5S_t*^y74n?M1(u>kWF3_lQlHJu+;(@%jF>A{JIzt8 z-%_~&QrqU}A>o_Uw9iaeB$q0zLmOm6{oncqZA>T`zlRQDdDx?)2FmVWZFb?rJDCpW zq#}8lw34f}96s~?XnuW2@DuD}&>b%iV8rL!Ypg=Sv*L%4>t)*nBJl<`#gJZd* zIZ9c~F;i`8^7z0xmYVrOV;aK~f`i}8SY~mNsxWk z1fXCo5nTRw8fp&aH$m@Gu*zYZL=90X22jUp13hO8i;A-EYkAwpuJe2!ERI%Zr(Er- zN(Cm%f-R+Zrj;*Cw1Jhn?2|u{&IEC<@~|%zSxn>(I>+0o1R@!GP>Ko<`KvztsZU5xsd_JB~tA4{>Zjq=e1b~LwpPQ>#sJ-o6BZ1E}y%FWZK86*C!^u$Sj=C(?TDp9|2(QXU-7}$-drfZh4+;#KFLZEq7m1 zf5=wcbn|G;O=2HtM>BFv_%&SlAa9%Y&bHfSqs8}rI5$V4v+8?M;~V?&3qIwI!fxNh z_%3MmSH-4(4U8W@xT7Xu^`RaTvbgqcHt$iDyHZBb1i!u-iM|qcNPB zbPIB}{m7lji6{==`)bMZlccH2c!F;xDc6FG71AT84`*U|Z#~-eJ4#XQZ0!2=;gi3e z-<~*4^DpiNMFVQKUH~auLMNnk+$;wtz;C21wGif(2=qP`KI8L7p%=tRcpxWoe*kSQ z63wNv-oASmmS~gN>(@thJuJQLAAC&8AgIPd6UdhgA<7m5JHa$f70dgHfI8C(x^W~3 zk^F~z4nvuxm}8D)eIlZ*38cIkQe-jIJ?N9hkoDuN2>bF-$g}ICF').text(data['explanation']) $(elem).replaceWith($newelem) } else { - var $newelem = $('').attr('value', data['code']) - $(elem).replaceWith($newelem) - $newelem.select() + if (redirect_url) { + window.location.href = redirect_url.replace('{{code}}', data['code']) + } else { + var $newelem = $('').attr('value', data['code']) + $(elem).replaceWith($newelem) + $newelem.select() + } } } }) diff --git a/r2/r2/templates/goldinfopage.html b/r2/r2/templates/goldinfopage.html index a2b040676..304ddbdee 100644 --- a/r2/r2/templates/goldinfopage.html +++ b/r2/r2/templates/goldinfopage.html @@ -102,7 +102,7 @@ _( '# New comment highlighting.\n' "What's new? Highlight which comments are new since the last time you viewed a thread." - ))} + ), "first")} ${feature_item('username-notifications', static('gold/sample-butler.png'), _( @@ -126,6 +126,7 @@
  • ${partner_item('ifixit', 'technological rectifications')}
  • ${partner_item('rover', 'canine accomodation')}
  • ${partner_item('solrepublic', 'acoustic accoutrements')}
    • +
  • ${partner_item('ups', 'logistics provider and gold supporter')}
    • ${feature_item('filter-all', @@ -161,7 +162,7 @@ '# Friends with benefits.\n' 'Add notes to keep track of them all.' ))} -
    +

    Last, but not least:

    • ${_('The Lounge.')} ${_('Access to a super-secret members-only community that may or may not exist.')}
      • diff --git a/r2/r2/templates/goldpartnerspage.html b/r2/r2/templates/goldpartnerspage.html index 6862f22f6..92022f32d 100644 --- a/r2/r2/templates/goldpartnerspage.html +++ b/r2/r2/templates/goldpartnerspage.html @@ -42,7 +42,7 @@ ${less_stylesheet('goldinfo.less')} -<%def name="partner_item(name, how_to_use, img_src, img_url=None, description_md='', extra_class='', button_dest=None, button_label=None)"> +<%def name="partner_item(name, how_to_use, img_src, img_url=None, description_md='', extra_class='', button_dest=None, button_label=None, claim_dest='')"> <%call expr="feature_item(name, img_src, description_md, extra_class, img_url)"> %if c.user.gold:
      @@ -51,9 +51,13 @@ %endif %if button_dest == 'claim': %if name in thing.existing_codes: - + %if not claim_dest: + + %else: + ${button_label or _('claim code')} + %endif %elif c.user.gold: - ${button_label or _('claim code')} + ${button_label or _('claim code')} %endif %elif button_dest: %if c.user.gold: @@ -75,7 +79,8 @@ img_url='http://backblaze.com', description_md='# Backblaze Online Backup\n' '3 months of free service (new accounts only).', - button_dest='claim')} + button_dest='claim', + extra_class='first')} ${partner_item('bartsbakery', "Claim your code below, then enter it as a Coupon code in your cart at http://bartsbakery.com to get 20% off any product.", @@ -176,7 +181,17 @@ 'Creative & elegant gardening solutions. $10 off purchases of $50 or more.', button_dest='claim')} -
      + ${partner_item('ups', + "Claim your code below.", + static('gold/partner-ups.png'), + img_url='https://wwwapps.ups.com/mcdp?loc=en_US&WT.ac=UPS_HS_MyChoiceTab_notice_Mrktg_PX_U1_en_us&WT.mc_id=UPS_HS_MyChoiceTab_notice&WT.svl=BnrMsg', + description_md='# UPS® Logistics Provider and Gold Supporter\n' + '3 months of free premium [UPS My Choice®](https://wwwapps.ups.com/mcdp?loc=en_US&WT.ac=UPS_HS_MyChoiceTab_notice_Mrktg_PX_U1_en_us&WT.mc_id=UPS_HS_MyChoiceTab_notice&WT.svl=BnrMsg) service to make home delivery quick and easy.', + extra_class='ups new', + button_dest='claim', + claim_dest='https://www.ups.com/pea/register?inc={{code}}')} + +
      View official rules for "Golden Tikkit" giveaways

      REDDIT