AKSubmission/templates/AKSubmission/ak_linked_list_inline.html

@@ -2,7 +2,7 @@
     {% if forloop.counter0 > 0 %}
         , 
     {% endif %}
-    <a href="{% url 'submit:ak_detail' event_slug=slug pk=ak.pk %}">{{ ak }}</a>
+    <a href="{{ ak.detail_url }}">{{ ak }}</a>
 {% empty %}
     -
 {% endfor %}

AKSubmission/templates/AKSubmission/ak_list.html

 {% load i18n %}
 
-<div class="float-right">
+<div class="float-end">
     <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"
+                <a class="nav-link dropdown-toggle" data-bs-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 %}
@@ -18,6 +18,19 @@
                 </div>
             </li>
         {% endif %}
+        {% if show_types %}
+            <li class="nav-item dropdown">
+                <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#" role="button" aria-haspopup="true"
+                   aria-expanded="false">{% trans "Types" %}</a>
+                <div class="dropdown-menu" style="">
+                    {% for type in event.aktype_set.all %}
+                        <a class="dropdown-item"
+                           href="{% url 'submit:ak_list_by_type' event_slug=event.slug type_slug=type.slug %}">
+                            {{ type }}</a>
+                    {% endfor %}
+                </div>
+            </li>
+        {% endif %}
     </ul>
 </div>
 
@@ -30,7 +43,7 @@
 <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"
+            <a class="nav-link {% if category.name == active_category %}active{% endif %}" data-bs-toggle="tab"
                href="#category_{{ category.pk }}">{{ category.name }}</a>
         </li>
     {% endfor %}

AKSubmission/templates/AKSubmission/ak_overview.html

 {% extends 'AKSubmission/submission_base.html' %}
 
 {% load i18n %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
 
 {% load tags_AKSubmission %}
 
@@ -13,12 +13,7 @@
 {% endblock %}
 
 {% block imports %}
-    <style>
-        /* Prevent wrapping of buttons in AK table */
-        .table td:nth-child(5) {
-            white-space: nowrap;
-        }
-    </style>
+    {% include "AKSubmission/ak_interest_script.html" %}
 {% endblock %}
 
 {% block breadcrumbs %}
@@ -30,8 +25,8 @@
 
 {% block content %}
     {% if event.active %}
-        <a class="btn btn-success float-right" href="{% url 'submit:submission_overview' event_slug=event.slug %}">
-            {% fa5_icon 'plus' 'fas' %} {% trans "Add AK" %}
+        <a class="btn btn-success float-end" href="{% url 'submit:submission_overview' event_slug=event.slug %}">
+            {% fa6_icon 'plus' 'fas' %} {% trans "Add AK" %}
         </a>
     {% endif %}
 

AKSubmission/templates/AKSubmission/ak_table.html

 {% load i18n %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
 
 {% load tags_AKSubmission %}
 
@@ -9,7 +9,9 @@
         <th>{% trans "Name" %}</th>
         <th>{% trans "Who?" %}</th>
         <th>{% trans 'Category' %}</th>
-        <th>{% trans "Tags" %}</th>
+        {% if show_types %}
+            <th>{% trans 'Types' %}</th>
+        {% endif %}
         <th></th>
     </tr>
     </thead>
@@ -17,49 +19,69 @@
     {% for ak in AKs %}
         <tr>
             <td>
-                <a href="{% url 'submit:ak_detail' event_slug=ak.event.slug pk=ak.pk %}"
+                <a href="{{ ak.detail_url }}"
                    class="text-dark text-decoration-none font-weight-bold">
                     {{ ak.name }}
                 </a>
                 {% if ak.present %}
-                    <span class="badge badge-dark badge-pill"
-                          title="{% trans 'Present results of this AK' %}">{% fa5_icon "bullhorn" 'fas' %}</span>
+                    <span class="badge bg-dark rounded-pill"
+                          title="{% trans 'Present results of this AK' %}">{% fa6_icon "bullhorn" 'fas' %}</span>
                 {% endif %}
                 {% if ak.reso %}
-                    <span class="badge badge-dark badge-pill"
-                          title="{% trans 'Intends to submit a resolution' %}">{% fa5_icon "scroll" 'fas' %}</span>
+                    <span class="badge bg-dark rounded-pill"
+                          title="{% trans 'Intends to submit a resolution' %}">{% fa6_icon "scroll" 'fas' %}</span>
                 {% endif %}
             </td>
             <td>
                 {% if ak.wish %}
-                    <span class="badge badge-dark badge-pill">{% trans "AK Wish" %}</span>
+                    <span class="badge bg-dark rounded-pill">{% trans "AK Wish" %}</span>
                 {% else %}
                     {% include "AKSubmission/owners_list.html" with owners=ak.owners %}
                 {% endif %}
             </td>
             <td>{% category_linked_badge ak.category event.slug %}</td>
-            <td>{% tag_list ak.tags.all event.slug %}</td>
-            <td class="text-right">
-                <a href="{% url 'submit:ak_detail' event_slug=ak.event.slug pk=ak.pk %}" data-toggle="tooltip"
+            {% if show_types %}
+                <td>
+                    {% for aktype in ak.types.all %}
+                        {% type_linked_badge aktype event.slug %}
+                    {% endfor %}
+                </td>
+            {% endif %}
+            <td class="text-end" style="white-space: nowrap;">
+                <a href="{{ ak.detail_url }}" data-bs-toggle="tooltip"
                    title="{% trans 'Details' %}"
-                   class="btn btn-primary">{% fa5_icon 'info' 'fas' %}</a>
+                   class="btn btn-primary">{% fa6_icon 'info' 'fas' %}</a>
                 {% if ak.link %}
-                    <a href="{{ ak.link }}" data-toggle="tooltip"
+                    <a href="{{ ak.link }}" data-bs-toggle="tooltip"
                        title="{% trans 'Open external link' %}"
-                       class="btn btn-info">{% fa5_icon 'external-link-alt' 'fas' %}</a>
+                       class="btn btn-info">{% fa6_icon 'external-link-alt' 'fas' %}</a>
                 {% endif %}
                 {% if event.active %}
-                    <a href="{% url 'submit:ak_edit' event_slug=event.slug pk=ak.pk %}" data-toggle="tooltip"
+                    <a href="{{ ak.edit_url }}" data-bs-toggle="tooltip"
                        title="{% trans 'Edit' %}"
-                       class="btn btn-success">{% fa5_icon 'pencil-alt' 'fas' %}</a>
-                     <a href="{% url 'submit:overview_inc_interest' event_slug=event.slug pk=ak.pk %}" data-toggle="tooltip"
+                       class="btn btn-success">{% fa6_icon 'pencil-alt' 'fas' %}</a>
+                    {% if interest_indication_active %}
+                        <span data-ak_id="{{ ak.pk }}" data-bs-toggle="tooltip"
                               title="{% trans 'Show Interest' %}"
-                       class="btn btn-primary">{% fa5_icon 'thumbs-up' 'fas' %}</a>
+                              class="btn btn-primary btn-interest"
+                              style="cursor: pointer">{% fa6_icon 'thumbs-up' 'fas' %}</span>
+                    {% endif %}
                 {% endif %}
             </td>
         </tr>
         <tr>
-            <td colspan="5" class="small">{{ ak.description|linebreaks }}</td>
+        <tr>
+            <td colspan="5" class="small">
+                <div class="d-block d-md-none">
+                    <details>
+                        <summary>{% trans "Details" %}</summary>
+                        {{ ak.description|linebreaks }}
+                    </details>
+                </div>
+                <div class="d-none d-md-block">
+                    {{ ak.description|linebreaks }}
+                </div>
+            </td>
         </tr>
     {% empty %}
         <tr>

AKSubmission/templates/AKSubmission/akmessage_add.html

 {% extends 'AKSubmission/submission_base.html' %}
 
 {% load i18n %}
-{% load bootstrap4 %}
-{% load fontawesome_5 %}
+{% load django_bootstrap5 %}
+{% load fontawesome_6 %}
 
 {% block title %}{% trans "AKs" %}: {{ event.name }} -
     {% trans "Add confidential message to organizers" %}{% endblock %}
@@ -12,7 +12,7 @@
     <li class="breadcrumb-item"><a
             href="{% url 'submit:submission_overview' event_slug=event.slug %}">{% trans "AK Submission" %}</a></li>
     <li class="breadcrumb-item"><a
-            href="{% url 'submit:ak_detail' event_slug=event.slug pk=ak.pk %}">{{ ak.short_name }}</a></li>
+            href="{{ ak.detail_url }}">{{ ak.short_name }}</a></li>
     <li class="breadcrumb-item active">{% trans "Add confidential message to organizers" %}</li>
 {% endblock %}
 
@@ -23,18 +23,16 @@
     {% endblock %}
     <form method="POST" class="post-form">{% csrf_token %}
         {% bootstrap_form form %}
-        {% buttons %}
-            <button type="submit" class="save btn btn-primary float-right">
-                {% fa5_icon "check" 'fas' %} {% trans "Send" %}
+        <button type="submit" class="save btn btn-primary float-end">
+            {% fa6_icon "check" 'fas' %} {% trans "Send" %}
         </button>
 
         <button type="reset" class="btn btn-danger">
-                {% fa5_icon "undo-alt" 'fas' %} {% trans "Reset Form" %}
+            {% fa6_icon "undo-alt" 'fas' %} {% trans "Reset Form" %}
         </button>
 
-            <a href="{% url 'submit:ak_detail' event_slug=event.slug pk=ak.pk %}" class="btn btn-secondary">
-                {% fa5_icon "times" 'fas' %} {% trans "Cancel" %}
+        <a href="{{ ak.detail_url }}" class="btn btn-secondary">
+            {% fa6_icon "times" 'fas' %} {% trans "Cancel" %}
         </a>
-        {% endbuttons %}
     </form>
 {% endblock %}

AKSubmission/templates/AKSubmission/akowner_create_update.html

 {% extends 'AKSubmission/submission_base.html' %}
 
 {% load i18n %}
-{% load bootstrap4 %}
-{% load fontawesome_5 %}
+{% load django_bootstrap5 %}
+{% load fontawesome_6 %}
 
 {% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "AK Owner" %}{% endblock %}
 
@@ -19,17 +19,15 @@
     {% endblock %}
     <form method="POST" class="post-form">{% csrf_token %}
         {% bootstrap_form form %}
-        {% buttons %}
-            <button type="submit" class="save btn btn-primary float-right">
-                {% fa5_icon "check" 'fas' %} {% trans "Continue" %}
+        <button type="submit" class="save btn btn-primary float-end">
+            {% fa6_icon "check" 'fas' %} {% trans "Continue" %}
         </button>
         <button type="reset" class="btn btn-danger">
-                {% fa5_icon "undo-alt" 'fas' %} {% trans "Reset Form" %}
+            {% fa6_icon "undo-alt" 'fas' %} {% trans "Reset Form" %}
         </button>
 
         <a href="{% url 'submit:submission_overview' event_slug=event.slug %}" class="btn btn-secondary">
-                {% fa5_icon "times" 'fas' %} {% trans "Cancel" %}
+            {% fa6_icon "times" 'fas' %} {% trans "Cancel" %}
         </a>
-        {% endbuttons %}
     </form>
 {% endblock %}
\ No newline at end of file

AKSubmission/templates/AKSubmission/akslot_add_update.html

 {% extends 'AKSubmission/submission_base.html' %}
 
 {% load i18n %}
-{% load bootstrap4 %}
-{% load fontawesome_5 %}
+{% load django_bootstrap5 %}
+{% load fontawesome_6 %}
 
 {% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "AK Duration(s)" %}{% endblock %}
 
@@ -11,7 +11,7 @@
     <li class="breadcrumb-item"><a
             href="{% url 'submit:submission_overview' event_slug=event.slug %}">{% trans "AK Submission" %}</a></li>
     <li class="breadcrumb-item"><a
-            href="{% url 'submit:ak_detail' event_slug=event.slug pk=ak.pk %}">{{ ak.short_name }}</a></li>
+            href="{{ ak.detail_url }}">{{ ak.short_name }}</a></li>
     <li class="breadcrumb-item active">{% trans "AK Duration(s)" %}</li>
 {% endblock %}
 
@@ -21,18 +21,16 @@
     {% endblock %}
     <form method="POST" class="post-form">{% csrf_token %}
     {% bootstrap_form form %}
-        {% buttons %}
-            <button type="submit" class="save btn btn-primary float-right">
-                {% fa5_icon "check" 'fas' %} {% trans "Continue" %}
+        <button type="submit" class="save btn btn-primary float-end">
+            {% fa6_icon "check" 'fas' %} {% trans "Continue" %}
         </button>
 
         <button type="reset" class="btn btn-danger">
-                {% fa5_icon "undo-alt" 'fas' %} {% trans "Reset Form" %}
+            {% fa6_icon "undo-alt" 'fas' %} {% trans "Reset Form" %}
         </button>
 
-            <a href="{% url 'submit:ak_detail' event_slug=event.slug pk=ak.pk %}" class="btn btn-secondary">
-                {% fa5_icon "times" 'fas' %} {% trans "Cancel" %}
+        <a href="{{ ak.detail_url }}" class="btn btn-secondary">
+            {% fa6_icon "times" 'fas' %} {% trans "Cancel" %}
         </a>
-        {% endbuttons %}
     </form>
 {% endblock %}

AKSubmission/templates/AKSubmission/akslot_delete.html

 {% extends 'AKSubmission/submission_base.html' %}
 
 {% load i18n %}
-{% load bootstrap4 %}
-{% load fontawesome_5 %}
+{% load django_bootstrap5 %}
+{% load fontawesome_6 %}
 
 {% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "AK Duration(s)" %}{% endblock %}
 
@@ -11,7 +11,7 @@
     <li class="breadcrumb-item"><a
             href="{% url 'submit:submission_overview' event_slug=event.slug %}">{% trans "AK Submission" %}</a></li>
     <li class="breadcrumb-item"><a
-            href="{% url 'submit:ak_detail' event_slug=event.slug pk=ak.pk %}">{{ ak.short_name }}</a></li>
+            href="{{ ak.detail_url }}">{{ ak.short_name }}</a></li>
     <li class="breadcrumb-item active">{% trans "AK Duration(s)" %}</li>
 {% endblock %}
 
@@ -37,14 +37,12 @@
             </tr>
             </tbody>
         </table>
-        {% buttons %}
-            <button type="submit" class="save btn btn-danger float-right" value="Confirm">
-                {% fa5_icon "check" 'fas' %} {% trans "Confirm" %}
+        <button type="submit" class="save btn btn-danger float-end" value="Confirm">
+            {% fa6_icon "check" 'fas' %} {% trans "Confirm" %}
         </button>
 
-            <a href="{% url 'submit:ak_detail' event_slug=event.slug pk=ak.pk %}" class="btn btn-secondary">
-                {% fa5_icon "times" 'fas' %} {% trans "Cancel" %}
+        <a href="{{ ak.detail_url }}" class="btn btn-secondary">
+            {% fa6_icon "times" 'fas' %} {% trans "Cancel" %}
         </a>
-        {% endbuttons %}
     </form>
 {% endblock %}

AKSubmission/templates/AKSubmission/category_linked_badge.html

 <a href="{% url 'submit:ak_list_by_category' event_slug=event_slug category_pk=category.pk %}">
-    <span class="badge badge-primary">{{ category }}</span>
+    <span class="badge bg-primary">{{ category }}</span>
 </a>

AKSubmission/templates/AKSubmission/submission_base.html

 {% extends "base.html" %}
 
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
 {% load i18n %}
 
 {% block breadcrumbs %}
@@ -10,7 +10,7 @@
 {% block footer_custom %}
     {% if event.contact_email %}
         <h4>
-            <a href="mailto:{{ event.contact_email }}">{% fa5_icon "envelope" 'fas' %} {% trans "Write to organizers of this event for questions and comments" %}</a>
+            <a href="mailto:{{ event.contact_email }}">{% fa6_icon "envelope" 'fas' %} {% trans "Write to organizers of this event for questions and comments" %}</a>
         </h4>
     {% endif %}
 {% endblock %}

AKSubmission/templates/AKSubmission/submission_not_configured.html

 {% extends 'AKSubmission/submission_base.html' %}
 
 {% load i18n %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
 {% load static %}
 
 {% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "AK Submission" %}{% endblock %}

AKSubmission/templates/AKSubmission/submission_overview.html

 {% extends 'AKSubmission/submission_base.html' %}
 
 {% load i18n %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
 {% load static %}
 
 {% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "AK Submission" %}{% endblock %}
@@ -26,12 +26,13 @@
         .select2-selection {
           height: 34px !important;
         }
+
+        .select2-container {
+            width: 300px!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 %}
+    {% include "AKSubmission/ak_interest_script.html" %}
 {% endblock %}
 
 {% block breadcrumbs %}
@@ -47,7 +48,8 @@
     {% blocktrans %}On this page you can see a list of current AKs, change them and add new ones.{% endblocktrans %}
 
     {% if event.active %}
-        <div class="jumbotron" style="margin-top:20px;">
+        <div class="card bg-secondary mt-4 mb-4">
+            <div class="card-body">
                 <form method="POST" action="#" class="form-row">
                     {% csrf_token %}
                     <a href="{% url 'submit:submit_ak_wish' event_slug=event.slug %}" class="btn btn-info">
@@ -77,6 +79,7 @@
                     />
                 </form>
             </div>
+        </div>
     {% else %}
         <div class="alert alert-warning" style="margin-top:20px;margin-bottom: 20px;">
             {% trans "This event is not active. You cannot add or change AKs" %}

AKSubmission/templates/AKSubmission/submit_new.html

 {% extends 'AKSubmission/submission_base.html' %}
 
 {% load i18n %}
-{% load bootstrap4 %}
-{% load fontawesome_5 %}
+{% load django_bootstrap5 %}
+{% load fontawesome_6 %}
 {% load static %}
+{% load tz %}
 
 {% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "New AK" %}{% endblock %}
 
 {% block imports %}
-    <link rel="stylesheet" href="{% static 'common/vendor/chosen-js/chosen.css' %}">
-    <link rel="stylesheet" href="{% static 'common/css/bootstrap-chosen.css' %}">
-    <link href='{% static 'AKSubmission/vendor/fullcalendar3/fullcalendar.min.css' %}' rel='stylesheet'/>
-    <link href='{% static 'AKSubmission/css/availabilities.css' %}' rel='stylesheet'/>
-
-    <script src="{% static "AKSubmission/vendor/moment/moment-with-locales.js" %}"></script>
-    <script src="{% static "AKSubmission/vendor/moment-timezone/moment-timezone-with-data-10-year-range.js" %}"></script>
-    <script src='{% static 'AKSubmission/vendor/fullcalendar3/fullcalendar.min.js' %}'></script>
-    <script src="{% static "common/js/availabilities.js" %}"></script>
+    {% include "AKModel/load_fullcalendar_availabilities.html" %}
+
+    <script>
+        {% get_current_language as LANGUAGE_CODE %}
+
+        document.addEventListener('DOMContentLoaded', function () {
+            createAvailabilityEditors(
+                '{{ event.timezone }}',
+                '{{ LANGUAGE_CODE }}',
+                '{{ event.start | timezone:event.timezone | date:"Y-m-d H:i:s" }}',
+                '{{ event.end | timezone:event.timezone | date:"Y-m-d H:i:s" }}'
+            );
+        });
+    </script>
+
+
+    <style>
+        #id_description_helptext::after {
+            content: " ({% trans "This is used for presentation slides among other things, and will be truncated to 200 characters for that purpose." %})";
+            color: #6c757d;
+        }
+    </style>
 {% endblock %}
 
 {% block breadcrumbs %}
@@ -34,22 +48,51 @@
     {% block headline %}
         <h2>{% trans 'New AK' %}</h2>
     {% endblock %}
-    <form method="POST" class="post-form">{% csrf_token %}
-        {% bootstrap_form form %}
-        {% buttons %}
-            <button type="submit" class="save btn btn-primary float-right">
-                {% fa5_icon "check" 'fas' %} {% trans "Submit" %}
+    <div id="app">
+        <form method="POST" class="post-form" id="formAK" @submit.prevent="handleSubmit">{% csrf_token %}
+            {% block form_contents %}
+                {#  Generate form, but make sure availabilities are always at the bottom #}
+                {% bootstrap_form form exclude='availabilities' %}
+                {% bootstrap_field form.availabilities form_group_class="" %}
+            {% endblock %}
+            <button type="submit" class="save btn btn-primary float-end">
+                {% fa6_icon "check" 'fas' %} {% trans "Submit" %}
             </button>
 
             <button type="reset" class="btn btn-danger">
-                {% fa5_icon "undo-alt" 'fas' %} {% trans "Reset Form" %}
+                {% fa6_icon "undo-alt" 'fas' %} {% trans "Reset Form" %}
             </button>
 
             <a href="{% url 'submit:submission_overview' event_slug=event.slug %}" class="btn btn-secondary">
-                {% fa5_icon "times" 'fas' %} {% trans "Cancel" %}
+                {% fa6_icon "times" 'fas' %} {% trans "Cancel" %}
             </a>
-        {% endbuttons %}
         </form>
+
+        {# Modal for confirmation #}
+        <div class="modal fade" id="akWarningModal" tabindex="-1" aria-labelledby="akWarningModalLabel"
+             aria-hidden="true">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h5 class="modal-title" id="akWarningModalLabel">{% trans "Continue with that name?" %}</h5>
+                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Schließen"></button>
+                    </div>
+                    <div class="modal-body">
+                        {% blocktrans %}Your AK name (or short name) starts with or contains the word "AK".<br><br>This
+                            is not recommended, as it makes the names longer, and may create an inconsistent style. The
+                            tool will ensure that one always know that a title belongs to an AK even without that
+                            prefix.<br><br>Do you still want to use that name?{% endblocktrans %}
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-primary"
+                                data-bs-dismiss="modal">{% trans "Change name" %}</button>
+                        <button type="button" class="btn btn-warning"
+                                @click="proceedSubmit">{% trans "Proceed with saving" %}</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
 {% endblock %}
 
 {% block bottom_script %}

AKSubmission/templates/AKSubmission/submit_new_wish.html

@@ -6,17 +6,6 @@
 
 {% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "New AK Wish" %}{% endblock %}
 
-{% block imports %}
-    <link rel="stylesheet" href="{% static 'common/vendor/chosen-js/chosen.css' %}">
-    <link rel="stylesheet" href="{% static 'common/css/bootstrap-chosen.css' %}">
-    <link href='{% static 'AKSubmission/vendor/fullcalendar3/fullcalendar.min.css' %}' rel='stylesheet'/>
-    <link href='{% static 'AKSubmission/css/availabilities.css' %}' rel='stylesheet'/>
-
-    <script src="{% static "AKSubmission/vendor/moment/moment-with-locales.js" %}"></script>
-    <script src="{% static "AKSubmission/vendor/moment-timezone/moment-timezone-with-data-10-year-range.js" %}"></script>
-    <script src='{% static 'AKSubmission/vendor/fullcalendar3/fullcalendar.min.js' %}'></script>
-    <script src="{% static "common/js/availabilities.js" %}"></script>
-{% endblock %}
 
 {% block breadcrumbs %}
     {% include "AKSubmission/submission_breadcrumbs.html" %}

AKSubmission/templates/AKSubmission/tags_list.html

-{% for tag in tags.all %}
-    <a href="{% url 'submit:ak_list_by_tag' event_slug=event_slug tag_pk=tag.pk %}"><span class="badge badge-info">{{ tag }}</span></a>
-{% endfor %}

AKSubmission/templates/AKSubmission/tracks_list.html

 {% for track in tracks.all %}
     <a href="{% url 'submit:ak_list_by_track' event_slug=event_slug track_pk=track.pk %}"><span
-            class="badge badge-info">{{ track }}</span></a>
+            class="badge bg-info">{{ track }}</span></a>
 {% endfor %}

AKSubmission/templates/AKSubmission/type_linked_badge.html

+<a href="{% url 'submit:ak_list_by_type' event_slug=event_slug type_slug=type.slug %}">
+    <span class="badge bg-info">{{ type }}</span>
+</a>

AKSubmission/templatetags/tags_AKSubmission.py

 from django import template
-from fontawesome_5.templatetags.fontawesome_5 import fa5_icon
+from fontawesome_6.templatetags.fontawesome_6 import fa6_icon
 
 register = template.Library()
 
 
 @register.filter
 def bool_symbol(bool_val):
+    """
+    Show a nice icon instead of the string true/false
+    :param bool_val: boolean value to iconify
+    :return: check or times icon depending on the value
+    """
     if bool_val:
-        return fa5_icon("check", "fas")
-    return fa5_icon("times", "fas")
-
-
-@register.inclusion_tag("AKSubmission/tags_list.html")
-def tag_list(tags, event_slug):
-    return {"tags": tags, "event_slug": event_slug}
+        return fa6_icon("check", "fas")
+    return fa6_icon("times", "fas")
 
 
 @register.inclusion_tag("AKSubmission/tracks_list.html")
 def track_list(tracks, event_slug):
+    """
+    Generate a clickable list of tracks (one badge per track) based upon the tracks_list template
+
+    :param tracks: tracks to consider
+    :param event_slug: slug of this event, required for link creation
+    :return: html fragment containing track links
+    """
     return {"tracks": tracks, "event_slug": event_slug}
 
 
 @register.inclusion_tag("AKSubmission/category_list.html")
 def category_list(categories, event_slug):
+    """
+    Generate a clickable list of categories (one badge per category) based upon the category_list template
+
+    :param categories: categories to consider
+    :param event_slug: slug of this event, required for link creation
+    :return: html fragment containing category links
+    """
     return {"categories": categories, "event_slug": event_slug}
 
 
 @register.inclusion_tag("AKSubmission/category_linked_badge.html")
 def category_linked_badge(category, event_slug):
+    """
+    Generate a clickable category badge based upon the category_linked_badge template
+    :param category: category to show/link
+    :param event_slug: slug of this event, required for link creation
+    :return: html fragment containing badge
+    """
     return {"category": category, "event_slug": event_slug}
+
+
+@register.inclusion_tag("AKSubmission/type_linked_badge.html")
+def type_linked_badge(ak_type, event_slug):
+    """
+    Generate a clickable type badge based upon the type_linked_badge template
+    :param ak_type: type to show/link
+    :param event_slug: slug of this event, required for link creation
+    :return: html fragment containing badge
+    """
+    return {"type": ak_type, "event_slug": event_slug}

AKSubmission/tests.py

-# Create your tests here.
+from datetime import datetime, timedelta
+
+from django.test import TestCase
+from django.urls import reverse_lazy
+
+from AKModel.models import AK, AKSlot, Event
+from AKModel.tests.test_views import BasicViewTests
+from AKSubmission.forms import AKSubmissionForm
+
+
+class ModelViewTests(BasicViewTests, TestCase):
+    """
+    Testcases for AKSubmission app.
+
+    This extends :class:`BasicViewTests` for standard view and edit testcases
+    that are specified in this class as VIEWS and EDIT_TESTCASES.
+
+    Additionally several additional testcases, in particular to test the API
+    and the dispatching for owner selection and editing are specified.
+    """
+    fixtures = ['model.json']
+
+    VIEWS = [
+        ('submission_overview', {'event_slug': 'kif42'}),
+        ('ak_detail', {'event_slug': 'kif42', 'pk': 1}),
+        ('ak_history', {'event_slug': 'kif42', 'pk': 1}),
+        ('ak_edit', {'event_slug': 'kif42', 'pk': 1}),
+        ('akslot_add', {'event_slug': 'kif42', 'pk': 1}),
+        ('akmessage_add', {'event_slug': 'kif42', 'pk': 1}),
+        ('akslot_edit', {'event_slug': 'kif42', 'pk': 5}),
+        ('akslot_delete', {'event_slug': 'kif42', 'pk': 5}),
+        ('ak_list', {'event_slug': 'kif42'}),
+        ('ak_list_by_category', {'event_slug': 'kif42', 'category_pk': 4}),
+        ('ak_list_by_track', {'event_slug': 'kif42', 'track_pk': 1}),
+        ('akowner_create', {'event_slug': 'kif42'}),
+        ('akowner_edit', {'event_slug': 'kif42', 'slug': 'a'}),
+        ('submit_ak', {'event_slug': 'kif42', 'owner_slug': 'a'}),
+        ('submit_ak_wish', {'event_slug': 'kif42'}),
+        ('error_not_configured', {'event_slug': 'kif42'}),
+    ]
+
+    APP_NAME = 'submit'
+
+    EDIT_TESTCASES = [
+        {'view': 'ak_edit', 'target_view': 'ak_detail', 'kwargs': {'event_slug': 'kif42', 'pk': 1},
+         'expected_message': "AK successfully updated"},
+        {'view': 'akslot_edit', 'target_view': 'ak_detail', 'kwargs': {'event_slug': 'kif42', 'pk': 5},
+         'target_kwargs': {'event_slug': 'kif42', 'pk': 1}, 'expected_message': "AK Slot successfully updated"},
+        {'view': 'akowner_edit', 'target_view': 'submission_overview', 'kwargs': {'event_slug': 'kif42', 'slug': 'a'},
+         'target_kwargs': {'event_slug': 'kif42'}, 'expected_message': "Person Info successfully updated"},
+    ]
+
+    def test_akslot_edit_delete_prevention(self):
+        """
+        Slots planned already may not be modified or deleted in front end
+        """
+        self.client.logout()
+
+        _, url = self._name_and_url(('akslot_edit', {'event_slug': 'kif42', 'pk': 1}))
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 302,
+                         msg=f"AK Slot editing ({url}) possible even though slot was already scheduled")
+        self._assert_message(response, "You cannot edit a slot that has already been scheduled")
+
+        _, url = self._name_and_url(('akslot_delete', {'event_slug': 'kif42', 'pk': 1}))
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 302,
+                         msg=f"AK Slot deletion ({url}) possible even though slot was already scheduled")
+        self._assert_message(response, "You cannot delete a slot that has already been scheduled")
+
+    def test_slot_creation_deletion(self):
+        """
+        Test creation and deletion of slots in frontend
+        """
+        ak_args = {'event_slug': 'kif42', 'pk': 1}
+        redirect_url = reverse_lazy(f"{self.APP_NAME}:ak_detail", kwargs=ak_args)
+
+        # Create a valid slot -> Redirect to AK detail page, message to user
+        count_slots = AK.objects.get(pk=1).akslot_set.count()
+        create_url = reverse_lazy(f"{self.APP_NAME}:akslot_add", kwargs=ak_args)
+        response = self.client.post(create_url, {'ak': 1, 'event': 2, 'duration': 1.5})
+        self.assertRedirects(response, redirect_url, status_code=302, target_status_code=200,
+                             msg_prefix="Did not correctly trigger redirect")
+        self.assertEqual(AK.objects.get(pk=1).akslot_set.count(), count_slots + 1,
+                         msg="New slot was not correctly saved")
+
+        # Get primary key of newly created Slot
+        slot_pk = AK.objects.get(pk=1).akslot_set.order_by('pk').last().pk
+
+        # Edit the recently created slot: Make sure view is accessible, post change
+        # -> redirect to detail page, duration updated
+        edit_url = reverse_lazy(f"{self.APP_NAME}:akslot_edit", kwargs={'event_slug': 'kif42', 'pk': slot_pk})
+        response = self.client.get(edit_url)
+        self.assertEqual(response.status_code, 200, msg=f"Cant open edit view for newly created slot ({edit_url})")
+        response = self.client.post(edit_url, {'ak': 1, 'event': 2, 'duration': 2})
+        self.assertRedirects(response, redirect_url, status_code=302, target_status_code=200,
+                             msg_prefix="Did not correctly trigger redirect")
+        self.assertEqual(AKSlot.objects.get(pk=slot_pk).duration, 2,
+                         msg="Slot was not correctly changed")
+
+        # Delete recently created slot: Make sure view is accessible, post deletion
+        # -> redirect to detail page, slot deleted, message to user
+        deletion_url = reverse_lazy(f"{self.APP_NAME}:akslot_delete", kwargs={'event_slug': 'kif42', 'pk': slot_pk})
+        response = self.client.get(deletion_url)
+        self.assertEqual(response.status_code, 200,
+                         msg="Cant open deletion view for newly created slot ({deletion_url})")
+        response = self.client.post(deletion_url, {})
+        self.assertRedirects(response, redirect_url, status_code=302, target_status_code=200,
+                             msg_prefix="Did not correctly trigger redirect")
+        self.assertFalse(AKSlot.objects.filter(pk=slot_pk).exists(), msg="Slot was not correctly deleted")
+        self.assertEqual(AK.objects.get(pk=1).akslot_set.count(), count_slots, msg="AK still has to many slots")
+
+    def test_ak_owner_editing(self):
+        """
+        Test dispatch of user editing requests
+        """
+        edit_url = reverse_lazy(f"{self.APP_NAME}:akowner_edit_dispatch", kwargs={'event_slug': 'kif42'})
+
+        base_url = reverse_lazy(f"{self.APP_NAME}:submission_overview", kwargs={'event_slug': 'kif42'})
+
+        # Empty form/no user selected -> start page
+        response = self.client.post(edit_url, {'owner_id': -1})
+        self.assertRedirects(response, base_url, status_code=302, target_status_code=200,
+                             msg_prefix="Did not redirect to start page even though no user was selected")
+        self._assert_message(response, "No user selected")
+
+        # Correct selection -> user edit page for that user
+        edit_redirect_url = reverse_lazy(f"{self.APP_NAME}:akowner_edit", kwargs={'event_slug': 'kif42', 'slug': 'a'})
+        response = self.client.post(edit_url, {'owner_id': 1})
+        self.assertRedirects(response, edit_redirect_url, status_code=302, target_status_code=200,
+                             msg_prefix=f"Dispatch redirect failed (should go to {edit_redirect_url})")
+
+    def test_ak_owner_selection(self):
+        """
+        Test dispatch of owner selection requests
+        """
+        select_url = reverse_lazy(f"{self.APP_NAME}:akowner_select", kwargs={'event_slug': 'kif42'})
+        create_url = reverse_lazy(f"{self.APP_NAME}:akowner_create", kwargs={'event_slug': 'kif42'})
+
+        # Empty user selection -> create a new user view
+        response = self.client.post(select_url, {'owner_id': -1})
+        self.assertRedirects(response, create_url, status_code=302, target_status_code=200,
+                             msg_prefix="Did not redirect to user create view even though no user was specified")
+
+        # Valid user selected -> redirect to view that allows to add a new AK with this user as owner
+        add_redirect_url = reverse_lazy(f"{self.APP_NAME}:submit_ak", kwargs={'event_slug': 'kif42', 'owner_slug': 'a'})
+        response = self.client.post(select_url, {'owner_id': 1})
+        self.assertRedirects(response, add_redirect_url, status_code=302, target_status_code=200,
+                             msg_prefix=f"Dispatch redirect to ak submission page failed "
+                                        f"(should go to {add_redirect_url})")
+
+    def test_orga_message_submission(self):
+        """
+        Test submission and storing of direct confident messages to organizers
+        """
+        form_url = reverse_lazy(f"{self.APP_NAME}:akmessage_add", kwargs={'event_slug': 'kif42', 'pk': 1})
+        detail_url = reverse_lazy(f"{self.APP_NAME}:ak_detail", kwargs={'event_slug': 'kif42', 'pk': 1})
+
+        count_messages = AK.objects.get(pk=1).akorgamessage_set.count()
+
+        # Test that submission view is accessible
+        response = self.client.get(form_url)
+        self.assertEqual(response.status_code, 200, msg="Could not load message form view")
+
+        # Test submission itself and the following redirect -> AK detail page
+        response = self.client.post(form_url, {'ak': 1, 'event': 2, 'text': 'Test message text'})
+        self.assertRedirects(response, detail_url, status_code=302, target_status_code=200,
+                             msg_prefix=f"Did not trigger redirect to ak detail page ({detail_url})")
+
+        # Make sure message was correctly saved in database and user is notified about that
+        self._assert_message(response, "Message to organizers successfully saved")
+        self.assertEqual(AK.objects.get(pk=1).akorgamessage_set.count(), count_messages + 1,
+                         msg="Message was not correctly saved")
+
+    def test_interest_api(self):
+        """
+        Test interest indicating API (access, functionality)
+        """
+        interest_api_url = "/kif42/api/ak/1/indicate-interest/"
+
+        ak = AK.objects.get(pk=1)
+        event = Event.objects.get(slug='kif42')
+        ak_interest_counter = ak.interest_counter
+
+        # Check Access method (only POST)
+        response = self.client.get(interest_api_url)
+        self.assertEqual(response.status_code, 405, "Should not be accessible via GET")
+
+        event.interest_start = datetime.now().astimezone(event.timezone) + timedelta(minutes=-10)
+        event.interest_end = datetime.now().astimezone(event.timezone) + timedelta(minutes=+10)
+        event.save()
+
+        # Test correct indication -> HTTP 200, counter increased
+        response = self.client.post(interest_api_url)
+        self.assertEqual(response.status_code, 200, f"API end point not working ({interest_api_url})")
+        self.assertEqual(AK.objects.get(pk=1).interest_counter, ak_interest_counter + 1, "Counter was not increased")
+
+        event.interest_end = datetime.now().astimezone(event.timezone) + timedelta(minutes=-2)
+        event.save()
+
+        # Test indication outside of indication window -> HTTP 403, counter not increased
+        response = self.client.post(interest_api_url)
+        self.assertEqual(response.status_code, 403,
+                         "API end point still reachable even though interest indication window ended "
+                         "({interest_api_url})")
+        self.assertEqual(AK.objects.get(pk=1).interest_counter, ak_interest_counter + 1,
+                         "Counter was increased even though interest indication window ended")
+
+        # Test call for non-existing AK -> HTTP 403
+        invalid_interest_api_url = "/kif42/api/ak/-1/indicate-interest/"
+        response = self.client.post(invalid_interest_api_url)
+        self.assertEqual(response.status_code, 404, f"Invalid URL reachable ({interest_api_url})")
+
+    def test_adding_of_unknown_user(self):
+        """
+        Test adding of a previously not existing owner to an AK
+        """
+        # Pre-Check: AK detail page existing?
+        detail_url = reverse_lazy(f"{self.APP_NAME}:ak_detail", kwargs={'event_slug': 'kif42', 'pk': 1})
+        response = self.client.get(detail_url)
+        self.assertEqual(response.status_code, 200, msg="Could not load ak detail view")
+
+        # Make sure AK detail page contains a link to add a new owner
+        edit_url = reverse_lazy(f"{self.APP_NAME}:ak_edit", kwargs={'event_slug': 'kif42', 'pk': 1})
+        response = self.client.get(edit_url)
+        self.assertEqual(response.status_code, 200, msg="Could not load ak detail view")
+        self.assertContains(response, "Add person not in the list yet",
+                            msg_prefix="Link to add unknown user not contained")
+
+        # Check adding of a new owner by posting an according request
+        # -> Redirect to AK detail page, message to user, owners list updated
+        self.assertEqual(AK.objects.get(pk=1).owners.count(), 1)
+        add_new_user_to_ak_url = reverse_lazy(f"{self.APP_NAME}:akowner_create", kwargs={'event_slug': 'kif42'}) \
+                                 + "?add_to_existing_ak=1"
+        response = self.client.post(add_new_user_to_ak_url,
+                                    {'name': 'New test owner', 'event': Event.get_by_slug('kif42').pk})
+        self.assertRedirects(response, detail_url,
+                             msg_prefix=f"No correct redirect: {add_new_user_to_ak_url} (POST) -> {detail_url}")
+        self._assert_message(response, "Added 'New test owner' as new owner of 'Test AK Inhalt'")
+        self.assertEqual(AK.objects.get(pk=1).owners.count(), 2)
+
+    def test_visibility_requirements_in_submission_form(self):
+        """
+        Test visibility of requirements field in submission form
+        """
+        event = Event.get_by_slug('kif42')
+        form = AKSubmissionForm(data={'name': 'Test AK', 'event': event}, instance=None, initial={"event": event})
+        self.assertIn('requirements', form.fields,
+                      msg="Requirements field not present in form even though event has requirements")
+
+        event2 = Event.objects.create(name='Event without requirements',
+                                      slug='no_req',
+                                      start=datetime.now().astimezone(event.timezone),
+                                      end=datetime.now().astimezone(event.timezone),
+                                      active=True)
+        form2 = AKSubmissionForm(data={'name': 'Test AK', 'event': event2}, instance=None, initial={"event": event2})
+        self.assertNotIn('requirements', form2.fields,
+                         msg="Requirements field should not be present for events without requirements")
+
+    def test_visibility_types_in_submission_form(self):
+        """
+        Test visibility of types field in submission form
+        """
+        event = Event.get_by_slug('kif42')
+        form = AKSubmissionForm(data={'name': 'Test AK', 'event': event}, instance=None, initial={"event": event})
+        self.assertIn('types', form.fields,
+                      msg="Requirements field not present in form even though event has requirements")
+
+        event2 = Event.objects.create(name='Event without types',
+                                      slug='no_types',
+                                      start=datetime.now().astimezone(event.timezone),
+                                      end=datetime.now().astimezone(event.timezone),
+                                      active=True)
+        form2 = AKSubmissionForm(data={'name': 'Test AK', 'event': event2}, instance=None, initial={"event": event2})
+        self.assertNotIn('types', form2.fields,
+                         msg="Requirements field should not be present for events without types")