From 02acfca6bac8024f3ba8e2540898229885b77283 Mon Sep 17 00:00:00 2001 From: fefa4ka Date: Thu, 17 Sep 2015 12:15:36 +0300 Subject: [PATCH] trademarks --- media/cms_page_media/7/BY.png | Bin 0 -> 516 bytes media/cms_page_media/7/CN.png | Bin 0 -> 707 bytes media/cms_page_media/7/EU.png | Bin 0 -> 1000 bytes media/cms_page_media/7/KZ.png | Bin 0 -> 1551 bytes media/cms_page_media/7/UA.png | Bin 0 -> 141 bytes media/cms_page_media/7/US.png | Bin 0 -> 215 bytes media/cms_page_media/7/Ukraine.png | Bin 0 -> 1319 bytes zsite/static/less/header.less | 23 +++++++++++++----- .../plugins/feature/people_list.html | 2 +- zsite/templates/base.html | 5 ++++ .../form_template/product_class.html | 7 ++++++ 11 files changed, 30 insertions(+), 7 deletions(-) create mode 100644 media/cms_page_media/7/BY.png create mode 100644 media/cms_page_media/7/CN.png create mode 100644 media/cms_page_media/7/EU.png create mode 100644 media/cms_page_media/7/KZ.png create mode 100644 media/cms_page_media/7/UA.png create mode 100644 media/cms_page_media/7/US.png create mode 100644 media/cms_page_media/7/Ukraine.png diff --git a/media/cms_page_media/7/BY.png b/media/cms_page_media/7/BY.png new file mode 100644 index 0000000000000000000000000000000000000000..102f3f4cd7281819c7992aa62a8f9f9f02769e19 GIT binary patch literal 516 zcmV+f0{i`mP)R*ThQHP{8CAlL=F_yA%siZ5`DDt;>dMMr-NN5)`S6z;jW zA1t%8vlr&f%+Ad2EfG;Bd6W*I1Ly!cfDYg<0L07jNxY3N;%WaN?$*}heHh|lYr9f- z){(Q1@AUJh;~w7tpy2c2QC!c>$JNYiReo4nt`weit;X zN~gAUKxcqKs0c*ntp(78 zIsQd+fwKfao2gk+TspJj(v0E`#bl1-@R8+04Qk=MFL0w2_OL^ zz&``bjOs{Z^ao%>hrPoP*JJ`zgNPXX>|qU!vt_g{sjzn@4S)vjj8Tk7Kn&|}4{G@G zY6CvK$e?y&5caMF0a)7%v@WV>T`q~wVF0s7Dp_1c`^XD80g&3WBE}Q z)>b2OmaOdtoC$yM&X@*wuLgUF?svxxUMyN#QAIPZ!|s)57bV`%h?ib50f7U;~I3VAL;z z*P9G9&#UNKe)c)K1i@BmQJeh-k+Pk};YN`nW>L&?g8J!lxEuZCOq_Ll zcs&6~tnKN%D4WG=MR-$G*L4N&@8*RwMgFMiuM6B~?kJVeo^>dpH63&w7LXSZJ?gswvn`Gk|+Y z!{_H2e0;VMwPTfJZRY;wEWo8xJ6;i6YH=<|<$-2Mk2UlC1xWpoQUXW-2_OL^fCP{L p5+LOO@*f%rAOR$R1o&?Oz5=W>+DtbQ`dI(~002ovPDHLkV1lGJJ}>|P literal 0 HcmV?d00001 diff --git a/media/cms_page_media/7/EU.png b/media/cms_page_media/7/EU.png new file mode 100644 index 0000000000000000000000000000000000000000..1f3b19c4a3748d7f01d44cffdf18d7dafac444ac GIT binary patch literal 1000 zcmV>P)gm^KY^dgNh zM$ayZK~G*d;Xj~>@$mC~Q>IW3$V|%saSksto%z1U_j}9ly*F?GxScGV0zd(v08juZ z02~IuX(zA~MFH?niJ7#@jsy^8f;x7b7cO#o2LPZ0+pHZug`ngCG~dZbOIsceru6gA zY+hk&w-W#j9WL{d0lrCtP%ncCO6kMmYdU2VJw3$2Yj*T(PN8UW1wET);zy@zg?x3D`| zU!`3?EZlWg5Al1}=#dS8=kYO|udYEzb_ZPP-gbbE970$}d)VG!eHRL9s!8XlOaO=y zGfHma_a_Zr&4s}~!MMUOVubeikr!T=Bk||68u~JWXu6dMfEeb~Lq1`zHy2VI&q$AB z%8zSJ#h4w|;c&)%nE;UcT^XxT0;-4xRSr<0N+@)si`OYK4ITgb zAstK~6Q*0Go!sOcVEqddXST>pm!MacR)T2HjWuo2la6^|xs7m-8>^7Fogh0;OvSzBo*CSv3`_@j#7wqx+WGj^Sbt@Jr?ar$J%K|cP#l>D?oI* zm!>hhv2vX%?w2%RrC?!RX1e5Tr|oJ3{o%O0Ry;FlQE4cHm(b_0?e$s6P~w->SK|3} z4C3=!Xz#@Kn8;3--r(cdG?W0B<(|fadi@lN>-3UF{+>N^p|vA@slZo`A2l5Pkc)uN?yh3yUBKNCi6c z&;HL&VJcy!MUe+zeDTe9V>B@w&v&P3S|B6uI0O`h?=w}LGklBc5H5;-_*Z8AQ z@&HKVWUF0ku+3G5gYKo6V?RJP?j#F<5HiWYG0ze-`QC!&dlPH)4FvFG@&HITw&H|m zA+Gq|hQ~h+tDIYt3xF`tKn867$sChVu5U~x0HT2~>fI&S>t2E5WMZ+SJ^>n_2{g4K z!tl*@Q)q2>xKLsNhJ)^jN0Vw5_!V2NWF zUbmh>w&qp$yKB{5N~pInh%#plUFZW;>g%x3u_sOdA@ty9p4o!6dKEUi%CX$J4exUD zGB)tpa&5Tf5*|~mgcAXv4bNx}>~}AR**68}y#=V@OVZ<_IgEj3E9zY(SnAl0Lb7_v zHyy#iC}`AI3C&@?V;>ICs)t*?A=pqN0EF4ZuH&?KK0fm-Mx$?rVj)d+<=7_wxakH~ zJ2zp4vkofM9Rj3ubi;1p5+%0ju>*s+=a;PACgcK$Hk8vF)P^ z$;wQ$9gjf+p?2Z6VutM~%E^HA6q#t}$#;Ng=>bn*EHzP2ebgbN(=+0CA?jeIvzFbs z2%mC{wVsMm#BFL37TEXDacZfhscNDR2hbCDt_@RGT}H6IM9eXl>jRzm7LK@!amG83 zqMM~`FRDhyULjy7k+B{GG2M0yYn>aFmi~zW-9LdM--%@udIo`yprB{l5609yy8saD z`-1*&_D_Y&Kb}IY`S*u4iF>)Qiw#iX$6)hS4AQLBQW@ql4E_=9$I14(PXm3Fm__8( z`dYkUJ&XP(pUPjt{7^n4S~l(j5Q+dG^=?k4EGhuE)ubhU{B|Q-*>GmlUFN7-RT>ox zgukm5=WALrI^0OQeWBwMY}6}|Mb?%%x8qO#E)W=v@f3BmrTfql`pP?(B{Y*Iv^feo z!^q~o;gt6sILX=`PHdQ^kt^DaITC`_E-eFyKKWq&DV*@#)}CD=UniyX}ZD;MC` z8v|63%%vMfHdJwlSelFkI-zo0v?3-*sojg-eB~z9`Wn1oHnATB_`EHuvrAuC?%2k^ zYn8*T*FQ!cH%(7*^75M;{?^18znS+8WH4?UT})c{yO&|B>qCsUo{W-8NwOg|sYQ$* zIb=l2??o~p2{(_Lm_}hsN1kSH!1HEJMTjBX`BgA#4AgYIW;w6&SB}Zw9`?G?$j-2Y zq|HksON-iS`z@Fk;!tVAOJRQHSYdAy>02ki!UUr>hiC$jZkN9J??eVeSCSN23c}@a1<3bD@}`glMTh^Nk!3 zh)a#-N{ev&7{7zz>d$J(yC$%2h`>cF2IK7n#A#DdiA_XT#f&007yo`BtbjbJxv|^5 z3hVSr%pnUiZ4FpKG5>P?IWz}eQNYqWVnhNqG_nWy+B;kIgOQ{@egIuvN(`Zz4kIp8 z&fYNEdYXu#C0UMN*o zW53sw+6xtTXRsDSZUb?TftRrfYr)@5DRWnI?)c^PIi`u_NSM*r2-4BUWt`t%F#?nDHD zV`f}kOdLey;I66G{=8;_fbq5Fj!WNkB49aD8n& zdGa&B%?!+tJb!-V_Euy%Ak1uarCsersZ|S@5qQ74CyyQ(kO1@Cu=DKMEr){<;f;a% zs480&cPaoi_zotKvN4d{+^7R!05}|y7cYzm!%Udl^IE6}o1jUL`QAvGz3pWEzYFW!qNnxVJY(p$!{au|S(dC5SXK3$X!EKv`=b6)25# zuR+TirIm#xblYWKZ!DkXS`nDpD)UuB#smsVVJ#t%3Ni~BLAv9a$ol&XP5ldOQ^KPj z{-c!kZDtvtI~9wZGDYSQxNg0m0jPZ;K-FtAo$SF(23aK{@2<3RsFj%PE&0&07p@yE zwI*u_$;k{_{0%^MjWrM{vIQx(#SOAOm+kcb=FZcTJ!F)9eCP@8(`aDi)L2EZLA!KWXW9s@G*=CBK@j?eNxX53NV)7zMqP&~kLq3nm5L0?wwXX{s-q z*Jd~BV8?{L1`DIdXrZD9*-N6TL@1*+-L(rzLIh^f5Y~VltBmyY_KdgT$VPNe<54qC5T3YfwDTJuG^Hk_ z3CT#D5F|5cGhq-EiVA6kND(=0J8>k0ZU_Y-XW|M^XYz?@o^f-WiGnlZOp{?4ZZqCy zqkh=y?hkh5^=!Y94uw>o`TGe;Au@?lhzLq4^4J^OXwFW~q30|(qJyR-LZ72t6Bjq0*4 d>$1+f{sADkJblGL(6ayl002ovPDHLkV1n<$a>M`t literal 0 HcmV?d00001 diff --git a/zsite/static/less/header.less b/zsite/static/less/header.less index f96426f..707c7cf 100644 --- a/zsite/static/less/header.less +++ b/zsite/static/less/header.less @@ -6,10 +6,10 @@ } .header-logo { - .make-lg-column(8); - .make-md-column(8); - .make-sm-column(6); - .make-xs-column(6); + .make-lg-column(6); + .make-md-column(6); + .make-sm-column(4); + .make-xs-column(4); .slogan { position: absolute; @@ -23,10 +23,21 @@ } } -.header-contacts { + +.header-content { .make-lg-column(4); .make-md-column(4); - .make-xs-column(6); + .make-sm-column(4); + + + +} + + +.header-contacts { + .make-lg-column(2); + .make-md-column(2); + .make-xs-column(4); @media (min-width: 0px) { display: none; diff --git a/zsite/templates/aldryn_people/plugins/feature/people_list.html b/zsite/templates/aldryn_people/plugins/feature/people_list.html index 5362935..34f8d70 100644 --- a/zsite/templates/aldryn_people/plugins/feature/people_list.html +++ b/zsite/templates/aldryn_people/plugins/feature/people_list.html @@ -29,7 +29,7 @@
-

{{ person.name }}, {{ person.function|lower }}, {% trans 'answer your questions' %}

+

{{ person.name }}, {{ person.function|lower }}, {% trans 'answer your questions' %}

{% static_placeholder request.current_page.parent.reverse_id %} diff --git a/zsite/templates/base.html b/zsite/templates/base.html index c5291b6..623b6ae 100644 --- a/zsite/templates/base.html +++ b/zsite/templates/base.html @@ -25,6 +25,11 @@
{% trans 'Protection of intellectual property' %}
+
+ {% if request.current_page.parent %} + {% static_placeholder 'header-content-'|add:request.current_page.parent.reverse_id %} + {% endif %} +
  • {% language_chooser 'language_chooser.html' %}
    • diff --git a/zsite/templates/form_template/product_class.html b/zsite/templates/form_template/product_class.html index 0efc9c6..ba16bf5 100644 --- a/zsite/templates/form_template/product_class.html +++ b/zsite/templates/form_template/product_class.html @@ -142,6 +142,13 @@ var form = { scope.classes = count; if(scope.classes > 5) { scope.extra_classes = scope.classes - 5; + } else { + scope.extra_classes = 0; + } + if(scope.classes > 3) { + scope.kz_extra_classes = scope.classes - 3; + } else { + scope.kz_extra_classes = 0; } }); };