From 1c7bea1c752b7cb9b258230d16006a17b2ed1f8d Mon Sep 17 00:00:00 2001
From: Johan Lundberg <lundberg@nordu.net>
Date: Tue, 1 Feb 2011 14:32:11 +0100
Subject: Added url names and use url reverse.

---
 templates/changepw/change_password.html | 7 ++++---
 urls.py                                 | 4 ++--
 views.py                                | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/templates/changepw/change_password.html b/templates/changepw/change_password.html
index b650b73..bb3f0c5 100644
--- a/templates/changepw/change_password.html
+++ b/templates/changepw/change_password.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% block js %}
-<script type="text/javascript" src="/site_media/js/jquery/jquery-1.4.4.min.js"></script>
-<script type="text/javascript" src="/site_media/js/jquery/password_strength.js"></script>
+<script type="text/javascript" src="/nordunet/site_media/js/jquery/jquery-1.4.4.min.js"></script>
+<script type="text/javascript" src="/nordunet/site_media/js/jquery/password_strength.js"></script>
 {% endblock %}
 {% block content %}
 <h2>Change password</h2>
@@ -16,7 +16,7 @@
     <p class="error">
         {{ form.non_field_errors }}
     </p>
-    <form action="/changepw/" method="post" autocomplete="off">{% csrf_token %}
+    <form action="{% url changepw %}" method="post" autocomplete="off">{% csrf_token %}
     <table>
         <tr>
             <th class="formlabel">Username:</th><td>{{ user.username }}</td>
@@ -45,4 +45,5 @@
         <p>Return code: {{ return_value }}</p>
     {% endif %}
 {% endif %}
+<p><a href="{% url logout %}">Log out</a></p>
 {% endblock %}
diff --git a/urls.py b/urls.py
index eb64d93..bfdb5ce 100644
--- a/urls.py
+++ b/urls.py
@@ -1,6 +1,6 @@
 # This also imports the include function
 from django.conf.urls.defaults import *
 
-urlpatterns = patterns('changepw.views',
-    (r'^$', 'change_password'),
+urlpatterns = patterns('apps.changepw.views',
+    url(r'^/$', 'change_password', name='changepw'),
 )
diff --git a/views.py b/views.py
index 6060098..8399f0c 100644
--- a/views.py
+++ b/views.py
@@ -1,12 +1,12 @@
 from django.contrib.auth.decorators import login_required
-from changepw.models import ChangePasswordForm
+from apps.changepw.models import ChangePasswordForm
 from django import forms
 from django.shortcuts import render_to_response
 from django.template import RequestContext
 from django.http import HttpResponseRedirect
 import subprocess
 
-@login_required
+@login_required(login_url='/nordunet/accounts/login/')
 def change_password(request):
     '''
     If the user is authenticated and the form is valid the password
-- 
cgit v1.1