diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-03-25 18:39:21 +0100 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-03-25 18:39:21 +0100 |
commit | 3fcdf69304580650c6244165aae0b1fc46221cff (patch) | |
tree | 0fd3bc3526ee732faa9cc6d30a160e6dbc3e3d2a /papillon/polls/views.py | |
parent | 68eaa550ed54678bc2855f5a45d58073dba59a2d (diff) | |
download | Papillon-3fcdf69304580650c6244165aae0b1fc46221cff.tar.bz2 Papillon-3fcdf69304580650c6244165aae0b1fc46221cff.zip |
Fix static / media mix
Diffstat (limited to 'papillon/polls/views.py')
-rw-r--r-- | papillon/polls/views.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/papillon/polls/views.py b/papillon/polls/views.py index eeed883..54920b7 100644 --- a/papillon/polls/views.py +++ b/papillon/polls/views.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2008 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> +# Copyright (C) 2008-2016 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as @@ -25,11 +25,12 @@ from random import choice as random_choice import string import time -from django.shortcuts import render_to_response -from django.http import HttpResponseRedirect +from django.core.urlresolvers import reverse from django.conf import settings +from django.http import HttpResponseRedirect +from django.shortcuts import render_to_response +from django.template import RequestContext from django.utils.translation import gettext_lazy as _ -from django.core.urlresolvers import reverse from papillon.polls.models import Poll, PollUser, Choice, Voter, Vote, \ Category, Comment @@ -50,7 +51,7 @@ def getBaseResponse(request): languages = [] for language_code, language_label in settings.LANGUAGES: languages.append((language_code, language_label)) - return {'media_url': settings.MEDIA_URL, 'languages': languages, + return {'languages': languages, 'admin_url': settings.ADMIN_MEDIA_PREFIX}, None @@ -65,7 +66,8 @@ def index(request): response_dct['categories'] = Category.objects.all() if 'bad_poll' in request.GET: response_dct['error'] = _("The poll requested don't exist (anymore?)") - return render_to_response('main.html', response_dct) + return render_to_response('main.html', response_dct, + context_instance=RequestContext(request)) def category(request, category_id): |