diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-05-30 21:39:44 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-05-30 21:39:44 +0200 |
| commit | c0e5fbb52d5964973e5f07e82d235f1906c522e3 (patch) | |
| tree | 7901bc8ab44964f2088741962c41183378095959 | |
| parent | 882f983f49e2f0fdffa142701c71ba2d2886d598 (diff) | |
| download | Chimère-c0e5fbb52d5964973e5f07e82d235f1906c522e3.tar.bz2 Chimère-c0e5fbb52d5964973e5f07e82d235f1906c522e3.zip | |
Add layerswitcher to edit forms
| -rw-r--r-- | chimere/static/chimere/css/styles.css | 1 | ||||
| -rw-r--r-- | chimere/templates/chimere/blocks/live_coordinates.html | 1 | ||||
| -rw-r--r-- | chimere/templates/chimere/blocks/polygon_edit.html | 1 | ||||
| -rw-r--r-- | chimere/widgets.py | 2 |
4 files changed, 3 insertions, 2 deletions
diff --git a/chimere/static/chimere/css/styles.css b/chimere/static/chimere/css/styles.css index 0bec2a8..24dcef1 100644 --- a/chimere/static/chimere/css/styles.css +++ b/chimere/static/chimere/css/styles.css @@ -1258,7 +1258,6 @@ div.pp_default .pp_expand{ z-index:100; position: absolute; background-color: rgba(255,255,255,0.7); - top: 60px; } .LayerSwitcher .LayerClickDiv, .LayerSwitcher .LayerClickDiv * { diff --git a/chimere/templates/chimere/blocks/live_coordinates.html b/chimere/templates/chimere/blocks/live_coordinates.html index c779dca..b4b7d1e 100644 --- a/chimere/templates/chimere/blocks/live_coordinates.html +++ b/chimere/templates/chimere/blocks/live_coordinates.html @@ -21,6 +21,7 @@ </div> +<div id='layerSwitcher'></div> <div id='map_edit'></div> <div id='live_lonlat'> <p> diff --git a/chimere/templates/chimere/blocks/polygon_edit.html b/chimere/templates/chimere/blocks/polygon_edit.html index 929ac9d..59fe07e 100644 --- a/chimere/templates/chimere/blocks/polygon_edit.html +++ b/chimere/templates/chimere/blocks/polygon_edit.html @@ -19,6 +19,7 @@ </script> <div id='popup'></div> +<div id='layerSwitcher'></div> <div id='map_edit'></div> <div class='help'>{% trans "To delete a vertice, hold the SHIFT key and click." %}</div> <input type='hidden' name='{{name}}' id='id_{{name}}' value='{{value}}'/> diff --git a/chimere/widgets.py b/chimere/widgets.py index 2a8bc5d..c9c6cc2 100644 --- a/chimere/widgets.py +++ b/chimere/widgets.py @@ -496,7 +496,7 @@ class RouteChooserWidget(forms.TextInput): tpl += "\n<div class='help-route' id='help-route-create'>%s</div>"\ % help_create tpl += \ - u"\n<div id='map_edit'>\n"\ + u"\n<div id='layerSwitcher'></div>\n<div id='map_edit'>\n"\ u" <div class='map_button'>\n"\ u" <a href='#' id='button-move-map' class='toggle-button "\ u"toggle-button-active' "\ |