Merge branch 'develop' into 'master'

Remove culture category

See merge request vtmk/web2.0!125

kaehmy/migrations/0004_auto_20181018_2121.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.0.7 on 2018-10-18 18:21
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('kaehmy', '0003_auto_20180902_1943'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='kaehmybaserole',
+            name='category',
+            field=models.CharField(choices=[('corporate', 'Corporate affairs'), ('freshman', 'Freshmen'), ('international', 'International'), ('external', 'External affairs'), ('media', 'Media'), ('tech', 'Technology'), ('wellbeing', 'Wellbeing'), ('elepaja', 'Elepaja'), ('ceremonies', 'Ceremonies'), ('studies', 'Studies'), ('sosso', 'Sössö magazine'), ('alumni', 'Alumni relations'), ('others', 'Others')], default='others', max_length=255, verbose_name='Category'),
+        ),
+    ]

kaehmy/models.py

@@ -25,7 +25,6 @@ class KaehmyBaseRole(webapp.models.BaseRole):
         ('wellbeing', _('Wellbeing')),
         ('elepaja', _('Elepaja')),
         ('ceremonies', _('Ceremonies')),
-        ('culture', _('Culture')),
         ('studies', _('Studies')),
         ('sosso', _('Sössö magazine')),
         ('alumni', _('Alumni relations')),

kaehmy/templates/kaehmy.html

@@ -27,9 +27,9 @@
         <ul>
             <li><strong>29.10.</strong>  {% blocktrans %}Hallitustyrkkypaneeli (haku hallitukseen olisi hyvä tehdä ennen tätä!){% endblocktrans %}</li>
             <li><strong>5.11.</strong>  {% blocktrans %}Vaalikokous, osa 1 (puheenjohtajan valinta){% endblocktrans %}</li>
+            <li><strong>12.11.</strong> {% blocktrans %}Kiltailta{% endblocktrans %}</li>
             <li><strong>15.11.</strong> {% blocktrans %}Vaalikokous, osa 2 (hallituksen valinta){% endblocktrans %}</li>
-            <li><strong>19.11.</strong> {% blocktrans %}Kiltailta{% endblocktrans %}</li>
-            <li><strong>21.11.</strong> {% blocktrans %}Haku toimariksi olisi hyvä tehdä ennen tätä!{% endblocktrans %}</li>
+            <li><strong>20.11.</strong> {% blocktrans %}Haku toimariksi olisi hyvä tehdä ennen tätä!{% endblocktrans %}</li>
             <li><strong>26.11.</strong> {% blocktrans %}Vaalikokous, osa 3 (toimarien valinta){% endblocktrans %}</li>
         </ul>
         <form name="kaehmyForm" action="/kaehmy/submit/" method="post" class="form">{% csrf_token %}