From 97ca02d4f6a78c762f48bdabc11b08006bc39994 Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Mon, 30 Mar 2020 11:38:49 +0200
Subject: [PATCH] Update template for XML import
---
aleksis/apps/untis/menus.py | 4 ++--
.../untis/{untis_import.html => xml_import.html} | 8 ++++----
aleksis/apps/untis/views.py | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
rename aleksis/apps/untis/templates/untis/{untis_import.html => xml_import.html} (78%)
diff --git a/aleksis/apps/untis/menus.py b/aleksis/apps/untis/menus.py
index e217878..7e4cbd6 100644
--- a/aleksis/apps/untis/menus.py
+++ b/aleksis/apps/untis/menus.py
@@ -3,8 +3,8 @@ from django.utils.translation import ugettext_lazy as _
MENUS = {
"DATA_MANAGEMENT_MENU": [
{
- "name": _("Untis import"),
- "url": "untis_import",
+ "name": _("Untis XML import"),
+ "url": "untis_xml_import",
"validators": [
"menu_generator.validators.is_authenticated",
"menu_generator.validators.is_superuser",
diff --git a/aleksis/apps/untis/templates/untis/untis_import.html b/aleksis/apps/untis/templates/untis/xml_import.html
similarity index 78%
rename from aleksis/apps/untis/templates/untis/untis_import.html
rename to aleksis/apps/untis/templates/untis/xml_import.html
index 9305deb..e6ec685 100644
--- a/aleksis/apps/untis/templates/untis/untis_import.html
+++ b/aleksis/apps/untis/templates/untis/xml_import.html
@@ -5,7 +5,7 @@
{% load material_form i18n %}
-{% block page_title %}{% blocktrans %}Import Untis data{% endblocktrans %}{% endblock %}
+{% block page_title %}{% blocktrans %}Import Untis data via XML{% endblocktrans %}{% endblock %}
{% block content %}
@@ -14,9 +14,9 @@
Untis provides a function for exporting all data as an XML file.
{% endblocktrans %}
</p>
- <div class="alert error">
+ <div class="alert warning">
<p>
- <i class="material-icons left">error</i>
+ <i class="material-icons left">warning</i>
{% blocktrans %}
Newly imported data will be valid as of tomorrow.
{% endblocktrans %}
@@ -37,7 +37,7 @@
<form method="post" enctype="multipart/form-data">
{% csrf_token %}
{% form form=upload_form %}{% endform %}
- {% include "core/save_button.html" %}
+ {% include "core/save_button.html" with icon="import_export" caption=_("Import data") %}
</form>
{% endblock %}
diff --git a/aleksis/apps/untis/views.py b/aleksis/apps/untis/views.py
index 494156c..cc9420d 100644
--- a/aleksis/apps/untis/views.py
+++ b/aleksis/apps/untis/views.py
@@ -24,7 +24,7 @@ def xml_import(request: HttpRequest) -> HttpResponse:
context["upload_form"] = upload_form
- return render(request, "untis/untis_import.html", context)
+ return render(request, "untis/xml_import.html", context)
@login_required
--
GitLab