AKSubmission/templates/AKSubmission/ak_interest_script.html

 {% load i18n %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
 
 <script>
     document.addEventListener('DOMContentLoaded', function () {
@@ -42,7 +42,7 @@
                     data: {
                     },
                     success: function (response) {
-                       btn.html('{% fa5_icon 'check' 'fas' %}');
+                       btn.html('{% fa6_icon 'check' 'fas' %}');
                        btn.off('click');
                     },
                     error: function (response) {

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,13 +13,6 @@
 {% 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 %}
 
@@ -32,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,45 +19,51 @@
     {% 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>
+                       class="btn btn-success">{% fa6_icon 'pencil-alt' 'fas' %}</a>
                     {% if interest_indication_active %}
-                        <span data-ak_id="{{ ak.pk }}" data-toggle="tooltip"
+                        <span data-ak_id="{{ ak.pk }}" data-bs-toggle="tooltip"
                            title="{% trans 'Show Interest' %}"
-                           class="btn btn-primary btn-interest" style="cursor: pointer">{% fa5_icon 'thumbs-up' 'fas' %}</span>
+                           class="btn btn-primary btn-interest" style="cursor: pointer">{% fa6_icon 'thumbs-up' 'fas' %}</span>
                     {% endif %}
                 {% endif %}
             </td>

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>
+        <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" %}
-            </button>
+        <button type="reset" class="btn btn-danger">
+            {% 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>
-        {% endbuttons %}
+        <a href="{{ ak.detail_url }}" class="btn btn-secondary">
+            {% fa6_icon "times" 'fas' %} {% trans "Cancel" %}
+        </a>
     </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>
-            <button type="reset" class="btn btn-danger">
-                {% fa5_icon "undo-alt" 'fas' %} {% trans "Reset Form" %}
-            </button>
+        <button type="submit" class="save btn btn-primary float-end">
+            {% fa6_icon "check" 'fas' %} {% trans "Continue" %}
+        </button>
+        <button type="reset" class="btn btn-danger">
+            {% 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" %}
-            </a>
-        {% endbuttons %}
+        <a href="{% url 'submit:submission_overview' event_slug=event.slug %}" class="btn btn-secondary">
+            {% fa6_icon "times" 'fas' %} {% trans "Cancel" %}
+        </a>
     </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 %}
 
@@ -20,19 +20,17 @@
         <h2>{% trans 'AK Duration(s)' %}</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 "Continue" %}
-            </button>
+    {% bootstrap_form form %}
+        <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" %}
-            </button>
+        <button type="reset" class="btn btn-danger">
+            {% 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>
-        {% endbuttons %}
+        <a href="{{ ak.detail_url }}" class="btn btn-secondary">
+            {% fa6_icon "times" 'fas' %} {% trans "Cancel" %}
+        </a>
     </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>
+        <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>
-        {% endbuttons %}
+        <a href="{{ ak.detail_url }}" class="btn btn-secondary">
+            {% fa6_icon "times" 'fas' %} {% trans "Cancel" %}
+        </a>
     </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,14 +26,13 @@
         .select2-selection {
           height: 34px !important;
         }
+
+        .select2-container {
+            width: 300px!important;
+        }
     </style>
 
     {% include "AKSubmission/ak_interest_script.html" %}
-
-    {% 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 %}
@@ -49,35 +48,37 @@
     {% 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;">
-            <form method="POST" action="#" class="form-row">
-                {% csrf_token %}
-                <a href="{% url 'submit:submit_ak_wish' event_slug=event.slug %}" class="btn btn-info">
-                    {% trans "New AK Wish" %}
-                </a>
-                <span style="font-size: 1.5em">
-	                    &nbsp;&nbsp; | &nbsp;
-	                    <label for="selectOwnerId" class="align-middle d-inline">{% trans "Who" %}:</label>
-	                </span>&nbsp;&nbsp;
-                <select name="owner_id" id="selectOwnerId" class="">
-                    <option value="-1">{% trans "I do not own AKs yet" %}</option>
-                    {% for owner in existingOwners %}
-                        <option value="{{ owner.pk }}">{{ owner }}</option>
-                    {% endfor %}
-                </select> &nbsp;&nbsp;
-                <input
-                        type="submit"
-                        class="btn btn-primary"
-                        value="{% trans "New AK" %}"
-                        formaction="{% url 'submit:akowner_select' event_slug=event.slug %}"
-                />&nbsp;&nbsp;
-                <input
-                        type="submit"
-                        class="btn btn-success"
-                        value="{% trans 'Edit Person Info' %}"
-                        formaction="{% url 'submit:akowner_edit_dispatch' event_slug=event.slug %}"
-                />
-            </form>
+        <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">
+                        {% trans "New AK Wish" %}
+                    </a>
+                    <span style="font-size: 1.5em">
+                            &nbsp;&nbsp; | &nbsp;
+                            <label for="selectOwnerId" class="align-middle d-inline">{% trans "Who" %}:</label>
+                        </span>&nbsp;&nbsp;
+                    <select name="owner_id" id="selectOwnerId" class="">
+                        <option value="-1">{% trans "I do not own AKs yet" %}</option>
+                        {% for owner in existingOwners %}
+                            <option value="{{ owner.pk }}">{{ owner }}</option>
+                        {% endfor %}
+                    </select> &nbsp;&nbsp;
+                    <input
+                            type="submit"
+                            class="btn btn-primary"
+                            value="{% trans "New AK" %}"
+                            formaction="{% url 'submit:akowner_select' event_slug=event.slug %}"
+                    />&nbsp;&nbsp;
+                    <input
+                            type="submit"
+                            class="btn btn-success"
+                            value="{% trans 'Edit Person Info' %}"
+                            formaction="{% url 'submit:akowner_edit_dispatch' event_slug=event.slug %}"
+                    />
+                </form>
+            </div>
         </div>
     {% else %}
         <div class="alert alert-warning" style="margin-top:20px;margin-bottom: 20px;">

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_present_helptext::after {
+            content: " ({% trans "only relevant for KIF-AKs - determines whether the AK appears in the slides for the closing plenary session" %})";
+            color: #6c757d;
+        }
+    </style>
 {% endblock %}
 
 {% block breadcrumbs %}
@@ -34,22 +48,49 @@
     {% 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 %}
+                {% bootstrap_form form %}
+            {% 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>
+        </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" %}
@@ -27,4 +16,4 @@
 
 {% block headline %}
     <h2>{% trans 'New AK Wish' %}</h2>
-{% endblock %}
+{% endblock %}
\ No newline at end of file

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}