From cc9768b8953e4c67a866edbd81d9d745163b7a20 Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Sun, 28 May 2017 22:03:02 +0300 Subject: [PATCH] Mobile login screen and translations --- locale/en/LC_MESSAGES/django.mo | Bin 6615 -> 6721 bytes locale/en/LC_MESSAGES/django.po | 83 ++++++++++++++++++-------------- locale/fi/LC_MESSAGES/django.mo | Bin 7111 -> 7259 bytes locale/fi/LC_MESSAGES/django.po | 83 ++++++++++++++++++-------------- webapp/static/css/login.css | 14 ++++++ webapp/templates/login.html | 12 ++--- 6 files changed, 116 insertions(+), 76 deletions(-) diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index 9435ae5ef9e12ea3d5ec99f139a1e130cfe04347..de97be5352f09e9eff6e67864f6557912b19c17c 100644 GIT binary patch literal 6721 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 Rt~X1Ula&{@|Gmr4e*mhzn>7Fc literal 6615 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 diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index b9ee95d..da992d6 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-26 19:53+0300\n" +"POT-Creation-Date: 2017-05-28 21:51+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -50,7 +50,7 @@ msgid "External image" msgstr "External image" #: infoscreen/templates/infoscreen_admin.html:24 -#: members/templates/members_base.html:69 +#: members/templates/members_base.html:79 msgid "Log out" msgstr "Log out" @@ -239,7 +239,7 @@ msgstr "Error" msgid "Back" msgstr "Back" -#: members/templates/member_add.html:8 members/templates/members_base.html:45 +#: members/templates/member_add.html:8 members/templates/members_base.html:55 msgid "Add member" msgstr "Add member" @@ -302,46 +302,47 @@ msgid "Download CSV" msgstr "Download CSV" #: members/templates/members_base.html:33 +#: members/templates/members_base.html:42 msgid "Member register of SIK ry" msgstr "Member register of SIK ry" -#: members/templates/members_base.html:42 webapp/templates/main_index.html:7 +#: members/templates/members_base.html:52 webapp/templates/main_index.html:7 msgid "Members" msgstr "Members" -#: members/templates/members_base.html:44 +#: members/templates/members_base.html:54 msgid "List members" msgstr "List members" -#: members/templates/members_base.html:46 +#: members/templates/members_base.html:56 msgid "Add multiple" msgstr "Add multiple" -#: members/templates/members_base.html:50 +#: members/templates/members_base.html:60 msgid "Payments" msgstr "Payments" -#: members/templates/members_base.html:52 +#: members/templates/members_base.html:62 msgid "List payments" msgstr "List payments" -#: members/templates/members_base.html:53 members/templates/payment_add.html:8 +#: members/templates/members_base.html:63 members/templates/payment_add.html:8 msgid "Add payment" msgstr "Add payment" -#: members/templates/members_base.html:57 +#: members/templates/members_base.html:67 msgid "Applications" msgstr "Applications" -#: members/templates/members_base.html:59 +#: members/templates/members_base.html:69 msgid "List applications" msgstr "List applications" -#: members/templates/members_base.html:60 +#: members/templates/members_base.html:70 msgid "Application form" msgstr "Application form" -#: members/templates/members_base.html:65 members/templates/settings.html:11 +#: members/templates/members_base.html:75 members/templates/settings.html:11 msgid "Settings" msgstr "Settings" @@ -361,93 +362,93 @@ msgstr "Payment events" msgid "Language" msgstr "Language" -#: members/templates/settings.html:20 sikweb/settings-sample.py:177 +#: members/templates/settings.html:20 sikweb/settings-sample.py:179 #: sikweb/settings.py:177 msgid "Finnish" msgstr "Finnish" -#: members/templates/settings.html:21 sikweb/settings-sample.py:176 +#: members/templates/settings.html:21 sikweb/settings-sample.py:178 #: sikweb/settings.py:176 msgid "English" msgstr "English" -#: members/views.py:114 members/views.py:171 members/views.py:190 +#: members/views.py:127 members/views.py:184 members/views.py:203 msgid "No member id specified" msgstr "No member id specified" -#: members/views.py:136 +#: members/views.py:149 msgid "Successfully added member" msgstr "Successfully added member" -#: members/views.py:157 +#: members/views.py:170 msgid "Successfully updated member" msgstr "Successfully updated member" -#: members/views.py:161 +#: members/views.py:174 msgid "Could not update member object" msgstr "Could not update member object" -#: members/views.py:175 +#: members/views.py:188 msgid "Successfully deleted member" msgstr "Successfully deleted member" -#: members/views.py:181 +#: members/views.py:194 msgid "Could not delete member object" msgstr "Could not delete member object" -#: members/views.py:224 members/views.py:258 members/views.py:276 +#: members/views.py:237 members/views.py:271 members/views.py:289 msgid "No application id specified" msgstr "No application id specified" -#: members/views.py:245 +#: members/views.py:258 msgid "Successfully accepted application" msgstr "Successfully accepted application" -#: members/views.py:248 +#: members/views.py:261 msgid "Could not accept application object" msgstr "Could not accept application object" -#: members/views.py:262 +#: members/views.py:275 msgid "Successfully deleted application" msgstr "Successfully deleted application" -#: members/views.py:267 +#: members/views.py:280 msgid "Could not delete application object" msgstr "Could not delete application object" -#: members/views.py:331 +#: members/views.py:344 msgid "Successfully added payment for member" msgstr "Successfully added payment for member" -#: members/views.py:344 members/views.py:357 members/views.py:371 +#: members/views.py:357 members/views.py:370 members/views.py:384 msgid "No payment id specified" msgstr "No payment id specified" -#: members/views.py:375 +#: members/views.py:388 msgid "Successfully deleted payment" msgstr "Successfully deleted payment" -#: members/views.py:380 +#: members/views.py:393 msgid "Could not delete payment object" msgstr "Could not delete payment object" -#: members/views.py:395 +#: members/views.py:408 msgid "Successfully updated payment" msgstr "Successfully updated payment" -#: members/views.py:398 +#: members/views.py:411 msgid "Could not update payment object" msgstr "Could not update payment object" -#: members/views.py:415 +#: members/views.py:428 msgid "Missing \"textfield\" POST request field" msgstr "Missing \"textfield\" POST request field" -#: members/views.py:420 +#: members/views.py:433 msgid "Successfully imported multiple members" msgstr "Successfully imported multiple members" -#: members/views.py:423 +#: members/views.py:436 msgid "Failed to import members" msgstr "Failed to import members" @@ -463,6 +464,18 @@ msgstr "SIK Admin" msgid "Aalto-yliopiston Sähköinsinöörikilta ry" msgstr "Aalto-yliopiston Sähköinsinöörikilta ry" +#: webapp/templates/login.html:25 webapp/templates/login.html:27 +msgid "Username" +msgstr "Username" + +#: webapp/templates/login.html:31 webapp/templates/login.html:33 +msgid "Password" +msgstr "Password" + +#: webapp/templates/login.html:43 +msgid "Log in" +msgstr "Log in" + #: webapp/templates/main_index.html:8 msgid "Infoscreen" msgstr "Infoscreen" diff --git a/locale/fi/LC_MESSAGES/django.mo b/locale/fi/LC_MESSAGES/django.mo index e85684ae0c3277efd2ef78fd8bfe940ed65dc2bc..3e66af371086721823f8273fec6974b190933926 100644 GIT binary patch delta 2581 zcmYk-e@xVM9LMnw$Inv)`IR6NP$H;@iFAR2Xen7r0+FaBac7_$a;I_ZTtD3XA%9q{ zT4Uj~^>hBQoiU%J$M3L_#9T^Czyn@xCDQ;exX+^=Vj& zIkxP^Jjz>96K%%|>_VEFQyA9FN62uz=2g^LzKv=yVe3D%Uc@Zwr%)^V4%N{tY60`8 ziQcqj2iuuL*@@cOB0dVR67}4UOwNB5nPw_9kq{Q*(|8-6#%1^(s=*X$VqYR-m>FBX zj@gudLp|qU`}Eu*)WUMCMW}JgQ4@A8ZH^C6ZNJ!sT3HLKgHHS4Ayh|x)D|B{t>g@r zVFXL?`{CBaoUoQu%|>Y{9jNyzgc@=fHN~??BQuJcQUo>P1=OBiLI-|@M-q(r8V^%$ zU_&SI9n==I=Ek4*pw2Fk%buu95II6*U>u0EezCi8WWn>KVE9%g6bu__T zyc^4~4m(i&j-YPc8>p?BL~Y$idE99?nM+jYMO?rVEaXJ>0@hA42gf5&wb^I-= zqpP<33v#aJhAk&^BeatlsDblPuR$?tp=Dt*T1lmK3&yqz)v*UPkRR1BgxY~;P%C-~ zwKHc?JMk_S;YHN*KcEJ>hU#|?b%YDn@ZV(AAc4160~VuJ?n0eW6Y_{@K@HSv>qDp& zJ!Q*7r~yx*Cj265VW&|8PoUagK#emM|2}NKv0u!hwrU=AmN!vbxtP1V84FPz??+wh zgQ%4Zp%(Bg>JpFR9T-JT@H(p9@2LL%vO1URr;qb5Afv4;Lp``2)o>$fOSjqjy{N79 zpa$x-^+TxN&=*kc&Y%|Zmi>Mbb+;m@ot?oAxPYaMZ`ROT2{vH``cao{1htY+aSdKU zP0-0Zs)=NyCb%3m;5yU_-Kaa#h7g%XsoY*IuVpePYelqPuCvh)PNhoQHl^!CF z5dor?;3p!MTvqO>*=6$wtvjs6c%RMdNFOD1RMo^?#AfaPDx#avt^a>|kU}Y;%lQbg zjnFHm)IjJi)DuZW8&N}a5K0ddbwra2q)mh_r|!$Gq&w1il#fHUW+Uz<_7h&BmAIAk zGkwGs_FxN9MfBLZa?~Z=OYF3DWsy$j&SZx#Fg%(ulM)ObKRVDI31$A2kh&+>GZ66l zhugFIQfo^#RBdusMW(aPrKAOY!RT0YED-VKrzfPfdHcOVZ@?QFENE~niHIUo z*F|QwrgkAr)`hM$Ty)`0Q7)IWwQAVh8m*eumi7HU|KsZH|9d{?9G>UAKM&t59;{AZ zF3RZ+q;_H^@y4hStQa?j3u#kc2wSlQ2XPQ@!UJP7_8^ahBRCh2VJ?0i>%T^R;S!f| zIE**rZ&(;YIw@H(p38WgiQZU&L#;RsJJAOZq66(g?>mY%+#BmZ!da9DV);j$OnC$y zXf6-U!9t`eEXK4WUqOa#4Xe<-Y(gJcAL}QR@{{p!VcU<`75S-9P3$ESKp!ctcHlfdLL02%nmkfP`E_Bb{LPvH2@4+)zhrgf=S8$>{gp1G>T86IR zDy+h0^!3}1DeOgGyCJ*-f5q8Y%s!X<{x^`Z;oWFM9kKi}vK!&GSbiH_!eeO1C(+a2 zkIwWAI+1hH3z)1F+U_;9pBxT=&*fv0-=B$OoKYFNGz-y{Sc&>M@<4olDxm!dP9hj!e6Hn1A) zXk#qzL|5n~bPLny3LeCId#uv~T zypJjT4Cmla=;11&7bj4Sci{%Ky)JYh`_TcuScnJW@2*G4#534Z6_*{T;}pP zJQ~aHsi}=9C!F~bVkKePm?613Thp2hVLrMd>1Vl=5+1yEVlm-i+d-H-7tO>9;$C7C z(L~e`Cblv>kmNF_J7$w}F_*#~;;9>z$m^e^om@G@>2N=pIwD2!x@;lG*NDkaX=qqS?Izw{cVm4Hg*-GppmfxrxoBA*Hoz1Hqedv0@7kw8C zzs)-I$%O4=7Nr)})K*pYEhsvf+xPRd?5w^&r`Kms-q+SP@LqYUy>08BR7cC+-7R6q Gmhdl=PR-!} diff --git a/locale/fi/LC_MESSAGES/django.po b/locale/fi/LC_MESSAGES/django.po index 1abf0c5..fdc875b 100644 --- a/locale/fi/LC_MESSAGES/django.po +++ b/locale/fi/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-26 19:53+0300\n" +"POT-Creation-Date: 2017-05-28 21:51+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -51,7 +51,7 @@ msgid "External image" msgstr "Ulkoinen kuva" #: infoscreen/templates/infoscreen_admin.html:24 -#: members/templates/members_base.html:69 +#: members/templates/members_base.html:79 msgid "Log out" msgstr "Kirjaudu ulos" @@ -240,7 +240,7 @@ msgstr "Virhe" msgid "Back" msgstr "Takaisin" -#: members/templates/member_add.html:8 members/templates/members_base.html:45 +#: members/templates/member_add.html:8 members/templates/members_base.html:55 msgid "Add member" msgstr "Lisää jäsen" @@ -306,46 +306,47 @@ msgid "Download CSV" msgstr "Lataa CSV" #: members/templates/members_base.html:33 +#: members/templates/members_base.html:42 msgid "Member register of SIK ry" msgstr "Aalto-yliopiston Sähköinsinöörikilta ry:n jäsenrekisteri" -#: members/templates/members_base.html:42 webapp/templates/main_index.html:7 +#: members/templates/members_base.html:52 webapp/templates/main_index.html:7 msgid "Members" msgstr "Jäsenet" -#: members/templates/members_base.html:44 +#: members/templates/members_base.html:54 msgid "List members" msgstr "Jäsenlistaus" -#: members/templates/members_base.html:46 +#: members/templates/members_base.html:56 msgid "Add multiple" msgstr "Lisää useita" -#: members/templates/members_base.html:50 +#: members/templates/members_base.html:60 msgid "Payments" msgstr "Maksutapahtumat" -#: members/templates/members_base.html:52 +#: members/templates/members_base.html:62 msgid "List payments" msgstr "Maksulistaus" -#: members/templates/members_base.html:53 members/templates/payment_add.html:8 +#: members/templates/members_base.html:63 members/templates/payment_add.html:8 msgid "Add payment" msgstr "Lisää maksu" -#: members/templates/members_base.html:57 +#: members/templates/members_base.html:67 msgid "Applications" msgstr "Jäsenhakemukset" -#: members/templates/members_base.html:59 +#: members/templates/members_base.html:69 msgid "List applications" msgstr "Hakemuslistaus" -#: members/templates/members_base.html:60 +#: members/templates/members_base.html:70 msgid "Application form" msgstr "Jäsenhakemuslomake" -#: members/templates/members_base.html:65 members/templates/settings.html:11 +#: members/templates/members_base.html:75 members/templates/settings.html:11 msgid "Settings" msgstr "Asetukset" @@ -365,93 +366,93 @@ msgstr "Maksutapahtumat" msgid "Language" msgstr "Kieli" -#: members/templates/settings.html:20 sikweb/settings-sample.py:177 +#: members/templates/settings.html:20 sikweb/settings-sample.py:179 #: sikweb/settings.py:177 msgid "Finnish" msgstr "suomi" -#: members/templates/settings.html:21 sikweb/settings-sample.py:176 +#: members/templates/settings.html:21 sikweb/settings-sample.py:178 #: sikweb/settings.py:176 msgid "English" msgstr "englanti" -#: members/views.py:114 members/views.py:171 members/views.py:190 +#: members/views.py:127 members/views.py:184 members/views.py:203 msgid "No member id specified" msgstr "Jäsenen ID ei määritelty" -#: members/views.py:136 +#: members/views.py:149 msgid "Successfully added member" msgstr "Onnistuneesti lisättiin jäsen" -#: members/views.py:157 +#: members/views.py:170 msgid "Successfully updated member" msgstr "Onnistuneesti päivitettiin jäsen" -#: members/views.py:161 +#: members/views.py:174 msgid "Could not update member object" msgstr "Jäsenobjektia ei voitu päivittää" -#: members/views.py:175 +#: members/views.py:188 msgid "Successfully deleted member" msgstr "Onnistuneesti poistettiin jäsen" -#: members/views.py:181 +#: members/views.py:194 msgid "Could not delete member object" msgstr "Jäsenobjektia ei voitu poistaa" -#: members/views.py:224 members/views.py:258 members/views.py:276 +#: members/views.py:237 members/views.py:271 members/views.py:289 msgid "No application id specified" msgstr "Hakemuksen ID ei määritelty" -#: members/views.py:245 +#: members/views.py:258 msgid "Successfully accepted application" msgstr "Onnistuneesti hyväksyttiin hakemus" -#: members/views.py:248 +#: members/views.py:261 msgid "Could not accept application object" msgstr "Hakemusobjektia ei voitu hyväksyä" -#: members/views.py:262 +#: members/views.py:275 msgid "Successfully deleted application" msgstr "Onnistuneesti poistettiin hakemus" -#: members/views.py:267 +#: members/views.py:280 msgid "Could not delete application object" msgstr "Hakemusobjektia ei voitu poistaa" -#: members/views.py:331 +#: members/views.py:344 msgid "Successfully added payment for member" msgstr "Onnistuneesti lisättiin maksutapahtuma jäsenelle" -#: members/views.py:344 members/views.py:357 members/views.py:371 +#: members/views.py:357 members/views.py:370 members/views.py:384 msgid "No payment id specified" msgstr "Maksutapahtuman ID ei määritelty" -#: members/views.py:375 +#: members/views.py:388 msgid "Successfully deleted payment" msgstr "Onnistuneesti poistettiin maksutapahtuma" -#: members/views.py:380 +#: members/views.py:393 msgid "Could not delete payment object" msgstr "Maksutapahtumaobjektia ei voitu poistaa" -#: members/views.py:395 +#: members/views.py:408 msgid "Successfully updated payment" msgstr "Onnistuneesti päivitettiin maksutapahtuma" -#: members/views.py:398 +#: members/views.py:411 msgid "Could not update payment object" msgstr "Maksutapahtumaobjektia ei voitu päivittää" -#: members/views.py:415 +#: members/views.py:428 msgid "Missing \"textfield\" POST request field" msgstr "Puuttuva \"textfield\" POST-kenttä" -#: members/views.py:420 +#: members/views.py:433 msgid "Successfully imported multiple members" msgstr "Onnistuneesti tuotu useita jäseniä" -#: members/views.py:423 +#: members/views.py:436 msgid "Failed to import members" msgstr "Jäsenten tuonti epäonnistui" @@ -467,6 +468,18 @@ msgstr "SIK Hallintapaneeli" msgid "Aalto-yliopiston Sähköinsinöörikilta ry" msgstr "Aalto-yliopiston Sähköinsinöörikilta ry" +#: webapp/templates/login.html:25 webapp/templates/login.html:27 +msgid "Username" +msgstr "Käyttäjänimi" + +#: webapp/templates/login.html:31 webapp/templates/login.html:33 +msgid "Password" +msgstr "Salasana" + +#: webapp/templates/login.html:43 +msgid "Log in" +msgstr "Kirjaudu sisään" + #: webapp/templates/main_index.html:8 msgid "Infoscreen" msgstr "Infonäyttö" diff --git a/webapp/static/css/login.css b/webapp/static/css/login.css index b4959e3..8d20848 100644 --- a/webapp/static/css/login.css +++ b/webapp/static/css/login.css @@ -3,14 +3,28 @@ html { height: 100%; } +@media (max-width: 760px) { + html { + font-size: 24px; + } +} + +@media (min-width: 760px) { + html { + font-size: 16px; + } +} + body { max-width: 760px; margin: auto; + font-size: 1rem; } h1 { padding-bottom: 3rem; padding-top: 3rem; + font-size: 3rem; } #content-body { diff --git a/webapp/templates/login.html b/webapp/templates/login.html index 4c85bc3..7d2d763 100644 --- a/webapp/templates/login.html +++ b/webapp/templates/login.html @@ -5,8 +5,8 @@ - SIK - Login + @@ -22,15 +22,15 @@

SIK Admin

{% csrf_token %}
- +
- +
- +
- +
@@ -40,7 +40,7 @@
- +