diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index 5de156c..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 a4607ef..38c3186 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 19:03+0200\n" +"POT-Creation-Date: 2018-01-25 16:56+0200\n" "PO-Revision-Date: 2017-11-02 23:09+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -162,8 +162,7 @@ msgid "id" msgstr "id" #: infoscreen/templates/infoscreen_admin.html:140 webapp/models.py:110 -#: webapp/models.py:143 webapp/templates/form_listAll.html:36 -#: webapp/templates/kaehmy/kaehmy_list.html:36 +#: webapp/models.py:143 webapp/templates/kaehmy/kaehmy_list.html:36 msgid "Name" msgstr "Name" @@ -192,7 +191,6 @@ msgid "Last name" msgstr "Last name" #: members/models.py:16 webapp/models.py:144 -#: webapp/templates/form_listAll.html:40 #: webapp/templates/kaehmy/kaehmy_list.html:40 msgid "Email" msgstr "Email" @@ -285,7 +283,6 @@ 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/form_listAll.html:48 #: webapp/templates/kaehmy/kaehmy_list.html:48 msgid "Send" msgstr "Send" @@ -947,43 +944,6 @@ 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" @@ -1069,6 +1029,36 @@ msgstr "" msgid "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" msgstr "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" +#: webapp/templates/kaehmy/kaehmy_list.html:24 +#: webapp/templates/kaehmy/kaehmy_list.html:59 +msgid "All kaehmys" +msgstr "All applications" + +#: webapp/templates/kaehmy/kaehmy_list.html:32 +msgid "Commenting on post by " +msgstr "" + +#: webapp/templates/kaehmy/kaehmy_list.html:44 +msgid "Comment" +msgstr "" + +#: webapp/templates/kaehmy/kaehmy_list.html:57 +msgid "Filter kaehmys" +msgstr "Filter kaehmys" + +#: webapp/templates/kaehmy/kaehmy_list.html:70 +#: webapp/templates/kaehmy/kaehmy_statistics.html:18 +msgid "Total kaehmys:" +msgstr "Total applications:" + +#: webapp/templates/kaehmy/kaehmy_list.html:88 +msgid "Show comments" +msgstr "" + +#: webapp/templates/kaehmy/kaehmy_list.html:94 +msgid "Add comment" +msgstr "" + #: webapp/templates/kaehmy/kaehmy_message.html:11 msgid "Reply" msgstr "" @@ -1135,13 +1125,16 @@ msgid "List challenges" msgstr "All challenges" #: webapp/templates/ohlhafv/new.html:12 -msgid "Ohlhafv" -msgstr "Øhlhäfv" +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.mo b/locale/fi/LC_MESSAGES/django.mo index f889a09..250db6d 100644 Binary files a/locale/fi/LC_MESSAGES/django.mo and b/locale/fi/LC_MESSAGES/django.mo differ diff --git a/locale/fi/LC_MESSAGES/django.po b/locale/fi/LC_MESSAGES/django.po index 7004a5c..d45f2f7 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 19:03+0200\n" +"POT-Creation-Date: 2018-01-25 16:56+0200\n" "PO-Revision-Date: 2017-11-02 23:04+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -163,8 +163,7 @@ msgid "id" msgstr "id" #: infoscreen/templates/infoscreen_admin.html:140 webapp/models.py:110 -#: webapp/models.py:143 webapp/templates/form_listAll.html:36 -#: webapp/templates/kaehmy/kaehmy_list.html:36 +#: webapp/models.py:143 webapp/templates/kaehmy/kaehmy_list.html:36 msgid "Name" msgstr "Nimi" @@ -193,7 +192,6 @@ msgid "Last name" msgstr "Sukunimi" #: members/models.py:16 webapp/models.py:144 -#: webapp/templates/form_listAll.html:40 #: webapp/templates/kaehmy/kaehmy_list.html:40 msgid "Email" msgstr "Sähköposti" @@ -286,7 +284,6 @@ 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/form_listAll.html:48 #: webapp/templates/kaehmy/kaehmy_list.html:48 msgid "Send" msgstr "Lähetä" @@ -944,43 +941,6 @@ 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" @@ -1069,6 +1029,36 @@ msgstr "Etusivulle" msgid "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" msgstr "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" +#: webapp/templates/kaehmy/kaehmy_list.html:24 +#: webapp/templates/kaehmy/kaehmy_list.html:59 +msgid "All kaehmys" +msgstr "Kaikki kaehmyt" + +#: webapp/templates/kaehmy/kaehmy_list.html:32 +msgid "Commenting on post by " +msgstr "Kommentoidaan viestiin lähettäjältä " + +#: webapp/templates/kaehmy/kaehmy_list.html:44 +msgid "Comment" +msgstr "Kommentti" + +#: webapp/templates/kaehmy/kaehmy_list.html:57 +msgid "Filter kaehmys" +msgstr "Rajaa kaehmyjä" + +#: webapp/templates/kaehmy/kaehmy_list.html:70 +#: webapp/templates/kaehmy/kaehmy_statistics.html:18 +msgid "Total kaehmys:" +msgstr "Kaehmyjä yhteensä:" + +#: webapp/templates/kaehmy/kaehmy_list.html:88 +msgid "Show comments" +msgstr "Näytä kommentit" + +#: webapp/templates/kaehmy/kaehmy_list.html:94 +msgid "Add comment" +msgstr "Kommentoi" + #: webapp/templates/kaehmy/kaehmy_message.html:11 msgid "Reply" msgstr "Vastaa" @@ -1095,16 +1085,12 @@ msgid "Are you perhaps looking for one of the following?" msgstr "Etsitkö kenties jotain näistä?" #: webapp/templates/main_index.html:24 -#, fuzzy -#| msgid "Infoscreen Admin Pane" msgid "Infoscreen admin pane" msgstr "Infonäyttöjen hallintapaneeli" #: webapp/templates/main_index.html:26 -#, fuzzy -#| msgid "Kaehmy application: {}" msgid "Kaehmy application" -msgstr "Kaehmy: {}" +msgstr "Kaehmyt" #: webapp/templates/navigation.html:6 msgid "Guild" @@ -1135,13 +1121,16 @@ msgid "List challenges" msgstr "Kaikki haasteet" #: webapp/templates/ohlhafv/new.html:12 -msgid "Ohlhafv" -msgstr "Øhlhäfv" +msgid "Challenge your foe(s) to combat!" +msgstr "Haasta kaverisi mittelöön!" #: webapp/templates/ohlhafv/new.html:19 msgid "Challenge" msgstr "Haasta" +#~ msgid "Ohlhafv" +#~ msgstr "Øhlhäfv" + #~ msgid "Infoscreen" #~ msgstr "Infonäyttö" 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..d8cf1e6 --- /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; + /*background-color: rgb(252, 225, 69);*/ +} + +.card h5 { + color: black; +} + +.card p { + color: black; +} + +h6 { + color: black; +} \ No newline at end of file diff --git a/webapp/static/img/heevi_banner.svg b/webapp/static/img/heevi_banner.svg index 85a4b9b..a066b20 100644 --- a/webapp/static/img/heevi_banner.svg +++ b/webapp/static/img/heevi_banner.svg @@ -2,9 +2,9 @@ + height="600px" viewBox="0 0 1920 600" xml:space="preserve"> - + diff --git a/webapp/templates/ohlhafv/base.html b/webapp/templates/ohlhafv/base.html index 0692385..e56a99a 100644 --- a/webapp/templates/ohlhafv/base.html +++ b/webapp/templates/ohlhafv/base.html @@ -3,7 +3,9 @@ {% load static %} {% load i18n %} + {% block header %} + {% include "ohlhafv/header.html" %} {% endblock header %} diff --git a/webapp/templates/ohlhafv/list.html b/webapp/templates/ohlhafv/list.html index 822da25..540c0d1 100644 --- a/webapp/templates/ohlhafv/list.html +++ b/webapp/templates/ohlhafv/list.html @@ -5,7 +5,7 @@ {% block content %}
-

{% trans "All challenges" %}

+

{% trans "All challenges" %}

diff --git a/webapp/templates/ohlhafv/new.html b/webapp/templates/ohlhafv/new.html index e7dca76..61a7e96 100644 --- a/webapp/templates/ohlhafv/new.html +++ b/webapp/templates/ohlhafv/new.html @@ -9,7 +9,7 @@ {% block content %}
-

{% trans "Ohlhafv" %}

+

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

{% csrf_token %}