From 69c1b2dcb29dbedfee43763a315287f4db75d8f2 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Wed, 24 Jan 2018 17:20:55 +0200 Subject: [PATCH 1/9] Add team challenge option --- webapp/migrations/0036_auto_20180124_1712.py | 49 ++++++++++++++++++++ webapp/models.py | 17 ++++--- 2 files changed, 60 insertions(+), 6 deletions(-) create mode 100644 webapp/migrations/0036_auto_20180124_1712.py 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..a3aa9dc 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.0L)')) ) - 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')) # Telegram channel entry for Kaehmys From 77cdce714ab4fbb7e5daa7a84ba74e81c7a49089 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Wed, 24 Jan 2018 17:37:15 +0200 Subject: [PATCH 2/9] Add translations to Ohlhafv page --- locale/en/LC_MESSAGES/django.mo | Bin 14081 -> 14081 bytes locale/en/LC_MESSAGES/django.po | 44 +++++++++++++++++++++++++++--- locale/fi/LC_MESSAGES/django.mo | Bin 16681 -> 17157 bytes locale/fi/LC_MESSAGES/django.po | 46 ++++++++++++++++++++++++++++---- webapp/models.py | 2 +- 5 files changed, 82 insertions(+), 10 deletions(-) diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index 7e92ac5c90519812870ac5c7d15f2a8383278b5a..8d0d8523ea77a5bbb3b0b6901bcf7b5a55b1949c 100644 GIT binary patch delta 16 XcmZq7Ys}m5P?_1>%4qWwWm#bWI@tyz delta 16 XcmZq7Ys}m5P?_1x%6Rh=Wm#bWI@bmx diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index b853547..5836595 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-24 17:21+0200\n" "PO-Revision-Date: 2017-11-02 23:09+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -822,7 +822,7 @@ msgstr "Kaehmy comment" msgid "Kaehmykommentit" msgstr "Kaehmy comments" -#: webapp/models.py:162 +#: webapp/models.py:162 webapp/models.py:290 msgid "Message" msgstr "" @@ -886,11 +886,47 @@ 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" +msgstr "" + +#: webapp/models.py:282 +msgid "Team Challenge (1 x 0.33 L, 2 x 0.5 L, 1 x 1.0L)" +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 "" diff --git a/locale/fi/LC_MESSAGES/django.mo b/locale/fi/LC_MESSAGES/django.mo index cfca45e64af4b4e033ba1f0688df96dda704894b..b0f6dd0014cb09951b53a673c904293d625a0d2c 100644 GIT binary patch delta 5750 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 O`QOnLrmtO-xba`tkbU|9 delta 5316 zcmZA334Bdg0>|-_NC;VEYeGUKB0(Y{DMeDT22B_mYK`uKVw7rZ8E;0!(jn6}Q;l_O zX)V>k>td-+o5ogEp%|$Wq%CGpGiKCGXPDpr-Q%O5xgY=cJ?Fgp&OOV$H%b*GY*J`Me;7h*8Z z!$w$!0l3Eb-etB@(6v59op=y~@QibUxoq2SVFB$v5zcuNu?6)aREMiD4L4iQVms=A zk;bH82KwN548+M8YFx(5p`Z>*u_3OsCsd$*;I`lILao4l)J(oaonM0^u?|^0)2)dy zT-#)0bIeDz&&EzT5B0lU7{c{UC53oAi7|KwHM7X3j-8QzW;h?Z@Kn@_6`^Lb1a*NG z*7X=leG7)+KGez{$5gz8ns7*zF)qz8hJreXN9|!UYVXofTaksD`9Re9!%!WLMx8ea z)!|H3KPBjkOHl(U!+!V{s-GLE^L~tC{dM9!8l-Qub3uR95=Ef~)CzUMWc&T2ww{YD zmdQsA>}AviW~2HmMonNb>VoB{6S`;hrN;e*^G5j(1qt<8=Q~Y({0ETXZE6I zR*hPbQ>e$T*0$H7Zni6^d*Yt8F*nj>9^)3Mt!WVJd>@V-skcH6%r%mNI(`Z@kO{Uv z&02&Zv@bw)RBo+64Rj}Ji#|au@j=wm9z%V90d=7psPq1TTA81aU3ZzrtcOOPgxr`W z1J%(`)C%O=`czcMvrt?13YOzG)C%>bQA?bQI&T=VTV@<;g^H0U)U2@eo#?0M|1bs3 z>;!5hYEc8YiW>3XP%Co>wGv)DtLiWebx$N&yQ0qPkJ{VEQT>iXO>8>qX(+X>!!SMn z?@`c+hfo(jg>0iaXWM^5&B(8nv!qQ?OWGPW^AuZ8M-8A0Y9c+Yx#&av3Dk;?LQQN6 zy0j#P6nwB0HIOpY1=pfF+=1H5J*d4qgcI=_R7d?2oTVRR9fg|6Sk(8EQ3INe?3S5} zT9LI0tUqP5hmTmifZ8*!MCXrDb5uRU)`y`wehD?eIo2gukNRr+{W|oaz8O>TUDUmC z4)wb$sIB~0BI~ac{aYI|1cOmCdmeS+YShTDp?+{1wda0qoZm&FUfIo1Z^BIU!+w~I zgOPuxh!3u5DzH9&f$H}w7X=OA9BPR#;V`_3+KPT{ofpwi)SuI1N<0u!2_rXR9juOwr~U0(SK2Qsee1?#2D1$nPThRQ0EQ6VjP9K zC(ff*;_s*>4oPwLx+OkBy$|ZeGY2zqJ2F6*xkf>I^H0=;v|$=RFa}^e>iZ6;8D!e_ zY+KL6Alma$OFIz@a2o3T8e}m|9crKf?VWyOv6G(v6bky`a~Oy(U@XqW7PuVQcC#Cq zoVjS*gE}}%oQfJ~XAHtVwtWa{0Qsm16rk>*skUB>E%p4DQt-ze*ckVr_UB>%<}&^vax%vA6;? z^S!7GR@(Ye)DKUhmilXC(&j4WVAR9>Nyf3Lty+&scnm}E->9c8fICr!bY%TC;s_eF z*Bw!h(NNTzaRh4SFQS%iuKj*FYK2zY`rD|1Znb`Zn(3$3))FUt++oA?O5Ow|-TOWs- z;0#p%i%i~cX|rEBCVfWPorjh2{rQTsE+)3eaU9l6x51jp_Vq=)^kxSmxmhA zXbi)#wtW`H>G_{WK{wq-jK)olRqxSem)Rr~mmY;!%sDZ3OonL`k z+1;q8?2xq@)&CiEY3VLf(B1FLhVvwu1dPKG7>l#94X#A(brtHdx{T^LG|RbQ6lzOS zQ5Wcmx+!x|D>)of@mX7cEsOQno~@!mOZpCK2K#U@R^ik5PnMH5iVYtou;E zJApA+gPQprRR0ZnIDZu*Q4{Hni8!f;%Nbc24O;3os6E_*n#pz?grC`ZSWoBAaUy!r zu9wUOqGJX5nEZy!Av(0JI&`t~qyypPV@xm>C#a`mXM=_hsI1Nt;i=@|0CoxGLGo@6M2&iC2dI^`3upZ z^Cx;r&d1~M9JyxO4p>DY`J5b6h2!@Qp8sF&pqxuw3ARyGlZ_;cxXB@M|Cmc*kgfaz z!^s%(fo)ra7j1bh{$R_^@FlX1oF=`Aj(qYCfFC12UbXK|S=H$)$@ zi(Ij7AK{?AG7b)sVy`73#a^dmanC4uA(QltIUQAzfBO3ueq(4Y8{Y^TYr#%R*f z)+6u_B!p}r#UzdB2qRy6N)JBfQ7k2cZBq>1zrGnxrHmXWGe`z`p6J*^x{||WA<@x^ zG$xbCR-$9JgBgpvNrkPC#yGM`^+vHjJF?yP!k5-_Z)y_c?>-y9!OLBekmK$4ZFAkL rtbWqzdXHp0?5<5Z;^VGvU+(W-l)2x_J)~Qew|h_zZ||}xy_WqC=M)eY diff --git a/locale/fi/LC_MESSAGES/django.po b/locale/fi/LC_MESSAGES/django.po index 28cbf29..bb061b2 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-24 17:21+0200\n" "PO-Revision-Date: 2017-11-02 23:04+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -819,7 +819,7 @@ msgstr "Kaehmykommentti" msgid "Kaehmykommentit" msgstr "Kaehmykommentit" -#: webapp/models.py:162 +#: webapp/models.py:162 webapp/models.py:290 msgid "Message" msgstr "Viesti" @@ -883,11 +883,47 @@ 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" +msgstr "Joukkue" + +#: webapp/models.py:282 +msgid "Team Challenge (1 x 0.33 L, 2 x 0.5 L, 1 x 1.0L)" +msgstr "Joukkuehaaste (1 x 0.33 L, 2 x 0.5 L, 1 x 1.0L)" + +#: 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" @@ -1075,7 +1111,7 @@ msgstr "Øhlhäfv" #: webapp/templates/ohlhafv.html:15 msgid "Challenge" -msgstr "Haaste" +msgstr "Haasta" #: webapp/templates/ohlhafv_list.html:11 msgid "All challenges" diff --git a/webapp/models.py b/webapp/models.py index a3aa9dc..d40531f 100644 --- a/webapp/models.py +++ b/webapp/models.py @@ -285,7 +285,7 @@ class OhlhafvChallenge(models.Model): 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')) + victim_email = models.EmailField(_('Victim email')) series = models.CharField(_('Series'), choices=SERIES_CHOICES, max_length=10) message = models.TextField(_('Message')) From 6e5074f8feec67facc5c157cefc8e27cdccd1581 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Wed, 24 Jan 2018 18:12:21 +0200 Subject: [PATCH 3/9] Rearrange html files to folders --- webapp/templates/{ => kaehmy}/kaehmy.html | 4 ++-- webapp/templates/{ => kaehmy}/kaehmy_base.html | 6 +++--- .../{ => kaehmy}/kaehmy_checkbox_option.html | 0 webapp/templates/{ => kaehmy}/kaehmy_error.html | 2 +- webapp/templates/{ => kaehmy}/kaehmy_export.html | 2 +- webapp/templates/{ => kaehmy}/kaehmy_footer.html | 0 webapp/templates/{ => kaehmy}/kaehmy_header.html | 0 webapp/templates/{ => kaehmy}/kaehmy_list.html | 6 +++--- .../templates/{ => kaehmy}/kaehmy_message.html | 2 +- .../{ => kaehmy}/kaehmy_navigation.html | 0 .../{ => kaehmy}/kaehmy_statistics.html | 4 ++-- webapp/templates/{ => ohlhafv}/ohlhafv.html | 0 webapp/templates/{ => ohlhafv}/ohlhafv_list.html | 0 webapp/views.py | 16 ++++++++-------- 14 files changed, 21 insertions(+), 21 deletions(-) rename webapp/templates/{ => kaehmy}/kaehmy.html (97%) rename webapp/templates/{ => kaehmy}/kaehmy_base.html (91%) rename webapp/templates/{ => kaehmy}/kaehmy_checkbox_option.html (100%) rename webapp/templates/{ => kaehmy}/kaehmy_error.html (89%) rename webapp/templates/{ => kaehmy}/kaehmy_export.html (92%) rename webapp/templates/{ => kaehmy}/kaehmy_footer.html (100%) rename webapp/templates/{ => kaehmy}/kaehmy_header.html (100%) rename webapp/templates/{ => kaehmy}/kaehmy_list.html (95%) rename webapp/templates/{ => kaehmy}/kaehmy_message.html (88%) rename webapp/templates/{ => kaehmy}/kaehmy_navigation.html (100%) rename webapp/templates/{ => kaehmy}/kaehmy_statistics.html (88%) rename webapp/templates/{ => ohlhafv}/ohlhafv.html (100%) rename webapp/templates/{ => ohlhafv}/ohlhafv_list.html (100%) 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.html b/webapp/templates/ohlhafv/ohlhafv.html similarity index 100% rename from webapp/templates/ohlhafv.html rename to webapp/templates/ohlhafv/ohlhafv.html diff --git a/webapp/templates/ohlhafv_list.html b/webapp/templates/ohlhafv/ohlhafv_list.html similarity index 100% rename from webapp/templates/ohlhafv_list.html rename to webapp/templates/ohlhafv/ohlhafv_list.html diff --git a/webapp/views.py b/webapp/views.py index 63e9090..818bcaf 100644 --- a/webapp/views.py +++ b/webapp/views.py @@ -151,7 +151,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/ohlhafv.html', {'form': form}) @ensure_csrf_cookie @@ -186,7 +186,7 @@ def ohlhafv_list(request, *args, **kwargs): 'table': table_html, 'challenge_count': len(challenges), } - return render(request, 'ohlhafv_list.html', context) + return render(request, 'ohlhafv/ohlhafv_list.html', context) @ensure_csrf_cookie @@ -214,7 +214,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 @@ -242,7 +242,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"]) @@ -267,14 +267,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 @@ -320,7 +320,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') @@ -344,4 +344,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) From a9164f8c6e0e0f57cdc2df3d03dfa3454e7d4e15 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Wed, 24 Jan 2018 19:02:44 +0200 Subject: [PATCH 4/9] Construct Ohlhafv page based on kaehmy --- webapp/static/css/ohlhafv_header.css | 37 ++ webapp/static/img/heevi_banner.svg | 460 ++++++++++++++++++ webapp/templates/form_base.html | 50 ++ webapp/templates/ohlhafv/base.html | 19 + webapp/templates/ohlhafv/header.html | 8 + webapp/templates/ohlhafv/list.html | 25 + webapp/templates/ohlhafv/navigation.html | 10 + .../ohlhafv/{ohlhafv.html => new.html} | 6 +- webapp/templates/ohlhafv/ohlhafv_list.html | 20 - webapp/views.py | 19 +- 10 files changed, 624 insertions(+), 30 deletions(-) create mode 100644 webapp/static/css/ohlhafv_header.css create mode 100644 webapp/static/img/heevi_banner.svg create mode 100644 webapp/templates/form_base.html create mode 100644 webapp/templates/ohlhafv/base.html create mode 100644 webapp/templates/ohlhafv/header.html create mode 100644 webapp/templates/ohlhafv/list.html create mode 100644 webapp/templates/ohlhafv/navigation.html rename webapp/templates/ohlhafv/{ohlhafv.html => new.html} (81%) delete mode 100644 webapp/templates/ohlhafv/ohlhafv_list.html 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..85a4b9b --- /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/ohlhafv/base.html b/webapp/templates/ohlhafv/base.html new file mode 100644 index 0000000..0692385 --- /dev/null +++ b/webapp/templates/ohlhafv/base.html @@ -0,0 +1,19 @@ +{% 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..822da25 --- /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/ohlhafv.html b/webapp/templates/ohlhafv/new.html similarity index 81% rename from webapp/templates/ohlhafv/ohlhafv.html rename to webapp/templates/ohlhafv/new.html index c4f658b..e7dca76 100644 --- a/webapp/templates/ohlhafv/ohlhafv.html +++ b/webapp/templates/ohlhafv/new.html @@ -1,8 +1,12 @@ -{% extends "webapp_base.html" %} +{% extends "ohlhafv/base.html" %} {% load bootstrap3 %} {% load i18n %} +{% block navigation %} + {% include "ohlhafv/navigation.html" %} +{% endblock %} + {% block content %}

{% trans "Ohlhafv" %}

diff --git a/webapp/templates/ohlhafv/ohlhafv_list.html b/webapp/templates/ohlhafv/ohlhafv_list.html deleted file mode 100644 index a693237..0000000 --- a/webapp/templates/ohlhafv/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 818bcaf..82922f2 100644 --- a/webapp/views.py +++ b/webapp/views.py @@ -151,7 +151,7 @@ def contact_view(request, *args, **kwargs): def ohlhafv_view(request, *args, **kwargs): """Render Ohlhafv form page.""" form = OhlhafvForm() - return render(request, 'ohlhafv/ohlhafv.html', {'form': form}) + return render(request, 'ohlhafv/new.html', {'form': form}) @ensure_csrf_cookie @@ -173,20 +173,21 @@ def ohlhafv_submit(request, *args, **kwargs): def ohlhafv_list(request, *args, **kwargs): """Present Ohlhafv challenges list.""" challenges = OhlhafvChallenge.objects.all() + challenges = challenges.order_by('-id') - table = OhlhafvTable(challenges, - request=request, - exclude=['id', 'challenger_email', 'victim_email'], - attrs={'class': 'table table-bordered table-hover'}) + #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) + #table.paginate(page=request.GET.get('page', 1), per_page=25) + #table_html = table.as_html(request) context = { - 'table': table_html, + 'challenges': challenges, 'challenge_count': len(challenges), } - return render(request, 'ohlhafv/ohlhafv_list.html', context) + return render(request, 'ohlhafv/list.html', context) @ensure_csrf_cookie From 9df62a1247804aad3cb9f80e96805e9aa2e19936 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Wed, 24 Jan 2018 19:09:51 +0200 Subject: [PATCH 5/9] Fix translations --- locale/en/LC_MESSAGES/django.mo | Bin 14081 -> 14154 bytes locale/en/LC_MESSAGES/django.po | 159 +++++++++++++++++-------------- locale/fi/LC_MESSAGES/django.mo | Bin 17157 -> 17249 bytes locale/fi/LC_MESSAGES/django.po | 161 ++++++++++++++++++-------------- webapp/models.py | 2 +- 5 files changed, 182 insertions(+), 140 deletions(-) diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index 8d0d8523ea77a5bbb3b0b6901bcf7b5a55b1949c..5de156c701407582b70c9410c311fa308917ee99 100644 GIT binary patch delta 4359 zcmZA44Rlv^9mnw>$e3e1%ncZiLckmo90NBL#LNaR2n0sWW>P#48ImC`m50A*q^L|_ zp`buMjKnaWW(0&N5?Wc*i2~FUkQ@pQbm##+=^^X={@)+xc)G{WUcY<)_y4=U-}nCR z{o~>}znYUemfK=gV0(*nBcoe}(56`k3tD?LgsnLt9LH^VIj*=O@fo~~{THzxzJz== z9E!)^L%tG@VJke3cKHcrV`gp$?LtU}JQ|+Z8{1+jdO~?TJ{D)NKPm3NjXl^uigx&K z9EcftA@s-V@EV+kEpR2a!KaZ^!v^$wJJZKgAsnFLiHG6`M=^{2Q&^4Xu{(}zm z%kW$1c^j}dZow<@5IVqrMsqua(3$-~XeCA?GY_|68?GN}XxQ<+=m-}g*9^v;3V_{8`00V zq8;x*FL)sC{~GQ1ee8ti&^3~gpPb(o?Wa3B^8)nz66}RH=X3x4!ZZ#v$GgxA-i= zD)~GWX43Fpr=s=fiR;jN_Cs`}d(cICIC=)1*+sNMIXrXe#fFR_6rlZ-qa`05twJX< z3EQ*&!gLyz@&R<@i_sI-pdGJAXSxaPa1VOn16YgiqTe6UGjTL}!3pT%n~3RBqlX;!KRk?mu{p1|tFRwB(@Jy^R$~>`pq1K-&G8-V*(`*E zc%1$7eUg5E%k-_xQM?R4D4_mc=r0_w<6N%d2c6LwcSjdnF?xX^=s<5lS8*kJ-V}6Z z_r(2&q768M&>(LSp$IEd7IH0Yn~Qe1 z2s7|;^ujB!0vpi_oQt1dK>Pg!yp%cZ^Y-(TeuV3`uzWbMh%b45ww&y z4M+x5iLQ+q=)fMsY+Q~GWG#B34bd&=bG{3$z&mmOJ#5YXIc$R;qqicng!)_Jwlpkl zNA!e3^n^0BGQ-dxk8#)zYtcnHAN~F+v;yle2e+dY+K*H599o%iJZgUbtLS;t2U36E zcy%1GG%L|p@XK+3A3DRM=!`$WEAT9O{(sP!wjY$(8$E9jddqG=2Ra^eu{OF0o!E*& z)Zfx<;D9sP9zWQPc61OOz>(;m(V3h@XZ&}xQW>l$2i_X}ybs!M5jxYsXnz%$hvTpo zr=@7v!SA9+&w!%BJCn^U#uZ!U;G49pS@h$adHy)WlwzU4|$f5bB9-#|9SgAd~R*nR|aVmm+TzY$)F?a_E=Y|CV_h`dS` z5TB}L9pPsYamZ%6OLJW@&~l0s5U z?jTQB^kX*8sv?LqILNbfYCUs;9DIjiNB$Z7| za%N>`O`SP;_U!3%YNj`x?)q_Niy=cxu5CKidvkU}>)dut4Ff)HmbriR%-J*dH#R*r Hur}j=gRGge delta 4308 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 Date: Thu, 25 Jan 2018 18:31:06 +0200 Subject: [PATCH 6/9] Add hot new designs to Ohlhafv :fire: --- locale/en/LC_MESSAGES/django.mo | Bin 14154 -> 14096 bytes locale/en/LC_MESSAGES/django.po | 81 +++++++++++------------- locale/fi/LC_MESSAGES/django.mo | Bin 17249 -> 17406 bytes locale/fi/LC_MESSAGES/django.po | 87 ++++++++++++-------------- webapp/static/css/kaehmy_nav.css | 2 +- webapp/static/css/ohlhafv/base.css | 95 +++++++++++++++++++++++++++++ webapp/static/img/heevi_banner.svg | 4 +- webapp/templates/ohlhafv/base.html | 2 + webapp/templates/ohlhafv/list.html | 2 +- webapp/templates/ohlhafv/new.html | 2 +- 10 files changed, 177 insertions(+), 98 deletions(-) create mode 100644 webapp/static/css/ohlhafv/base.css diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index 5de156c701407582b70c9410c311fa308917ee99..65091e151f9cb72ff14c660f2e2fd3fd909b44d7 100644 GIT binary patch delta 4299 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 MP0AhAc3tRy0rx{H%>V!Z 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 %} From a219b930b30fb3ff7b31f1ffd80720f97aa5179b Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Thu, 25 Jan 2018 18:33:04 +0200 Subject: [PATCH 7/9] Make a title black --- webapp/static/css/ohlhafv/base.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/static/css/ohlhafv/base.css b/webapp/static/css/ohlhafv/base.css index d8cf1e6..b8e837b 100644 --- a/webapp/static/css/ohlhafv/base.css +++ b/webapp/static/css/ohlhafv/base.css @@ -79,7 +79,7 @@ h3 { border-width: 0 0 1px 0; border-style: solid; border-color: black; - /*background-color: rgb(252, 225, 69);*/ + color: black; } .card h5 { From 1e2bf104948bb2730027766d35eebf18fad404f8 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Thu, 25 Jan 2018 20:06:17 +0200 Subject: [PATCH 8/9] Allow blank Ohlhafv messages --- webapp/models.py | 2 +- webapp/views.py | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/webapp/models.py b/webapp/models.py index b2fa897..1af695e 100644 --- a/webapp/models.py +++ b/webapp/models.py @@ -287,7 +287,7 @@ class OhlhafvChallenge(models.Model): 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')) + message = models.TextField(_('Message'), blank=True, null=False) # Telegram channel entry for Kaehmys diff --git a/webapp/views.py b/webapp/views.py index 82922f2..d0c1e77 100644 --- a/webapp/views.py +++ b/webapp/views.py @@ -161,10 +161,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/') @@ -174,15 +172,6 @@ def ohlhafv_list(request, *args, **kwargs): """Present Ohlhafv challenges list.""" challenges = OhlhafvChallenge.objects.all() challenges = challenges.order_by('-id') - - #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) - context = { 'challenges': challenges, 'challenge_count': len(challenges), From 181be6b80c10f2aeee05f1c6f74d2f1557eec554 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Thu, 25 Jan 2018 20:10:54 +0200 Subject: [PATCH 9/9] Fix bug in Ohlhafv model regarding translation --- webapp/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/models.py b/webapp/models.py index 1af695e..7133d09 100644 --- a/webapp/models.py +++ b/webapp/models.py @@ -279,7 +279,7 @@ class OhlhafvChallenge(models.Model): ('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)')) + ('Team', _('Team Challenge (1 x 0.33 L, 2 x 0.5 L, 1 x 1.0 L)')) ) challenger = models.CharField(_('Challenger'), max_length=255)