summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authoretienne <etienne@9215b0d5-fb2c-4bbd-8d3e-bd2e9090e864>2009-01-14 00:05:56 +0000
committeretienne <etienne@9215b0d5-fb2c-4bbd-8d3e-bd2e9090e864>2009-01-14 00:05:56 +0000
commit0d1b6ecd08c24cca9aa283fcb4f30a456899a5f3 (patch)
tree765ee8b20f577a8e6756c3403bf471451c9aa296 /main
parent5577411f505db728e778a9bda8cd8a958c805317 (diff)
downloadChimère-0d1b6ecd08c24cca9aa283fcb4f30a456899a5f3.tar.bz2
Chimère-0d1b6ecd08c24cca9aa283fcb4f30a456899a5f3.zip
Keep zoom level and bounds between pages
git-svn-id: http://www.peacefrogs.net/svn/chimere/trunk@13 9215b0d5-fb2c-4bbd-8d3e-bd2e9090e864
Diffstat (limited to 'main')
-rw-r--r--main/actions.py5
-rw-r--r--main/views.py4
-rw-r--r--main/widgets.py2
3 files changed, 4 insertions, 7 deletions
diff --git a/main/actions.py b/main/actions.py
index 77f8a46..89ba987 100644
--- a/main/actions.py
+++ b/main/actions.py
@@ -29,5 +29,6 @@ class Action:
def __init__(self, id, path, label):
self.id, self.path, self.label = id, main_path + path, label
-actions = [Action('view', '', _('View')), Action('edit', 'edit', _('Add')),
- Action('edit_route', 'edit_route', _('Add route'))]
+actions = [Action('view', '', _('View')),
+ Action('edit', 'edit', _('Add a new point of interest')),
+ Action('edit_route', 'edit_route', _('Add a new route'))]
diff --git a/main/views.py b/main/views.py
index 8c26a36..0aadb18 100644
--- a/main/views.py
+++ b/main/views.py
@@ -110,7 +110,6 @@ def editRoute(request):
# If the form has been submited
if request.method == 'POST':
form = RouteForm(request.POST, request.FILES)
- print request.POST
# All validation rules pass
if form.is_valid():
route = form.save()
@@ -149,7 +148,6 @@ def submited(request, action):
"""
Successful submission page
"""
- print action
response_dct = {'actions':actions, 'action_selected':action,
'media_path':settings.MEDIA_URL,}
return render_to_response('submited.html', response_dct)
@@ -186,4 +184,4 @@ def getGeoObjects(request, category_ids, status='A'):
return HttpResponse('no results')
data = '{"type": "FeatureCollection", "features":[%s]}' % \
",".join([geo_object.getGeoJSON() for geo_object in geo_objects])
- return HttpResponse(data) \ No newline at end of file
+ return HttpResponse(data)
diff --git a/main/widgets.py b/main/widgets.py
index 1e12c19..2f2154b 100644
--- a/main/widgets.py
+++ b/main/widgets.py
@@ -42,8 +42,6 @@ def getMapJS():
js += u"var centerLonLat = new OpenLayers.LonLat(%f,\
%f).transform(epsg_display_projection, epsg_projection);\n" % \
settings.DEFAULT_CENTER
- js += u"var maxExtent = new OpenLayers.Bounds(%f, %f, %f, %f);\n" % \
- settings.MAP_BOUNDS
js += u"var media_path = '%s';\n" % settings.MEDIA_URL
js = u"""<script type="text/javascript"><!--
%s// !--></script>