diff --git a/accounts/templates/login.html b/accounts/templates/login.html index 754a867c8cad625e2ec941abb7166879c4b0fcd7..6f6134a64eecaba79f16779f20dc985d669988d4 100644 --- a/accounts/templates/login.html +++ b/accounts/templates/login.html @@ -12,13 +12,13 @@ {% endif %} {% if next %} - {% if user.is_authenticated %} <ul class="messagelist"> - <li class="error">Accès non autorisé</li> - </ul> + {% if user.is_authenticated %} + <li class="error">Accès non autorisé.</li> {% else %} - <p>Merci de vous connecter.</p> + <li class="info">Vous devez vous connectez pour accéder à cette page.</li> {% endif %} + </ul> {% endif %} <form method="post" action="{% url 'accounts:login' %}?next={{ next|urlencode }}"> {% csrf_token %} diff --git a/accounts/views.py b/accounts/views.py index 9216439602ec2d2e54dbc6ef6caec6f467d7c744..89696cc3be9db3884927d02bbe6860ce1d9f4be4 100644 --- a/accounts/views.py +++ b/accounts/views.py @@ -1,5 +1,6 @@ from django.contrib import messages from django.contrib.auth import login, logout +from django.contrib.auth.mixins import LoginRequiredMixin from django.contrib.auth.views import LoginView as DjangoLoginView from django.contrib.sites.shortcuts import get_current_site from django.http import Http404 @@ -32,9 +33,10 @@ class LogoutView(RedirectView): return super().get_redirect_url(*args, **kwargs) -class ProfileView(TemplateView): +class ProfileView(LoginRequiredMixin, TemplateView): """Vue des actions de gestion de son profil""" template_name = "profile.html" + redirect_field_name = "next" class CreateAccountView(View): diff --git a/home/static/css/style.css b/home/static/css/style.css index 06958bbfaa60a187a18b9e5182a26848474e9594..47e0f4b0d187a0420021b3afee7d91a69506440f 100644 --- a/home/static/css/style.css +++ b/home/static/css/style.css @@ -209,22 +209,19 @@ ul.messagelist { ul.messagelist li { display: block; font-weight: 400; - font-size: 13px; padding: 10px 10px 10px 65px; margin: 0 0 10px 0; background: #dfd; - background-size: 16px auto; color: #333; } - ul.messagelist li.warning { background: #ffc; - background-size: 14px auto; } - ul.messagelist li.error { background: #ffefef; - background-size: 16px auto; +} +ul.messagelist li.info { + background: #ddf; } footer {