From b6366e6a1ba504d39269ac33e64e4b770083c717 Mon Sep 17 00:00:00 2001 From: Jailson Dias Date: Tue, 20 Sep 2016 11:37:30 -0300 Subject: [PATCH] Resolvido o problema do context processors e ajeitado o template de login e remember password #76 --- core/context_processors.py | 14 ++++++++------ core/templates/index.html | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------- core/templates/remember_password.html | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------ core/views.py | 5 +++-- courses/context_processors.py | 21 ++++++++++----------- 5 files changed, 142 insertions(+), 108 deletions(-) diff --git a/core/context_processors.py b/core/context_processors.py index cc8602f..71e44d7 100644 --- a/core/context_processors.py +++ b/core/context_processors.py @@ -1,9 +1,11 @@ from .models import Notification def notifications(request): - if request.user.is_authenticated: - return { - 'notifications': Notification.objects.filter(user= request.user, read=False).order_by('-datetime') - } - else: - return request \ No newline at end of file + context = {} + context['notifications'] = None + if not request.user is None: + if request.user.is_authenticated: + return { + 'notifications': Notification.objects.filter(user= request.user, read=False).order_by('-datetime') + } + return context diff --git a/core/templates/index.html b/core/templates/index.html index 1e8918f..310f460 100644 --- a/core/templates/index.html +++ b/core/templates/index.html @@ -10,71 +10,86 @@ {% endblock sidebar %} {% block content %} -
-
- +
+
+
+
+
+
+ logo amadeus +
+
+
-
{% for breadcrumb in breadcrumbs %} {{ breadcrumb.text }} {% endfor %} -
- -
-
-
- {% if message %} -
- {{message}} -
- - {% endif %} -
- -
- {% csrf_token %} -
- -
- -
-
-
- -
- -
-
-
-
- -
-
-
- +
- -
- +
+
+ {% if message %} + + {% endif %} +
+
+ {#
#} +
+ {% csrf_token %} +
+ +
+
-
- +
+
+ +
+ +
+
+
+
+
- +
+ + {#
#} + {#
#} +
+ Forgot your password? +
+ {#
#} + {#
#} +
+ +
+
+ +
+ {#
#}
-
-
+
+
-
- {% trans 'Sign Up' %} -
+
+ {% trans 'Sign Up' %} +
+
{% endblock%} {% block rightbar %} - -{% endblock rightbar %} \ No newline at end of file + +{% endblock rightbar %} diff --git a/core/templates/remember_password.html b/core/templates/remember_password.html index 642a114..1eab8e7 100644 --- a/core/templates/remember_password.html +++ b/core/templates/remember_password.html @@ -1,49 +1,66 @@ {% extends "index.html" %} -{% load i18n %} -{% block content %} +{% load i18n static %} +{% block content%} -
-
- logo amadeus -
-
-
-
-
- {% if success %} -
- {{success}} -
- {% elif danger %} -
- {{danger}} -
- {% endif %} -
-
+
+
+
+
+
+
+ logo amadeus +
+
+
+
+
+
+ {% if success %} + + {% elif danger %} + + {% endif %} +
+
+
{% csrf_token %} -
- - +
+ + {#
#} + + {#
#}
-
- - +
+ + {#
#} + + {#
#}
-
- - -
+
+ +
- -
- - +
+
+
-
{% endblock content %} diff --git a/core/views.py b/core/views.py index 794310f..0f087c7 100644 --- a/core/views.py +++ b/core/views.py @@ -71,7 +71,7 @@ def remember_password(request): @log_decorator('Acessar', 'Sistema') def login(request): context = {} - + if request.POST: username = request.POST['username'] password = request.POST['password'] @@ -81,9 +81,10 @@ def login(request): return redirect(reverse("app:index")) else: context["message"] = _("E-mail or password are incorrect!") + context["username"] = username elif request.user.is_authenticated: return redirect(reverse('app:index')) - + return render(request,"index.html",context) diff --git a/courses/context_processors.py b/courses/context_processors.py index 921c3cf..aaa3fb3 100644 --- a/courses/context_processors.py +++ b/courses/context_processors.py @@ -1,14 +1,13 @@ from .models import Course def courses(request): - if request.user.is_authenticated: - context = {} - - if request.user.is_staff: - context['courses_list'] = Course.objects.all() - else: - context['courses_list'] = Course.objects.filter(professors__in = [request.user]) - - return context - else: - return request \ No newline at end of file + context = {} + context['courses_list'] = None + if not request.user is None: + if request.user.is_authenticated: + if request.user.is_staff: + context['courses_list'] = Course.objects.all() + else: + context['courses_list'] = Course.objects.filter(professors__in = [request.user]) + return context + return context -- libgit2 0.21.2