summaryrefslogtreecommitdiff
path: root/chimere/views.py
diff options
context:
space:
mode:
Diffstat (limited to 'chimere/views.py')
-rw-r--r--chimere/views.py46
1 files changed, 28 insertions, 18 deletions
diff --git a/chimere/views.py b/chimere/views.py
index 90fa821..17e510c 100644
--- a/chimere/views.py
+++ b/chimere/views.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-# Copyright (C) 2008-2011 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet>
+# Copyright (C) 2008-2012 É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
@@ -29,7 +29,7 @@ from django.core import serializers
from django.db.models import Q
from django.http import HttpResponseRedirect, HttpResponse
from django.shortcuts import render_to_response
-from django.template import loader
+from django.template import loader, RequestContext
from django.utils import simplejson
from django.utils.http import urlquote
from django.utils.translation import ugettext as _
@@ -47,7 +47,7 @@ def get_base_response(area_name=""):
"""
Get the base url
"""
- base_response_dct = {'media_path':settings.MEDIA_URL,}
+ base_response_dct = {'media_path':settings.STATIC_URL,}
base_url = settings.EXTRA_URL
if not base_url.startswith('/'):
base_url = '/' + base_url
@@ -70,8 +70,8 @@ def index(request, area_name=None, default_area=None, simple=False):
tab = " "*4
for url in URL_OSM_CSS:
extra += tab + '<link rel="stylesheet" href="%s" />' % url
- for url in URL_OSM_JS + ["%sbase.js" % settings.MEDIA_URL,
- "%smain_map.js" % settings.MEDIA_URL,]:
+ for url in URL_OSM_JS + ["%sbase.js" % settings.STATIC_URL,
+ "%smain_map.js" % settings.STATIC_URL,]:
extra += tab + '<script src="%s"></script>\n' % url
# show the welcome page
today = datetime.date.today().strftime('%y-%m-%d')
@@ -108,7 +108,8 @@ def index(request, area_name=None, default_area=None, simple=False):
tpl = 'main_map.html'
if simple:
tpl = 'main_map_simple.html'
- return render_to_response(tpl, response_dct)
+ return render_to_response(tpl, response_dct,
+ context_instance=RequestContext(request))
def edit(request, area_name=""):
"""
@@ -149,7 +150,8 @@ def edit(request, area_name=""):
# manualy populate the custom widget
if 'subcategory' in form.data and form.data['subcategory']:
response_dct['current_category'] = int(form.data['subcategory'])
- return render_to_response('edit.html', response_dct)
+ return render_to_response('edit.html', response_dct,
+ context_instance=RequestContext(request))
def uploadFile(request, category_id='', area_name=''):
response_dct = get_base_response(area_name)
@@ -192,7 +194,8 @@ def uploadFile(request, category_id='', area_name=''):
# An unbound form
form = Form()
response_dct.update({'form':form})
- return render_to_response('upload_file.html', response_dct)
+ return render_to_response('upload_file.html', response_dct,
+ context_instance=RequestContext(request))
def processRouteFile(request, area_name='', file_id=None):
if file_id:
@@ -250,7 +253,8 @@ def editRoute(request, area_name=""):
# manualy populate the custom widget
if 'subcategory' in form.data and form.data['subcategory']:
response_dct['current_category'] = int(form.data['subcategory'])
- return render_to_response('edit_route.html', response_dct)
+ return render_to_response('edit_route.html', response_dct,
+ context_instance=RequestContext(request))
def welcome(request, display=None):
"""
@@ -271,7 +275,8 @@ def submited(request, area_name="", action=""):
"""
response_dct = get_base_response(area_name)
response_dct.update({'actions':actions, 'action_selected':action,})
- return render_to_response('submited.html', response_dct)
+ return render_to_response('submited.html', response_dct,
+ context_instance=RequestContext(request))
def charte(request, area_name=""):
"""
@@ -279,7 +284,8 @@ def charte(request, area_name=""):
"""
response_dct = get_base_response(area_name)
response_dct.update({'actions':actions, 'action_selected':('charte',)})
- return render_to_response('charte.html', response_dct)
+ return render_to_response('charte.html', response_dct,
+ context_instance=RequestContext(request))
def contactus(request, area_name=""):
"""
@@ -295,9 +301,9 @@ def contactus(request, area_name=""):
response = notifyStaff(_(u"Comments/request on the map"),
form.cleaned_data['content'], form.cleaned_data['email'])
if response:
- msg = _(u"Thank you for your contribution. It will be taken \
-into account. If you have left your email you may be contacted soon for more \
-details.")
+ msg = _(u"Thank you for your contribution. It will be taken "\
+ u"into account. If you have left your email you may "\
+ u"be contacted soon for more details.")
else:
msg = _(u"Temporary error. Renew your message later.")
else:
@@ -305,7 +311,8 @@ details.")
response_dct = get_base_response(area_name)
response_dct.update({'actions':actions, 'action_selected':('contact',),
'contact_form':form, 'message':msg})
- return render_to_response('contactus.html', response_dct)
+ return render_to_response('contactus.html', response_dct,
+ context_instance=RequestContext(request))
def getDetail(request, area_name, marker_id):
'''
@@ -329,7 +336,8 @@ def getDetail(request, area_name, marker_id):
share_networks.append((network[0], network[1] % net_dct, network[2]))
response_dct['share_networks'] = share_networks
response_dct['dated'] = settings.DAYS_BEFORE_EVENT and marker.start_date
- return render_to_response('detail.html', response_dct)
+ return render_to_response('detail.html', response_dct,
+ context_instance=RequestContext(request))
def getDescriptionDetail(request, area_name, category_id):
'''
@@ -341,7 +349,8 @@ def getDescriptionDetail(request, area_name, category_id):
return HttpResponse('no results')
response_dct = get_base_response(area_name)
response_dct['category'] = category
- return render_to_response('category_detail.html', response_dct)
+ return render_to_response('category_detail.html', response_dct,
+ context_instance=RequestContext(request))
def checkDate(q):
"""
@@ -432,7 +441,8 @@ def getAvailableCategories(request, area_name=None, area=None, status='A',
subcategories = [(cat, list(subcats)) \
for cat, subcats in groupby(categories, get_cat)]
response_dct['sub_categories'] = subcategories
- return render_to_response('categories.html', response_dct)
+ return render_to_response('categories.html', response_dct,
+ context_instance=RequestContext(request))
def getTinyfiedUrl(parameters, area_name=''):
'''
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-24 14:17:31 +0000