From 03982ee620d7a81a4e1798d763fb1f625952f7ce Mon Sep 17 00:00:00 2001 From: Ojakoo Date: Fri, 23 Sep 2022 17:51:01 +0300 Subject: [PATCH 1/2] Update kaehmy dates and change header to html instead of picture. --- kaehmy/static/kaehmy/css/base.css | 10 +++---- kaehmy/static/kaehmy/css/footer.css | 7 ++--- kaehmy/static/kaehmy/css/header.css | 45 +++++++++++----------------- kaehmy/static/kaehmy/css/nav.css | 10 +++++-- locale/en/LC_MESSAGES/django.mo | Bin 15979 -> 16467 bytes locale/en/LC_MESSAGES/django.po | 23 +++++++++++--- locale/fi/LC_MESSAGES/django.mo | Bin 16729 -> 17265 bytes locale/fi/LC_MESSAGES/django.po | 25 ++++++++++++---- templates/kaehmy/base.html | 2 +- templates/kaehmy/header.html | 11 +++++-- templates/kaehmy/kaehmy.html | 10 ++++--- templates/kaehmy/message.html | 2 +- templates/kaehmy/navigation.html | 4 +-- 13 files changed, 89 insertions(+), 60 deletions(-) diff --git a/kaehmy/static/kaehmy/css/base.css b/kaehmy/static/kaehmy/css/base.css index cee09ba..e5e10cc 100644 --- a/kaehmy/static/kaehmy/css/base.css +++ b/kaehmy/static/kaehmy/css/base.css @@ -5,12 +5,6 @@ margin-right: auto; } -body { - max-width: 1000px; - margin-left: auto !important; - margin-right: auto !important; -} - div.tooltip-inner { max-width: 25rem; } @@ -28,6 +22,10 @@ div.tooltip-inner { .kaehmy-content { padding-left: 0.5rem; padding-right: 0.5rem; + max-width: 1000px; + width: 100%; + margin-left: auto; + margin-right: auto; } p { diff --git a/kaehmy/static/kaehmy/css/footer.css b/kaehmy/static/kaehmy/css/footer.css index 8c8bba8..47a2547 100644 --- a/kaehmy/static/kaehmy/css/footer.css +++ b/kaehmy/static/kaehmy/css/footer.css @@ -3,13 +3,9 @@ } footer { - /* position: absolute; */ bottom: 0; width: 100%; - height: 60px; /* Set the fixed height of the footer here */ - /* line-height: 60px; /* Vertically center the text there */ - margin-top: 2rem; - margin-bottom: 1rem; + margin: 1rem; } footer .container .col .nav .nav-item { @@ -26,6 +22,7 @@ footer .container .col .nav .nav-item { .lang-select { width: 10rem; + margin-bottom: 1rem; display: inline-block; } diff --git a/kaehmy/static/kaehmy/css/header.css b/kaehmy/static/kaehmy/css/header.css index 53471fc..fadea3b 100644 --- a/kaehmy/static/kaehmy/css/header.css +++ b/kaehmy/static/kaehmy/css/header.css @@ -1,37 +1,28 @@ -.header-content { - +.kaehmy-header { + background-color: #0c2938; } -.header-content .logo { +.kaehmy-header-content { + display: flex; + flex-wrap: wrap; + align-items: center; + justify-content: center; -} - -.header-content .logo img { - display: block; - height: auto; - margin: auto; -} - -.kaehmy-banner { max-width: 1000px; + width: 100%; margin-left: auto; margin-right: auto; } -@media screen and (min-width: 1000px) { - .kaehmy_header-content { - position: absolute; - left: 0; - top: 0; - background-color: #0c2938; - width: 100%; - } - - .kaehmy_header { - margin-bottom: 331px; - } -} - .kaehmy-banner-image { - width: 100%; + max-height: 10rem; + max-width: 100%; } + +.heading { + display: flex; + place-content: center; + flex-direction: column; + text-align: center; + margin: 1rem; +} \ No newline at end of file diff --git a/kaehmy/static/kaehmy/css/nav.css b/kaehmy/static/kaehmy/css/nav.css index ee7db33..ce41111 100644 --- a/kaehmy/static/kaehmy/css/nav.css +++ b/kaehmy/static/kaehmy/css/nav.css @@ -1,11 +1,15 @@ .kaehmy_navigation { margin-bottom: 10px; -} - -.navbar-border { border-bottom: 2px solid #282b3b; } .navbar-light .navbar-nav .nav-link { color: black; } + +.navbar { + max-width: 1000px; + width: 100%; + margin-left: auto; + margin-right: auto; +} \ No newline at end of file diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index b72519783a3f03d1c1e8ee7398e7457028475681..9b164d50c93a6a2676f6488d8c3e711ed11e1bcd 100644 GIT binary patch delta 5340 zcmZwK3wVw90mt!wB9XYnC8UzLoe<&@M-o!ErWkYW(8kuJT6M??M{eXKsnGVQZFMPA z)U7QwqtqHU#~5m@%cd$TYIUp2wAOka8{6}Y(qa4l&ig-|_1XLQozMUOf8X=I|J!@= zxc2*FER7mlGGbRHYyRn&F2QGKiTkaIo} z)t+k2#&Q8P0SHKmJ@4Qtk;_QY=M5sYETXHjc^nT@3L*RdzwM-8Zl%W3a}y6MzR~#(*xF8 zU`i>ltY!}ChHH?0W@=D3IEy*Lv8ikkY~yn9;G z9Avf4Fnmbwe*pzvRWmEpV9YYqgSVh|>2~XW)XW@5?SZqXj^02`Wj)?8*$TDEx}#=h z5bAzokX15ysQXl5J)Um@6zbr7)C?>_P4ybo+U>(UJcx_16+1Qxx1eTb8)_yFp$2l) zp8o>Xfvczo-b8imKI;1Tjyzk1Bnnz<7c!fs3u0nJ2`K|G}LCC zi(0DHsPAt^{lwOwez0nBFrGpFnbw`1O+TbF^RJ$k&`=lssNFjg)$@56iOZ3HW)&Y_ z;{p5^?&;$ERovOtdC-bI+j*7feS@ zRV8Y~FQYoN1T~_ysJ*fUb=@A+3>>xfbJlCtyQn=C$F%A`-7pgaeJRjcQ;b|=R->ly zFvejmYFD2_eerL${TtMEvE7~aIMfJ}F&|S=yZuFs!8cKV6*r)+JBKV?z+9owo`zef zHB08@RZsg^^HH0z8Z{HkuraPhb#N={0q>zYdI+`4Pa}Oa*H9f#X1MBb8tQrJ*h%mI z7z(;UHEIc7LiKPSYO0rFBV3EIScAIJPHcjEQPOHqfEvIF)P2q(KYHd0s>3looDMZX zb*LHYx+DxdN+Fd(2b_fbGxKeIA2y@@1?r1mqrP|#^*a&EUl`T9pnegvQ5_y>>rbOP zP>y=-W}%jB12)I)J(>T|W}`t(ZP-}Pz8H{Pf4${mF#CRNr`l~n&wI|9^ zGdKq)NAR|wuDkQFGmwV8oV9nM1~j-A^RF+Cpg|9Q3KMWVYDOxoucJot0ji@%tS3>M z_5wD=yQmH{>h089qxM91)W{z}E!7CrOg#~>CnjNN%~4Z61NB#NA*zF$P;bF546QXb zr+yZ7qwAgUWzA~KMG=|Djzx}k0~5cQxDs3jSTn%X?< zh*RzPB{+oo8#n_$M~!IQBhJiBK+R|+Y9P;}&cB9QlGPZi_y27Q>cBSC7Y zYPWxe8reP6-e{5I{8h}smej{%E1YTTD{Vc9y3cXc{m-E`-(`%^`~MXMt>F!;;hogT zo1)e_0oC)?sHJI#x!4Dba1m-r?x5}y+uxb7B-FsVqQ2iBHGsjWAFS~hNT)EBLT6lw z-EcpKI)v)68Q|>R7}V4ypf+1O)b$;Zx6S;7)RO0j9;{=tgV|#hqsYrnJrH6OpJRwd zcY-`g{zTp-qe%ssOLY8_v?0BSI{!E+APdQOa-Oh4=54}+gqDQYKePn;Rn&2Wv?cFp z{WnthkQ9^fG1e9)qFz5u+Zx-p7};y4ifH4pYN6v7e11k=C7+NDgc*dl zi2wgnI776P%ZZNNq=xiWg+o6iYl;5Y{G6O6KB6N?hLhf^a114v$xc#6PLlA^(-ykp zk4OuxfB0}ySWVs_L&*1tj!O>akJg{z6XXJUhde`O5kJv!l;o0+$tluW}x{w7#N1Q|Gvo4>Hk!tdL zl0sf2fowi>9Ct8(z^$Z#t^W!~kS4aCh;zsa5<^Nz8qx6^2Q$z*(i-Lmwr~g|opQkZ zHhdPh*z%hXw1tb?DHPhuWK1S+k!8e7rV$3^)?qGHDj;O{{N~$YdWmTREm#4DGmlEvU_IPA;*2C^>cko`y zpy-Ar+_193HDL6}tc+zDIZ451(-y~uM^;!??($5VR$T2Xoy-GW6;r&fiDjPhf(J(R z-D}DU3w@J(o?=&dS+UpeUUojQB$$`cGh+Ba-N;p1_FRf_iu&facXUmx4iD2)THw;T z|Gkqg2o2F4d?oX4orIAdFJtpFQB_`-zrs^q;Vnp6_HK4suqHb{GD<@X*6-aSx_+U@ NSMH22n32;j;y>y7Y#9Im delta 4856 zcmYk-4S3G=9>?+DwtJh0F(z#Duv=qhPc}0PlZ0kcV#I`EmWLS|BX&4{ArH+{X9qQ; zq@Y!|*3e#GA+?jJLJ_b;oq2(SnXdY=T*+H)Nw8Gz!D<3DkAP*c_j>uWzvZTdma? z!|R7p_xSIDYz9i@Dr#3*P^b!fGYVF)PU+ymHjU|DrF!~)!Ma0y)hb9>KN38si+%gVIbyU zFb+cvWF%%|0qTL(_VxYtyax50Pf-Iojk^E2DC(~luGx-T$e>Jnd9ms|@Z=ovp8LGs`QM>;e+h2=)Ilq8IFp7_wDlyrip%P9<_K{hHTJs9) zD;UZYeW)dNjY0G$qF(Qg z9?V2-#w^Um!Z_Bykj95}Xbls)x;N^D+Kkz#waP=?U>dUFO%dvgX$=m-=P@2HAh$9h zoM@oQ7=r1jP1*-F@F5t8qvNT6HyUH<_!XDpZ7ienBF;~6AM|LVF|#?JjJn}zY=q}f zCBB53aXsomH;_N`2mf?^LX!J>8fvp=peFo)LnDmF2yBWIQJZB3>cTQq1 z2(_tBVi^96`nCHF`7=q$?yp@Qs)8#~16+gJ+)gD8y|LQ9a1eFjG24F4V5AnHS>ws3}>Mpun0BM z<)~f08M%k4LJhnQHQ=96*Vm&;eiJpI+o;M0^X1VTTcVcEi~isLZZulZk%GFgKkCL0 zqBhA`)Mk1NHIPY|jismu9Op5w1G$VX@Vf2)-JUmPog&$PracY4Ap>>8 zL8u!IL%wUw7}SW%PyU$u~p68;YZ@h^# zG{REU`7@{oZozomiCU7As9(G9Q6;~DDscm9_y5oK2QeBgQ6r?wWTGlD10%2m^%cE5 zozH(bjV*Mj0#!IQz?g&f!n@g7t?17{ZKfR5%!^R(n~QqzGE^m2TB}hLID;DCdFxfw zX1swdF}xS`*MmFtaywE{Ykxm##=}udG67Yg0^2_yHKXOI0hXhF?Y5%^b`bSddmQ!t z%c#oLqwW)s=`Ll2V;ikerH;gW9AM91#i5*kg(`W}J?;ZKqQ0_Iuni8ywm8Y2FGS6J z18Rbm*4?PeypOHX`Iv@A`WSDs3Ug z;bQyxPJDp#y|@4ykO?_vRv))Cb5SK-g__BF)Qoqb2CxV9zyqj~e}cOHTk8eXKrW+p z`7aoSE&959BLTgfKZ2@U3AX3?X07db!{1@d=cpU~h&d(b1oz`&(4ND)cGgyTLK%XuPN%j)5*_vQ@B*W;oGq z)v=X4M7|=&NCy%_4iX)Ui1v?;17r|MC9BCyGM(H|m$FKzoN3?p;2{#|V6a_hhFaq<|cC8x z>oAHOC+BTnoOL%2Ci*BYBZo;ANhAZvUyr|Y^13=S;v&+C^ds++rKF5ZCEt)5@(6j2 z=qMy1`l2ns7h>x5hv&a~t!^!5~hh&4!{&Kuy+f8taZRcZz zZ6CppNHO^b8A}$BL*&l!ERDuwB6*vvA_*jt3?Up5{$D+{PLNR2#@7%rC&afeYFmJB zN4vK@z9+q3271zZru6V-#tsY)NuE?(JZH9VMf~fHD)vRq@Lfsk8Q{xLza3OjnHlG+ j%*?YF|Ju84aCrXgqN3@gr3D4v{5g}Jn(2$|-#6g@3L)b} diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index 4427a7a..0c69590 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -419,16 +419,22 @@ msgid "Päivämääriä & deadlineja" msgstr "Dates and deadlines" #: kaehmy/templates/kaehmy.html:31 +msgid "Toimikuntamessut @OK20" +msgstr "Guild fair @OK20" + +msgid "Deadline hallitusvirkoihin hakemiselle." +msgstr "Deadline for applying to the board." + +#: kaehmy/templates/kaehmy.html:32 msgid "Vaalikokous, osa 1 (puheenjohtajan valinta) ja hallitustyrkkypaneeli" msgstr "Election meeting, part 1 (chairman election)" -#: kaehmy/templates/kaehmy.html:32 +#: kaehmy/templates/kaehmy.html:33 msgid "Vaalikokous, osa 2 (hallituksen valinta)" msgstr "Election meeting, part 2 (board election)" -#: kaehmy/templates/kaehmy.html:33 -msgid "Toimikunta-appro" -msgstr "Guild committee crawl" +msgid "Deadline toimivirkoihin hakemiselle." +msgstr "Deadline for applying to official roles." #: kaehmy/templates/kaehmy.html:34 msgid "Vaalikokous, osa 3 (toimarien valinta)" @@ -505,6 +511,15 @@ msgstr "New application" msgid "Statistics" msgstr "" +msgid "Kähmyt ovat auki!" +msgstr "Kaehmys have started!" + +msgid "Haku hallitukseen 24.10. mennessä ja toimihenkilöksi 18.11 mennessä." +msgstr "Apply for the board by 24.10. and for official roles by 18.11." + +msgid "Hae nyt!" +msgstr "Apply now!" + #: members/forms.py:107 members/models.py:101 members/tables.py:41 msgid "Member" msgstr "Member" diff --git a/locale/fi/LC_MESSAGES/django.mo b/locale/fi/LC_MESSAGES/django.mo index e7d259a133073068a1e4ccb27e3a60ec0abdb40d..dd2fdbd5b00f1938edcc632a6662a02e62b7291d 100644 GIT binary patch delta 6017 zcmb`}dwfsl0mtzt5#oMH5F+>yA|fIpZj&@|Yut)9x+0^3SblQRNKmHzxhx%P5mj>w zx>C0e+v3`Wc2cycTPvhRl~!ppbPFqne!e+Rw(iya+4FjR^M0P^cg}fk=NwArczySh zm*=9N&r-wTkt3iL#6+2g3!bSSF7VW^e#jHI9wlWoHU)RttR zW-tr&a4oZLL|>L>H)`hZGFtt945RTps)KqgtL_tk8fX}5Af2qS$iwb22^4gL5vUuw zty57mnv2@A#i$inVcWN$I@*Jp$$r!lA4DE(Q-Zp08R~8E;g!;TnxR%Gq`dAirUwPx zxHodH8HUSn8b)HBR?Z5=qXyI$wN;78gKS2lR%!<78CY!Vn^6;b57qHUsMq@p^0=9= z(U1O(Pitoe0jQ_6nYBG?>0(gNKws1ilTb5CMJ@3h>r&JTY(kw^i0b%50599$m!Q4} z`KaqQg|PosDD0#`OInD!;4rHF1ZrT#sJG%0YUbW;oYyD_UDSJ_wqhJ=X+5@{Z|i%| zm-aKLt-fHr(T4S}M8hL{LZwh=hBYvP_PVHlRN_zr%tGB@CTcGiSl6Pq;xDLY;eFIf zeTIp63DYpTtuxTqQ4=flP|%VcLS6U?>c-!qo`naf8`TVR{w=77TEa-|gE7dx&1__G z%oePIr%+3L&ep#|tw1SO#WJjho(B}vfp0r!AT?1J2BJ5%!5SEb)v*h<^y0&U2dIw^ zcg}Cq-dUMw)P(w?RyGki)jWghcrI!nuOI{PnAa$1rfaNQt%X>N_M@n!EwSyTsQ3E5 zt=C|mYEchFJ#?YS$I!%}wkiqr?4)BCT!{Km9mF2=Z|+gh$hvfJW*CR+U;wJ)k*F2P zK&`+G)Y9eJ_C>aykF{yvfZBqcsE4r-b^j8afR|C%_vhmhs`o#Uf<`_Q)lnXH#?`1B zeTlIy5C0Bz;@X7BGg2Vp{E{&v$o+n>I+zg zH83E`S&3j&N1d=0CZRf*g&N>|)cJX~o^R{xP#>J_s6F3_>TjR*L=@|(FqA z2Hm&{PlisYi7u>;!UiJr%@lKE2uB%BhRUdwIP0@MulpjN0Dwbxfr|Kq8|qpf-n>a~kObr_FYiQ%XfonU{T zjaorZu5DO^TFNEZ05_m!T!>nM!`9=r{S0d5E?IA3RednJIs>fM-TA#CGHDZnTCpTl zKgmwrV{#~H31^^YJ{R>&EJby&-qv@ZW>SP&fm61A5jEga)cM}Oa60ls4ZIO*E1IKT z$4Jz9PhhOx|4|e)fK{j&uSZ?D9d+YfsJG%6F2|e58))YBaJFbK>Y>|jJ%ZY*Vr+tC zsO#&-I1}rHI=>fIqkl7)f<`zTb%7hTM7gMEU^!~Ut5JKl)z){Tt~-ocnRBS?ucA8e zj&-bU4YY=!CK`pFrW9f+XvRs_v8WYsWBF@l>oZZG(p=O-wh`6gTlV+Es69T38bC4X z`pc-TEyW;wh#Gj4$5?+A!XI<~!x4*mYM(+4Xd>!a$U?oAv#j$_1I)uRGyg`d(Z{4cv2|f|j;QZ>QthsJ&~1+RIj`6$!J( zqBr%Sr~xLT9=>ttg5P43;f^BTEV`G0>_)~a8)=mi9b0-rjuFZ648;Z^{+|cdD5SJN&ZYakZ;Ib zq9cXmm6!O}58olbA<<+4(b0hXmb4->NG*~}Dvph|@Htkq=mfmG_*hV%Gu!oMHo z#~o{TYXvV-_>}yzq5+?^ko%7sZPd`Yot91AUa~m ze)6O$_E>yuE;S`H&7EGfD=pjY>ewx!W5@rV6H(v}n&;y;uxNd1#`GN5q^Zd{uH-3c z?iK~NTw8tXGnTX|nK{WB+;B>cD}KnpsK|nqq5Z24`p&TVqnXR9_Grj`Eb>`unb_xb@J+R8it delta 5487 zcmZYB33QET9>?(~i)cJ%#h3oC}?RI~Uc?@gt`DLUb7as3iI#x0}Vgu^0VnbYu z!B~vt@C3%vzq>?14Lrnf46E!t5R3Xk66*70)XXzbGsr|e-yW0jIlDg|`%<5ZET%hx zjM1IKM7(SFfkagGR<0syX340I zn_w(vVjOlyt?Ub!h7-`InXRCpnSO%$;^(M6EJO|LYt$ZohuV_ksFk>c`rb`c!}n0n zg(i3_7Kdst3Cmy#YCvh&0kaZVe?2hA9>_KGP#rBr4P-s41Haw>#_ETW)pX}j19^n% zD3Ft^?}wq_m-rmOw7{bBO zj1y2>l!ST>Q&AnJp;oRb>bXp-w?%D12h;?7{V3?Q8*fg-P?jPWHS@(u-sfwuDfKO= z4z8dEcoQ{%2WBwS(;<#RwVQ-$r?J@zHIdH9*7#f>3Yz&K`(Qk(10QMzZ=ja)E#!Q; z4^RznN4*96P_+k-3a7Am%yJqY>kca2nOr@59M9ch$2yYR24Z#E*Z5% zS*X45WA$;U8O=gM))+@1RyL=n1x7?|&o(HCPKZqeiF( zI++7dD=-%ITn?(^`N(l_`KT4!Viux0*ooSjeHe_zs1-Va8rTi=X=e8*1Y=aP_dy)0 zqpGNe>Y`StF=`;KQ3L2idPr3+8tC zC}`=?~wGwp5;G)JS_ znSxr;Io^GrE1;nF`D5>f+m3p$2zA(wp_b|@YCvThdOxAn@JZ^eQ9n!*F%#FJ26h28 z!yBmfAD}vp-~dEoB1Y)_Po=HM`V7xn$0F$IGf zc>`~N>ZmO?!)~Z{aqO116ZB+fgRuADFDMLLLwa1lF9VD3Jj)1=Ab&7vS%2-xX>Mo+w@@Q}gj%BT3~wppQNMKcQ5|(M zvr#kZi)whJ-5-ld)L%hOC?D1Sa;vXHJ^yJ2>#wEW%8l}P4)q@2Mg20yH1Q5!J+mX0 zyyuw8=Q$XI8&R*_SLQC%fQwKoatXDScTxYtQjrr|vb8=6dab&nI_!a(`6$#9PO{Gz zpq4Dp>K|e(_0_2Vf7pha;rFN+A2-j~{fnrTx@87(BE$GW@WoQl2os+29!No+am`Un zG{&5O+QZ4H8Ba&;{X$g3E3NKFO<*Ug-2+xXi5ln?)bjz&OWOCj7z!G3JZcN7qh7N{ zs0X`ZD;$6t!276~u0(xrBdX!esMEd=^YJ=zj@_&l-qvhGovkm;y_l%?znFsd^fs!2 z=%>AzWuU&0g(We;}Q&0mx zqW1O*Y6~8rMqah0XMLh<)Qvrrw*!`hgSI`xIf3+8@k$@*)g z(QI%Mreg~BKyAeo)N8g3)$m@7!-J@$Kac9*KI*UqwDwjk3e%`pL7jn)c7HNzi)NrE zwy-tpuP?5)4?aV6uoE@2BlsMi#6g(W#`}q$hgz|%s0MeSR_3620rmZdSRDh~dMi{D z_0N1`)I=xxDAb{_40VWhVPz~r?fqHQ%&((5yocH{m*wqYBx)sM&1B@YcFj=(%S0Wz zE*OBi)_S;6==;tp56rzdi;N`W$q=GzB^ge>BuhzMGLNh#eMxO{glr@|$t9wTpO?qi zJxU*wj$}94PyenH1zqRJUx}9Id(wdDN+wCy&UB&!b(!oUV~8&O(iM_Es@SCidW}@F`UdLlV9>W zU&qp`3xyim|MC>pkTi0N_(@~(5z!Up@%V3VEB(&=6V4{L$pTV^3??s5w4v}cGoTQQ>GMRKGlZdXrkr=W? z6}#$Tgq3{Wb@$Xg_j=$b$hNM%*HZhAca`wFEG$&+LUX+wfZ>9yGk9q?Bq%j*9y z&**4&qtcvAw3{PP+tS49f5FyP-i}kq>;6R*KPuy&o3J^+pPM){*q>T!eW?Fhz4l@L d*E5O(7UU*2@E>YAKiEI9#lSHC<*eBO{{!`R9i;#O diff --git a/locale/fi/LC_MESSAGES/django.po b/locale/fi/LC_MESSAGES/django.po index ac91863..a5e41bf 100644 --- a/locale/fi/LC_MESSAGES/django.po +++ b/locale/fi/LC_MESSAGES/django.po @@ -417,21 +417,27 @@ msgstr "" " eikä siis missään nimessä sitova ilmoittautumien mihinkään " "tehtävään!" +#: kaehmy/templates/kaehmy.html:31 +msgid "Toimikuntamessut @OK20" +msgstr "Toimikuntamessut @OK20" + +msgid "Deadline hallitusvirkoihin hakemiselle." +msgstr "Deadline hallitusvirkoihin hakemiselle." + #: kaehmy/templates/kaehmy.html:29 msgid "Päivämääriä & deadlineja" msgstr "Päivämääriä & deadlineja" -#: kaehmy/templates/kaehmy.html:31 +#: kaehmy/templates/kaehmy.html:32 msgid "Vaalikokous, osa 1 (puheenjohtajan valinta) ja hallitustyrkkypaneeli" msgstr "Vaalikokous, osa 1 (puheenjohtajan valinta) ja hallitustyrkkypaneeli" -#: kaehmy/templates/kaehmy.html:32 +#: kaehmy/templates/kaehmy.html:33 msgid "Vaalikokous, osa 2 (hallituksen valinta)" msgstr "Vaalikokous, osa 2 (hallituksen valinta)" -#: kaehmy/templates/kaehmy.html:33 -msgid "Toimikunta-appro" -msgstr "" +msgid "Deadline toimivirkoihin hakemiselle." +msgstr "Deadline toimivirkoihin hakemiselle." #: kaehmy/templates/kaehmy.html:34 msgid "Vaalikokous, osa 3 (toimarien valinta)" @@ -502,6 +508,15 @@ msgstr "Uusi kaehmy" msgid "Statistics" msgstr "Kaehmytilastot" +msgid "Kähmyt ovat auki!" +msgstr "Kähmyt ovat auki!" + +msgid "Haku hallitukseen 24.10. mennessä ja toimihenkilöksi 18.11 mennessä." +msgstr "Haku hallitukseen 24.10. mennessä ja toimihenkilöksi 18.11 mennessä." + +msgid "Hae nyt!" +msgstr "Hae nyt!" + #: members/forms.py:107 members/models.py:101 members/tables.py:41 msgid "Member" msgstr "Jäsen" diff --git a/templates/kaehmy/base.html b/templates/kaehmy/base.html index 0b56266..6af89bb 100644 --- a/templates/kaehmy/base.html +++ b/templates/kaehmy/base.html @@ -13,7 +13,7 @@ {% block body %} {% block header %} -
+
{% include "kaehmy/header.html" %}
{% endblock header %} diff --git a/templates/kaehmy/header.html b/templates/kaehmy/header.html index cf8e165..7cbdecb 100644 --- a/templates/kaehmy/header.html +++ b/templates/kaehmy/header.html @@ -1,7 +1,14 @@ {% load i18n %} -
+
+
+

{% blocktrans %}Kähmyt ovat auki!{% endblocktrans %}

+

{% blocktrans %}Haku hallitukseen 24.10. mennessä ja toimihenkilöksi 18.11 mennessä.{% endblocktrans %}

+

{% blocktrans %}Hae nyt!{% endblocktrans %}

diff --git a/templates/kaehmy/kaehmy.html b/templates/kaehmy/kaehmy.html index 71d9c84..4cfddc4 100644 --- a/templates/kaehmy/kaehmy.html +++ b/templates/kaehmy/kaehmy.html @@ -28,10 +28,12 @@

{% trans "Päivämääriä & deadlineja" %}
    -
  • 25.10. {% blocktrans %}Vaalikokous, osa 1 (puheenjohtajan valinta) ja hallitustyrkkypaneeli{% endblocktrans %}
    • -
  • 01.11. {% blocktrans %}Vaalikokous, osa 2 (hallituksen valinta){% endblocktrans %}
    • -
  • 09.11. {% blocktrans %}Toimikunta-appro{% endblocktrans %}
    • -
  • 17.11. {% blocktrans %}Vaalikokous, osa 3 (toimarien valinta){% endblocktrans %}
    • +
  • 11.10. {% blocktrans %}Toimikuntamessut @OK20{% endblocktrans %}
    • +
  • 24.10. {% blocktrans %}Deadline hallitusvirkoihin hakemiselle.{% endblocktrans %}
    • +
  • 25.10. {% blocktrans %}Vaalikokous, osa 1 (puheenjohtajan valinta) ja hallitustyrkkypaneeli{% endblocktrans %}
    • +
  • 07.11. {% blocktrans %}Vaalikokous, osa 2 (hallituksen valinta){% endblocktrans %}
    • +
  • 18.11. {% blocktrans %}Deadline toimivirkoihin hakemiselle.{% endblocktrans %}
    • +
  • 24.11. {% blocktrans %}Vaalikokous, osa 3 (toimarien valinta){% endblocktrans %}
{% csrf_token %} {% bootstrap_field form.name %} diff --git a/templates/kaehmy/message.html b/templates/kaehmy/message.html index 0374b96..c787931 100644 --- a/templates/kaehmy/message.html +++ b/templates/kaehmy/message.html @@ -2,7 +2,7 @@
-

{{ message.name }}

+

{{ message.name }}

{{ message.message|linebreaks|urlize }}

{{ message.timestamp }}
diff --git a/templates/kaehmy/navigation.html b/templates/kaehmy/navigation.html index b9e8919..99720b0 100644 --- a/templates/kaehmy/navigation.html +++ b/templates/kaehmy/navigation.html @@ -1,8 +1,8 @@ {% load i18n %} {% load static %} -
-