diff options
| author | Leif Johansson <leifj@sunet.se> | 2011-02-09 10:34:12 +0100 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2011-02-09 10:34:12 +0100 |
| commit | f4ee518893a1441aebdba4322d0692553bd8469e (patch) | |
| tree | b5672cc95dce41f8821ff3edb22b9bba869c097b | |
| parent | 23816211095cbc8bfde3313b3b1ccf4a43908420 (diff) | |
prefix in templates
| -rw-r--r-- | meetingtools/apps/auth/views.py | 5 | ||||
| -rw-r--r-- | templates/base.html | 15 |
2 files changed, 11 insertions, 9 deletions
diff --git a/meetingtools/apps/auth/views.py b/meetingtools/apps/auth/views.py index 877e43f..6828ac2 100644 --- a/meetingtools/apps/auth/views.py +++ b/meetingtools/apps/auth/views.py @@ -9,6 +9,7 @@ import datetime from django.views.decorators.cache import never_cache import logging from meetingtools.apps.userprofile.models import UserProfile +from meetingtools.multiresponse import redirect_to def meta(request,attr): v = request.META.get(attr) @@ -72,10 +73,10 @@ def accounts_login_federated(request): next = request.session.get("after_login_redirect", None) if next is not None: - return HttpResponseRedirect(next) + return redirect_to(next) else: pass - return HttpResponseRedirect("/") + return redirect_to("/") @never_cache def logout(request): diff --git a/templates/base.html b/templates/base.html index 951fdbd..86dea54 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,3 +1,4 @@ +{% load prefix %} <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> @@ -6,13 +7,13 @@ <meta http-equiv="content-type" content="text/html;charset=utf-8" /> <meta http-equiv="Content-Style-Type" content="text/css" /> - <link href="{{prefix}}/site-media/css/reset.css" rel="stylesheet" type="text/css" /> - <link type="text/css" href="/site-media/css/flick/jquery-ui-1.8.2.custom.css" rel="stylesheet"> - <link href="{{prefix}}/site-media/css/sunet.css" rel="stylesheet" type="text/css" /> - <link href="{{prefix}}/site-media/css/style.css" rel="stylesheet" type="text/css" /> - <link href="{{prefix}}/site-media/css/gs.css" rel="stylesheet" type="text/css" /> - <script type="text/javascript" src="{{prefix}}/site-media/js/jquery-1.4.2.min.js"></script> - <script type="text/javascript" src="{{prefix}}/site-media/js/jquery-ui-1.8.2.custom.min.js"></script> + <link href="{% prefix %}/site-media/css/reset.css" rel="stylesheet" type="text/css" /> + <link type="text/css" href="{% prefix %}/site-media/css/flick/jquery-ui-1.8.2.custom.css" rel="stylesheet"> + <link href="{% prefix %}/site-media/css/sunet.css" rel="stylesheet" type="text/css" /> + <link href="{% prefix %}/site-media/css/style.css" rel="stylesheet" type="text/css" /> + <link href="{% prefix %}/site-media/css/gs.css" rel="stylesheet" type="text/css" /> + <script type="text/javascript" src="{% prefix %}/site-media/js/jquery-1.4.2.min.js"></script> + <script type="text/javascript" src="{% prefix %}/site-media/js/jquery-ui-1.8.2.custom.min.js"></script> <!--[if IE]> <link href="css/sunet-ie6.css" rel="stylesheet" type="text/css" /> |