diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index 7e92ac5..65091e1 100644 Binary files a/locale/en/LC_MESSAGES/django.mo and b/locale/en/LC_MESSAGES/django.mo differ diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index b853547..e32a316 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-01-24 16:31+0200\n" +"POT-Creation-Date: 2018-01-25 20:18+0200\n" "PO-Revision-Date: 2017-11-02 23:09+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -162,7 +162,8 @@ msgid "id" msgstr "id" #: infoscreen/templates/infoscreen_admin.html:140 webapp/models.py:110 -#: webapp/models.py:143 webapp/templates/kaehmy_list.html:36 +#: webapp/models.py:143 webapp/templates/form_listAll.html:36 +#: webapp/templates/kaehmy/kaehmy_list.html:36 msgid "Name" msgstr "Name" @@ -191,7 +192,8 @@ msgid "Last name" msgstr "Last name" #: members/models.py:16 webapp/models.py:144 -#: webapp/templates/kaehmy_list.html:40 +#: webapp/templates/form_listAll.html:40 +#: webapp/templates/kaehmy/kaehmy_list.html:40 msgid "Email" msgstr "Email" @@ -283,7 +285,8 @@ msgstr "Don't forget to pay your membership fee!" #: members/templates/member_add_many.html:55 #: members/templates/member_add_many_confirm.html:22 #: templates/password_reset/recovery_form.html:10 -#: webapp/templates/kaehmy_list.html:48 +#: webapp/templates/form_listAll.html:48 +#: webapp/templates/kaehmy/kaehmy_list.html:48 msgid "Send" msgstr "Send" @@ -480,7 +483,7 @@ msgstr "Finnish" msgid "English" msgstr "English" -#: members/templates/settings.html:23 webapp/templates/kaehmy.html:77 +#: members/templates/settings.html:23 webapp/templates/kaehmy/kaehmy.html:77 msgid "Submit" msgstr "Submit" @@ -573,15 +576,17 @@ msgid "Go" msgstr "Go" #: templates/base.html:14 templates/footer.html:10 -#: webapp/templates/kaehmy_base.html:14 webapp/templates/main_index.html:9 +#: webapp/templates/form_base.html:14 +#: webapp/templates/kaehmy/kaehmy_base.html:14 +#: webapp/templates/main_index.html:9 msgid "Aalto-yliopiston Sähköinsinöörikilta ry" msgstr "Aalto-yliopiston Sähköinsinöörikilta ry" -#: templates/error.html:8 webapp/templates/kaehmy_error.html:8 +#: templates/error.html:8 webapp/templates/kaehmy/kaehmy_error.html:8 msgid "Error" msgstr "Error" -#: templates/error.html:15 webapp/templates/kaehmy_error.html:15 +#: templates/error.html:15 webapp/templates/kaehmy/kaehmy_error.html:15 msgid "Back" msgstr "Back" @@ -660,7 +665,7 @@ msgstr "Phone number (not public)" msgid "Custom roles" msgstr "Custom roles" -#: webapp/forms.py:52 webapp/templates/kaehmy.html:41 +#: webapp/forms.py:52 webapp/templates/kaehmy/kaehmy.html:41 msgid "Preset roles" msgstr "Preset roles" @@ -822,11 +827,11 @@ msgstr "Kaehmy comment" msgid "Kaehmykommentit" msgstr "Kaehmy comments" -#: webapp/models.py:162 +#: webapp/models.py:162 webapp/models.py:290 msgid "Message" msgstr "" -#: webapp/models.py:181 webapp/templates/kaehmy.html:12 +#: webapp/models.py:181 webapp/templates/kaehmy/kaehmy.html:12 msgid "Kaehmylomake" msgstr "Kaehmy application" @@ -886,11 +891,43 @@ msgstr "" msgid "Officials" msgstr "" -#: webapp/models.py:293 +#: webapp/models.py:275 +msgid "Ohlhafv challenge" +msgstr "" + +#: webapp/models.py:276 +msgid "Ohlhafv challenges" +msgstr "" + +#: webapp/models.py:282 +msgid "Team Challenge (1 x 0.33 L, 2 x 0.5 L, 1 x 1.0 L)" +msgstr "" + +#: webapp/models.py:285 +msgid "Challenger" +msgstr "" + +#: webapp/models.py:286 +msgid "Victim" +msgstr "" + +#: webapp/models.py:287 +msgid "Challenger email" +msgstr "" + +#: webapp/models.py:288 +msgid "Victim email" +msgstr "" + +#: webapp/models.py:289 +msgid "Series" +msgstr "" + +#: webapp/models.py:298 msgid "Telegram channel" msgstr "" -#: webapp/models.py:294 +#: webapp/models.py:299 msgid "Telegram channels" msgstr "" @@ -906,6 +943,43 @@ msgstr "Contact" msgid "Event calendar" msgstr "Event calendar" +#: webapp/templates/form_listAll.html:24 webapp/templates/form_listAll.html:59 +#: webapp/templates/kaehmy/kaehmy_list.html:24 +#: webapp/templates/kaehmy/kaehmy_list.html:59 +msgid "All kaehmys" +msgstr "All applications" + +#: webapp/templates/form_listAll.html:32 +#: webapp/templates/kaehmy/kaehmy_list.html:32 +msgid "Commenting on post by " +msgstr "" + +#: webapp/templates/form_listAll.html:44 +#: webapp/templates/kaehmy/kaehmy_list.html:44 +msgid "Comment" +msgstr "" + +#: webapp/templates/form_listAll.html:57 +#: webapp/templates/kaehmy/kaehmy_list.html:57 +msgid "Filter kaehmys" +msgstr "Filter kaehmys" + +#: webapp/templates/form_listAll.html:70 +#: webapp/templates/kaehmy/kaehmy_list.html:70 +#: webapp/templates/kaehmy/kaehmy_statistics.html:18 +msgid "Total kaehmys:" +msgstr "Total applications:" + +#: webapp/templates/form_listAll.html:88 +#: webapp/templates/kaehmy/kaehmy_list.html:88 +msgid "Show comments" +msgstr "" + +#: webapp/templates/form_listAll.html:94 +#: webapp/templates/kaehmy/kaehmy_list.html:94 +msgid "Add comment" +msgstr "" + #: webapp/templates/guild.html:10 msgid "Kilta" msgstr "Guild" @@ -914,7 +988,7 @@ msgstr "Guild" msgid "Jobs" msgstr "Jobs" -#: webapp/templates/kaehmy.html:16 +#: webapp/templates/kaehmy/kaehmy.html:16 msgid "" "Kaehmykoneella voit ilmaista kiinnostuksesi toimia killassa ensi vuonna.\n" " Listassa on vastuualueittain sekä hallitus- että " @@ -934,7 +1008,7 @@ msgstr "" "Best positions to consider for English speaking people are in the " "International category." -#: webapp/templates/kaehmy.html:23 +#: webapp/templates/kaehmy/kaehmy.html:23 msgid "" "Muista, että kaehmyn lähettäminen on kiinnostuksen ilmaus \n" " eikä siis missään nimessä sitova ilmoittautumien mihinkään " @@ -943,97 +1017,68 @@ msgstr "" "Note, that sending an application is not binding and should be considered as " "a gesture of interest." -#: webapp/templates/kaehmy.html:26 +#: webapp/templates/kaehmy/kaehmy.html:26 msgid "Päivämääriä & deadlineja" msgstr "Dates and deadlines" -#: webapp/templates/kaehmy.html:28 +#: webapp/templates/kaehmy/kaehmy.html:28 msgid "Hallitustyrkkypaneeli (haku hallitukseen olisi hyvä tehdä ennen tätä!)" msgstr "Board panel discussion (applications to the board before this date!)" -#: webapp/templates/kaehmy.html:29 +#: webapp/templates/kaehmy/kaehmy.html:29 msgid "Vaalikokous, osa 1 (puheenjohtajan valinta)" msgstr "Election meeting, part 1 (chairman election)" -#: webapp/templates/kaehmy.html:30 +#: webapp/templates/kaehmy/kaehmy.html:30 msgid "Vaalikokous, osa 2 (hallituksen valinta)" msgstr "Election meeting, part 2 (board election)" -#: webapp/templates/kaehmy.html:31 +#: webapp/templates/kaehmy/kaehmy.html:31 msgid "Kiltailta" msgstr "Guild night" -#: webapp/templates/kaehmy.html:32 +#: webapp/templates/kaehmy/kaehmy.html:32 msgid "Haku toimariksi olisi hyvä tehdä ennen tätä!" msgstr "Deadline to apply as a non-board official!" -#: webapp/templates/kaehmy.html:33 +#: webapp/templates/kaehmy/kaehmy.html:33 msgid "Vaalikokous, osa 3 (toimarien valinta)" msgstr "Election meeting, part 3 (non-board election)" -#: webapp/templates/kaehmy_export.html:9 +#: webapp/templates/kaehmy/kaehmy_export.html:9 msgid "All applications" msgstr "All applications" -#: webapp/templates/kaehmy_export.html:13 +#: webapp/templates/kaehmy/kaehmy_export.html:13 msgid "Board applications" msgstr "Board applications" -#: webapp/templates/kaehmy_export.html:18 +#: webapp/templates/kaehmy/kaehmy_export.html:18 msgid "Non-board applications" msgstr "Non-board applications" -#: webapp/templates/kaehmy_export.html:23 +#: webapp/templates/kaehmy/kaehmy_export.html:23 msgid "Front page" msgstr "" -#: webapp/templates/kaehmy_footer.html:23 +#: webapp/templates/kaehmy/kaehmy_footer.html:23 msgid "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" msgstr "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" -#: webapp/templates/kaehmy_list.html:24 webapp/templates/kaehmy_list.html:59 -msgid "All kaehmys" -msgstr "All applications" - -#: webapp/templates/kaehmy_list.html:32 -msgid "Commenting on post by " -msgstr "" - -#: webapp/templates/kaehmy_list.html:44 -msgid "Comment" -msgstr "" - -#: webapp/templates/kaehmy_list.html:57 -msgid "Filter kaehmys" -msgstr "Filter kaehmys" - -#: webapp/templates/kaehmy_list.html:70 -#: webapp/templates/kaehmy_statistics.html:18 -msgid "Total kaehmys:" -msgstr "Total applications:" - -#: webapp/templates/kaehmy_list.html:88 -msgid "Show comments" -msgstr "" - -#: webapp/templates/kaehmy_list.html:94 -msgid "Add comment" -msgstr "" - -#: webapp/templates/kaehmy_message.html:11 +#: webapp/templates/kaehmy/kaehmy_message.html:11 msgid "Reply" msgstr "" -#: webapp/templates/kaehmy_navigation.html:6 +#: webapp/templates/kaehmy/kaehmy_navigation.html:6 msgid "List kaehmys" msgstr "List applications" -#: webapp/templates/kaehmy_navigation.html:7 +#: webapp/templates/kaehmy/kaehmy_navigation.html:7 msgid "New kaehmy" msgstr "New application" -#: webapp/templates/kaehmy_navigation.html:8 -#: webapp/templates/kaehmy_statistics.html:13 +#: webapp/templates/kaehmy/kaehmy_navigation.html:8 +#: webapp/templates/kaehmy/kaehmy_statistics.html:13 msgid "Statistics" msgstr "" @@ -1046,16 +1091,12 @@ msgid "Are you perhaps looking for one of the following?" msgstr "" #: webapp/templates/main_index.html:24 -#, fuzzy -#| msgid "Infoscreen Admin Pane" msgid "Infoscreen admin pane" msgstr "Infoscreen Admin Pane" #: webapp/templates/main_index.html:26 -#, fuzzy -#| msgid "Kaehmy application: {}" msgid "Kaehmy application" -msgstr "Kaehmy application: {}" +msgstr "Kaehmy application" #: webapp/templates/navigation.html:6 msgid "Guild" @@ -1069,22 +1110,33 @@ msgstr "Sössö" msgid "Corporate" msgstr "Corporate" -#: webapp/templates/ohlhafv.html:8 -msgid "Ohlhafv" -msgstr "Ohlhafv" - -#: webapp/templates/ohlhafv.html:15 -msgid "Challenge" -msgstr "Challenge" - -#: webapp/templates/ohlhafv_list.html:11 +#: webapp/templates/ohlhafv/list.html:8 msgid "All challenges" msgstr "All challenges" -#: webapp/templates/ohlhafv_list.html:15 +#: webapp/templates/ohlhafv/list.html:12 msgid "Total challenges:" msgstr "Total challenges:" +#: webapp/templates/ohlhafv/navigation.html:6 +msgid "New challenge" +msgstr "" + +#: webapp/templates/ohlhafv/navigation.html:7 +msgid "List challenges" +msgstr "All challenges" + +#: webapp/templates/ohlhafv/new.html:12 +msgid "Challenge your foe(s) to combat!" +msgstr "" + +#: webapp/templates/ohlhafv/new.html:19 +msgid "Challenge" +msgstr "Challenge" + +#~ msgid "Ohlhafv" +#~ msgstr "Øhlhäfv" + #~ msgid "Infoscreen" #~ msgstr "Infoscreen" diff --git a/locale/fi/LC_MESSAGES/django.po b/locale/fi/LC_MESSAGES/django.po index d810400..6251ec7 100644 --- a/locale/fi/LC_MESSAGES/django.po +++ b/locale/fi/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-01-24 16:31+0200\n" +"POT-Creation-Date: 2018-01-25 20:18+0200\n" "PO-Revision-Date: 2017-11-02 23:04+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -163,7 +163,8 @@ msgid "id" msgstr "id" #: infoscreen/templates/infoscreen_admin.html:140 webapp/models.py:110 -#: webapp/models.py:143 webapp/templates/kaehmy_list.html:36 +#: webapp/models.py:143 webapp/templates/form_listAll.html:36 +#: webapp/templates/kaehmy/kaehmy_list.html:36 msgid "Name" msgstr "Nimi" @@ -192,7 +193,8 @@ msgid "Last name" msgstr "Sukunimi" #: members/models.py:16 webapp/models.py:144 -#: webapp/templates/kaehmy_list.html:40 +#: webapp/templates/form_listAll.html:40 +#: webapp/templates/kaehmy/kaehmy_list.html:40 msgid "Email" msgstr "Sähköposti" @@ -284,7 +286,8 @@ msgstr "Muista myös maksaa jäsenmaksusi!" #: members/templates/member_add_many.html:55 #: members/templates/member_add_many_confirm.html:22 #: templates/password_reset/recovery_form.html:10 -#: webapp/templates/kaehmy_list.html:48 +#: webapp/templates/form_listAll.html:48 +#: webapp/templates/kaehmy/kaehmy_list.html:48 msgid "Send" msgstr "Lähetä" @@ -479,7 +482,7 @@ msgstr "suomi" msgid "English" msgstr "englanti" -#: members/templates/settings.html:23 webapp/templates/kaehmy.html:77 +#: members/templates/settings.html:23 webapp/templates/kaehmy/kaehmy.html:77 msgid "Submit" msgstr "Lisää" @@ -571,15 +574,17 @@ msgid "Go" msgstr "Vaihda" #: templates/base.html:14 templates/footer.html:10 -#: webapp/templates/kaehmy_base.html:14 webapp/templates/main_index.html:9 +#: webapp/templates/form_base.html:14 +#: webapp/templates/kaehmy/kaehmy_base.html:14 +#: webapp/templates/main_index.html:9 msgid "Aalto-yliopiston Sähköinsinöörikilta ry" msgstr "Aalto-yliopiston Sähköinsinöörikilta ry" -#: templates/error.html:8 webapp/templates/kaehmy_error.html:8 +#: templates/error.html:8 webapp/templates/kaehmy/kaehmy_error.html:8 msgid "Error" msgstr "Virhe" -#: templates/error.html:15 webapp/templates/kaehmy_error.html:15 +#: templates/error.html:15 webapp/templates/kaehmy/kaehmy_error.html:15 msgid "Back" msgstr "Takaisin" @@ -657,7 +662,7 @@ msgstr "Puhelinnumero (ei julkinen)" msgid "Custom roles" msgstr "Uudet virat" -#: webapp/forms.py:52 webapp/templates/kaehmy.html:41 +#: webapp/forms.py:52 webapp/templates/kaehmy/kaehmy.html:41 msgid "Preset roles" msgstr "Kaehmyvirat" @@ -819,11 +824,11 @@ msgstr "Kaehmykommentti" msgid "Kaehmykommentit" msgstr "Kaehmykommentit" -#: webapp/models.py:162 +#: webapp/models.py:162 webapp/models.py:290 msgid "Message" msgstr "Viesti" -#: webapp/models.py:181 webapp/templates/kaehmy.html:12 +#: webapp/models.py:181 webapp/templates/kaehmy/kaehmy.html:12 msgid "Kaehmylomake" msgstr "Kaehmylomake" @@ -883,11 +888,43 @@ msgstr "Toimihenkilö" msgid "Officials" msgstr "Toimihenkilöt" -#: webapp/models.py:293 +#: webapp/models.py:275 +msgid "Ohlhafv challenge" +msgstr "Ohlhafv haaste" + +#: webapp/models.py:276 +msgid "Ohlhafv challenges" +msgstr "Ohlhafv haasteet" + +#: webapp/models.py:282 +msgid "Team Challenge (1 x 0.33 L, 2 x 0.5 L, 1 x 1.0 L)" +msgstr "Joukkuehaaste (1 x 0.33 L, 2 x 0.5 L, 1 x 1.0 L)" + +#: webapp/models.py:285 +msgid "Challenger" +msgstr "Haastaja" + +#: webapp/models.py:286 +msgid "Victim" +msgstr "Uhri" + +#: webapp/models.py:287 +msgid "Challenger email" +msgstr "Haastajan sähköpostiosoite" + +#: webapp/models.py:288 +msgid "Victim email" +msgstr "Uhrin sähköpostiosoite" + +#: webapp/models.py:289 +msgid "Series" +msgstr "Sarja" + +#: webapp/models.py:298 msgid "Telegram channel" msgstr "Telegram-kanava" -#: webapp/models.py:294 +#: webapp/models.py:299 msgid "Telegram channels" msgstr "Telegram-kanavat" @@ -903,6 +940,43 @@ msgstr "Yhteystiedot" msgid "Event calendar" msgstr "Tapahtumakalenteri" +#: webapp/templates/form_listAll.html:24 webapp/templates/form_listAll.html:59 +#: webapp/templates/kaehmy/kaehmy_list.html:24 +#: webapp/templates/kaehmy/kaehmy_list.html:59 +msgid "All kaehmys" +msgstr "Kaikki kaehmyt" + +#: webapp/templates/form_listAll.html:32 +#: webapp/templates/kaehmy/kaehmy_list.html:32 +msgid "Commenting on post by " +msgstr "Kommentoidaan viestiin lähettäjältä " + +#: webapp/templates/form_listAll.html:44 +#: webapp/templates/kaehmy/kaehmy_list.html:44 +msgid "Comment" +msgstr "Kommentti" + +#: webapp/templates/form_listAll.html:57 +#: webapp/templates/kaehmy/kaehmy_list.html:57 +msgid "Filter kaehmys" +msgstr "Rajaa kaehmyjä" + +#: webapp/templates/form_listAll.html:70 +#: webapp/templates/kaehmy/kaehmy_list.html:70 +#: webapp/templates/kaehmy/kaehmy_statistics.html:18 +msgid "Total kaehmys:" +msgstr "Kaehmyjä yhteensä:" + +#: webapp/templates/form_listAll.html:88 +#: webapp/templates/kaehmy/kaehmy_list.html:88 +msgid "Show comments" +msgstr "Näytä kommentit" + +#: webapp/templates/form_listAll.html:94 +#: webapp/templates/kaehmy/kaehmy_list.html:94 +msgid "Add comment" +msgstr "Kommentoi" + #: webapp/templates/guild.html:10 msgid "Kilta" msgstr "Kilta" @@ -911,7 +985,7 @@ msgstr "Kilta" msgid "Jobs" msgstr "Työpaikat" -#: webapp/templates/kaehmy.html:16 +#: webapp/templates/kaehmy/kaehmy.html:16 msgid "" "Kaehmykoneella voit ilmaista kiinnostuksesi toimia killassa ensi vuonna.\n" " Listassa on vastuualueittain sekä hallitus- että " @@ -933,7 +1007,7 @@ msgstr "" " tai olla yhteydessä kyseistä virkaa tänä vuonna toimittavaan " "henkilöön." -#: webapp/templates/kaehmy.html:23 +#: webapp/templates/kaehmy/kaehmy.html:23 msgid "" "Muista, että kaehmyn lähettäminen on kiinnostuksen ilmaus \n" " eikä siis missään nimessä sitova ilmoittautumien mihinkään " @@ -943,97 +1017,68 @@ msgstr "" " eikä siis missään nimessä sitova ilmoittautumien mihinkään " "tehtävään!" -#: webapp/templates/kaehmy.html:26 +#: webapp/templates/kaehmy/kaehmy.html:26 msgid "Päivämääriä & deadlineja" msgstr "Päivämääriä & deadlineja" -#: webapp/templates/kaehmy.html:28 +#: webapp/templates/kaehmy/kaehmy.html:28 msgid "Hallitustyrkkypaneeli (haku hallitukseen olisi hyvä tehdä ennen tätä!)" msgstr "Hallitustyrkkypaneeli (haku hallitukseen olisi hyvä tehdä ennen tätä!)" -#: webapp/templates/kaehmy.html:29 +#: webapp/templates/kaehmy/kaehmy.html:29 msgid "Vaalikokous, osa 1 (puheenjohtajan valinta)" msgstr "Vaalikokous, osa 1 (puheenjohtajan valinta)" -#: webapp/templates/kaehmy.html:30 +#: webapp/templates/kaehmy/kaehmy.html:30 msgid "Vaalikokous, osa 2 (hallituksen valinta)" msgstr "Vaalikokous, osa 2 (hallituksen valinta)" -#: webapp/templates/kaehmy.html:31 +#: webapp/templates/kaehmy/kaehmy.html:31 msgid "Kiltailta" msgstr "Kiltailta" -#: webapp/templates/kaehmy.html:32 +#: webapp/templates/kaehmy/kaehmy.html:32 msgid "Haku toimariksi olisi hyvä tehdä ennen tätä!" msgstr "Haku toimariksi olisi hyvä tehdä ennen tätä!" -#: webapp/templates/kaehmy.html:33 +#: webapp/templates/kaehmy/kaehmy.html:33 msgid "Vaalikokous, osa 3 (toimarien valinta)" msgstr "Vaalikokous, osa 3 (toimarien valinta)" -#: webapp/templates/kaehmy_export.html:9 +#: webapp/templates/kaehmy/kaehmy_export.html:9 msgid "All applications" msgstr "Kaikki kaehmyt" -#: webapp/templates/kaehmy_export.html:13 +#: webapp/templates/kaehmy/kaehmy_export.html:13 msgid "Board applications" msgstr "Hallituskaehmyt" -#: webapp/templates/kaehmy_export.html:18 +#: webapp/templates/kaehmy/kaehmy_export.html:18 msgid "Non-board applications" msgstr "Toimarikaehmyt" -#: webapp/templates/kaehmy_export.html:23 +#: webapp/templates/kaehmy/kaehmy_export.html:23 msgid "Front page" msgstr "Etusivulle" -#: webapp/templates/kaehmy_footer.html:23 +#: webapp/templates/kaehmy/kaehmy_footer.html:23 msgid "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" msgstr "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" -#: webapp/templates/kaehmy_list.html:24 webapp/templates/kaehmy_list.html:59 -msgid "All kaehmys" -msgstr "Kaikki kaehmyt" - -#: webapp/templates/kaehmy_list.html:32 -msgid "Commenting on post by " -msgstr "Kommentoidaan viestiin lähettäjältä " - -#: webapp/templates/kaehmy_list.html:44 -msgid "Comment" -msgstr "Kommentti" - -#: webapp/templates/kaehmy_list.html:57 -msgid "Filter kaehmys" -msgstr "Rajaa kaehmyjä" - -#: webapp/templates/kaehmy_list.html:70 -#: webapp/templates/kaehmy_statistics.html:18 -msgid "Total kaehmys:" -msgstr "Kaehmyjä yhteensä:" - -#: webapp/templates/kaehmy_list.html:88 -msgid "Show comments" -msgstr "Näytä kommentit" - -#: webapp/templates/kaehmy_list.html:94 -msgid "Add comment" -msgstr "Kommentoi" - -#: webapp/templates/kaehmy_message.html:11 +#: webapp/templates/kaehmy/kaehmy_message.html:11 msgid "Reply" msgstr "Vastaa" -#: webapp/templates/kaehmy_navigation.html:6 +#: webapp/templates/kaehmy/kaehmy_navigation.html:6 msgid "List kaehmys" msgstr "Kaikki kaehmyt" -#: webapp/templates/kaehmy_navigation.html:7 +#: webapp/templates/kaehmy/kaehmy_navigation.html:7 msgid "New kaehmy" msgstr "Uusi kaehmy" -#: webapp/templates/kaehmy_navigation.html:8 -#: webapp/templates/kaehmy_statistics.html:13 +#: webapp/templates/kaehmy/kaehmy_navigation.html:8 +#: webapp/templates/kaehmy/kaehmy_statistics.html:13 msgid "Statistics" msgstr "Kaehmytilastot" @@ -1065,22 +1110,36 @@ msgstr "Sössö" msgid "Corporate" msgstr "Yritys" -#: webapp/templates/ohlhafv.html:8 -msgid "Ohlhafv" -msgstr "Øhlhäfv" - -#: webapp/templates/ohlhafv.html:15 -msgid "Challenge" -msgstr "Haaste" - -#: webapp/templates/ohlhafv_list.html:11 +#: webapp/templates/ohlhafv/list.html:8 msgid "All challenges" msgstr "Kaikki haasteet" -#: webapp/templates/ohlhafv_list.html:15 +#: webapp/templates/ohlhafv/list.html:12 msgid "Total challenges:" msgstr "Haasteita yhteensä:" +#: webapp/templates/ohlhafv/navigation.html:6 +msgid "New challenge" +msgstr "Uusi haaste" + +#: webapp/templates/ohlhafv/navigation.html:7 +msgid "List challenges" +msgstr "Kaikki haasteet" + +#: webapp/templates/ohlhafv/new.html:12 +msgid "Challenge your foe(s) to combat!" +msgstr "Haasta kaverisi mittelöön!" + +#: webapp/templates/ohlhafv/new.html:19 +msgid "Challenge" +msgstr "Haasta" + +#~ msgid "Team" +#~ msgstr "Joukkue" + +#~ msgid "Ohlhafv" +#~ msgstr "Øhlhäfv" + #~ msgid "Infoscreen" #~ msgstr "Infonäyttö" diff --git a/webapp/migrations/0036_auto_20180124_1712.py b/webapp/migrations/0036_auto_20180124_1712.py new file mode 100644 index 0000000..0647108 --- /dev/null +++ b/webapp/migrations/0036_auto_20180124_1712.py @@ -0,0 +1,49 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11 on 2018-01-24 15:12 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('webapp', '0035_auto_20171019_1413'), + ] + + operations = [ + migrations.AlterModelOptions( + name='ohlhafvchallenge', + options={'verbose_name': 'Ohlhafv challenge', 'verbose_name_plural': 'Ohlhafv challenges'}, + ), + migrations.AlterField( + model_name='ohlhafvchallenge', + name='challenger', + field=models.CharField(max_length=255, verbose_name='Challenger'), + ), + migrations.AlterField( + model_name='ohlhafvchallenge', + name='challenger_email', + field=models.EmailField(max_length=254, verbose_name='Challenger email'), + ), + migrations.AlterField( + model_name='ohlhafvchallenge', + name='message', + field=models.TextField(verbose_name='Message'), + ), + migrations.AlterField( + model_name='ohlhafvchallenge', + name='series', + field=models.CharField(choices=[('0.33 L', '0.33 L'), ('0.5 L', '0.5 L'), ('1.0 L', '1.0 L'), ('Team', 'Team Challenge (1 x 0.33 L, 2 x 0.5 L, 1 x 1.0L)')], max_length=10, verbose_name='Series'), + ), + migrations.AlterField( + model_name='ohlhafvchallenge', + name='victim', + field=models.CharField(max_length=255, verbose_name='Victim'), + ), + migrations.AlterField( + model_name='ohlhafvchallenge', + name='victim_email', + field=models.EmailField(max_length=254, verbose_name='Victim Email'), + ), + ] diff --git a/webapp/models.py b/webapp/models.py index c6cea6b..7133d09 100644 --- a/webapp/models.py +++ b/webapp/models.py @@ -271,18 +271,23 @@ class Official(User): class OhlhafvChallenge(models.Model): """Model containing all info about ohlhafv challenge.""" + class Meta: + verbose_name = _('Ohlhafv challenge') + verbose_name_plural = _('Ohlhafv challenges') + SERIES_CHOICES = ( ('0.33 L', '0.33 L'), ('0.5 L', '0.5 L'), ('1.0 L', '1.0 L'), + ('Team', _('Team Challenge (1 x 0.33 L, 2 x 0.5 L, 1 x 1.0 L)')) ) - challenger = models.CharField(max_length=255) - victim = models.CharField(max_length=255) - challenger_email = models.EmailField() - victim_email = models.EmailField() - series = models.CharField(choices=SERIES_CHOICES, max_length=10) - message = models.TextField() + challenger = models.CharField(_('Challenger'), max_length=255) + victim = models.CharField(_('Victim'), max_length=255) + challenger_email = models.EmailField(_('Challenger email')) + victim_email = models.EmailField(_('Victim email')) + series = models.CharField(_('Series'), choices=SERIES_CHOICES, max_length=10) + message = models.TextField(_('Message'), blank=True, null=False) # Telegram channel entry for Kaehmys diff --git a/webapp/static/css/kaehmy_nav.css b/webapp/static/css/kaehmy_nav.css index 8b629d1..ee7db33 100644 --- a/webapp/static/css/kaehmy_nav.css +++ b/webapp/static/css/kaehmy_nav.css @@ -7,5 +7,5 @@ } .navbar-light .navbar-nav .nav-link { - color: #102a40; + color: black; } diff --git a/webapp/static/css/ohlhafv/base.css b/webapp/static/css/ohlhafv/base.css new file mode 100644 index 0000000..b8e837b --- /dev/null +++ b/webapp/static/css/ohlhafv/base.css @@ -0,0 +1,95 @@ +html, body { + background-color: rgb(252, 225, 69); +} + +body { + padding: 0 1rem 0; +} + +.bg-faded, .form-control { + /*background-color: rgb(252, 225, 69);*/ + border-color: black; + color: black; + + border-radius: 0; + box-shadow: 10px 10px rgba(0, 0, 0, 0.5); +} + +.form-control:focus { + border-color: black; + outline-style: solid; + outline-color: black; + outline-width: 2px; +} + +.form-control::placeholder { + color: rgb(63, 63, 63); +} + +.form-group label { + color: black; +} + +footer { + color: black; +} + +footer select.form-control { + box-shadow: 0 0; +} + +h3 { + padding: 2rem 0 2rem; + color: black; +} + +.navbar { + border-radius: 0; + background-color: rgb(252, 225, 69); + box-shadow: 0 0; +} + +.btn.btn-primary { + border-color: black; + background-color: white; + border-radius: 0; + color: black; + + margin-top: 1rem; + box-shadow: 10px 10px rgba(0, 0, 0, 0.5); +} + +.btn.btn-primary:hover { + outline-style: solid; + outline-color: black; + outline-width: 2px; +} + +.card { + background-color: rgb(252, 225, 69); + border-color: black; + border-radius: 0; + + box-shadow: 10px 10px rgba(0, 0, 0, 0.5); + + margin-bottom: 2rem; +} + +.card-header { + border-width: 0 0 1px 0; + border-style: solid; + border-color: black; + color: black; +} + +.card h5 { + color: black; +} + +.card p { + color: black; +} + +h6 { + color: black; +} \ No newline at end of file diff --git a/webapp/static/css/ohlhafv_header.css b/webapp/static/css/ohlhafv_header.css new file mode 100644 index 0000000..9ac33d7 --- /dev/null +++ b/webapp/static/css/ohlhafv_header.css @@ -0,0 +1,37 @@ +.header-content { + +} + +.header-content .logo { + +} + +.header-content .logo img { + display: block; + height: auto; + margin: auto; +} + +.ohlhafv-banner { + max-width: 1000px; + margin-left: auto; + margin-right: auto; +} + +@media screen and (min-width: 1000px) { + .ohlhafv_header-content { + position: absolute; + left: 0; + top: 0; + background-color: #052f5f; + width: 100%; + } + + .ohlhafv_header { + margin-bottom: 331px; + } +} + +.ohlhafv-banner-image { + width: 100%; +} diff --git a/webapp/static/img/heevi_banner.svg b/webapp/static/img/heevi_banner.svg new file mode 100644 index 0000000..a066b20 --- /dev/null +++ b/webapp/static/img/heevi_banner.svg @@ -0,0 +1,460 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/webapp/templates/form_base.html b/webapp/templates/form_base.html new file mode 100644 index 0000000..8a6f883 --- /dev/null +++ b/webapp/templates/form_base.html @@ -0,0 +1,50 @@ + + +{% load i18n %} +{% load static %} +{% load staticfiles %} + + + + + + + + + {% trans "Aalto-yliopiston Sähköinsinöörikilta ry" %} + + + + + + + + + + + +
+ {% block header %} + {% endblock header %} +
+ +
+ {% block navigation %} + {% endblock %} +
+ +
+ {% block content %} + {% endblock %} +
+ +
+ {% block footer %} + {% endblock footer %} +
+ + diff --git a/webapp/templates/kaehmy.html b/webapp/templates/kaehmy/kaehmy.html similarity index 97% rename from webapp/templates/kaehmy.html rename to webapp/templates/kaehmy/kaehmy.html index e0f5a30..4e6d12e 100644 --- a/webapp/templates/kaehmy.html +++ b/webapp/templates/kaehmy/kaehmy.html @@ -1,10 +1,10 @@ -{% extends "kaehmy_base.html" %} +{% extends "kaehmy/kaehmy_base.html" %} {% load bootstrap3 %} {% load i18n %} {% block navigation %} - {% include "kaehmy_navigation.html" %} + {% include "kaehmy/kaehmy_navigation.html" %} {% endblock %} {% block content %} diff --git a/webapp/templates/kaehmy_base.html b/webapp/templates/kaehmy/kaehmy_base.html similarity index 91% rename from webapp/templates/kaehmy_base.html rename to webapp/templates/kaehmy/kaehmy_base.html index fdd50ac..c9c593f 100644 --- a/webapp/templates/kaehmy_base.html +++ b/webapp/templates/kaehmy/kaehmy_base.html @@ -30,12 +30,12 @@ {% block header %}
- {% include "kaehmy_header.html" %} + {% include "kaehmy/kaehmy_header.html" %}
{% endblock header %} {% block navigation %} - {% include "kaehmy_navigation.html" %} + {% include "kaehmy/kaehmy_navigation.html" %} {% endblock %}
@@ -44,7 +44,7 @@
{% block footer %} - {% include "kaehmy_footer.html" %} + {% include "kaehmy/kaehmy_footer.html" %} {% endblock footer %}
diff --git a/webapp/templates/kaehmy_checkbox_option.html b/webapp/templates/kaehmy/kaehmy_checkbox_option.html similarity index 100% rename from webapp/templates/kaehmy_checkbox_option.html rename to webapp/templates/kaehmy/kaehmy_checkbox_option.html diff --git a/webapp/templates/kaehmy_error.html b/webapp/templates/kaehmy/kaehmy_error.html similarity index 89% rename from webapp/templates/kaehmy_error.html rename to webapp/templates/kaehmy/kaehmy_error.html index cdcc0ed..a1ecfe3 100644 --- a/webapp/templates/kaehmy_error.html +++ b/webapp/templates/kaehmy/kaehmy_error.html @@ -1,4 +1,4 @@ -{% extends "kaehmy_base.html" %} +{% extends "kaehmy/kaehmy_base.html" %} {% load static %} {% load i18n %} diff --git a/webapp/templates/kaehmy_export.html b/webapp/templates/kaehmy/kaehmy_export.html similarity index 92% rename from webapp/templates/kaehmy_export.html rename to webapp/templates/kaehmy/kaehmy_export.html index 7d30fea..9495444 100644 --- a/webapp/templates/kaehmy_export.html +++ b/webapp/templates/kaehmy/kaehmy_export.html @@ -1,4 +1,4 @@ -{% extends "kaehmy_base.html" %} +{% extends "kaehmy/kaehmy_base.html" %} {% load static %} {% load i18n %} diff --git a/webapp/templates/kaehmy_footer.html b/webapp/templates/kaehmy/kaehmy_footer.html similarity index 100% rename from webapp/templates/kaehmy_footer.html rename to webapp/templates/kaehmy/kaehmy_footer.html diff --git a/webapp/templates/kaehmy_header.html b/webapp/templates/kaehmy/kaehmy_header.html similarity index 100% rename from webapp/templates/kaehmy_header.html rename to webapp/templates/kaehmy/kaehmy_header.html diff --git a/webapp/templates/kaehmy_list.html b/webapp/templates/kaehmy/kaehmy_list.html similarity index 95% rename from webapp/templates/kaehmy_list.html rename to webapp/templates/kaehmy/kaehmy_list.html index eea449a..4d8f485 100644 --- a/webapp/templates/kaehmy_list.html +++ b/webapp/templates/kaehmy/kaehmy_list.html @@ -1,10 +1,10 @@ -{% extends "kaehmy_base.html" %} +{% extends "kaehmy/kaehmy_base.html" %} {% load static %} {% load i18n %} {% block navigation %} - {% include "kaehmy_navigation.html" %} + {% include "kaehmy/kaehmy_navigation.html" %} {% endblock %} {% block content %} @@ -97,7 +97,7 @@
{% for message in application.messages.all %} - {% include "kaehmy_message.html" with messages=message.messages.all %} + {% include "kaehmy/kaehmy_message.html" with messages=message.messages.all %} {% endfor %}
diff --git a/webapp/templates/kaehmy_message.html b/webapp/templates/kaehmy/kaehmy_message.html similarity index 88% rename from webapp/templates/kaehmy_message.html rename to webapp/templates/kaehmy/kaehmy_message.html index f3a15fd..2dada37 100644 --- a/webapp/templates/kaehmy_message.html +++ b/webapp/templates/kaehmy/kaehmy_message.html @@ -13,7 +13,7 @@
{% for message in messages %} - {% include "kaehmy_message.html" with messages=message.messages.all %} + {% include "kaehmy/kaehmy_message.html" with messages=message.messages.all %} {% endfor %}
diff --git a/webapp/templates/kaehmy_navigation.html b/webapp/templates/kaehmy/kaehmy_navigation.html similarity index 100% rename from webapp/templates/kaehmy_navigation.html rename to webapp/templates/kaehmy/kaehmy_navigation.html diff --git a/webapp/templates/kaehmy_statistics.html b/webapp/templates/kaehmy/kaehmy_statistics.html similarity index 88% rename from webapp/templates/kaehmy_statistics.html rename to webapp/templates/kaehmy/kaehmy_statistics.html index 7c999fe..097b294 100644 --- a/webapp/templates/kaehmy_statistics.html +++ b/webapp/templates/kaehmy/kaehmy_statistics.html @@ -1,10 +1,10 @@ -{% extends "kaehmy_base.html" %} +{% extends "kaehmy/kaehmy_base.html" %} {% load bootstrap3 %} {% load i18n %} {% block navigation %} - {% include "kaehmy_navigation.html" %} + {% include "kaehmy/kaehmy_navigation.html" %} {% endblock %} {% block content %} diff --git a/webapp/templates/ohlhafv/base.html b/webapp/templates/ohlhafv/base.html new file mode 100644 index 0000000..e56a99a --- /dev/null +++ b/webapp/templates/ohlhafv/base.html @@ -0,0 +1,21 @@ +{% extends "form_base.html" %} + +{% load static %} +{% load i18n %} + + +{% block header %} + + {% include "ohlhafv/header.html" %} +{% endblock header %} + +{% block navigation %} + {% include "ohlhafv/navigation.html" %} +{% endblock %} + +{% block content %} +{% endblock %} + +{% block footer %} + {% include "kaehmy/kaehmy_footer.html" %} +{% endblock footer %} \ No newline at end of file diff --git a/webapp/templates/ohlhafv/header.html b/webapp/templates/ohlhafv/header.html new file mode 100644 index 0000000..5227112 --- /dev/null +++ b/webapp/templates/ohlhafv/header.html @@ -0,0 +1,8 @@ +{% load i18n %} + + +
+ +
diff --git a/webapp/templates/ohlhafv/list.html b/webapp/templates/ohlhafv/list.html new file mode 100644 index 0000000..540c0d1 --- /dev/null +++ b/webapp/templates/ohlhafv/list.html @@ -0,0 +1,25 @@ +{% extends "ohlhafv/base.html" %} + +{% load static %} +{% load i18n %} + +{% block content %} +
+

{% trans "All challenges" %}

+
+ +
+
{% trans "Total challenges:" %} {{ challenge_count }}
+
+ +{% for challenge in challenges %} +
+

{{ challenge.challenger }} vs. {{ challenge.victim }}

+
+
{{ challenge.series }}
+

{{ challenge.message|linebreaks|urlize }}

+
+
+{% endfor %} + +{% endblock content %} \ No newline at end of file diff --git a/webapp/templates/ohlhafv/navigation.html b/webapp/templates/ohlhafv/navigation.html new file mode 100644 index 0000000..53f3da3 --- /dev/null +++ b/webapp/templates/ohlhafv/navigation.html @@ -0,0 +1,10 @@ +{% load i18n %} + +
+ +
diff --git a/webapp/templates/ohlhafv.html b/webapp/templates/ohlhafv/new.html similarity index 72% rename from webapp/templates/ohlhafv.html rename to webapp/templates/ohlhafv/new.html index c4f658b..61a7e96 100644 --- a/webapp/templates/ohlhafv.html +++ b/webapp/templates/ohlhafv/new.html @@ -1,11 +1,15 @@ -{% extends "webapp_base.html" %} +{% extends "ohlhafv/base.html" %} {% load bootstrap3 %} {% load i18n %} +{% block navigation %} + {% include "ohlhafv/navigation.html" %} +{% endblock %} + {% block content %}
-

{% trans "Ohlhafv" %}

+

{% trans "Challenge your foe(s) to combat!" %}

{% csrf_token %} diff --git a/webapp/templates/ohlhafv_list.html b/webapp/templates/ohlhafv_list.html deleted file mode 100644 index a693237..0000000 --- a/webapp/templates/ohlhafv_list.html +++ /dev/null @@ -1,20 +0,0 @@ -{% extends "webapp_base.html" %} - -{% load static %} -{% load i18n %} -{% load django_tables2 %} - -{% block content %} -
- -
-

{% trans "All challenges" %}

-
- -
- {% trans "Total challenges:" %}{{ application_count }} -
- - {{ table|safe }} -
-{% endblock content %} diff --git a/webapp/views.py b/webapp/views.py index 64915ad..e86666c 100644 --- a/webapp/views.py +++ b/webapp/views.py @@ -155,7 +155,7 @@ def contact_view(request, *args, **kwargs): def ohlhafv_view(request, *args, **kwargs): """Render Ohlhafv form page.""" form = OhlhafvForm() - return render(request, 'ohlhafv.html', {'form': form}) + return render(request, 'ohlhafv/new.html', {'form': form}) @ensure_csrf_cookie @@ -165,10 +165,8 @@ def ohlhafv_submit(request, *args, **kwargs): form = OhlhafvForm(request.POST) if form.is_valid(): form.save() - # return HttpResponseRedirect('/list/') else: pass - # return render(request, 'error.html', {'error': form.errors}) return HttpResponseRedirect('/ohlhafv/list/') @@ -177,20 +175,12 @@ def ohlhafv_submit(request, *args, **kwargs): def ohlhafv_list(request, *args, **kwargs): """Present Ohlhafv challenges list.""" challenges = OhlhafvChallenge.objects.all() - - table = OhlhafvTable(challenges, - request=request, - exclude=['id', 'challenger_email', 'victim_email'], - attrs={'class': 'table table-bordered table-hover'}) - - table.paginate(page=request.GET.get('page', 1), per_page=25) - table_html = table.as_html(request) - + challenges = challenges.order_by('-id') context = { - 'table': table_html, + 'challenges': challenges, 'challenge_count': len(challenges), } - return render(request, 'ohlhafv_list.html', context) + return render(request, 'ohlhafv/list.html', context) @ensure_csrf_cookie @@ -218,7 +208,7 @@ def kaehmy_list_view(request, *args, **kwargs): 'application_count': len(applications), 'filter_options': filter_options } - return render(request, 'kaehmy_list.html', context) + return render(request, 'kaehmy/kaehmy_list.html', context) @ensure_csrf_cookie @@ -246,7 +236,7 @@ def kaehmy_comment(request, *args, **kwargs): context = { 'error': form.errors } - return render(request, 'kaehmy_error.html', context) + return render(request, 'kaehmy/kaehmy_error.html', context) @require_http_methods(["GET"]) @@ -271,14 +261,14 @@ def kaehmy_statistics_view(request, *args, **kwargs): 'application_count': len(applications), 'role_list': role_list } - return render(request, 'kaehmy_statistics.html', context) + return render(request, 'kaehmy/kaehmy_statistics.html', context) @require_http_methods(["GET"]) def kaehmy_view(request, *args, **kwargs): """Render Kaehmy form page.""" form = KaehmyForm_Form() - return render(request, 'kaehmy.html', {'form': form}) + return render(request, 'kaehmy/kaehmy.html', {'form': form}) @ensure_csrf_cookie @@ -324,7 +314,7 @@ def kaehmy_submit(request, *args, **kwargs): context = { 'error': form.errors } - return render(request, 'kaehmy_error.html', context) + return render(request, 'kaehmy/kaehmy_error.html', context) return HttpResponseRedirect('/kaehmy') @@ -348,4 +338,4 @@ def kaehmy_export_view(request, *args, **kwargs): 'non_board_table': make_table(non_board), 'board_table': make_table(board), } - return render(request, 'kaehmy_export.html', context) + return render(request, 'kaehmy/kaehmy_export.html', context)