From c722d8bf9e2f647d5cd8fa3a85a17d0cb3b5b101 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Fri, 4 Mar 2011 09:36:18 -0600
Subject: Remove multiple account login/logout URLs

And slightly spruce up the logout template with a header.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/base.html                | 2 +-
 templates/registration/logout.html | 4 +++-
 urls.py                            | 4 ----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/templates/base.html b/templates/base.html
index 03795dd9..88bb3414 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -44,7 +44,7 @@
                         title="arch-dev mailing list archives">Archives</a></li>
                     <li><a href="/mirrors/" title="Mirror server statistics">Mirrors</a></li>
                     <li><a href="/devel/profile/" title="Modify your account profile">Profile</a></li>
-                    <li><a href="/accounts/logout/" title="Logout of the developer interface">Logout</a></li>
+                    <li><a href="/logout/" title="Logout of the developer interface">Logout</a></li>
                 </ul>
             {% endif %}
         </div><!-- #archdev-navbar -->
diff --git a/templates/registration/logout.html b/templates/registration/logout.html
index f8e07621..e890ce99 100644
--- a/templates/registration/logout.html
+++ b/templates/registration/logout.html
@@ -3,7 +3,9 @@
 
 {% block content %}
 <div id="dev-logout" class="box">
-	<p>Logout successful.<p>
+    <h2>Developer Logout</h2>
+
+	<p>Logout was successful.<p>
 </div>
 {% endblock %}
 
diff --git a/urls.py b/urls.py
index 3608da67..33319263 100644
--- a/urls.py
+++ b/urls.py
@@ -42,12 +42,8 @@ urlpatterns += patterns('django.contrib.sitemaps.views',
 urlpatterns += patterns('django.contrib.auth.views',
     (r'^login/$',           'login',  {
         'template_name': 'registration/login.html'}),
-    (r'^accounts/login/$',  'login',  {
-        'template_name': 'registration/login.html'}),
     (r'^logout/$',          'logout', {
         'template_name': 'registration/logout.html'}),
-    (r'^accounts/logout/$', 'logout', {
-        'template_name': 'registration/logout.html'}),
 )
 
 # Public pages
-- 
cgit v1.2.3-55-g3dc8