Skip to content
Snippets Groups Projects
Commit c85b92a9 authored by Benjamin Hättasch's avatar Benjamin Hättasch
Browse files

Fix and improve breadcrumbs for submission

Use including of breadcrumbs instead of super calls
Improve URL scheme for three submission views
parent 69cc510c
Branches
No related tags found
No related merge requests found
Showing with 13 additions and 14 deletions
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
{% block title %}{% trans "AKs" %}: {{ ak.event.name }} - {% trans "AK" %}: {{ ak.name }}{% endblock %} {% block title %}{% trans "AKs" %}: {{ ak.event.name }} - {% trans "AK" %}: {{ ak.name }}{% endblock %}
{% block breadcrumbs %} {% block breadcrumbs %}
{{ block.super}} {% include "AKSubmission/breadcrumbs_submission.html" %}
<li class="breadcrumb-item"><a href="{% url 'submit:submission_overview' event_slug=ak.event.slug %}">{% trans "AK Submission" %}</a></li> <li class="breadcrumb-item"><a href="{% url 'submit:submission_overview' event_slug=ak.event.slug %}">{% trans "AK Submission" %}</a></li>
<li class="breadcrumb-item active">{{ ak.name }}</li> <li class="breadcrumb-item active">{{ ak.name }}</li>
{% endblock %} {% endblock %}
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
{% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "Edit AK" %}: {{ ak.name }}{% endblock %} {% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "Edit AK" %}: {{ ak.name }}{% endblock %}
{% block breadcrumbs %} {% block breadcrumbs %}
{{ block.super}} {% include "AKSubmission/breadcrumbs_submission.html" %}
<li class="breadcrumb-item"><a <li class="breadcrumb-item"><a
href="{% url 'submit:submission_overview' event_slug=event.slug %}">{% trans "AK Submission" %}</a></li> 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> <li class="breadcrumb-item"><a href="{% url 'submit:ak_detail' event_slug=event.slug pk=ak.pk %}">{{ ak.short_name }}</a></li>
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
{% endblock %} {% endblock %}
{% block breadcrumbs %} {% block breadcrumbs %}
{{ block.super}} {% include "AKSubmission/breadcrumbs_submission.html" %}
<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:submission_overview' event_slug=event.slug %}">{% trans "AK Submission" %}</a></li>
<li class="breadcrumb-item active">{% trans "AKs" %}</li> <li class="breadcrumb-item active">{% trans "AKs" %}</li>
{% endblock %} {% endblock %}
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
{% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "AK Owner" %}{% endblock %} {% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "AK Owner" %}{% endblock %}
{% block breadcrumbs %} {% block breadcrumbs %}
{{ block.super}} {% include "AKSubmission/breadcrumbs_submission.html" %}
<li class="breadcrumb-item"><a <li class="breadcrumb-item"><a
href="{% url 'submit:submission_overview' event_slug=event.slug %}">{% trans "AK Submission" %}</a></li> href="{% url 'submit:submission_overview' event_slug=event.slug %}">{% trans "AK Submission" %}</a></li>
<li class="breadcrumb-item active">{% trans "AK Owner" %}</li> <li class="breadcrumb-item active">{% trans "AK Owner" %}</li>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
{% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "AK Duration(s)" %}{% endblock %} {% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "AK Duration(s)" %}{% endblock %}
{% block breadcrumbs %} {% block breadcrumbs %}
{{ block.super}} {% include "AKSubmission/breadcrumbs_submission.html" %}
<li class="breadcrumb-item"><a <li class="breadcrumb-item"><a
href="{% url 'submit:submission_overview' event_slug=event.slug %}">{% trans "AK Submission" %}</a></li> 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> <li class="breadcrumb-item"><a href="{% url 'submit:ak_detail' event_slug=event.slug pk=ak.pk %}">{{ ak.short_name }}</a></li>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
{% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "AK Duration(s)" %}{% endblock %} {% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "AK Duration(s)" %}{% endblock %}
{% block breadcrumbs %} {% block breadcrumbs %}
{{ block.super}} {% include "AKSubmission/breadcrumbs_submission.html" %}
<li class="breadcrumb-item"><a <li class="breadcrumb-item"><a
href="{% url 'submit:submission_overview' event_slug=event.slug %}">{% trans "AK Submission" %}</a></li> 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> <li class="breadcrumb-item"><a href="{% url 'submit:ak_detail' event_slug=event.slug pk=ak.pk %}">{{ ak.short_name }}</a></li>
......
...@@ -4,8 +4,7 @@ ...@@ -4,8 +4,7 @@
{% load i18n %} {% load i18n %}
{% block breadcrumbs %} {% block breadcrumbs %}
<li class="breadcrumb-item">AKPlanning</li> {% include "AKSubmission/breadcrumbs_submission.html" %}
<li class="breadcrumb-item"><a href="{% url 'dashboard:dashboard' %}">{{ event.slug }}</a></li>
{% endblock %} {% endblock %}
{% block footer_custom %} {% block footer_custom %}
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
{% endblock %} {% endblock %}
{% block breadcrumbs %} {% block breadcrumbs %}
{{ block.super }} {% include "AKSubmission/breadcrumbs_submission.html" %}
<li class="breadcrumb-item active">{% trans "AK Submission" %}</li> <li class="breadcrumb-item active">{% trans "AK Submission" %}</li>
{% endblock %} {% endblock %}
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
{% endblock %} {% endblock %}
{% block breadcrumbs %} {% block breadcrumbs %}
{{ block.super}} {% include "AKSubmission/breadcrumbs_submission.html" %}
<li class="breadcrumb-item"><a <li class="breadcrumb-item"><a
href="{% url 'submit:submission_overview' event_slug=event.slug %}">{% trans "AK Submission" %}</a></li> href="{% url 'submit:submission_overview' event_slug=event.slug %}">{% trans "AK Submission" %}</a></li>
<li class="breadcrumb-item"><a href="{% url 'submit:akowner_edit' event_slug=event.slug slug=owner.slug %}">{{ owner.slug }}</a></li> <li class="breadcrumb-item"><a href="{% url 'submit:akowner_edit' event_slug=event.slug slug=owner.slug %}">{{ owner.slug }}</a></li>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
{% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "New AK Wish" %}{% endblock %} {% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "New AK Wish" %}{% endblock %}
{% block breadcrumbs %} {% block breadcrumbs %}
{{ block.super}} {% include "AKSubmission/breadcrumbs_submission.html" %}
<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:submission_overview' event_slug=event.slug %}">{% trans "AK Submission" %}</a></li>
<li class="breadcrumb-item active">{% trans "New AK Wish" %}</li> <li class="breadcrumb-item active">{% trans "New AK Wish" %}</li>
{% endblock %} {% endblock %}
......
...@@ -9,14 +9,14 @@ urlpatterns = [ ...@@ -9,14 +9,14 @@ urlpatterns = [
'<slug:event_slug>/submission/', '<slug:event_slug>/submission/',
include([ include([
path('', views.SubmissionOverviewView.as_view(), name='submission_overview'), path('', views.SubmissionOverviewView.as_view(), name='submission_overview'),
path('ak/<int:pk>', views.AKDetailView.as_view(), name='ak_detail'), path('ak/<int:pk>/', views.AKDetailView.as_view(), name='ak_detail'),
path('ak/<int:pk>/edit/', views.AKEditView.as_view(), name='ak_edit'), path('ak/<int:pk>/edit/', views.AKEditView.as_view(), name='ak_edit'),
path('ak/<int:pk>/add_slot/', views.AKSlotAddView.as_view(), name='akslot_add'), 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>/edit/', views.AKSlotEditView.as_view(), name='akslot_edit'),
path('akslot/<int:pk>/delete/', views.AKSlotDeleteView.as_view(), name='akslot_delete'), path('akslot/<int:pk>/delete/', views.AKSlotDeleteView.as_view(), name='akslot_delete'),
path('aks/', views.AKListView.as_view(), name='ak_list'), path('aks/', views.AKListView.as_view(), name='ak_list'),
path('aks/category/<int:category_pk>', views.AKListByCategoryView.as_view(), name='ak_list_by_category'), 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/tag/<int:tag_pk>/', views.AKListByTagView.as_view(), name='ak_list_by_tag'),
path('owner/', views.AKOwnerCreateView.as_view(), name='akowner_create'), path('owner/', views.AKOwnerCreateView.as_view(), name='akowner_create'),
path('new/', views.AKOwnerSelectDispatchView.as_view(), name='akowner_select'), path('new/', views.AKOwnerSelectDispatchView.as_view(), name='akowner_select'),
path('owner/edit/', views.AKOwnerEditDispatchView.as_view(), name='akowner_edit_dispatch'), path('owner/edit/', views.AKOwnerEditDispatchView.as_view(), name='akowner_edit_dispatch'),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment