From 4b69cd02518c1eefd66e9a93f45ed6694d227993 Mon Sep 17 00:00:00 2001 From: LongHairedHacker Date: Tue, 2 May 2017 22:58:49 +0200 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Added=20some=20eye=20candy=20?= =?UTF-8?q?=E2=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gulaschromstore/settings.py | 2 + templates/base.html | 40 +++- users/templates/users/check_confirmation.html | 1 + users/templates/users/login.html | 11 ++ users/templates/users/password_reset.html | 10 + .../users/password_reset_confirm.html | 10 + users/templates/users/send_confirmation.html | 1 + users/templates/users/signup.html | 11 ++ users/templates/users/user_edit.html | 181 ------------------ users/templates/users/user_update.html | 11 ++ 10 files changed, 89 insertions(+), 189 deletions(-) delete mode 100644 users/templates/users/user_edit.html diff --git a/gulaschromstore/settings.py b/gulaschromstore/settings.py index c113086..7eb50a7 100644 --- a/gulaschromstore/settings.py +++ b/gulaschromstore/settings.py @@ -133,3 +133,5 @@ MEDIA_ROOT = os.path.join(BASE_DIR, 'media') EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' AUTH_USER_MODEL = 'users.User' + +LOGIN_REDIRECT_URL = '/' diff --git a/templates/base.html b/templates/base.html index 9fd5555..9f443da 100644 --- a/templates/base.html +++ b/templates/base.html @@ -18,9 +18,15 @@ - Roms + + Roms + {% if user.is_authenticated %} - Rom Hochladen + + Rom Hochladen + {% endif %} @@ -30,17 +36,35 @@
- Roms + + Roms + {% if user.is_authenticated %} - Rom Hochladen + + Rom Hochladen + {% endif %} {% if not user.is_authenticated %} - Registrieren - Login + + {% else %} - Profil - Logout + + Profil + + + Logout + {% endif %}
diff --git a/users/templates/users/check_confirmation.html b/users/templates/users/check_confirmation.html index 00f4ea9..9616d08 100644 --- a/users/templates/users/check_confirmation.html +++ b/users/templates/users/check_confirmation.html @@ -1,6 +1,7 @@ {% extends "base.html" %} {% block title %}Registerierung abgeschlossen{% endblock %} +{% block nav_signup_class %}is-active{% endblock %} {% block content %}
diff --git a/users/templates/users/login.html b/users/templates/users/login.html index d1840fa..28a03e3 100644 --- a/users/templates/users/login.html +++ b/users/templates/users/login.html @@ -1,6 +1,7 @@ {% extends "base.html" %} {% block title %}Einloggen{% endblock %} +{% block nav_login_class %}is-active{% endblock %} {% block content %}
@@ -12,6 +13,16 @@ Du bist doch schon eingeloggt!?
Meinten sie: ausloggen ? {% else %} + {% if form.non_field_errors %} +
+
+ Nope! +
+
+ {{ form.non_field_errors }} +
+
+ {% endif %}
{% csrf_token %} diff --git a/users/templates/users/password_reset.html b/users/templates/users/password_reset.html index 2f80499..464ce0a 100644 --- a/users/templates/users/password_reset.html +++ b/users/templates/users/password_reset.html @@ -13,6 +13,16 @@ Und hast trotzdem dein Passwort vergessen?
Von mir aus, dann log dich erstm aus. {% else %} + {% if form.non_field_errors %} +
+
+ Nope! +
+
+ {{ form.non_field_errors }} +
+
+ {% endif %} {% csrf_token %} diff --git a/users/templates/users/password_reset_confirm.html b/users/templates/users/password_reset_confirm.html index 793a1b8..ba5c6b0 100644 --- a/users/templates/users/password_reset_confirm.html +++ b/users/templates/users/password_reset_confirm.html @@ -14,6 +14,16 @@ Wenn ja dann geh nach hause, ansonsten erstmal ausloggen
{% else %} + {% if form.non_field_errors %} +
+
+ Nope! +
+
+ {{ form.non_field_errors }} +
+
+ {% endif %} {% csrf_token %} diff --git a/users/templates/users/send_confirmation.html b/users/templates/users/send_confirmation.html index 9110799..fc8b7b2 100644 --- a/users/templates/users/send_confirmation.html +++ b/users/templates/users/send_confirmation.html @@ -1,6 +1,7 @@ {% extends "base.html" %} {% block title %}Registerierung bestätigen{% endblock %} +{% block nav_signup_class %}is-active{% endblock %} {% block content %}
diff --git a/users/templates/users/signup.html b/users/templates/users/signup.html index c218e60..50ebfd9 100644 --- a/users/templates/users/signup.html +++ b/users/templates/users/signup.html @@ -1,6 +1,7 @@ {% extends "base.html" %} {% block title %}Registrieren{% endblock %} +{% block nav_signup_class %}is-active{% endblock %} {% block content %}
@@ -13,6 +14,16 @@ Du bist eingeloggt und willst du dich registrieren.
Geh heim du bist besoffen! {% else %} + {% if form.non_field_errors %} +
+
+ Nope! +
+
+ {{ form.non_field_errors }} +
+
+ {% endif %} {% csrf_token %} diff --git a/users/templates/users/user_edit.html b/users/templates/users/user_edit.html deleted file mode 100644 index ec7e5e6..0000000 --- a/users/templates/users/user_edit.html +++ /dev/null @@ -1,181 +0,0 @@ -{% extends "base.html" %} - -{% block title %}Profil bearbeiten{% endblock %} - -{% block content %} -
-
-
-
-

Profil bearbeiten

- - {% csrf_token %} - -
-
- -
-
-
-
- - - - - - {% if form.email.errors %} - - {% endif %} - -
-

- {{form.email.errors.as_text}} -

-
-
-
- -
-
- -
-
-
-
- - - - - - {% if form.current_password.errors %} - - {% endif %} - -
-

- {{form.current_password.errors.as_text}} -

-
-
-
- -
-
- -
-
-
-
- - - - - - {% if form.new_password1.errors %} - - {% endif %} - -
-

- {{form.new_password1.errors.as_text}} -

-
-
-
- -
-
- -
-
-
-
- - - - - - {% if form.new_password2.errors %} - - {% endif %} - -
-

- {{form.new_password2.errors.as_text}} -

-
-
-
- -
-
- -
-
-
-
- - - - - - {% if form.twitter.errors %} - - {% endif %} - -
-

- {{form.twitter.errors.as_text}} -

-
-
-
- -
-
- -
-
-
-
- - - - - - {% if form.github.errors %} - - {% endif %} - -
-

- {{form.github.errors.as_text}} -

-
-
-
- -
-

- -

-
- - {% endif %} -
-
-
-
-{% endblock %} diff --git a/users/templates/users/user_update.html b/users/templates/users/user_update.html index b35d1b2..8333e2e 100644 --- a/users/templates/users/user_update.html +++ b/users/templates/users/user_update.html @@ -1,6 +1,7 @@ {% extends "base.html" %} {% block title %}Profil bearbeiten{% endblock %} +{% block nav_profile_class %}is-active{% endblock %} {% block content %}
@@ -8,6 +9,16 @@

Profil bearbeiten

+ {% if form.non_field_errors %} +
+
+ Nope! +
+
+ {{ form.non_field_errors }} +
+
+ {% endif %}
{% csrf_token %}