diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc index c78c15e..6d7f4aa 100644 Binary files a/digitaleagentur/__pycache__/settings.cpython-38.pyc and b/digitaleagentur/__pycache__/settings.cpython-38.pyc differ diff --git a/digitaleagentur/settings.py b/digitaleagentur/settings.py index 22ecf54..12f98a0 100644 --- a/digitaleagentur/settings.py +++ b/digitaleagentur/settings.py @@ -210,7 +210,9 @@ DEFAULT_CHARSET = 'utf-8' LOGIN_REDIRECT_URL = 'users-dashboard' # LOGIN PAGE FOR LOGIN-REDIRECT -LOGIN_URL = 'login' +#LOGIN_URL = 'login' +# NC Default Login findet im Dashboard statt! +LOGIN_URL = NEXTCLOUD_URL STATIC_URL = '/static/' diff --git a/users/templates/users/login.html b/users/templates/users/login.html index d4d0cfa..a28d167 100644 --- a/users/templates/users/login.html +++ b/users/templates/users/login.html @@ -1,56 +1,8 @@ -{% extends "users/publicbase.html" %} - -{% load crispy_forms_tags %} -{% block content %} - -
-
-
- {% csrf_token %} -
- - -

Digitale Agentur Login

- - {% if messages %} - {% for message in messages %} - - {% endfor %} - {% endif %} - {{ form|crispy }} -
-
- - - - Passwort vergessen?
- -
-
-
- - Probleme beim anmelden? - - - Agentur registrieren - -
-
-
- + -{% endblock content %} \ No newline at end of file + \ No newline at end of file diff --git a/users/templates/users/login_SAVE.html b/users/templates/users/login_SAVE.html new file mode 100644 index 0000000..d4d0cfa --- /dev/null +++ b/users/templates/users/login_SAVE.html @@ -0,0 +1,56 @@ +{% extends "users/publicbase.html" %} + +{% load crispy_forms_tags %} +{% block content %} + +
+
+
+ {% csrf_token %} +
+ + +

Digitale Agentur Login

+ + {% if messages %} + {% for message in messages %} + + {% endfor %} + {% endif %} + {{ form|crispy }} +
+
+ + + + Passwort vergessen?
+ +
+
+
+ + Probleme beim anmelden? + + + Agentur registrieren + +
+
+
+ +{% endblock content %} \ No newline at end of file diff --git a/users/templates/users/password_reset.html b/users/templates/users/password_reset.html index a3cfc37..a28d167 100644 --- a/users/templates/users/password_reset.html +++ b/users/templates/users/password_reset.html @@ -1,25 +1,8 @@ -{% extends "users/publicbase.html" %} -{% load crispy_forms_tags %} -{% block content %} - -
-
- - -

Passwort anfordern

- -

Bitte geben Sie ihre E-Mailadresse ein, mit der Sie sich bei der Digitalen Agentur registriert haben.

-
- {% csrf_token %} - {{ form|crispy }} -
-   -
-
-
-{% endblock content %} \ No newline at end of file +{% load static %} + + \ No newline at end of file diff --git a/users/templates/users/password_reset.html_SAVE b/users/templates/users/password_reset.html_SAVE new file mode 100644 index 0000000..a3cfc37 --- /dev/null +++ b/users/templates/users/password_reset.html_SAVE @@ -0,0 +1,25 @@ +{% extends "users/publicbase.html" %} +{% load crispy_forms_tags %} +{% block content %} + +
+
+ + +

Passwort anfordern

+ +

Bitte geben Sie ihre E-Mailadresse ein, mit der Sie sich bei der Digitalen Agentur registriert haben.

+
+ {% csrf_token %} + {{ form|crispy }} +
+   +
+
+
+{% endblock content %} \ No newline at end of file diff --git a/users/templates/users/register.html b/users/templates/users/register.html index bdc5651..a28d167 100644 --- a/users/templates/users/register.html +++ b/users/templates/users/register.html @@ -1,67 +1,8 @@ - -{% extends "users/publicbase.html" %} - -{% load crispy_forms_tags %} - -{% block content %} -
-
- {% if messages %} - {% for message in messages %} - - {% endfor %} - {% endif %} -
- {% csrf_token %} -
- - -

Registrieren Sie Ihre Agentur

- - {% for field in form %} - {% if field.name != 'captcha' %} - {{field.field_name}} - {% if field.name == 'agb' %} - {{field}}  AGB's*
- {% elif field.name == 'av' %} - {{field}}  AV-Vertrag* - {% else %} - {{field|as_crispy_field}} - {% endif %} - {% endif %} - {% endfor %} - - -
-
- -
-
-
-
- -{% endblock content %} \ No newline at end of file +{% load static %} + + \ No newline at end of file diff --git a/users/templates/users/register.html_SAVE b/users/templates/users/register.html_SAVE new file mode 100644 index 0000000..bdc5651 --- /dev/null +++ b/users/templates/users/register.html_SAVE @@ -0,0 +1,67 @@ + +{% extends "users/publicbase.html" %} + +{% load crispy_forms_tags %} + +{% block content %} +
+
+ {% if messages %} + {% for message in messages %} + + {% endfor %} + {% endif %} +
+ {% csrf_token %} +
+ + +

Registrieren Sie Ihre Agentur

+ + {% for field in form %} + {% if field.name != 'captcha' %} + {{field.field_name}} + {% if field.name == 'agb' %} + {{field}}  AGB's*
+ {% elif field.name == 'av' %} + {{field}}  AV-Vertrag* + {% else %} + {{field|as_crispy_field}} + {% endif %} + {% endif %} + {% endfor %} + + +
+
+ +
+
+
+
+ +{% endblock content %} \ No newline at end of file diff --git a/users/templates/users/registercomplete.html b/users/templates/users/registercomplete.html index d721e66..a28d167 100644 --- a/users/templates/users/registercomplete.html +++ b/users/templates/users/registercomplete.html @@ -1,24 +1,8 @@ - -{% extends "users/publicbase.html" %} - -{% load crispy_forms_tags %} - -{% block content %} - - -
-
- - -

Registrierung abgeschlossen

- -

Ihre Agentur wurde erfolgreich angelegt! Bitte prüfen Sie Ihre E-Mails, um sich ein Passwort für Ihren Account zu erstellen. Anschließend können Sie sich in Ihrer Agentur anmelden. -

-
-
-{% endblock content %} \ No newline at end of file +{% load static %} + + \ No newline at end of file diff --git a/users/templates/users/registercomplete.html_SAVE b/users/templates/users/registercomplete.html_SAVE new file mode 100644 index 0000000..d721e66 --- /dev/null +++ b/users/templates/users/registercomplete.html_SAVE @@ -0,0 +1,24 @@ + +{% extends "users/publicbase.html" %} + +{% load crispy_forms_tags %} + +{% block content %} + + +
+
+ + +

Registrierung abgeschlossen

+ +

Ihre Agentur wurde erfolgreich angelegt! Bitte prüfen Sie Ihre E-Mails, um sich ein Passwort für Ihren Account zu erstellen. Anschließend können Sie sich in Ihrer Agentur anmelden. +

+
+
+{% endblock content %} \ No newline at end of file