{% block "content" %}{% endblock %}
diff --git a/k4ever/main/templates/main/search-form.html b/k4ever/main/templates/form.html
similarity index 53%
rename from k4ever/main/templates/main/search-form.html
rename to k4ever/main/templates/form.html
index 0a06802..88dd68f 100644
--- a/k4ever/main/templates/main/search-form.html
+++ b/k4ever/main/templates/form.html
@@ -7,6 +7,14 @@
# Licensed under GNU Affero General Public License v3 or later
{% endcomment %}
-
+{% for field in form %}
+
+ {{ field.label_tag }}
+
+{% endfor %}
\ No newline at end of file
diff --git a/k4ever/main/templates/main/navbar-content.html b/k4ever/main/templates/main/navbar-content.html
new file mode 100644
index 0000000..4763767
--- /dev/null
+++ b/k4ever/main/templates/main/navbar-content.html
@@ -0,0 +1,44 @@
+{% comment %}
+# This file is part of k4ever, a point-of-sale system
+# Contact............
+ {{ field }}
+ {% if field.errors %}
+
+ {{ field.errors }}
+ {% endif %} +
-
- {% if form %} - {% if password_success %} - {{ password_success }}
- {% endif %} -
-
-
- {% else %}
- Da du dich nicht über Django authentifizierst (sondern z.B. über LDAP) kannst du dein Passwort hier nicht ändern.
- {% endif %}
-
- Passwort
-- {% if form %} - {% if password_success %} - {{ password_success }}
- {% endif %} -
-
-
-
+
+
{% endblock %}
diff --git a/k4ever/main/templatetags/__init__.py b/k4ever/main/templatetags/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/k4ever/main/templates/main/navigation.html b/k4ever/main/templatetags/navigation_extras.py
similarity index 58%
rename from k4ever/main/templates/main/navigation.html
rename to k4ever/main/templatetags/navigation_extras.py
index 9d1ad8d..97a31a7 100644
--- a/k4ever/main/templates/main/navigation.html
+++ b/k4ever/main/templatetags/navigation_extras.py
@@ -1,13 +1,18 @@
-{% comment %}
+# -*- coding: utf-8 -*-
# This file is part of k4ever, a point-of-sale system
# Contact............ Pluginberechtigungen
- {% if pluginerror %} - {{ pluginerror|safe }} - {% endif %} - {% if pluginmsg %} - {{ pluginmsg|safe }} - {% endif %} --
Erlaubt | - {% else %} -+ | Name | -Author | -Beschreibung | -AuthBlob | -Erlauben/Verbieten | -
---|---|---|---|---|---|---|
{{ p.plugin.name }} {{ p.plugin.version }} |
- {{ p.plugin.author }} | -{{ p.plugin.descr }} |
-
- {% if p.plugin.userCanWriteAuthblob %}
-
-
+
+
+
- {% else %}
- {% if p.plugin.userCanReadAuthblob %}
- {{ p.authblob }}
{% else %}
- ---
+ Passwort+ {% if form %} + {% if password_success %} +
+
+ {% endif %}
+
+ Passwort geändert.+
+
+
+
+ Da du dich nicht direkt über das Kassensystem authentifizierst (sondern z.B. über LDAP) kannst du dein Passwort hier nicht ändern. {% endif %} - {% endif %} - |
- Plugin verbieten | -||
Verboten | - {% for plugin in unallowed %} -{{ plugin.name }} {{ plugin.version }} |
- {{ plugin.author }} | -{{ plugin.descr }} |
- - | Plugin erlauben | -|
-
-
- Anmelden -
- Registrieren -
t |
Kontoinhaber_in: | +Alexander Eichner | +
---|---|
Kontonummer | +3854536 | +
Bankleitzahl | +20041155 | +
Betreff | +{{ user.username }} | +
Kontoinhaber_in: | ++ |
---|---|
Kontonummer | ++ |
Bankleitzahl | ++ |
Betreff | ++ |