diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-02-01 13:19:30 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-02-01 13:19:30 +0100 |
| commit | 279d6cf6c47a56dcb45c601d781261bc06d356f1 (patch) | |
| tree | 7c9384f1bab82a5ca7e6167aad579b89da7c26b4 | |
| parent | ec3320209e19c837705edc90d629d77bc2cdce5a (diff) | |
| parent | ae84c6703fa9bf1b937b23dde15df3bd7e63aef4 (diff) | |
| download | Chimère-279d6cf6c47a56dcb45c601d781261bc06d356f1.tar.bz2 Chimère-279d6cf6c47a56dcb45c601d781261bc06d356f1.zip | |
Merge branch 'master' of ssh://daenerys.peacefrogs.net/var/local/git/chimere
| -rw-r--r-- | chimere/templates/chimere/blocks/areas.html | 1 | ||||
| -rw-r--r-- | chimere/views.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/chimere/templates/chimere/blocks/areas.html b/chimere/templates/chimere/blocks/areas.html index 8c4b981..a1ebe76 100644 --- a/chimere/templates/chimere/blocks/areas.html +++ b/chimere/templates/chimere/blocks/areas.html @@ -3,6 +3,7 @@ <div id='areas-div'> <label for='areas-select'>{% trans "Areas:" %}</label> <select id='areas-select'> + {% if not has_default_area %}<option value=''>--</option>{% endif %} {% for area in areas %} <option value='{{area.urn}}'{% if area_name and area.urn == area_name %} selected='selected'{% endif %}{% if not area_name and area.default %} selected='selected'{% endif %}>{{area.name}}</option> {% endfor %} diff --git a/chimere/views.py b/chimere/views.py index a874c75..b49da6e 100644 --- a/chimere/views.py +++ b/chimere/views.py @@ -130,6 +130,7 @@ def index(request, area_name=None, default_area=None, simple=False): 'areas_visible': settings.CHIMERE_DISPLAY_AREAS, 'map_layer':settings.CHIMERE_DEFAULT_MAP_LAYER, 'dynamic_categories':response_dct['dynamic_categories'], + 'has_default_area':Area.objects.filter(default=True).count(), 'zoomout':zoomout }) tpl = 'chimere/main_map.html' |