summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chimere/templates/chimere/blocks/map_params.html1
-rw-r--r--chimere/views.py66
-rw-r--r--chimere/widgets.py3
3 files changed, 36 insertions, 34 deletions
diff --git a/chimere/templates/chimere/blocks/map_params.html b/chimere/templates/chimere/blocks/map_params.html
index 59cd96c..abdb582 100644
--- a/chimere/templates/chimere/blocks/map_params.html
+++ b/chimere/templates/chimere/blocks/map_params.html
@@ -1,6 +1,7 @@
{% load i18n %}
<script type="text/javascript">
var chimere_init_options = {};
+ chimere_init_options["default_icon"] = '{{STATIC_URL}}img/marker-green.png';
chimere_init_options["map_layers"] = [{{map_layers|safe|escape}}];
chimere_init_options['permalink_label'] = '{%trans "Permalink"%}';
chimere_init_options['permalink_element'] = document.getElementById('permalink');
diff --git a/chimere/views.py b/chimere/views.py
index 412545f..371731d 100644
--- a/chimere/views.py
+++ b/chimere/views.py
@@ -92,9 +92,9 @@ def index(request, area_name=None, default_area=None, simple=False,
request.session['last_visit'] != today:
request.session['last_visit'] = today
news_visible = True
- response_dct, redirect = get_base_response(area_name)
- if redirect:
- return redirect
+ response_dct, redir = get_base_response(area_name)
+ if redir:
+ return redir
# don't mess with permalink
if zoomout and request.GET and 'lat' in request.GET \
and 'lon' in request.GET:
@@ -119,9 +119,9 @@ def get_edit_page(redirect_url, item_cls, item_form):
Edition page
"""
def func(request, area_name="", item_id=None, cat_type=['M']):
- response_dct, redirect = get_base_response(area_name)
- if redirect:
- return redirect, None, None
+ response_dct, redir = get_base_response(area_name)
+ if redir:
+ return redir, None, None
if 'area_name' in response_dct:
area_name = response_dct['area_name']
subcategories = SubCategory.getAvailable(cat_type, area_name)
@@ -245,9 +245,9 @@ def edit(request, area_name="", item_id=None, submited=False):
context_instance=RequestContext(request))
def uploadFile(request, category_id='', area_name=''):
- response_dct, redirect = get_base_response(area_name)
- if redirect:
- return redirect
+ response_dct, redir = get_base_response(area_name)
+ if redir:
+ return redir
Form = FileForm if not category_id else FullFileForm
category = None
if category_id:
@@ -364,9 +364,9 @@ def submited(request, area_name="", action=""):
"""
Successful submission page
"""
- response_dct, redirect = get_base_response(area_name)
- if redirect:
- return redirect
+ response_dct, redir = get_base_response(area_name)
+ if redir:
+ return redir
response_dct.update({'actions':actions, 'action_selected':action,})
return render_to_response('chimere/submited.html', response_dct,
context_instance=RequestContext(request))
@@ -375,9 +375,9 @@ def charte(request, area_name=""):
"""
Affichage de la charte
"""
- response_dct, redirect = get_base_response(area_name)
- if redirect:
- return redirect
+ response_dct, redir = get_base_response(area_name)
+ if redir:
+ return redir
response_dct.update({'actions':actions, 'action_selected':('charte',)})
return render_to_response('chimere/charte.html', response_dct,
context_instance=RequestContext(request))
@@ -403,9 +403,9 @@ def contactus(request, area_name=""):
msg = _(u"Temporary error. Renew your message later.")
else:
form = ContactForm()
- response_dct, redirect = get_base_response(area_name)
- if redirect:
- return redirect
+ response_dct, redir = get_base_response(area_name)
+ if redir:
+ return redir
response_dct.update({'actions':actions, 'action_selected':('contact',),
'contact_form':form, 'message':msg})
return render_to_response('chimere/contactus.html', response_dct,
@@ -420,9 +420,9 @@ def getDetail(request, area_name, marker_id):
status__in=['A', 'S'])[0]
except (ValueError, IndexError):
return HttpResponse('no results')
- response_dct, redirect = get_base_response(area_name)
- if redirect:
- return redirect
+ response_dct, redir = get_base_response(area_name)
+ if redir:
+ return redir
response_dct['marker'] = marker
if request.method == 'GET':
if 'simple' in request.GET and request.GET['simple']:
@@ -448,9 +448,9 @@ def getDescriptionDetail(request, area_name, category_id):
category = Category.objects.filter(id=int(category_id))[0]
except (ValueError, IndexError):
return HttpResponse('no results')
- response_dct, redirect = get_base_response(area_name)
- if redirect:
- return redirect
+ response_dct, redir = get_base_response(area_name)
+ if redir:
+ return redir
response_dct['category'] = category
return render_to_response('chimere/category_detail.html', response_dct,
context_instance=RequestContext(request))
@@ -518,9 +518,9 @@ def get_available_categories(request, area_name=None, area=None, status='A',
if settings.CHIMERE_DYNAMIC_CATEGORIES and \
not "current_extent" in request.GET:
return ""
- context_data, redirect = get_base_response(area_name)
- if redirect:
- return redirect
+ context_data, redir = get_base_response(area_name)
+ if redir:
+ return redir
if not settings.CHIMERE_DYNAMIC_CATEGORIES:
# Categories are not updated dynamicaly when the user move the map
# so we return ALL the categories
@@ -563,9 +563,9 @@ def getTinyfiedUrl(parameters, area_name=''):
urn = TinyUrl.getUrnByParameters(parameters)
except:
return {}
- response_dct, redirect = get_base_response(area_name)
- if redirect:
- return redirect
+ response_dct, redir = get_base_response(area_name)
+ if redir:
+ return redir
url = settings.SERVER_URL
if url[-1] == '/':
url = url[:-1]
@@ -588,7 +588,7 @@ def redirectFromTinyURN(request, area_name='', tiny_urn=''):
Redirect from a tiny Urn
"""
parameters = '?' + TinyUrl.getParametersByUrn(tiny_urn)
- response_dct, redirect = get_base_response(area_name)
- if redirect:
- return redirect
+ response_dct, redir = get_base_response(area_name)
+ if redir:
+ return redir
return HttpResponseRedirect(response_dct['extra_url'] + parameters)
diff --git a/chimere/widgets.py b/chimere/widgets.py
index bfa4fe7..e9a391e 100644
--- a/chimere/widgets.py
+++ b/chimere/widgets.py
@@ -150,12 +150,13 @@ class PointChooserWidget(forms.TextInput):
var EPSG_DISPLAY_PROJECTION = epsg_display_projection = new OpenLayers.Projection('EPSG:%s');
var EPSG_PROJECTION = epsg_projection = new OpenLayers.Projection('EPSG:%s');
var chimere_init_options = {};
+ chimere_init_options["default_icon"] = new OpenLayers.Icon('%schimere/img/marker-green.png', new OpenLayers.Size(21, 25), new OpenLayers.Pixel(-(21/2), -25));
chimere_init_options["map_layers"] = [%s];
chimere_init_options['dynamic_categories'] = false;
chimere_init_options['edition'] = true;
chimere_init_options["checked_categories"] = [];
""" % (settings.STATIC_URL, settings.CHIMERE_EPSG_DISPLAY_PROJECTION,
- settings.CHIMERE_EPSG_PROJECTION,
+ settings.CHIMERE_EPSG_PROJECTION, settings.STATIC_URL,
", ".join(map_layers))
#TODO: manage area
tpl = u"<script type='text/javascript'><!--\n"\
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-21 00:47:54 +0000