From 7dba5527f21bdc9af24e19b502ae2d6d592e7b32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20H=C3=A4ttasch?=
<benjamin.haettasch@fachschaft.informatik.tu-darmstadt.de>
Date: Tue, 19 May 2020 20:30:42 +0200
Subject: [PATCH] Fix tab order in submission forms
Fixes #15
---
.../templates/AKSubmission/akowner_create_update.html | 6 +++---
AKSubmission/templates/AKSubmission/akslot_add_update.html | 7 ++++---
AKSubmission/templates/AKSubmission/akslot_delete.html | 7 ++++---
AKSubmission/templates/AKSubmission/submit_new.html | 7 ++++---
4 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/AKSubmission/templates/AKSubmission/akowner_create_update.html b/AKSubmission/templates/AKSubmission/akowner_create_update.html
index b8f7a402..34ba27ba 100644
--- a/AKSubmission/templates/AKSubmission/akowner_create_update.html
+++ b/AKSubmission/templates/AKSubmission/akowner_create_update.html
@@ -20,6 +20,9 @@
<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>
@@ -27,9 +30,6 @@
<a href="{% url 'submit:submission_overview' event_slug=event.slug %}" class="btn btn-secondary">
{% fa5_icon "times" 'fas' %} {% trans "Cancel" %}
</a>
- <button type="submit" class="save btn btn-primary float-right">
- {% fa5_icon "check" 'fas' %} {% trans "Continue" %}
- </button>
{% endbuttons %}
</form>
{% endblock %}
\ No newline at end of file
diff --git a/AKSubmission/templates/AKSubmission/akslot_add_update.html b/AKSubmission/templates/AKSubmission/akslot_add_update.html
index afcce856..838267bf 100644
--- a/AKSubmission/templates/AKSubmission/akslot_add_update.html
+++ b/AKSubmission/templates/AKSubmission/akslot_add_update.html
@@ -22,6 +22,10 @@
<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>
@@ -29,9 +33,6 @@
<a href="{% url 'submit:ak_detail' event_slug=event.slug pk=ak.pk %}" class="btn btn-secondary">
{% fa5_icon "times" 'fas' %} {% trans "Cancel" %}
</a>
- <button type="submit" class="save btn btn-primary float-right">
- {% fa5_icon "check" 'fas' %} {% trans "Continue" %}
- </button>
{% endbuttons %}
</form>
{% endblock %}
diff --git a/AKSubmission/templates/AKSubmission/akslot_delete.html b/AKSubmission/templates/AKSubmission/akslot_delete.html
index 2ae502df..b58654b3 100644
--- a/AKSubmission/templates/AKSubmission/akslot_delete.html
+++ b/AKSubmission/templates/AKSubmission/akslot_delete.html
@@ -38,12 +38,13 @@
</tbody>
</table>
{% buttons %}
- <a href="{% url 'submit:ak_detail' event_slug=event.slug pk=ak.pk %}" class="btn btn-secondary">
- {% fa5_icon "times" 'fas' %} {% trans "Cancel" %}
- </a>
<button type="submit" class="save btn btn-danger float-right" value="Confirm">
{% fa5_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 %}
</form>
{% endblock %}
diff --git a/AKSubmission/templates/AKSubmission/submit_new.html b/AKSubmission/templates/AKSubmission/submit_new.html
index 283e8525..42626533 100644
--- a/AKSubmission/templates/AKSubmission/submit_new.html
+++ b/AKSubmission/templates/AKSubmission/submit_new.html
@@ -37,6 +37,10 @@
<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" %}
+ </button>
+
<button type="reset" class="btn btn-danger">
{% fa5_icon "undo-alt" 'fas' %} {% trans "Reset Form" %}
</button>
@@ -44,9 +48,6 @@
<a href="{% url 'submit:submission_overview' event_slug=event.slug %}" class="btn btn-secondary">
{% fa5_icon "times" 'fas' %} {% trans "Cancel" %}
</a>
- <button type="submit" class="save btn btn-primary float-right">
- {% fa5_icon "check" 'fas' %} {% trans "Submit" %}
- </button>
{% endbuttons %}
</form>
{% endblock %}
--
GitLab