From: Nicolas Iooss Date: Sat, 30 Mar 2013 21:09:04 +0000 (+0100) Subject: Add logout page (view, template, link) X-Git-Url: http://git.polytechnique.org/?p=xnet;a=commitdiff_plain;h=63209f275f8fd4f8f420b525a2004b705a9e5d80 Add logout page (view, template, link) Signed-off-by: Nicolas Iooss --- diff --git a/xnet/settings/base.py b/xnet/settings/base.py index f865072..b595943 100644 --- a/xnet/settings/base.py +++ b/xnet/settings/base.py @@ -142,6 +142,9 @@ TEMPLATE_DIRS = ( ) INSTALLED_APPS = ( + # site app defines registration/ templates which overwrite other apps + 'xnet.site', + 'django.contrib.auth', 'django.contrib.contenttypes', 'django.contrib.sessions', @@ -154,7 +157,6 @@ INSTALLED_APPS = ( 'crispy_forms', 'xnet.accounts', - 'xnet.site', 'xnet.groups', 'xnet.news', 'xnet.events', diff --git a/xnet/site/templates/base.html b/xnet/site/templates/base.html index 37ddf18..a1e7a1d 100644 --- a/xnet/site/templates/base.html +++ b/xnet/site/templates/base.html @@ -15,16 +15,17 @@ {% block body %} -
-
+
+
Logo {% if user.is_authenticated %}

{{ user.get_full_name }}  |  - {% trans "Log Out" %} - + + {% trans "Log Out" %} +

    diff --git a/xnet/site/templates/registration/logged_out.html b/xnet/site/templates/registration/logged_out.html new file mode 100644 index 0000000..5fd8fb0 --- /dev/null +++ b/xnet/site/templates/registration/logged_out.html @@ -0,0 +1,8 @@ +{% extends "base.html" %} +{% load url from future %} + +{% block content %} +

    Déconnexion réussie

    +

    Vous êtes à présent déconnecté du site.

    +

    Se reconnecter

    +{% endblock %} diff --git a/xnet/urls.py b/xnet/urls.py index ab5ef0f..6c4236b 100644 --- a/xnet/urls.py +++ b/xnet/urls.py @@ -9,6 +9,7 @@ admin.site.login_template = 'xnet/admin_login.html' urlpatterns = patterns('', url(r'media/(?P.*)', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}), url(r'^$', 'xnet.site.views.home', name='home'), + url(r'^exit', 'django.contrib.auth.views.logout', name='logout'), url(r'^403$', 'django.views.defaults.permission_denied'), url(r'^404$', 'django.views.defaults.page_not_found'), url(r'^500$', 'django.views.defaults.server_error'),