From 5b62a88ffbb4e529be32e3f552c32497ab4666e5 Mon Sep 17 00:00:00 2001 From: Jan Szejko Date: Wed, 15 Jun 2016 17:04:52 +0200 Subject: [PATCH 1/1] non-teasing teaser (digital olympiad stub) --- edumed/static/css/base.css | 36 +++++ edumed/static/css/base.scss | 18 +++ .../static/img/menu/olimpiada/harmonogram.png | Bin 0 -> 3499 bytes .../img/menu/olimpiada/harmonogram_active.png | Bin 0 -> 3261 bytes edumed/static/img/menu/olimpiada/komitet.png | Bin 0 -> 3521 bytes .../img/menu/olimpiada/komitet_active.png | Bin 0 -> 3457 bytes edumed/static/img/menu/olimpiada/kontakt.png | Bin 0 -> 4387 bytes .../img/menu/olimpiada/kontakt_active.png | Bin 0 -> 4323 bytes .../static/img/menu/olimpiada/literatura.png | Bin 0 -> 2160 bytes .../img/menu/olimpiada/literatura_active.png | Bin 0 -> 2121 bytes edumed/static/img/menu/olimpiada/program.png | Bin 0 -> 4366 bytes .../img/menu/olimpiada/program_active.png | Bin 0 -> 4335 bytes .../static/img/menu/olimpiada/regulamin.png | Bin 0 -> 2246 bytes .../img/menu/olimpiada/regulamin_active.png | Bin 0 -> 2196 bytes .../img/menu/olimpiada/svg/harmonogram.svg | 145 +++++++++++++++++ .../menu/olimpiada/svg/harmonogram_active.svg | 146 ++++++++++++++++++ .../static/img/menu/olimpiada/svg/komitet.svg | 63 ++++++++ .../img/menu/olimpiada/svg/komitet_active.svg | 63 ++++++++ .../static/img/menu/olimpiada/svg/kontakt.svg | 74 +++++++++ .../img/menu/olimpiada/svg/kontakt_active.svg | 74 +++++++++ .../img/menu/olimpiada/svg/literatura.svg | 63 ++++++++ .../menu/olimpiada/svg/literatura_active.svg | 63 ++++++++ .../static/img/menu/olimpiada/svg/program.svg | 104 +++++++++++++ .../img/menu/olimpiada/svg/program_active.svg | 104 +++++++++++++ .../img/menu/olimpiada/svg/regulamin.svg | 98 ++++++++++++ .../menu/olimpiada/svg/regulamin_active.svg | 98 ++++++++++++ edumed/templates/base.html | 2 +- edumed/templates/base_super.html | 13 +- edumed/templates/olimpiada_teaser.html | 33 ++-- edumed/urls.py | 7 +- edumed/views.py | 51 +++--- 31 files changed, 1216 insertions(+), 39 deletions(-) create mode 100644 edumed/static/img/menu/olimpiada/harmonogram.png create mode 100644 edumed/static/img/menu/olimpiada/harmonogram_active.png create mode 100644 edumed/static/img/menu/olimpiada/komitet.png create mode 100644 edumed/static/img/menu/olimpiada/komitet_active.png create mode 100644 edumed/static/img/menu/olimpiada/kontakt.png create mode 100644 edumed/static/img/menu/olimpiada/kontakt_active.png create mode 100644 edumed/static/img/menu/olimpiada/literatura.png create mode 100644 edumed/static/img/menu/olimpiada/literatura_active.png create mode 100644 edumed/static/img/menu/olimpiada/program.png create mode 100644 edumed/static/img/menu/olimpiada/program_active.png create mode 100644 edumed/static/img/menu/olimpiada/regulamin.png create mode 100644 edumed/static/img/menu/olimpiada/regulamin_active.png create mode 100644 edumed/static/img/menu/olimpiada/svg/harmonogram.svg create mode 100644 edumed/static/img/menu/olimpiada/svg/harmonogram_active.svg create mode 100644 edumed/static/img/menu/olimpiada/svg/komitet.svg create mode 100644 edumed/static/img/menu/olimpiada/svg/komitet_active.svg create mode 100644 edumed/static/img/menu/olimpiada/svg/kontakt.svg create mode 100644 edumed/static/img/menu/olimpiada/svg/kontakt_active.svg create mode 100644 edumed/static/img/menu/olimpiada/svg/literatura.svg create mode 100644 edumed/static/img/menu/olimpiada/svg/literatura_active.svg create mode 100644 edumed/static/img/menu/olimpiada/svg/program.svg create mode 100644 edumed/static/img/menu/olimpiada/svg/program_active.svg create mode 100644 edumed/static/img/menu/olimpiada/svg/regulamin.svg create mode 100644 edumed/static/img/menu/olimpiada/svg/regulamin_active.svg diff --git a/edumed/static/css/base.css b/edumed/static/css/base.css index 2d17d6e..99182a2 100644 --- a/edumed/static/css/base.css +++ b/edumed/static/css/base.css @@ -116,6 +116,42 @@ header.main { header.main nav .menu-kontakt:hover:before { background: url(../img/menu/kontakt_active.png) no-repeat 0 0; background-size: 100%; } + header.main nav .menu-oc-program:before { + background: url(../img/menu/olimpiada/program.png) no-repeat 0 0; + background-size: 100%; } + header.main nav .menu-oc-harmonogram:before { + background: url(../img/menu/olimpiada/harmonogram.png) no-repeat 0 0; + background-size: 100%; } + header.main nav .menu-oc-regulamin:before { + background: url(../img/menu/olimpiada/regulamin.png) no-repeat 0 0; + background-size: 100%; } + header.main nav .menu-oc-literatura:before { + background: url(../img/menu/olimpiada/literatura.png) no-repeat 0 0; + background-size: 100%; } + header.main nav .menu-oc-komitet:before { + background: url(../img/menu/olimpiada/komitet.png) no-repeat 0 0; + background-size: 100%; } + header.main nav .menu-oc-kontakt:before { + background: url(../img/menu/olimpiada/kontakt.png) no-repeat 0 0; + background-size: 100%; } + header.main nav .menu-oc-program:hover:before { + background: url(../img/menu/olimpiada/program_active.png) no-repeat 0 0; + background-size: 100%; } + header.main nav .menu-oc-harmonogram:hover:before { + background: url(../img/menu/olimpiada/harmonogram_active.png) no-repeat 0 0; + background-size: 100%; } + header.main nav .menu-oc-regulamin:hover:before { + background: url(../img/menu/olimpiada/regulamin_active.png) no-repeat 0 0; + background-size: 100%; } + header.main nav .menu-oc-literatura:hover:before { + background: url(../img/menu/olimpiada/literatura_active.png) no-repeat 0 0; + background-size: 100%; } + header.main nav .menu-oc-komitet:hover:before { + background: url(../img/menu/olimpiada/komitet_active.png) no-repeat 0 0; + background-size: 100%; } + header.main nav .menu-oc-kontakt:hover:before { + background: url(../img/menu/olimpiada/kontakt_active.png) no-repeat 0 0; + background-size: 100%; } header.main #tagline { clear: both; float: left; diff --git a/edumed/static/css/base.scss b/edumed/static/css/base.scss index b422a2d..88d2033 100644 --- a/edumed/static/css/base.scss +++ b/edumed/static/css/base.scss @@ -117,6 +117,24 @@ header.main { .menu-o-nas:hover:before { background: url(../img/menu/o-nas_active.png) no-repeat 0 0; background-size: 100%;} .menu-kontakt:hover:before { background: url(../img/menu/kontakt_active.png) no-repeat 0 0; background-size: 100%;} + .menu-oc-program:before { background: url(../img/menu/olimpiada/program.png) no-repeat 0 0; background-size: 100%;} + .menu-oc-harmonogram:before { background: url(../img/menu/olimpiada/harmonogram.png) no-repeat 0 0; background-size: 100%;} + .menu-oc-regulamin:before { background: url(../img/menu/olimpiada/regulamin.png) no-repeat 0 0; background-size: 100%;} + .menu-oc-literatura:before { background: url(../img/menu/olimpiada/literatura.png) no-repeat 0 0; background-size: 100%;} + .menu-oc-komitet:before { background: url(../img/menu/olimpiada/komitet.png) no-repeat 0 0; background-size: 100%;} + .menu-oc-kontakt:before { background: url(../img/menu/olimpiada/kontakt.png) no-repeat 0 0; background-size: 100%;} + .menu-oc-program:hover:before { + background: url(../img/menu/olimpiada/program_active.png) no-repeat 0 0; background-size: 100%;} + .menu-oc-harmonogram:hover:before { + background: url(../img/menu/olimpiada/harmonogram_active.png) no-repeat 0 0; background-size: 100%;} + .menu-oc-regulamin:hover:before { + background: url(../img/menu/olimpiada/regulamin_active.png) no-repeat 0 0; background-size: 100%;} + .menu-oc-literatura:hover:before { + background: url(../img/menu/olimpiada/literatura_active.png) no-repeat 0 0; background-size: 100%;} + .menu-oc-komitet:hover:before { + background: url(../img/menu/olimpiada/komitet_active.png) no-repeat 0 0; background-size: 100%;} + .menu-oc-kontakt:hover:before { + background: url(../img/menu/olimpiada/kontakt_active.png) no-repeat 0 0; background-size: 100%;} } #tagline { diff --git a/edumed/static/img/menu/olimpiada/harmonogram.png b/edumed/static/img/menu/olimpiada/harmonogram.png new file mode 100644 index 0000000000000000000000000000000000000000..06e9c925ffc32ec6fb687be238b8266628681c56 GIT binary patch literal 3499 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 literal 0 HcmV?d00001 diff --git a/edumed/static/img/menu/olimpiada/komitet.png b/edumed/static/img/menu/olimpiada/komitet.png new file mode 100644 index 0000000000000000000000000000000000000000..2837890e06cda30df76433d0e0c1b3753bc64ccd GIT binary patch literal 3521 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 literal 0 HcmV?d00001 diff --git a/edumed/static/img/menu/olimpiada/komitet_active.png b/edumed/static/img/menu/olimpiada/komitet_active.png new file mode 100644 index 0000000000000000000000000000000000000000..b70ad4ca999241a2dde2428413e022d89de3b338 GIT binary patch literal 3457 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 literal 0 HcmV?d00001 diff --git a/edumed/static/img/menu/olimpiada/kontakt.png b/edumed/static/img/menu/olimpiada/kontakt.png new file mode 100644 index 0000000000000000000000000000000000000000..e94d1789b8405caa14146be10323d72790b4ff4c GIT binary patch literal 4387 zcmZ{ocQhOB_s3(8*wv!;Dn3?Xk5*|>{isp3cMxI*5!xEDX|<@;Dk{`gVvkr+vsDDG zRjXCIR)iqN&-Z)I?~mUfzkAMoUgzHDyzl+zp7WgNzA!a@z|44)5dZ)%KQz!ayQ0jM zi?GpNok0R?3Rj@^&@s{h0BTc!XAqjJm;zz;;2xlQgm2?25OOszGXemf-vR(4V*!BE zt5oDV0DuGm0GrMLfW|ujfXhD@`}p?N1+9zW1KrF28iO@y?kdCJZ(xJCqQQS%|BJU4 z0KnS#P*=wswy^U4nZ3mdcA(39n>kckF{hhCkCV+!A4Mmp0I zfy2zBe#YwVmE9!eg$U!dh1JoR$th&xeL`kz-+m=-+J&epN8QIuaMa_@P|fJFtmC4c zDd%Fw0tD6uhW7#}$>s^%4}eQHSv7x+muWVFQ|KRyrS;iJ+S=jME~VTwpgu+uk&CJq z-u+zwSMqI-(AN|V>tc#{In1T^{GHT>TaaLTfI(0n6PDXg1;eZbhCc7|z7Z}HQ+qOJe}m?0QZRtURm{(n+rc?K zgh@f({kS-fI;Hi4&B7D(`F7Ksr9?|sn(FT6nkl02xrqh4Sf4|fn4bV_(o3K|lq)(u z{%LG!&ys$9>2LzB#S|l#566XA;g+v`h<(MrVQ7X-RXy6AnhD4AOn{r0Wr{NGjg1*& z5TPzB6P4%%jNG68OcWLF_a`-Rt(eaTG+)nL2G7Dz6Uud#5cp9|e~MSeAyvUB8cq|* zU}?kdlZS8D!CXS#hW&3E_?>x+YU_XrONIE7M7Z`H`woMu4jw13v|*?qH`hkyUj$|Q za@YQQIZl+?F8;k<8IG7y{(6Hebu(2#&hyTC74~23&Se+^981qE1$=(UWZI*~ka4*BIdvAVFxv_uqH?lLAxr-vRa1Y3d2rbSA27 zTv3$Kq4%mp&9pNMCd)$3o@;DW6s1?;4zN@A7CqV8L1GH+0(&0p>Dug4mwNlcPe%{8 zfo0U^j^S=oQ>Klzo1HH`@#ptR6Q`e}sKSO+TNgq@mG6+3!p#1Lmp;MW`f;SyruGiT zdzJK`ki>hv&dn;gn(|Gr3){_O~` zllZBsL>4ZS?v-y}YK}R#Nplnsxf+Q$N9E4)rNbJNw8a2PROz>3U5cYgmcHbANIxBk z#X;t&_ta#?B3ZXr8q3KeHi9@lO zDrl9*pw4ibD}-99RCy;jN%*N9Os6*iU19m498SzzUs(#i>cTntQ#TIG7rx;d$HvRpi@CwPA#I~jK*e$LvmNa|)LdEG64 zD;zO#qJGylvS6sDHiYtq~}Ir#EdNGF^+t9S`K{ zfV0L_(Ax@L+iIm0yiL?;%PcxVfL2hUUU@VDePsG}kHbGG@bAr2CZTy~Br2=v(UxU1 zP1^ajTfHaI+uk>;&K2nYVR^`6$50_}k+<1L1(>yHNzzG$=eLQsQOIdJd^O<%R+r9w zceRRk@>$Ay0ZzSuY%UlEN9HKy=z%uI-G+nUruL?sk_l%=XU*F>JqvxEgZt2y0rk0v zIz^?3F?2;2eR+l9Y!MW{Jnt~mv3f+6^|JV0IqpEb#Tgbo4QZb$X>E2zq@n0`!qbPSdhT_{il*|-DHUzJ4eN`NxmJU3hmEkU)IQ> z`yZ!T&Z*M`wT>@it|8Z9l%B=y`WLJwXyMIZp+1A1JtHEy% zOH4b^YvGez^~>1!o4x_(%0ltuD7D@9u-=>N5H)yIyW@L_yEF?c5g6(+h)?Q+g12{5 z|5eDoY-cGqu1J@~A)QVz~ z+<8uUWZHM_F5_-qk?JX04Zp@-qqP*uAbYu&FX%ZqxE)@{yrS{nHeIO6olk{llOskR z`~Mqq8t?}K>fr;T4|OY@47oF8I*51SCa9tCG#2tDF$&P4Yq?dCNc^|eR4?znK8aGvlr^aMt+M3nYZ-KWI{ z8|Kyd8#GxjPx(`wZMyF}8uQN>F>+IA zFpdCfWq7(adA1mg3w$vrlhbXQ0EsfD6Gl9ZcbzpKe0E2g{M80z0t#tb2NYcUAwmZ$ zd_n7+5~O`9P$W`r=0y|Jsx!q)*XPP8;eenWn#f|AH0&-Mb17Mo!WE-!NsSDFuT#JN5*4@a%24^*c6iP|1UX;`j~hR)6#ZFYs5Sj%RV^(WRX*Th zJ#R(zGFUGukXS|TIu{j56^e!s^{4LdIN}$kFKq0nDrKYn2!80o+={<>9&_$4^hT8P1q8Jd9)>eTdb$h+$#Y zpcn_8Tra2pr|xS)R!MYVMxC7vU4Nc_-Y@A?l61pM_%8za%dWWF{T`>AgoXfT@Rz{$ zOfDs@xur!AZSJ{#YjOZ(on#52`KMrwL+_}=DaU5af6UKd+N|1a(y8?8zux)TVbGLd zT5F`kXg{Bh6cXh<6=1jP;{|!u4K2G0#ANZvW)AD&Iq+c(8)~tmd7LV~D&N&CHO=KB z--CY$TeLaPrt$P=vqpYFPOz6$!nTQSL; z;mq%BHP$TDYFDvLbk$_Jixe_Q1pZw1agmK%R|v}cdy~vciIUag(u`ZbC?vCor?U-@ zU{i7|f$SlKT$4u?Yy*WXa5a!s;;AeWJ8PtB($)mp?fn4|?v&SDK$hv!pYxm>I?URU zo(*VKNGAXDHM6H1Bka5u>&1O-6FYmZVgDici^RTyc|%5N<_@53>xdzFLin#+>$u`D}~ z=C4y=O|U()?g7gfo(*qmcFFOs3S63khy#5@nS-V`l47scHcX@r!DTAY>iuCE65&I4mn0Llo@0-G39zE9TI8 zY-taECt%iAnH5Q-Hq2%{g&!&&E^1G&&>v=OIg@fbDtl^ko?+)Sk~DpVkBSw+izakr z7#W=0%GRJkG;O&f`N1NrAn{UlbE)fXK+b+jzkzU?_chFb6Z`K3R|!T|Rp6N2d}wFL z{4jD@6B%FPCv0{kw%b{DO$6#qc+2G-3p<(!|4F>S48X5fIW@HZ)B89lrh}|?y|CYO z-ny~&GMwo+MdGr;wqY2)zN$Ui`oXG=9}RUgG(0Fx?NSJ_Jn}cyg4ca^Q#Z)wOE-@0 zGaE9ga*rnROBCsreN;Kumzb060Arq0CvpT>^iqX$gYQ}Cul0{0@ZfS$OgOK3L}0kx zOuh3(qF!ZRa1A#k07rLjNsySa~%w zbvJ`62XRBm@4e9x)VZJ;S0@-Y*BJSbEg(1M*O+mHXh^qt&#QSwlNdh9-PBN=HT0FL zzD{|`Q|~Bo^Sd_6ZFM)|QJWdc1QK4kTCt^v_NFUug37n(hf^i(is9F+!#$8aB{%RN zODTy@+Wu6tsZDX@gl-zK9rT)lt1f-!Xf8X?UcS0SN*O*L7x9!bSWS!hLy?xLWKM{F zpKZ~D8IAoEq8L()p@Y66d>W_t=T;Wo+lHRh?H)&dEpGG26?ZFb3uHRooc3i>MT*JA zWWWA5Sn;?bid%*giPTKopfeQUjAVvBUOAl9C{}J12bvdLX%3eVBPjUN5W3nlfeFiW zig3_z$OI8rAi&&Q^jLGZtu*eqFrXyhFD^5jM0wGgzTi$}ryZdmVY3i)u(wCf72xBc zBs?HU1Ty9F2e@yu@(Y=NZr`PRWxX3V52Y$&{E=>6*^P%uDrCeEl?<&z6qAWHXLK9N zsjCOEoHWF7LzByymQWA>GR}T6yvdK|jVbL8e~*IPlFvup$Ir+x&+1AeCA z6)d}vAr3p@{>E3GJCF$&s;a&9DQid;im%!-p1{POx>woFr=aairz_9cu!?P&r!4Ek zJ16ZPEPI82r0y_k)AXZUab~n9X4lP)FbbHmxY@i1Ru-~=crc&D5>uanP~Stp@xWB2 zG)or1V|k6!ac%Bix2q0}R$s z1WSVyG(ez}Gt0>TBk+a0dAdLQ{{@K!JO9}vSpBC1BG^O21%iOeA_F}E?w&qS4S9Ka z7~B^s?*;LLddnjMUFD%}NMESi{{j&N3G#H6_w@CU_l5c)<>5Y_zW$yNH;BA9+%E{? Z9VB;E^A=Fm@u~&jp`NjB^*!h4{{gHsU(Wyl literal 0 HcmV?d00001 diff --git a/edumed/static/img/menu/olimpiada/kontakt_active.png b/edumed/static/img/menu/olimpiada/kontakt_active.png new file mode 100644 index 0000000000000000000000000000000000000000..58e597a134a6dc4ee97dab7f28d6f6d103c95c7d GIT binary patch literal 4323 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 Ixa$!0ABChSvH$=8 literal 0 HcmV?d00001 diff --git a/edumed/static/img/menu/olimpiada/literatura.png b/edumed/static/img/menu/olimpiada/literatura.png new file mode 100644 index 0000000000000000000000000000000000000000..f252351745cf244cb6ecfd6f8683a5547135bb6f GIT binary patch literal 2160 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 AegFUf literal 0 HcmV?d00001 diff --git a/edumed/static/img/menu/olimpiada/program_active.png b/edumed/static/img/menu/olimpiada/program_active.png new file mode 100644 index 0000000000000000000000000000000000000000..9b6ec98a54d606ce235215310e3ff6a135402f41 GIT binary patch literal 4335 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 Pb^^4u^ffE4V@dx3);=vP literal 0 HcmV?d00001 diff --git a/edumed/static/img/menu/olimpiada/regulamin.png b/edumed/static/img/menu/olimpiada/regulamin.png new file mode 100644 index 0000000000000000000000000000000000000000..449ac1ccb1f600eefd4de86f47804aa8cd922d66 GIT binary patch literal 2246 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 L>nm0?3vcp2Brz3L literal 0 HcmV?d00001 diff --git a/edumed/static/img/menu/olimpiada/regulamin_active.png b/edumed/static/img/menu/olimpiada/regulamin_active.png new file mode 100644 index 0000000000000000000000000000000000000000..1a1516ba78ccfce2ba7c00710092e6f03af291a4 GIT binary patch literal 2196 zcmZ{mc{tPy7sr3fGDDal=~^0Dl6A(?l(kHDvdk4pm@zZVV1z+2_AQjPURknhvdcaU zLPC~O)*@W4#LZxC*1|jQeV+G^_mB5H&pDsxob!Co`SYAa8!HojUNK$(0Qk*J4bf~W zvt1f;f*pT``V!dS^f0(#004EVe7~?wL8nMfPGCJDQuelk56fw4Wh^0GOO&}$H_BV5_gQn1D3xi96PHG$q%hO;2;*+Hd=uGYWsLj zL7Ax3ar`G#D(w$Bq4Nyysos%-db}U4xty+#gVz%U!&0Z>m6JQnL+MK_h2vu><1`63 z=@-xIW^W!Ys;7pEzAhcijmX}zQ;OJg(^M^dHm5-+%_C)R4(qI31P8(-(-ilo`5IX9 zN(r7hGG%J%dm0mI7-`z>469i7>9J|^{qSMN{22G4j-IpBf(;9HTWGo`YI2nsG_l?L z3_de&1t(s5^$ zGViPN%@!L)>$Ulv+DelKp)DRe{l;nbud2*&k~t}gX%-;wzj>xvvG_v z&cb+~YdGq+g#>^_4R8MimDmJBIe_o+3JET1KP8qf&Hgs$6X@5(cC3n3Bs1c4&lVYLfChk;*k}}R zQmyosOxyYJlSA1{ZYB`l_b=-Opdk6M2k!Mu%eNyXPBz9yDBZyE_0he$PL4cV?x4iu zbgnpV!idi@)Hz;#nt0!!OcJ2J)uy_ZKwLfN8fN z#w%7Jl_aBR2!2Psqha%CyL9)9-w1+>gC{idZZFs;>(th`pH_G+j$46H^NZ8I@sRiF z;i>NqKh}#fR4URumwT4z>POi@2@}SuZ!VaUw|n#}M3r}BK4+JIyQ?6x>9X_s zT3aR|XTsz1_mndPEy)09qPfGDPDzy`^DU=>CqV$R|)K{8?Rq%XHgV2tt!6yV)cd1SXatF!igX_h9&K+YG-PxLix_;uS60pWz}z*`r5T;J;G{k?(fbz>U_ee?6|BrJrZ*g7+&5P{;+ku3t%YH&T8NWmV< zZ(mrwF_Alpa@2SHjDcp986LM9ldQrEEAp&n>E8SIt`9}cO_aCImK#Q(OJe!$Wk{O_ z?I_*fo-0&oHC|}1)S_;DP32j>4z+k*{FEqQ{P+Y*X$KX#;wA@lMK`b_PTXIl8~r&x z)y%$_asfuS0`S-Xf;P^dzy_d>P(!L9kSc1I?9`CjYL~PT2qlC%J5FyLRR52Fd>2o0 z5B~px@_H1MEx`O|10~2q+YL)0s08|x0C$o%K^qQ-6Yr7qh literal 0 HcmV?d00001 diff --git a/edumed/static/img/menu/olimpiada/svg/harmonogram.svg b/edumed/static/img/menu/olimpiada/svg/harmonogram.svg new file mode 100644 index 0000000..64a3a3e --- /dev/null +++ b/edumed/static/img/menu/olimpiada/svg/harmonogram.svg @@ -0,0 +1,145 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/edumed/static/img/menu/olimpiada/svg/harmonogram_active.svg b/edumed/static/img/menu/olimpiada/svg/harmonogram_active.svg new file mode 100644 index 0000000..f690251 --- /dev/null +++ b/edumed/static/img/menu/olimpiada/svg/harmonogram_active.svg @@ -0,0 +1,146 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/edumed/static/img/menu/olimpiada/svg/komitet.svg b/edumed/static/img/menu/olimpiada/svg/komitet.svg new file mode 100644 index 0000000..d04c979 --- /dev/null +++ b/edumed/static/img/menu/olimpiada/svg/komitet.svg @@ -0,0 +1,63 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/edumed/static/img/menu/olimpiada/svg/komitet_active.svg b/edumed/static/img/menu/olimpiada/svg/komitet_active.svg new file mode 100644 index 0000000..9202ac9 --- /dev/null +++ b/edumed/static/img/menu/olimpiada/svg/komitet_active.svg @@ -0,0 +1,63 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/edumed/static/img/menu/olimpiada/svg/kontakt.svg b/edumed/static/img/menu/olimpiada/svg/kontakt.svg new file mode 100644 index 0000000..1e9339f --- /dev/null +++ b/edumed/static/img/menu/olimpiada/svg/kontakt.svg @@ -0,0 +1,74 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/edumed/static/img/menu/olimpiada/svg/kontakt_active.svg b/edumed/static/img/menu/olimpiada/svg/kontakt_active.svg new file mode 100644 index 0000000..940e21e --- /dev/null +++ b/edumed/static/img/menu/olimpiada/svg/kontakt_active.svg @@ -0,0 +1,74 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/edumed/static/img/menu/olimpiada/svg/literatura.svg b/edumed/static/img/menu/olimpiada/svg/literatura.svg new file mode 100644 index 0000000..a004d7e --- /dev/null +++ b/edumed/static/img/menu/olimpiada/svg/literatura.svg @@ -0,0 +1,63 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/edumed/static/img/menu/olimpiada/svg/literatura_active.svg b/edumed/static/img/menu/olimpiada/svg/literatura_active.svg new file mode 100644 index 0000000..20395e7 --- /dev/null +++ b/edumed/static/img/menu/olimpiada/svg/literatura_active.svg @@ -0,0 +1,63 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/edumed/static/img/menu/olimpiada/svg/program.svg b/edumed/static/img/menu/olimpiada/svg/program.svg new file mode 100644 index 0000000..2418f09 --- /dev/null +++ b/edumed/static/img/menu/olimpiada/svg/program.svg @@ -0,0 +1,104 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/edumed/static/img/menu/olimpiada/svg/program_active.svg b/edumed/static/img/menu/olimpiada/svg/program_active.svg new file mode 100644 index 0000000..cf39f15 --- /dev/null +++ b/edumed/static/img/menu/olimpiada/svg/program_active.svg @@ -0,0 +1,104 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/edumed/static/img/menu/olimpiada/svg/regulamin.svg b/edumed/static/img/menu/olimpiada/svg/regulamin.svg new file mode 100644 index 0000000..61c274e --- /dev/null +++ b/edumed/static/img/menu/olimpiada/svg/regulamin.svg @@ -0,0 +1,98 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/edumed/static/img/menu/olimpiada/svg/regulamin_active.svg b/edumed/static/img/menu/olimpiada/svg/regulamin_active.svg new file mode 100644 index 0000000..50f8f6d --- /dev/null +++ b/edumed/static/img/menu/olimpiada/svg/regulamin_active.svg @@ -0,0 +1,98 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/edumed/templates/base.html b/edumed/templates/base.html index d336201..96641ad 100644 --- a/edumed/templates/base.html +++ b/edumed/templates/base.html @@ -9,7 +9,7 @@

  • Lekcje
    • {% comment %}
  • Współpraca
    • {% endcomment %}
  • Kompetencje
    • -
  • Olimpiada
    • +
  • Olimpiada
  • Dla trenera
  • Wesprzyj nas
  • O projekcie
    • diff --git a/edumed/templates/base_super.html b/edumed/templates/base_super.html index 73080d4..497a868 100644 --- a/edumed/templates/base_super.html +++ b/edumed/templates/base_super.html @@ -60,11 +60,13 @@
    {% block tagline %}{% endblock %}
    - + {% block searchbox %} + + {% endblock %}
    @@ -97,6 +99,7 @@ Jeśli nie oznaczono inaczej, wszystkie materiały na stronie są objęte wolną licencją Creative Commons Uznanie autorstwa – Na tych samych warunkach 3.0. + {% block copyrights %}{% endblock %}

    {% block sponsors %} diff --git a/edumed/templates/olimpiada_teaser.html b/edumed/templates/olimpiada_teaser.html index 071e68e..51b8c02 100644 --- a/edumed/templates/olimpiada_teaser.html +++ b/edumed/templates/olimpiada_teaser.html @@ -1,15 +1,28 @@ {% extends "base_super.html" %} +{% load textile_pl from fnp_markup %} -{% block logo %}{% endblock %} -{% block title %}Olimpiada cyfrowa{% endblock %} +{% block full_title %}Olimpiada cyfrowa{% endblock %} + +{% block logo %}Olimpiada cyfrowa{% endblock %} + +{% block searchbox %}{% endblock %} + +{% block top_navigation %} +
  • Regulamin
    • +
  • Program
    • +
  • Literatura
    • +
  • Harmonogram
    • +
  • Rada i komitet
    • +
  • Kontakt
    • +{% endblock %} {% block body %} - -

    Tutaj będzie coś zajebistego!

    -

    Podaj swój adres e-mail, żeby dostać powiadomienie:

    -
    - {% csrf_token %} - - -
    +
    + {{ flatpage.content|textile_pl }} +
    +{% endblock %} + +{% block copyrights %} +
    Ikonki w menu: + Designed by Freepik and distributed by Flaticon {% endblock %} \ No newline at end of file diff --git a/edumed/urls.py b/edumed/urls.py index 2d0d0a0..a62aee3 100644 --- a/edumed/urls.py +++ b/edumed/urls.py @@ -4,8 +4,7 @@ from django.conf import settings from django.contrib.flatpages.views import flatpage from django.shortcuts import redirect -from .views import HomeView, AvatarlessProfileEditView - +from .views import HomeView, AvatarlessProfileEditView, flatpage_with_template urlpatterns = patterns( '', @@ -15,7 +14,9 @@ urlpatterns = patterns( url(r'^info/(?P.*)$', flatpage, name="info"), url(r'^olimpiada/$', lambda request: flatpage(request, 'turniej/'), name='olimpiada'), url(r'^olimpiada/(?P.*)$', lambda request, url: flatpage(request, 'turniej/' + url), name='olimpiada'), - url(r'^olimpiada-teaser/$', 'edumed.views.olimpiada_teaser', name='olimpiada_teaser'), + url(r'^olimpiada-teaser/(?P.*)$', + lambda request, url: flatpage_with_template(request, 'turniej/' + url, 'olimpiada_teaser.html'), + name='olimpiada_teaser'), url(r'^szukaj/', include('haystack.urls')), url(r'^zglos/', include('contact.urls')), url(r'^forum/profile/edit/$', AvatarlessProfileEditView.as_view(), name='edit_profile'), diff --git a/edumed/views.py b/edumed/views.py index 1ba6137..af9bad5 100644 --- a/edumed/views.py +++ b/edumed/views.py @@ -1,15 +1,9 @@ # -*- coding: utf-8 -*- from django.contrib.flatpages.views import flatpage -from django.core.exceptions import ValidationError -from django.core.validators import EmailValidator -from django.http.response import HttpResponseRedirect -from django.shortcuts import render_to_response -from django.template.context import RequestContext from django.views.defaults import page_not_found from django.views.generic import TemplateView from pybb.views import ProfileEditView -from contact.models import Contact from .forms import AvatarlessEditProfileForm @@ -37,17 +31,34 @@ class AvatarlessProfileEditView(ProfileEditView): form_class = AvatarlessEditProfileForm -def olimpiada_teaser(request): - if request.POST: - email = request.POST.get('email') - try: - EmailValidator()(email) - Contact.objects.create( - contact=email, - body={}, - ip=request.META['REMOTE_ADDR'], - form_tag='olimpiada-teaser') - except ValidationError: - pass - return HttpResponseRedirect(request.path) - return render_to_response('olimpiada_teaser.html', context_instance=RequestContext(request)) +def flatpage_with_template(request, url, template_name): + """ + Public interface to the flat page view. + + Models: `flatpages.flatpages` + Templates: Uses the template defined by the ``template_name`` field, + or :template:`flatpages/default.html` if template_name is not defined. + Context: + flatpage + `flatpages.flatpages` object + """ + from django.conf import settings + from django.contrib.flatpages.models import FlatPage + from django.contrib.flatpages.views import render_flatpage + from django.contrib.sites.models import get_current_site + from django.http.response import Http404, HttpResponsePermanentRedirect + from django.shortcuts import get_object_or_404 + if not url.startswith('/'): + url = '/' + url + site_id = get_current_site(request).id + try: + f = get_object_or_404(FlatPage, url__exact=url, sites__id__exact=site_id) + except Http404: + if not url.endswith('/') and settings.APPEND_SLASH: + url += '/' + get_object_or_404(FlatPage, url__exact=url, sites__id__exact=site_id) + return HttpResponsePermanentRedirect('%s/' % request.path) + else: + raise + f.template_name = template_name + return render_flatpage(request, f) -- 2.20.1