Add logout page (view, template, link)
authorNicolas Iooss <nicolas.iooss_git@polytechnique.org>
Sat, 30 Mar 2013 21:09:04 +0000 (22:09 +0100)
committerNicolas Iooss <nicolas.iooss_git@polytechnique.org>
Sat, 30 Mar 2013 21:09:04 +0000 (22:09 +0100)
Signed-off-by: Nicolas Iooss <nicolas.iooss_git@polytechnique.org>
xnet/settings/base.py
xnet/site/templates/base.html
xnet/site/templates/registration/logged_out.html [new file with mode: 0644]
xnet/urls.py

index f865072..b595943 100644 (file)
@@ -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',
index 37ddf18..a1e7a1d 100644 (file)
     </head>
     <body>
     {% block body %}
-    <div class="navbar">
-        <div class="navbar-inner navbar-fixed-top">
+    <div class="navbar navbar-fixed-top">
+        <div class="navbar-inner">
             <div class="container">
                 <a class="logo-nav pull-left" href="{% url 'home' %}"><img src="" alt="Logo"></a>
                 {% if user.is_authenticated %}
                 <p class="navbar-text pull-right">
                     <a href="#">{{ user.get_full_name }}</a>
                     &nbsp;|&nbsp;
-                    <a href="#"><span class="picto picto-logout"></span>{% trans "Log Out" %}</a>
-
+                    <a href="{% url 'logout' %}">
+                        <span class="picto picto-logout"></span>{% trans "Log Out" %}
+                    </a>
                 </p>
                 <div class="nav-collapse collapse">
                     <ul class="nav">
diff --git a/xnet/site/templates/registration/logged_out.html b/xnet/site/templates/registration/logged_out.html
new file mode 100644 (file)
index 0000000..5fd8fb0
--- /dev/null
@@ -0,0 +1,8 @@
+{% extends "base.html" %}
+{% load url from future %}
+
+{% block content %}
+<h1>Déconnexion réussie</h1>
+<p>Vous êtes à présent déconnecté du site.</p>
+<p><a href="{% url 'authgroupex:login' %}">Se reconnecter</a></p>
+{% endblock %}
index ab5ef0f..6c4236b 100644 (file)
@@ -9,6 +9,7 @@ admin.site.login_template = 'xnet/admin_login.html'
 urlpatterns = patterns('',
     url(r'media/(?P<path>.*)', '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'),