Merge branch 'features-submission-improvements' into 'master'

Submission improvements

Closes #68, #74, #75, and #70

See merge request !32

AKDashboard/locale/de_DE/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-11 20:45+0000\n"
+"POT-Creation-Date: 2020-05-12 22:53+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -61,37 +61,37 @@ msgstr "Veranstaltung"
 msgid "Event this button belongs to"
 msgstr "Veranstaltung, zu der dieser Button gehört"
 
-#: AKDashboard/templates/AKDashboard/dashboard.html:30
+#: AKDashboard/templates/AKDashboard/dashboard.html:25
+msgid "Currently, there are no Events!"
+msgstr "Aktuell gibt es keine Events!"
+
+#: AKDashboard/templates/AKDashboard/dashboard.html:28
+msgid "Please contact an administrator if you want to use AKPlanning."
+msgstr ""
+"Bitte kontaktiere eine*n Administrator*in, falls du AKPlanning verwenden "
+"möchtest."
+
+#: AKDashboard/templates/AKDashboard/dashboard_row.html:13
 msgid "AK List"
 msgstr "AK Liste"
 
-#: AKDashboard/templates/AKDashboard/dashboard.html:40
+#: AKDashboard/templates/AKDashboard/dashboard_row.html:23
 msgid "Current AKs"
 msgstr "Aktuelle AKs"
 
-#: AKDashboard/templates/AKDashboard/dashboard.html:47
+#: AKDashboard/templates/AKDashboard/dashboard_row.html:30
 msgid "AK Wall"
 msgstr "AK-Wall"
 
-#: AKDashboard/templates/AKDashboard/dashboard.html:55
+#: AKDashboard/templates/AKDashboard/dashboard_row.html:38
 msgid "Schedule"
 msgstr "AK-Plan"
 
-#: AKDashboard/templates/AKDashboard/dashboard.html:65
+#: AKDashboard/templates/AKDashboard/dashboard_row.html:48
 msgid "AK Submission"
 msgstr "AK-Submission"
 
-#: AKDashboard/templates/AKDashboard/dashboard.html:81
+#: AKDashboard/templates/AKDashboard/dashboard_row.html:64
 msgid "Write to organizers of this event for questions and comments"
 msgstr ""
 "Kontaktiere die Organisator*innen des Events bei Fragen oder Kommentaren"
-
-#: AKDashboard/templates/AKDashboard/dashboard.html:88
-msgid "Currently, there are no Events!"
-msgstr "Aktuell gibt es keine Events!"
-
-#: AKDashboard/templates/AKDashboard/dashboard.html:91
-msgid "Please contact an administrator if you want to use AKPlanning."
-msgstr ""
-"Bitte kontaktiere eine*n Administrator*in, falls du AKPlanning verwenden "
-"möchtest."

AKDashboard/templates/AKDashboard/dashboard_event.html

@@ -15,7 +15,7 @@
 
 {% block breadcrumbs %}
     <li class="breadcrumb-item"><a href="{% url 'dashboard:dashboard' %}">AKPlanning</a></li>
-    <li class="breadcrumb-item active">{{ event.slug }}</li>
+    <li class="breadcrumb-item active">{{ event }}</li>
 {% endblock %}
 
 {% block content %}

AKDashboard/templates/AKDashboard/dashboard_row.html

@@ -40,7 +40,7 @@
                 </a>
             {% endif %}
         {% endif %}
-        {% if 'AKSubmission'|check_app_installed %}
+        {% if 'AKSubmission'|check_app_installed and event.active %}
             <a class="dashboard-box btn btn-primary"
                href="{% url 'submit:submission_overview' event_slug=event.slug %}">
                 <div class="col-sm-12 col-md-3 col-lg-2 dashboard-button">

AKModel/locale/de_DE/LC_MESSAGES/django.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-11 22:27+0000\n"
+"POT-Creation-Date: 2020-05-12 22:53+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -11,31 +11,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: AKModel/admin.py:96
+#: AKModel/admin.py:97
 msgid "Wish"
 msgstr "AK-Wunsch"
 
-#: AKModel/admin.py:102
+#: AKModel/admin.py:103
 msgid "Is wish"
 msgstr "Ist ein Wunsch"
 
-#: AKModel/admin.py:103
+#: AKModel/admin.py:104
 msgid "Is not a wish"
 msgstr "Ist kein Wunsch"
 
-#: AKModel/admin.py:130
+#: AKModel/admin.py:131
 msgid "Export to wiki syntax"
 msgstr "In Wiki-Syntax exportieren"
 
-#: AKModel/availability.py:38 AKModel/models.py:37 AKModel/models.py:61
-#: AKModel/models.py:113 AKModel/models.py:132 AKModel/models.py:164
-#: AKModel/models.py:217 AKModel/models.py:257 AKModel/models.py:287
+#: AKModel/availability.py:38 AKModel/models.py:40 AKModel/models.py:69
+#: AKModel/models.py:121 AKModel/models.py:140 AKModel/models.py:172
+#: AKModel/models.py:225 AKModel/models.py:267 AKModel/models.py:297
 msgid "Event"
 msgstr "Event"
 
-#: AKModel/availability.py:39 AKModel/models.py:62 AKModel/models.py:114
-#: AKModel/models.py:133 AKModel/models.py:165 AKModel/models.py:218
-#: AKModel/models.py:258 AKModel/models.py:288
+#: AKModel/availability.py:39 AKModel/models.py:70 AKModel/models.py:122
+#: AKModel/models.py:141 AKModel/models.py:173 AKModel/models.py:226
+#: AKModel/models.py:268 AKModel/models.py:298
 msgid "Associated event"
 msgstr "Zugehöriges Event"
 
@@ -47,7 +47,7 @@ msgstr "Person"
 msgid "Person whose availability this is"
 msgstr "Person deren Verfügbarkeit hier abgebildet wird"
 
-#: AKModel/availability.py:56 AKModel/models.py:261 AKModel/models.py:280
+#: AKModel/availability.py:56 AKModel/models.py:271 AKModel/models.py:290
 msgid "Room"
 msgstr "Raum"
 
@@ -55,7 +55,7 @@ msgstr "Raum"
 msgid "Room whose availability this is"
 msgstr "Raum dessen Verfügbarkeit hier abgebildet wird"
 
-#: AKModel/availability.py:65 AKModel/models.py:221 AKModel/models.py:279
+#: AKModel/availability.py:65 AKModel/models.py:231 AKModel/models.py:289
 msgid "AK"
 msgstr "AK"
 
@@ -63,7 +63,7 @@ msgstr "AK"
 msgid "AK whose availability this is"
 msgstr "Verfügbarkeiten"
 
-#: AKModel/availability.py:74 AKModel/models.py:117
+#: AKModel/availability.py:74 AKModel/models.py:125
 msgid "AK Category"
 msgstr "AK Kategorie"
 
@@ -79,87 +79,87 @@ msgstr "Verfügbarkeit"
 msgid "Availabilities"
 msgstr "Verfügbarkeiten"
 
-#: AKModel/models.py:14 AKModel/models.py:108 AKModel/models.py:129
-#: AKModel/models.py:148 AKModel/models.py:162 AKModel/models.py:180
-#: AKModel/models.py:250
+#: AKModel/models.py:17 AKModel/models.py:116 AKModel/models.py:137
+#: AKModel/models.py:156 AKModel/models.py:170 AKModel/models.py:188
+#: AKModel/models.py:260
 msgid "Name"
 msgstr "Name"
 
-#: AKModel/models.py:15
+#: AKModel/models.py:18
 msgid "Name or iteration of the event"
 msgstr "Name oder Iteration des Events"
 
-#: AKModel/models.py:16
+#: AKModel/models.py:19
 msgid "Short Form"
 msgstr "Kurzer Name"
 
-#: AKModel/models.py:17
+#: AKModel/models.py:20
 msgid "Short name of letters/numbers/dots/dashes/underscores used in URLs."
 msgstr ""
 "Kurzname bestehend aus Buchstaben, Nummern, Punkten und Unterstrichen zur "
 "Nutzung in URLs"
 
-#: AKModel/models.py:19
+#: AKModel/models.py:22
 msgid "Place"
 msgstr "Ort"
 
-#: AKModel/models.py:20
+#: AKModel/models.py:23
 msgid "City etc. the event takes place in"
 msgstr "Stadt o.ä. in der das Event stattfindet"
 
-#: AKModel/models.py:22
+#: AKModel/models.py:25
 msgid "Time Zone"
 msgstr "Zeitzone"
 
-#: AKModel/models.py:22
+#: AKModel/models.py:25
 msgid "Time Zone where this event takes place in"
 msgstr "Zeitzone in der das Event stattfindet"
 
-#: AKModel/models.py:23
+#: AKModel/models.py:26
 msgid "Start"
 msgstr "Start"
 
-#: AKModel/models.py:23
+#: AKModel/models.py:26
 msgid "Time the event begins"
 msgstr "Zeit zu der das Event beginnt"
 
-#: AKModel/models.py:24
+#: AKModel/models.py:27
 msgid "End"
 msgstr "Ende"
 
-#: AKModel/models.py:24
+#: AKModel/models.py:27
 msgid "Time the event ends"
 msgstr "Zeit zu der das Event endet"
 
-#: AKModel/models.py:26
+#: AKModel/models.py:29
 msgid "Active State"
 msgstr "Aktiver Status"
 
-#: AKModel/models.py:26
+#: AKModel/models.py:29
 msgid "Marks currently active events"
 msgstr "Markiert aktuell aktive Events"
 
-#: AKModel/models.py:28
+#: AKModel/models.py:31
 msgid "Base URL"
 msgstr "URL-Prefix"
 
-#: AKModel/models.py:28
+#: AKModel/models.py:31
 msgid "Prefix for wiki link construction"
 msgstr "Prefix für die automatische Generierung von Wiki-Links"
 
-#: AKModel/models.py:29
+#: AKModel/models.py:32
 msgid "Default Slot Length"
 msgstr "Standardslotlänge"
 
-#: AKModel/models.py:30
+#: AKModel/models.py:33
 msgid "Default length in hours that is assumed for AKs in this event."
 msgstr "Standardlänge von Slots (in Stunden) für dieses Event"
 
-#: AKModel/models.py:32
+#: AKModel/models.py:35
 msgid "Contact email address"
 msgstr "E-Mail Kontaktadresse"
 
-#: AKModel/models.py:34
+#: AKModel/models.py:37
 msgid ""
 "An email address that is displayed on every page and can be used for all "
 "kinds of questions"
@@ -167,210 +167,208 @@ msgstr ""
 "Eine Mailadresse die auf jeder Seite angezeigt wird und für alle Arten von "
 "Fragen genutzt werden kann"
 
-#: AKModel/models.py:38
+#: AKModel/models.py:41
 msgid "Events"
 msgstr "Events"
 
-#: AKModel/models.py:56
+#: AKModel/models.py:64
 msgid "Nickname"
 msgstr "Spitzname"
 
-#: AKModel/models.py:56
+#: AKModel/models.py:64
 msgid "Name to identify an AK owner by"
 msgstr "Name durch den eine AK Leitung identifiziert wird"
 
-#: AKModel/models.py:57
+#: AKModel/models.py:65
 msgid "Slug"
 msgstr "Slug"
 
-#: AKModel/models.py:57
+#: AKModel/models.py:65
 msgid "Slug for URL generation"
 msgstr "Slug für URL-Generierung"
 
-#: AKModel/models.py:58
+#: AKModel/models.py:66
 msgid "Institution"
 msgstr "Instutution"
 
-#: AKModel/models.py:58
+#: AKModel/models.py:66
 msgid "Uni etc."
 msgstr "Universität o.ä."
 
-#: AKModel/models.py:59 AKModel/models.py:189
+#: AKModel/models.py:67 AKModel/models.py:197
 msgid "Web Link"
 msgstr "Internet Link"
 
-#: AKModel/models.py:59
+#: AKModel/models.py:67
 msgid "Link to Homepage"
 msgstr "Link zu Homepage oder Webseite"
 
-#: AKModel/models.py:65
+#: AKModel/models.py:73
 msgid "AK Owner"
 msgstr "AK Leitung"
 
-#: AKModel/models.py:66
+#: AKModel/models.py:74
 msgid "AK Owners"
 msgstr "AK Leitungen"
 
-#: AKModel/models.py:108
+#: AKModel/models.py:116
 msgid "Name of the AK Category"
 msgstr "Name des AK Kategorie"
 
-#: AKModel/models.py:109 AKModel/models.py:130
+#: AKModel/models.py:117 AKModel/models.py:138
 msgid "Color"
 msgstr "Farbe"
 
-#: AKModel/models.py:109 AKModel/models.py:130
+#: AKModel/models.py:117 AKModel/models.py:138
 msgid "Color for displaying"
 msgstr "Farbe für die Anzeige"
 
-#: AKModel/models.py:110 AKModel/models.py:183
+#: AKModel/models.py:118 AKModel/models.py:191
 msgid "Description"
 msgstr "Beschreibung"
 
-#: AKModel/models.py:111
+#: AKModel/models.py:119
 msgid "Short description of this AK Category"
 msgstr "Beschreibung der AK-Kategorie"
 
-#: AKModel/models.py:118
+#: AKModel/models.py:126
 msgid "AK Categories"
 msgstr "AK Kategorien"
 
-#: AKModel/models.py:129
+#: AKModel/models.py:137
 msgid "Name of the AK Track"
 msgstr "Name des AK Tracks"
 
-#: AKModel/models.py:136
+#: AKModel/models.py:144
 msgid "AK Track"
 msgstr "AK Track"
 
-#: AKModel/models.py:137
+#: AKModel/models.py:145
 msgid "AK Tracks"
 msgstr "AK Tracks"
 
-#: AKModel/models.py:148
+#: AKModel/models.py:156
 msgid "Name of the AK Tag"
 msgstr "Name das AK Tags"
 
-#: AKModel/models.py:151
+#: AKModel/models.py:159
 msgid "AK Tag"
 msgstr "AK Tag"
 
-#: AKModel/models.py:152
+#: AKModel/models.py:160
 msgid "AK Tags"
 msgstr "AK Tags"
 
-#: AKModel/models.py:162
+#: AKModel/models.py:170
 msgid "Name of the Requirement"
 msgstr "Name der Anforderung"
 
-#: AKModel/models.py:168
+#: AKModel/models.py:176
 msgid "AK Requirement"
 msgstr "AK Anforderung"
 
-#: AKModel/models.py:169
+#: AKModel/models.py:177
 msgid "AK Requirements"
 msgstr "AK Anforderungen"
 
-#: AKModel/models.py:180
+#: AKModel/models.py:188
 msgid "Name of the AK"
 msgstr "Name des AKs"
 
-#: AKModel/models.py:181
+#: AKModel/models.py:189
 msgid "Short Name"
 msgstr "Kurzer Name"
 
-#: AKModel/models.py:182
+#: AKModel/models.py:190
 msgid "Name displayed in the schedule"
 msgstr "Name zur Anzeige im AK Plan"
 
-#: AKModel/models.py:183
+#: AKModel/models.py:191
 msgid "Description of the AK"
 msgstr "Beschreibung des AKs"
 
-#: AKModel/models.py:185
+#: AKModel/models.py:193
 msgid "Owners"
 msgstr "Leitungen"
 
-#: AKModel/models.py:186
+#: AKModel/models.py:194
 msgid "Those organizing the AK"
 msgstr "Menschen, die den AK organisieren und halten"
 
-#: AKModel/models.py:189
+#: AKModel/models.py:197
 msgid "Link to wiki page"
 msgstr "Link zur Wiki Seite"
 
-#: AKModel/models.py:191
+#: AKModel/models.py:199
 msgid "Category"
 msgstr "Kategorie"
 
-#: AKModel/models.py:192
+#: AKModel/models.py:200
 msgid "Category of the AK"
 msgstr "Kategorie des AKs"
 
-#: AKModel/models.py:193
+#: AKModel/models.py:201
 msgid "Tags"
 msgstr "Tags"
 
-#: AKModel/models.py:193
+#: AKModel/models.py:201
 msgid "Tags provided by owners"
 msgstr "Tags, die durch die AK Leitung vergeben wurden"
 
-#: AKModel/models.py:194
+#: AKModel/models.py:202
 msgid "Track"
 msgstr "Track"
 
-#: AKModel/models.py:195
+#: AKModel/models.py:203
 msgid "Track the AK belongs to"
 msgstr "Track zu dem der AK gehört"
 
-#: AKModel/models.py:197
+#: AKModel/models.py:205
 msgid "Resolution Intention"
 msgstr "Resolutionsabsicht"
 
-#: AKModel/models.py:198
+#: AKModel/models.py:206
 msgid "Intends to submit a resolution"
 msgstr "Beabsichtigt eine Resolution einzureichen"
 
-#: AKModel/models.py:199
+#: AKModel/models.py:207
 msgid "Present this AK"
 msgstr "AK Präsentieren"
 
-#: AKModel/models.py:200
+#: AKModel/models.py:208
 msgid "Present results of this AK"
 msgstr "Die Ergebnisse dieses AKs vorstellen"
 
-#: AKModel/models.py:202
+#: AKModel/models.py:210
 msgid "Requirements"
 msgstr "Anforderungen"
 
-#: AKModel/models.py:203
+#: AKModel/models.py:211
 msgid "AK's Requirements"
 msgstr "Anforderungen des AKs"
 
-#: AKModel/models.py:205
+#: AKModel/models.py:213
 msgid "Conflicting AKs"
 msgstr "AK Konflikte"
 
-#: AKModel/models.py:206
+#: AKModel/models.py:214
 msgid "AKs that conflict and thus must not take place at the same time"
 msgstr ""
 "AKs, die Konflikte haben und deshalb nicht gleichzeitig stattfinden dürfen"
 
-#: AKModel/models.py:207
+#: AKModel/models.py:215
 msgid "Prerequisite AKs"
 msgstr "Vorausgesetzte AKs"
 
-#: AKModel/models.py:208
+#: AKModel/models.py:216
 msgid "AKs that should precede this AK in the schedule"
 msgstr "AKS die im AK Plan vor diesem AK stattfinden müssen"
 
-#: AKModel/models.py:210
-#, fuzzy
-#| msgid "Internal Notes"
+#: AKModel/models.py:218
 msgid "Organizational Notes"
-msgstr "Interne Notizen"
+msgstr "Notizen zur Organisation"
 
-#: AKModel/models.py:211
+#: AKModel/models.py:219
 msgid ""
 "Notes to organizers. These are public. For private notes, please send an e-"
 "mail."
@@ -378,97 +376,95 @@ msgstr ""
 "Notizen an die Organisator*innen. Diese sind öffentlich, für private "
 "Anmerkungen bitte eine E-Mail schicken."
 
-#: AKModel/models.py:213
+#: AKModel/models.py:221
 msgid "Interest"
 msgstr "Interesse"
 
-#: AKModel/models.py:213
+#: AKModel/models.py:221
 msgid "Expected number of people"
 msgstr "Erwartete Personenzahl"
 
-#: AKModel/models.py:214
-#, fuzzy
-#| msgid "Interest"
+#: AKModel/models.py:222
 msgid "Interest Counter"
-msgstr "Interesse"
+msgstr "Interessenszähler"
 
-#: AKModel/models.py:215
+#: AKModel/models.py:223
 msgid "People who have indicated interest online"
 msgstr "Anzahl Personen, die online Interesse bekundet haben"
 
-#: AKModel/models.py:222
+#: AKModel/models.py:232
 msgid "AKs"
 msgstr "AKs"
 
-#: AKModel/models.py:250
+#: AKModel/models.py:260
 msgid "Name or number of the room"
 msgstr "Name oder Nummer des Raums"
 
-#: AKModel/models.py:251
+#: AKModel/models.py:261
 msgid "Building"
 msgstr "Gebäude"
 
-#: AKModel/models.py:252
+#: AKModel/models.py:262
 msgid "Name or number of the building"
 msgstr "Name oder Nummer des Gebäudes"
 
-#: AKModel/models.py:253
+#: AKModel/models.py:263
 msgid "Capacity"
 msgstr "Kapazität"
 
-#: AKModel/models.py:253
+#: AKModel/models.py:263
 msgid "Maximum number of people"
 msgstr "Maximale Personenzahl"
 
-#: AKModel/models.py:254
+#: AKModel/models.py:264
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: AKModel/models.py:255
+#: AKModel/models.py:265
 msgid "AK requirements fulfilled by the room"
 msgstr "AK Anforderungen, die dieser Raum erfüllt"
 
-#: AKModel/models.py:262
+#: AKModel/models.py:272
 msgid "Rooms"
 msgstr "Räume"
 
-#: AKModel/models.py:279
+#: AKModel/models.py:289
 msgid "AK being mapped"
 msgstr "AK, der zugeordnet wird"
 
-#: AKModel/models.py:281
+#: AKModel/models.py:291
 msgid "Room the AK will take place in"
 msgstr "Raum in dem der AK stattfindet"
 
-#: AKModel/models.py:282
+#: AKModel/models.py:292
 msgid "Slot Begin"
 msgstr "Beginn des Slots"
 
-#: AKModel/models.py:282
+#: AKModel/models.py:292
 msgid "Time and date the slot begins"
 msgstr "Zeit und Datum zu der der AK beginnt"
 
-#: AKModel/models.py:284
+#: AKModel/models.py:294
 msgid "Duration"
 msgstr "Dauer"
 
-#: AKModel/models.py:285
+#: AKModel/models.py:295
 msgid "Length in hours"
 msgstr "Länge in Stunden"
 
-#: AKModel/models.py:290
+#: AKModel/models.py:300
 msgid "Last update"
 msgstr "Letzte Aktualisierung"
 
-#: AKModel/models.py:293
+#: AKModel/models.py:303
 msgid "AK Slot"
 msgstr "AK Slot"
 
-#: AKModel/models.py:294
+#: AKModel/models.py:304
 msgid "AK Slots"
 msgstr "AK Slot"
 
-#: AKModel/models.py:308
+#: AKModel/models.py:318
 msgid "Not scheduled yet"
 msgstr "Noch nicht geplant"
 

AKPlan/templates/AKPlan/plan_breadcrumbs.html

@@ -8,7 +8,10 @@
         AKPlanning
     {% endif %}
 </li>
-<li class="breadcrumb-item">{{ event.slug }}</li>
 <li class="breadcrumb-item">
-    <a href="{% url 'plan:plan_overview' event_slug=event.slug %}">{% trans "AK Plan" %}</a>
+    {% if 'AKDashboard'|check_app_installed %}
+        <a href="{% url 'dashboard:dashboard_event' slug=event.slug %}">{{ event }}</a>
+    {% else %}
+        {{ event }}
+    {% endif %}
 </li>

AKPlan/templates/AKPlan/plan_index.html

@@ -70,6 +70,9 @@
 
 {% block breadcrumbs %}
     {% include "AKPlan/plan_breadcrumbs.html" %}
+    <li class="breadcrumb-item">
+        {% trans "AK Plan" %}
+    </li>
 {% endblock %}
 
 

AKPlan/templates/AKPlan/plan_room.html

@@ -5,8 +5,10 @@
 
 {% block breadcrumbs %}
     {% include "AKPlan/plan_breadcrumbs.html" %}
-    <li class="breadcrumb-item">{% trans "Room" %}</li>
-    <li class="breadcrumb-item">{{ room.title }}</li>
+    <li class="breadcrumb-item">
+        <a href="{% url 'plan:plan_overview' event_slug=event.slug %}">{% trans "AK Plan" %}</a>
+    </li>
+    <li class="breadcrumb-item">{% trans "Room" %}: {{ room.title }}</li>
 {% endblock %}
 
 
@@ -41,7 +43,7 @@
         </ul>
     </div>
 
-    <h1>Plan: {{ event }} -- {% trans "Room" %}: {{ room }}</h1>
+    <h1>Plan: {{ event }} ({% trans "Room" %}: {{ room }})</h1>
 
     {% timezone event.timezone %}
         <div class="row" style="margin-top:30px;clear:both;">

AKPlan/templates/AKPlan/plan_track.html

@@ -5,8 +5,10 @@
 
 {% block breadcrumbs %}
     {% include "AKPlan/plan_breadcrumbs.html" %}
-    <li class="breadcrumb-item">{% trans "Track" %}</li>
-    <li class="breadcrumb-item">{{ track }}</li>
+    <li class="breadcrumb-item">
+        <a href="{% url 'plan:plan_overview' event_slug=event.slug %}">{% trans "AK Plan" %}</a>
+    </li>
+    <li class="breadcrumb-item">{% trans "Track" %}: {{ track }}</li>
 {% endblock %}
 
 
@@ -41,7 +43,7 @@
         </ul>
     </div>
 
-    <h1>Plan: {{ event }} -- {% trans "Track" %}: {{ track }}</h1>
+    <h1>Plan: {{ event }} ({% trans "Track" %}: {{ track }})</h1>
 
     {% timezone event.timezone %}
         <div class="row" style="margin-top:30px;clear: both;">

AKPlanning/locale/de_DE/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-11 22:27+0000\n"
+"POT-Creation-Date: 2020-05-12 22:53+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,10 +17,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: AKPlanning/settings.py:127
+#: AKPlanning/settings.py:129
 msgid "German"
 msgstr "Deutsch"
 
-#: AKPlanning/settings.py:128
+#: AKPlanning/settings.py:130
 msgid "English"
 msgstr "Englisch"

AKSubmission/locale/de_DE/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-11 22:27+0000\n"
+"POT-Creation-Date: 2020-05-12 22:53+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -40,7 +40,9 @@ msgstr ""
 
 #: AKSubmission/templates/AKSubmission/ak_detail.html:10
 #: AKSubmission/templates/AKSubmission/ak_edit.html:8
-#: AKSubmission/templates/AKSubmission/ak_list.html:8
+#: AKSubmission/templates/AKSubmission/ak_history.html:11
+#: AKSubmission/templates/AKSubmission/ak_overview.html:8
+#: AKSubmission/templates/AKSubmission/ak_overview.html:27
 #: AKSubmission/templates/AKSubmission/akowner_create_update.html:7
 #: AKSubmission/templates/AKSubmission/akslot_add_update.html:7
 #: AKSubmission/templates/AKSubmission/akslot_delete.html:7
@@ -52,13 +54,15 @@ msgid "AKs"
 msgstr "AKs"
 
 #: AKSubmission/templates/AKSubmission/ak_detail.html:10
+#: AKSubmission/templates/AKSubmission/ak_history.html:11
 #: AKSubmission/templates/AKSubmission/akslot_delete.html:31
 msgid "AK"
 msgstr "AK"
 
 #: AKSubmission/templates/AKSubmission/ak_detail.html:15
 #: AKSubmission/templates/AKSubmission/ak_edit.html:13
-#: AKSubmission/templates/AKSubmission/ak_list.html:22
+#: AKSubmission/templates/AKSubmission/ak_history.html:16
+#: AKSubmission/templates/AKSubmission/ak_overview.html:22
 #: AKSubmission/templates/AKSubmission/akowner_create_update.html:12
 #: AKSubmission/templates/AKSubmission/akslot_add_update.html:12
 #: AKSubmission/templates/AKSubmission/akslot_delete.html:12
@@ -73,64 +77,94 @@ msgstr "AK-Eintragung"
 msgid "Interest"
 msgstr "Interesse"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:45
-#: AKSubmission/templates/AKSubmission/ak_list_table.html:32
+#: AKSubmission/templates/AKSubmission/ak_detail.html:33
+#, fuzzy
+#| msgid "Interest"
+msgid "Show Interest"
+msgstr "Interesse"
+
+#: AKSubmission/templates/AKSubmission/ak_detail.html:39
+#: AKSubmission/templates/AKSubmission/ak_table.html:48
+msgid "Open external link"
+msgstr "Externen Link öffnen"
+
+#: AKSubmission/templates/AKSubmission/ak_detail.html:44
+#: AKSubmission/templates/AKSubmission/ak_history.html:19
+#: AKSubmission/templates/AKSubmission/ak_history.html:31
+msgid "History"
+msgstr "Versionsgeschichte"
+
+#: AKSubmission/templates/AKSubmission/ak_detail.html:47
+#: AKSubmission/templates/AKSubmission/ak_detail.html:146
+#: AKSubmission/templates/AKSubmission/ak_edit.html:16
+#: AKSubmission/templates/AKSubmission/ak_table.html:53
+msgid "Edit"
+msgstr "Bearbeiten"
+
+#: AKSubmission/templates/AKSubmission/ak_detail.html:52
+#: AKSubmission/templates/AKSubmission/ak_history.html:31
+#: AKSubmission/templates/AKSubmission/ak_table.html:35
 msgid "AK Wish"
 msgstr "AK-Wunsch"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:49
-#: AKSubmission/templates/AKSubmission/ak_list_table.html:10
+#: AKSubmission/templates/AKSubmission/ak_detail.html:56
+#: AKSubmission/templates/AKSubmission/ak_table.html:10
 msgid "Who?"
 msgstr "Wer?"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:53
-#: AKSubmission/templates/AKSubmission/ak_list_table.html:11
+#: AKSubmission/templates/AKSubmission/ak_detail.html:62
+#: AKSubmission/templates/AKSubmission/ak_history.html:36
+#: AKSubmission/templates/AKSubmission/ak_table.html:11
 msgid "Category"
 msgstr "Kategorie"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:59
+#: AKSubmission/templates/AKSubmission/ak_detail.html:68
 msgid "Present this AK"
 msgstr "Diesen AK vorstellen"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:63
-#: AKSubmission/templates/AKSubmission/ak_list_table.html:12
+#: AKSubmission/templates/AKSubmission/ak_detail.html:72
+#: AKSubmission/templates/AKSubmission/ak_table.html:12
 msgid "Tags"
 msgstr "Tags"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:69
+#: AKSubmission/templates/AKSubmission/ak_detail.html:78
 msgid "Reso?"
 msgstr "Reso?"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:76
+#: AKSubmission/templates/AKSubmission/ak_detail.html:85
 msgid "Requirements"
 msgstr "Anforderungen"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:89
+#: AKSubmission/templates/AKSubmission/ak_detail.html:98
 msgid "Conflicting AKs"
 msgstr "AK Konflikte"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:97
+#: AKSubmission/templates/AKSubmission/ak_detail.html:106
 msgid "Prerequisite AKs"
 msgstr "AK Voraussetzungen"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:105
+#: AKSubmission/templates/AKSubmission/ak_detail.html:114
 msgid "Notes"
 msgstr "Notizen"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:122
+#: AKSubmission/templates/AKSubmission/ak_detail.html:131
 msgid "When?"
 msgstr "Wann?"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:123
+#: AKSubmission/templates/AKSubmission/ak_detail.html:132
 #: AKSubmission/templates/AKSubmission/akslot_delete.html:35
 msgid "Duration"
 msgstr "Dauer"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:124
+#: AKSubmission/templates/AKSubmission/ak_detail.html:133
 msgid "Room"
 msgstr "Raum"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:150
+#: AKSubmission/templates/AKSubmission/ak_detail.html:149
+msgid "Delete"
+msgstr "Löschen"
+
+#: AKSubmission/templates/AKSubmission/ak_detail.html:161
 msgid "Add another slot"
 msgstr "Einen neuen AK-Slot hinzufügen"
 
@@ -139,35 +173,53 @@ msgstr "Einen neuen AK-Slot hinzufügen"
 msgid "Edit AK"
 msgstr "AK bearbeiten"
 
-#: AKSubmission/templates/AKSubmission/ak_edit.html:16
-msgid "Edit"
-msgstr "Bearbeiten"
-
-#: AKSubmission/templates/AKSubmission/ak_list.html:23
-#: AKSubmission/templates/AKSubmission/ak_list.html:27
-msgid "AK List"
-msgstr "AK Liste"
-
-#: AKSubmission/templates/AKSubmission/ak_list.html:30
-msgid "Categories"
-msgstr "Kategorie"
+#: AKSubmission/templates/AKSubmission/ak_history.html:27
+msgid "Back"
+msgstr "Zurück"
 
-#: AKSubmission/templates/AKSubmission/ak_list.html:37
-msgid "Tracks"
-msgstr ""
-
-#: AKSubmission/templates/AKSubmission/ak_list_table.html:9
+#: AKSubmission/templates/AKSubmission/ak_history.html:35
+#: AKSubmission/templates/AKSubmission/ak_table.html:9
 msgid "Name"
 msgstr "Name"
 
-#: AKSubmission/templates/AKSubmission/ak_list_table.html:23
+#: AKSubmission/templates/AKSubmission/ak_history.html:37
+msgid "Track"
+msgstr "Track"
+
+#: AKSubmission/templates/AKSubmission/ak_history.html:38
+msgid "Time"
+msgstr "Zeit"
+
+#: AKSubmission/templates/AKSubmission/ak_history.html:48
+#: AKSubmission/templates/AKSubmission/ak_table.html:26
 msgid "present this AK"
 msgstr "Diesen AK vorstellen"
 
-#: AKSubmission/templates/AKSubmission/ak_list_table.html:27
+#: AKSubmission/templates/AKSubmission/ak_history.html:52
+#: AKSubmission/templates/AKSubmission/ak_table.html:30
 msgid "Reso"
 msgstr "Reso"
 
+#: AKSubmission/templates/AKSubmission/ak_list.html:6 AKSubmission/views.py:29
+msgid "All AKs"
+msgstr "Alle AKs"
+
+#: AKSubmission/templates/AKSubmission/ak_list.html:11
+msgid "Tracks"
+msgstr "Tracks"
+
+#: AKSubmission/templates/AKSubmission/ak_overview.html:23
+msgid "AK List"
+msgstr "AK-Liste"
+
+#: AKSubmission/templates/AKSubmission/ak_table.html:44
+msgid "Details"
+msgstr "Details"
+
+#: AKSubmission/templates/AKSubmission/ak_table.html:63
+msgid "There are no AKs in this category yet"
+msgstr "Es gibt noch keine AKs in dieser Kategorie"
+
 #: AKSubmission/templates/AKSubmission/akowner_create_update.html:7
 #: AKSubmission/templates/AKSubmission/akowner_create_update.html:13
 #: AKSubmission/templates/AKSubmission/akowner_create_update.html:18
@@ -252,60 +304,64 @@ msgstr ""
 "Dieses Event is nicht aktiv. Es können keine AKs hinzugefügt oder bearbeitet "
 "werden"
 
-#: AKSubmission/templates/AKSubmission/submission_overview.html:66
-msgid "Current AKs"
-msgstr "Aktuelle AKs"
-
 #: AKSubmission/templates/AKSubmission/submit_new.html:41
 msgid "Submit"
 msgstr "Eintragen"
 
-#: AKSubmission/views.py:39
+#: AKSubmission/views.py:49
 msgid "Wishes"
 msgstr "Wünsche"
 
-#: AKSubmission/views.py:39
+#: AKSubmission/views.py:49
 msgid "AKs one would like to have"
 msgstr ""
 "AKs die sich gewünscht wurden, aber bei denen noch nicht klar ist, wer sie "
 "macht. Falls du dir das vorstellen kannst, trag dich einfach ein"
 
-#: AKSubmission/views.py:109
+#: AKSubmission/views.py:65
+
+msgid "Currently planned AKs"
+msgstr "Aktuell geplante AKs"
+
+#: AKSubmission/views.py:136
 msgid "Event inactive. Cannot create or update."
 msgstr "Event inaktiv. Hinzufügen/Bearbeiten nicht möglich."
 
-#: AKSubmission/views.py:125
+#: AKSubmission/views.py:152
 msgid "AK successfully created"
 msgstr "AK erfolgreich angelegt"
 
-#: AKSubmission/views.py:183
+#: AKSubmission/views.py:210
 msgid "AK successfully updated"
 msgstr "AK erfolgreich aktualisiert"
 
-#: AKSubmission/views.py:261
+#: AKSubmission/views.py:288
 msgid "Person Info successfully updated"
 msgstr "Personen-Info erfolgreich aktualisiert"
 
-#: AKSubmission/views.py:281
+#: AKSubmission/views.py:308
 msgid "No user selected"
 msgstr "Keine Person ausgewählt"
 
-#: AKSubmission/views.py:307
+#: AKSubmission/views.py:334
 msgid "AK Slot successfully added"
 msgstr "AK-Slot erfolgreich angelegt"
 
-#: AKSubmission/views.py:321
+#: AKSubmission/views.py:348
 msgid "You cannot edit a slot that has already been scheduled"
 msgstr "Bereits geplante AK-Slots können nicht mehr bearbeitet werden"
 
-#: AKSubmission/views.py:331
+#: AKSubmission/views.py:358
 msgid "AK Slot successfully updated"
 msgstr "AK-Slot erfolgreich aktualisiert"
 
-#: AKSubmission/views.py:344
+#: AKSubmission/views.py:371
 msgid "You cannot delete a slot that has already been scheduled"
 msgstr "Bereits geplante AK-Slots können nicht mehr gelöscht werden"
 
-#: AKSubmission/views.py:354
+#: AKSubmission/views.py:381
 msgid "AK Slot successfully deleted"
 msgstr "AK-Slot erfolgreich angelegt"
+
+#~ msgid "Categories"
+#~ msgstr "Kategorie"

AKSubmission/templates/AKSubmission/ak_detail.html

@@ -117,7 +117,7 @@
         {% endif %}
     </table>
 
-    <p style="margin-top: 30px;margin-bottom: 30px;">{{ ak.description }}</p>
+    <p style="margin-top: 30px;margin-bottom: 30px;">{{ ak.description|linebreaks }}</p>
 
 
     {% if 'AKPlan'|check_app_installed %}

AKSubmission/templates/AKSubmission/ak_list.html

-{% extends 'AKSubmission/submission_base.html' %}
-
 {% load i18n %}
-{% load fontawesome_5 %}
-
-{% load tags_AKSubmission %}
-
-{% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "AKs" %}{% endblock %}
-
-{% block imports %}
-    <style>
-        /* Prevent wrapping of buttons in AK table */
-        .table td:nth-child(5) {
-            white-space: nowrap;
-        }
-    </style>
-{% endblock %}
-
-{% block breadcrumbs %}
-    {% include "AKSubmission/submission_breadcrumbs.html" %}
-    <li class="breadcrumb-item"><a
-            href="{% url 'submit:submission_overview' event_slug=event.slug %}">{% trans "AK Submission" %}</a></li>
-    <li class="breadcrumb-item active">{% trans "AK List" %}</li>
-{% endblock %}
-
-{% block content %}
-    <h1>{{ event.name }}: {% trans "AK List" %}</h1>
-
-    {% if categories.count > 0 %}
-        <b>{% trans 'Categories' %}:</b>
-        {% category_list categories event.slug %}
-    {% endif %}
-
-    <br><br>
-
-    {% if tracks.count > 0 %}
-        <b>{% trans 'Tracks' %}:</b>
-        {% track_list tracks event.slug %}
-    {% endif %}
-
-    <br><br>
-
-    {% if filter_condition_string != "" %}
-        <h2 class="text-secondary">{{ filter_condition_string }}</h2>
-    {% endif %}
-
-    {% include "AKSubmission/ak_list_table.html" %}
 
-{% endblock %}
+<div class="float-right">
+    <ul class="nav nav-pills">
+        <li class="nav-item">
+            <a class="nav-link" href="{% url 'submit:ak_list' event_slug=event.slug %}">{% trans "All AKs" %}</a>
+        </li>
+        {% if event.aktrack_set.count > 0 %}
+            <li class="nav-item dropdown">
+                <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true"
+                   aria-expanded="false">{% trans "Tracks" %}</a>
+                <div class="dropdown-menu" style="">
+                    {% for track in event.aktrack_set.all %}
+                        <a class="dropdown-item"
+                           href="{% url 'submit:ak_list_by_track' event_slug=event.slug track_pk=track.pk %}">
+                            {{ track }}</a>
+                    {% endfor %}
+                </div>
+            </li>
+        {% endif %}
+    </ul>
+</div>
+
+<h2>{{ table_title }}</h2>
+
+<noscript>
+    {% include "AKSubmission/ak_table.html" %}
+</noscript>
+
+<ul class="nav nav-tabs" style="margin-bottom:15px">
+    {% for category, _ in categories_with_aks %}
+        <li class="nav-item">
+            <a class="nav-link {% if category.name == active_category %}active{% endif %}" data-toggle="tab"
+               href="#category_{{ category.pk }}">{{ category.name }}</a>
+        </li>
+    {% endfor %}
+</ul>
+
+<div id="akListTabbed" class="tab-content">
+    {% for category, AKs in categories_with_aks %}
+        <div class="tab-pane fade {% if category.name == active_category %}show active{% endif %}" id="category_{{ category.pk }}">
+            <p><b>{{ category.name }}:</b> {{ category.description }}</p>
+            {% include "AKSubmission/ak_table.html" %}
+        </div>
+    {% endfor %}
+</div>

AKSubmission/templates/AKSubmission/ak_overview.html

+{% extends 'AKSubmission/submission_base.html' %}
+
+{% load i18n %}
+{% load fontawesome_5 %}
+
+{% load tags_AKSubmission %}
+
+{% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "AKs" %}{% endblock %}
+
+{% block imports %}
+    <style>
+        /* Prevent wrapping of buttons in AK table */
+        .table td:nth-child(5) {
+            white-space: nowrap;
+        }
+    </style>
+{% endblock %}
+
+{% block breadcrumbs %}
+    {% include "AKSubmission/submission_breadcrumbs.html" %}
+    <li class="breadcrumb-item"><a
+            href="{% url 'submit:submission_overview' event_slug=event.slug %}">{% trans "AK Submission" %}</a></li>
+    <li class="breadcrumb-item active">{% trans "AK List" %}</li>
+{% endblock %}
+
+{% block content %}
+    <h1>{% trans "AKs" %}: {{ event.name }}</h1>
+
+    {% include "AKSubmission/ak_list.html" %}
+{% endblock %}

AKSubmission/templates/AKSubmission/ak_list_table.html → AKSubmission/templates/AKSubmission/ak_table.html

@@ -56,7 +56,11 @@
             </td>
         </tr>
         <tr>
-            <td colspan="5" class="small">{{ ak.description }}</td>
+            <td colspan="5" class="small">{{ ak.description|linebreaks }}</td>
+        </tr>
+    {% empty %}
+        <tr>
+            <td colspan="5" class="small">{% trans "There are no AKs in this category yet" %}</td>
         </tr>
     {% endfor %}
     </tbody>

AKSubmission/templates/AKSubmission/submission_breadcrumbs.html

@@ -7,4 +7,10 @@
         AKPlanning
     {% endif %}
 </li>
-<li class="breadcrumb-item">{{ event.slug }}</li>
+<li class="breadcrumb-item">
+    {% if 'AKDashboard'|check_app_installed %}
+        <a href="{% url 'dashboard:dashboard_event' slug=event.slug %}">{{ event }}</a>
+    {% else %}
+        {{ event }}
+    {% endif %}
+</li>

AKSubmission/templates/AKSubmission/submission_overview.html

@@ -2,6 +2,7 @@
 
 {% load i18n %}
 {% load fontawesome_5 %}
+{% load static %}
 
 {% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "AK Submission" %}{% endblock %}
 
@@ -11,7 +12,21 @@
         .table td:nth-child(5) {
             white-space: nowrap;
         }
+
+        /* Make Select2 boxes match Bootstrap heights: */
+        .select2-selection__rendered {
+          line-height: 32px !important;
+        }
+
+        .select2-selection {
+          height: 34px !important;
+        }
     </style>
+
+    {% if event.active %}
+        <link href="{% static 'common/vendor/select2/select2.min.css' %}" rel="stylesheet" />
+        <script src="{% static 'common/vendor/select2/select2.min.js' %}"></script>
+    {% endif %}
 {% endblock %}
 
 {% block breadcrumbs %}
@@ -63,28 +78,13 @@
         </div>
     {% endif %}
 
-    <h2>{% trans "Current AKs" %}</h2>
-
-    <noscript>
-        {% include "AKSubmission/ak_list_table.html" %}
-    </noscript>
-
-    <ul class="nav nav-tabs" style="margin-bottom:15px">
-        {% for category, _ in categories_with_aks %}
-            <li class="nav-item">
-                <a class="nav-link {% if forloop.first %}active{% endif %}" data-toggle="tab"
-                   href="#category_{{ category.pk }}">{{ category.name }}</a>
-            </li>
-        {% endfor %}
-    </ul>
-
-    <div id="akListTabbed" class="tab-content">
-        {% for category, AKs in categories_with_aks %}
-            <div class="tab-pane fade {% if forloop.first %}show active{% endif %}" id="category_{{ category.pk }}">
-                <p><b>{{ category.name }}:</b> {{ category.description }}</p>
-                {% include "AKSubmission/ak_list_table.html" %}
-            </div>
-        {% endfor %}
-    </div>
+    {% include "AKSubmission/ak_list.html" %}
+{% endblock %}
 
+{% block bottom_script %}
+    {% if event.active %}
+        <script>
+            $("#selectOwnerId").select2();
+        </script>
+    {% endif %}
 {% endblock %}

AKSubmission/urls.py

@@ -16,7 +16,7 @@ urlpatterns = [
             path('ak/<int:pk>/add_slot/', views.AKSlotAddView.as_view(), name='akslot_add'),
             path('akslot/<int:pk>/edit/', views.AKSlotEditView.as_view(), name='akslot_edit'),
             path('akslot/<int:pk>/delete/', views.AKSlotDeleteView.as_view(), name='akslot_delete'),
-            path('aks/', views.AKListView.as_view(), name='ak_list'),
+            path('aks/', views.AKOverviewView.as_view(), name='ak_list'),
             path('aks/category/<int:category_pk>/', views.AKListByCategoryView.as_view(), name='ak_list_by_category'),
             path('aks/tag/<int:tag_pk>/', views.AKListByTagView.as_view(), name='ak_list_by_tag'),
             path('aks/track/<int:track_pk>/', views.AKListByTrackView.as_view(), name='ak_list_by_track'),

AKSubmission/views.py

@@ -13,10 +13,20 @@ from AKModel.views import FilterByEventSlugMixin
 from AKSubmission.forms import AKWishForm, AKOwnerForm, AKEditForm, AKSubmissionForm, AKDurationForm
 
 
-class SubmissionOverviewView(FilterByEventSlugMixin, ListView):
+class AKOverviewView(FilterByEventSlugMixin, ListView):
     model = AKCategory
     context_object_name = "categories"
-    template_name = "AKSubmission/submission_overview.html"
+    template_name = "AKSubmission/ak_overview.html"
+    wishes_as_category = False
+
+    def filter_aks(self, context, category):
+        return category.ak_set.all()
+
+    def get_active_category_name(self, context):
+        return context["categories_with_aks"][0][0].name
+
+    def get_table_title(self, context):
+        return _("All AKs")
 
     def get_context_data(self, *, object_list=None, **kwargs):
         context = super().get_context_data(object_list=object_list, **kwargs)
@@ -27,17 +37,35 @@ class SubmissionOverviewView(FilterByEventSlugMixin, ListView):
 
         for category in context["categories"]:
             aks_for_category = []
-            for ak in category.ak_set.all():
-                if settings.WISHES_AS_CATEGORY and ak.wish:
+            for ak in self.filter_aks(context, category):
+                if self.wishes_as_category and ak.wish:
                     ak_wishes.append(ak)
                 else:
                     aks_for_category.append(ak)
             categories_with_aks.append((category, aks_for_category))
 
-        if settings.WISHES_AS_CATEGORY:
+        if self.wishes_as_category:
             categories_with_aks.append(
                 ({"name": _("Wishes"), "pk": "wish", "description": _("AKs one would like to have")}, ak_wishes))
+
         context["categories_with_aks"] = categories_with_aks
+        context["active_category"] = self.get_active_category_name(context)
+        context['table_title'] = self.get_table_title(context)
+
+        return context
+
+
+class SubmissionOverviewView(AKOverviewView):
+    model = AKCategory
+    context_object_name = "categories"
+    template_name = "AKSubmission/submission_overview.html"
+    wishes_as_category = settings.WISHES_AS_CATEGORY
+
+    def get_table_title(self, context):
+        return _("Currently planned AKs")
+
+    def get_context_data(self, *, object_list=None, **kwargs):
+        context = super().get_context_data(object_list=object_list, **kwargs)
 
         # Get list of existing owners for event (for AK submission start)
         context["existingOwners"] = AKOwner.objects.filter(event=self.event)
@@ -45,6 +73,39 @@ class SubmissionOverviewView(FilterByEventSlugMixin, ListView):
         return context
 
 
+class AKListByCategoryView(AKOverviewView):
+    def dispatch(self, request, *args, **kwargs):
+        self.category = get_object_or_404(AKCategory, pk=kwargs['category_pk'])
+        return super().dispatch(request, *args, **kwargs)
+
+    def get_active_category_name(self, context):
+        return self.category.name
+
+
+class AKListByTagView(AKOverviewView):
+    def dispatch(self, request, *args, **kwargs):
+        self.tag = get_object_or_404(AKTag, pk=kwargs['tag_pk'])
+        return super().dispatch(request, *args, **kwargs)
+
+    def filter_aks(self, context, category):
+        return self.tag.ak_set.filter(event=self.event, category=category)
+
+    def get_table_title(self, context):
+        return f"{_('AKs with Tag')} = {self.tag.name}"
+
+
+class AKListByTrackView(AKOverviewView):
+    def dispatch(self, request, *args, **kwargs):
+        self.track = get_object_or_404(AKTrack, pk=kwargs['track_pk'])
+        return super().dispatch(request, *args, **kwargs)
+
+    def filter_aks(self, context, category):
+        return category.ak_set.filter(track=self.track)
+
+    def get_table_title(self, context):
+        return f"{_('AKs with Track')} = {self.track.name}"
+
+
 class AKDetailView(EventSlugMixin, DetailView):
     model = AK
     context_object_name = "ak"
@@ -60,56 +121,16 @@ class AKHistoryView(EventSlugMixin, DetailView):
 class AKListView(FilterByEventSlugMixin, ListView):
     model = AK
     context_object_name = "AKs"
-    template_name = "AKSubmission/ak_list.html"
-    filter_condition_string = ""
+    template_name = "AKSubmission/ak_overview.html"
+    table_title = ""
 
     def get_context_data(self, *, object_list=None, **kwargs):
         context = super().get_context_data(object_list=object_list, **kwargs)
         context['categories'] = AKCategory.objects.filter(event=self.event)
         context['tracks'] = AKTrack.objects.filter(event=self.event)
-        context['filter_condition_string'] = self.filter_condition_string
         return context
 
 
-class AKListByCategoryView(AKListView):
-    category = None
-
-    def get_queryset(self):
-        # Find category based on event slug
-        try:
-            self.category = AKCategory.objects.get(pk=self.kwargs['category_pk'])
-            self.filter_condition_string = f"{_('Category')} = {self.category.name}"
-        except AKCategory.DoesNotExist:
-            raise Http404
-        return super().get_queryset().filter(category=self.category)
-
-
-class AKListByTagView(AKListView):
-    tag = None
-
-    def get_queryset(self):
-        # Find tag based on event slug
-        try:
-            self.tag = AKTag.objects.get(pk=self.kwargs['tag_pk'])
-            self.filter_condition_string = f"{_('Tag')} = {self.tag.name}"
-        except AKTag.DoesNotExist:
-            raise Http404
-        return super().get_queryset().filter(tags=self.tag)
-
-
-class AKListByTrackView(AKListView):
-    track = None
-
-    def get_queryset(self):
-        # Find track based on event slug
-        try:
-            self.track = AKTrack.objects.get(pk=self.kwargs['track_pk'])
-            self.filter_condition_string = f"{_('Track')} = {self.track.name}"
-        except AKTrack.DoesNotExist:
-            raise Http404
-        return super().get_queryset().filter(track=self.track)
-
-
 class EventInactiveRedirectMixin:
     def get_error_message(self):
         return _("Event inactive. Cannot create or update.")

static_common/common/vendor/select2/select2.min.css

+.select2-container{box-sizing:border-box;display:inline-block;margin:0;position:relative;vertical-align:middle}.select2-container .select2-selection--single{box-sizing:border-box;cursor:pointer;display:block;height:28px;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--single .select2-selection__rendered{display:block;padding-left:8px;padding-right:20px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.select2-container .select2-selection--single .select2-selection__clear{position:relative}.select2-container[dir="rtl"] .select2-selection--single .select2-selection__rendered{padding-right:8px;padding-left:20px}.select2-container .select2-selection--multiple{box-sizing:border-box;cursor:pointer;display:block;min-height:32px;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--multiple .select2-selection__rendered{display:inline-block;overflow:hidden;padding-left:8px;text-overflow:ellipsis;white-space:nowrap}.select2-container .select2-search--inline{float:left}.select2-container .select2-search--inline .select2-search__field{box-sizing:border-box;border:none;font-size:100%;margin-top:5px;padding:0}.select2-container .select2-search--inline .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-dropdown{background-color:white;border:1px solid #aaa;border-radius:4px;box-sizing:border-box;display:block;position:absolute;left:-100000px;width:100%;z-index:1051}.select2-results{display:block}.select2-results__options{list-style:none;margin:0;padding:0}.select2-results__option{padding:6px;user-select:none;-webkit-user-select:none}.select2-results__option[aria-selected]{cursor:pointer}.select2-container--open .select2-dropdown{left:0}.select2-container--open .select2-dropdown--above{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--open .select2-dropdown--below{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-search--dropdown{display:block;padding:4px}.select2-search--dropdown .select2-search__field{padding:4px;width:100%;box-sizing:border-box}.select2-search--dropdown .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-search--dropdown.select2-search--hide{display:none}.select2-close-mask{border:0;margin:0;padding:0;display:block;position:fixed;left:0;top:0;min-height:100%;min-width:100%;height:auto;width:auto;opacity:0;z-index:99;background-color:#fff;filter:alpha(opacity=0)}.select2-hidden-accessible{border:0 !important;clip:rect(0 0 0 0) !important;-webkit-clip-path:inset(50%) !important;clip-path:inset(50%) !important;height:1px !important;overflow:hidden !important;padding:0 !important;position:absolute !important;width:1px !important;white-space:nowrap !important}.select2-container--default .select2-selection--single{background-color:#fff;border:1px solid #aaa;border-radius:4px}.select2-container--default .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--default .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:bold}.select2-container--default .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--default .select2-selection--single .select2-selection__arrow{height:26px;position:absolute;top:1px;right:1px;width:20px}.select2-container--default .select2-selection--single .select2-selection__arrow b{border-color:#888 transparent transparent transparent;border-style:solid;border-width:5px 4px 0 4px;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__clear{float:left}.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__arrow{left:1px;right:auto}.select2-container--default.select2-container--disabled .select2-selection--single{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection--single .select2-selection__clear{display:none}.select2-container--default.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #888 transparent;border-width:0 4px 5px 4px}.select2-container--default .select2-selection--multiple{background-color:white;border:1px solid #aaa;border-radius:4px;cursor:text}.select2-container--default .select2-selection--multiple .select2-selection__rendered{box-sizing:border-box;list-style:none;margin:0;padding:0 5px;width:100%}.select2-container--default .select2-selection--multiple .select2-selection__rendered li{list-style:none}.select2-container--default .select2-selection--multiple .select2-selection__clear{cursor:pointer;float:right;font-weight:bold;margin-top:5px;margin-right:10px;padding:1px}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;cursor:default;float:left;margin-right:5px;margin-top:5px;padding:0 5px}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove{color:#999;cursor:pointer;display:inline-block;font-weight:bold;margin-right:2px}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover{color:#333}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice,.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-search--inline{float:right}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice{margin-left:5px;margin-right:auto}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove{margin-left:2px;margin-right:auto}.select2-container--default.select2-container--focus .select2-selection--multiple{border:solid black 1px;outline:0}.select2-container--default.select2-container--disabled .select2-selection--multiple{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection__choice__remove{display:none}.select2-container--default.select2-container--open.select2-container--above .select2-selection--single,.select2-container--default.select2-container--open.select2-container--above .select2-selection--multiple{border-top-left-radius:0;border-top-right-radius:0}.select2-container--default.select2-container--open.select2-container--below .select2-selection--single,.select2-container--default.select2-container--open.select2-container--below .select2-selection--multiple{border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--default .select2-search--dropdown .select2-search__field{border:1px solid #aaa}.select2-container--default .select2-search--inline .select2-search__field{background:transparent;border:none;outline:0;box-shadow:none;-webkit-appearance:textfield}.select2-container--default .select2-results>.select2-results__options{max-height:200px;overflow-y:auto}.select2-container--default .select2-results__option[role=group]{padding:0}.select2-container--default .select2-results__option[aria-disabled=true]{color:#999}.select2-container--default .select2-results__option[aria-selected=true]{background-color:#ddd}.select2-container--default .select2-results__option .select2-results__option{padding-left:1em}.select2-container--default .select2-results__option .select2-results__option .select2-results__group{padding-left:0}.select2-container--default .select2-results__option .select2-results__option .select2-results__option{margin-left:-1em;padding-left:2em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-2em;padding-left:3em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-3em;padding-left:4em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-4em;padding-left:5em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-5em;padding-left:6em}.select2-container--default .select2-results__option--highlighted[aria-selected]{background-color:#5897fb;color:white}.select2-container--default .select2-results__group{cursor:default;display:block;padding:6px}.select2-container--classic .select2-selection--single{background-color:#f7f7f7;border:1px solid #aaa;border-radius:4px;outline:0;background-image:-webkit-linear-gradient(top, #fff 50%, #eee 100%);background-image:-o-linear-gradient(top, #fff 50%, #eee 100%);background-image:linear-gradient(to bottom, #fff 50%, #eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0)}.select2-container--classic .select2-selection--single:focus{border:1px solid #5897fb}.select2-container--classic .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--classic .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:bold;margin-right:10px}.select2-container--classic .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--classic .select2-selection--single .select2-selection__arrow{background-color:#ddd;border:none;border-left:1px solid #aaa;border-top-right-radius:4px;border-bottom-right-radius:4px;height:26px;position:absolute;top:1px;right:1px;width:20px;background-image:-webkit-linear-gradient(top, #eee 50%, #ccc 100%);background-image:-o-linear-gradient(top, #eee 50%, #ccc 100%);background-image:linear-gradient(to bottom, #eee 50%, #ccc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFCCCCCC', GradientType=0)}.select2-container--classic .select2-selection--single .select2-selection__arrow b{border-color:#888 transparent transparent transparent;border-style:solid;border-width:5px 4px 0 4px;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__clear{float:left}.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__arrow{border:none;border-right:1px solid #aaa;border-radius:0;border-top-left-radius:4px;border-bottom-left-radius:4px;left:1px;right:auto}.select2-container--classic.select2-container--open .select2-selection--single{border:1px solid #5897fb}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow{background:transparent;border:none}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #888 transparent;border-width:0 4px 5px 4px}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--single{border-top:none;border-top-left-radius:0;border-top-right-radius:0;background-image:-webkit-linear-gradient(top, #fff 0%, #eee 50%);background-image:-o-linear-gradient(top, #fff 0%, #eee 50%);background-image:linear-gradient(to bottom, #fff 0%, #eee 50%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0)}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--single{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0;background-image:-webkit-linear-gradient(top, #eee 50%, #fff 100%);background-image:-o-linear-gradient(top, #eee 50%, #fff 100%);background-image:linear-gradient(to bottom, #eee 50%, #fff 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFFFFFFF', GradientType=0)}.select2-container--classic .select2-selection--multiple{background-color:white;border:1px solid #aaa;border-radius:4px;cursor:text;outline:0}.select2-container--classic .select2-selection--multiple:focus{border:1px solid #5897fb}.select2-container--classic .select2-selection--multiple .select2-selection__rendered{list-style:none;margin:0;padding:0 5px}.select2-container--classic .select2-selection--multiple .select2-selection__clear{display:none}.select2-container--classic .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;cursor:default;float:left;margin-right:5px;margin-top:5px;padding:0 5px}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove{color:#888;cursor:pointer;display:inline-block;font-weight:bold;margin-right:2px}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove:hover{color:#555}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice{float:right;margin-left:5px;margin-right:auto}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove{margin-left:2px;margin-right:auto}.select2-container--classic.select2-container--open .select2-selection--multiple{border:1px solid #5897fb}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--multiple{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--multiple{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--classic .select2-search--dropdown .select2-search__field{border:1px solid #aaa;outline:0}.select2-container--classic .select2-search--inline .select2-search__field{outline:0;box-shadow:none}.select2-container--classic .select2-dropdown{background-color:#fff;border:1px solid transparent}.select2-container--classic .select2-dropdown--above{border-bottom:none}.select2-container--classic .select2-dropdown--below{border-top:none}.select2-container--classic .select2-results>.select2-results__options{max-height:200px;overflow-y:auto}.select2-container--classic .select2-results__option[role=group]{padding:0}.select2-container--classic .select2-results__option[aria-disabled=true]{color:grey}.select2-container--classic .select2-results__option--highlighted[aria-selected]{background-color:#3875d7;color:#fff}.select2-container--classic .select2-results__group{cursor:default;display:block;padding:6px}.select2-container--classic.select2-container--open .select2-dropdown{border-color:#5897fb}