From f90d0e6159de8bd80eb2fe504585fbf9a78dda7f Mon Sep 17 00:00:00 2001 From: Yohan Boniface Date: Tue, 22 Jan 2013 22:39:25 +0100 Subject: [PATCH] Handle path styling options See https://github.com/yohanboniface/Leaflet.Storage/issues/26 --- umap/static/umap/umap.css | 26 +++++++++++++++++++++++ umap/templates/base.html | 13 ++++++++++++ umap/templates/umap/styles_fieldset.html | 27 ++++++++++++++++++++---- 3 files changed, 62 insertions(+), 4 deletions(-) diff --git a/umap/static/umap/umap.css b/umap/static/umap/umap.css index e4adfcc2..fffb5639 100644 --- a/umap/static/umap/umap.css +++ b/umap/static/umap/umap.css @@ -80,6 +80,32 @@ input:-moz-placeholder, :-moz-placeholder { background-color: #970b0e; } +#style_options > * { + display: none; +} + +#style_options .more_style_options, +#style_options legend { + display: block; + cursor: pointer; +} +#style_options .more_style_options:before { + content: "…"; +} +#style_options legend:before { + content: "▶"; + padding-right: 5px; +} +#style_options.on legend:before { + content: "▼"; +} +#style_options.on > * { + display: block; +} +#style_options.on .more_style_options { + display: none; +} + /* Map infos */ .category_color { display: inline-block; diff --git a/umap/templates/base.html b/umap/templates/base.html index f46ebd90..d3414565 100644 --- a/umap/templates/base.html +++ b/umap/templates/base.html @@ -45,6 +45,19 @@ {% endcompress js %} {% block bottom_js %} + {% endblock %}
diff --git a/umap/templates/umap/styles_fieldset.html b/umap/templates/umap/styles_fieldset.html index b9057732..a494a5cb 100644 --- a/umap/templates/umap/styles_fieldset.html +++ b/umap/templates/umap/styles_fieldset.html @@ -1,7 +1,8 @@ {% load umap_tags i18n %} -
- {% trans "Styles" %} - {% foundation_field form.color %} +
+ {% trans "Styles options" %} + + {% foundation_field form.options_color %} {% if form.icon_class and form.pictogram %}
@@ -12,4 +13,22 @@
{% endif %} -
+ {% foundation_field form.options_weight %} + {% if form.options_stroke %} +
+ {{ form.options_stroke.label }}{{ form.options_stroke }} +
+ {{ form.options_stroke.help_text }} + {% endif %} + {% foundation_field form.options_smoothFactor %} + {% foundation_field form.options_opacity %} + {% if form.options_fill %} +
+ {{ form.options_fill.label }}{{ form.options_fill }} +
+ {{ form.options_fill.help_text }} + {% endif %} + {% foundation_field form.options_fillOpacity %} + {% foundation_field form.options_fillColor %} + {% foundation_field form.options_dashArray %} +
\ No newline at end of file