From 4cd57741fecbb2c84caed4ca9c509b366c80a449 Mon Sep 17 00:00:00 2001
From: Mark Skipper <marks@aptivate.org>
Date: Mon, 22 Jun 2015 17:06:41 +0100
Subject: [PATCH] Redirect to login after logout

---
 django/website/hid/templates/hid/dashboard.html       |  4 ++--
 .../users/templates/registration/logged_out.html      | 11 -----------
 2 files changed, 2 insertions(+), 13 deletions(-)
 delete mode 100644 django/website/users/templates/registration/logged_out.html

diff --git a/django/website/hid/templates/hid/dashboard.html b/django/website/hid/templates/hid/dashboard.html
index 3354687e..0e4bffde 100644
--- a/django/website/hid/templates/hid/dashboard.html
+++ b/django/website/hid/templates/hid/dashboard.html
@@ -3,6 +3,6 @@
 
 {% block maincontent %}
 <p>{% trans "This is the dashboard page." %}</p>
-<p><a href="{% url "logout" %}">{% trans "Log out" %}</a></p>
+<p><a href="{% url "logout" %}?next={% url 'login' %}">{% trans "Log out" %}</a></p>
 
-{% endblock maincontent %}
\ No newline at end of file
+{% endblock maincontent %}
diff --git a/django/website/users/templates/registration/logged_out.html b/django/website/users/templates/registration/logged_out.html
deleted file mode 100644
index 0b36bb04..00000000
--- a/django/website/users/templates/registration/logged_out.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends "base.html" %}
-{% load i18n %}
-
-
-{% block maincontent %}
-<h1>{% trans "Logged out" %}</h1>
-<p>
-	 You are logged out.
-	 <a href="{% url "login" %}">{% trans "Log in again." %}</a>
-</p>
-{% endblock maincontent %}
\ No newline at end of file
-- 
GitLab