diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-07-05 19:23:14 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-07-05 19:23:14 +0200 |
| commit | f8c7d5a6aa8460db14ddfe39944d19a872b1be8d (patch) | |
| tree | 3861241657bf495f09a903d2ac9e18ec29627743 | |
| parent | b5128f3043e3d08e6a89325b246c87439531a930 (diff) | |
| download | Chimère-f8c7d5a6aa8460db14ddfe39944d19a872b1be8d.tar.bz2 Chimère-f8c7d5a6aa8460db14ddfe39944d19a872b1be8d.zip | |
Simplify zoom area management
| -rw-r--r-- | chimere/templates/chimere/blocks/areas.html | 3 | ||||
| -rw-r--r-- | chimere/urls.py | 2 | ||||
| -rw-r--r-- | chimere/views.py | 6 |
3 files changed, 5 insertions, 6 deletions
diff --git a/chimere/templates/chimere/blocks/areas.html b/chimere/templates/chimere/blocks/areas.html index 807b4b2..993616b 100644 --- a/chimere/templates/chimere/blocks/areas.html +++ b/chimere/templates/chimere/blocks/areas.html @@ -13,8 +13,7 @@ function (){ val = jQuery(this).val(); if(val){ - window.location = "{{ base_url }}" + jQuery(this).val() - + "/zoomout"; + window.location = "{{ base_url }}" + jQuery(this).val(); } else{ window.location = "{{ base_url }}"; diff --git a/chimere/urls.py b/chimere/urls.py index 9c1d291..66bf47d 100644 --- a/chimere/urls.py +++ b/chimere/urls.py @@ -78,5 +78,5 @@ urlpatterns += patterns('chimere.views', url(r'^(?P<area_name>\w+/)?process_route_file/(?P<file_id>\d+)/$', 'processRouteFile', name='process_route_file'), # At the end, because it catches large - url(r'^(?P<area_name>\w+)?(/(?P<zoomout>\w+))?', 'index', name="index"), + url(r'^(?P<area_name>\w+)?', 'index', name="index"), ) diff --git a/chimere/views.py b/chimere/views.py index 5068698..08a0add 100644 --- a/chimere/views.py +++ b/chimere/views.py @@ -85,8 +85,7 @@ def get_base_response(area_name=""): base_response_dct['JQUERY_CSS_URLS'] = settings.JQUERY_CSS_URLS return base_response_dct, None -def index(request, area_name=None, default_area=None, simple=False, - zoomout=None): +def index(request, area_name=None, default_area=None, simple=False): """ Main page """ @@ -102,7 +101,8 @@ def index(request, area_name=None, default_area=None, simple=False, if redir: return redir # don't mess with permalink - if zoomout and request.GET and 'lat' in request.GET \ + zoomout = True + if request.GET and 'lat' in request.GET \ and 'lon' in request.GET: zoomout = None response_dct.update({ |