diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-09-23 23:38:21 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-09-23 23:38:21 +0200 |
| commit | 3d3d618fc627fc4568c826e11a296a5e75e2ebb9 (patch) | |
| tree | 0e4c24d715b9d4a678eff9015f498b256a466c2b /chimere/templates | |
| parent | cf03b1eea89f4a7a0c0b03629a81a0d8d588a35f (diff) | |
| parent | 5d2cac2cb5a03c8f55a2396e4c4ce13911a9149c (diff) | |
| download | Chimère-3d3d618fc627fc4568c826e11a296a5e75e2ebb9.tar.bz2 Chimère-3d3d618fc627fc4568c826e11a296a5e75e2ebb9.zip | |
Merge branch 'v2.1' into v2.2
Conflicts:
chimere/admin.py
chimere/models.py
Diffstat (limited to 'chimere/templates')
| -rw-r--r-- | chimere/templates/chimere/blocks/map_menu.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chimere/templates/chimere/blocks/map_menu.html b/chimere/templates/chimere/blocks/map_menu.html index 38fb4a8..02f415a 100644 --- a/chimere/templates/chimere/blocks/map_menu.html +++ b/chimere/templates/chimere/blocks/map_menu.html @@ -1,7 +1,7 @@ {% load i18n %} <div id='chimere_map_menu'> <ul> - {% if routing %} + {% if routing and not simple %} <li id='map_menu_from' class='routing_item'>{% trans "From" context "routing" %}</li> <li id='map_menu_step' class='routing_item'>{% trans "Add a step" context "routing" %}</li> <li id='map_menu_to' class='routing_item'>{% trans "To" context "routing" %}</li> |