From 7a5a8794fd37888da9cdb5bb3fbd7c0ace923754 Mon Sep 17 00:00:00 2001 From: Yohan Boniface Date: Mon, 24 Jul 2023 16:40:08 +0200 Subject: [PATCH] Add icons to better distinguish edit panels cf #1156 --- umap/static/umap/img/16-white.svg | 8 +++++++- umap/static/umap/img/source/16-white.svg | 10 ++++++++-- umap/static/umap/js/umap.features.js | 3 ++- umap/static/umap/js/umap.js | 2 +- umap/static/umap/map.css | 25 ++++++++++++++++++++++++ 5 files changed, 43 insertions(+), 5 deletions(-) diff --git a/umap/static/umap/img/16-white.svg b/umap/static/umap/img/16-white.svg index e9b91538..c1417e5b 100644 --- a/umap/static/umap/img/16-white.svg +++ b/umap/static/umap/img/16-white.svg @@ -38,7 +38,6 @@ - @@ -132,5 +131,12 @@ + + + + + + + diff --git a/umap/static/umap/img/source/16-white.svg b/umap/static/umap/img/source/16-white.svg index 3bca63f3..82cb9904 100644 --- a/umap/static/umap/img/source/16-white.svg +++ b/umap/static/umap/img/source/16-white.svg @@ -3,7 +3,7 @@ - + @@ -56,7 +56,6 @@ - @@ -153,5 +152,12 @@ + + + + + + + diff --git a/umap/static/umap/js/umap.features.js b/umap/static/umap/js/umap.features.js index 92144d2d..2aaecacd 100644 --- a/umap/static/umap/js/umap.features.js +++ b/umap/static/umap/js/umap.features.js @@ -86,7 +86,8 @@ L.U.FeatureMixin = { edit: function (e) { if (!this.map.editEnabled || this.isReadOnly()) return - const container = L.DomUtil.create('div', 'umap-datalayer-container') + const container = L.DomUtil.create('div', 'umap-feature-container') + L.DomUtil.add('h3', `umap-feature-properties ${this.getClassName()}`, container, L._('Feature properties')) let builder = new L.U.FormBuilder(this, ['datalayer'], { callback: function () { diff --git a/umap/static/umap/js/umap.js b/umap/static/umap/js/umap.js index 5f8224c8..f9926541 100644 --- a/umap/static/umap/js/umap.js +++ b/umap/static/umap/js/umap.js @@ -1710,7 +1710,7 @@ L.U.Map.include({ if (!this.editEnabled) return const container = L.DomUtil.create('div', 'umap-edit-container'), metadataFields = ['options.name', 'options.description'], - title = L.DomUtil.create('h4', '', container) + title = L.DomUtil.create('h3', '', container) title.textContent = L._('Edit map properties') const builder = new L.U.FormBuilder(this, metadataFields) const form = builder.build() diff --git a/umap/static/umap/map.css b/umap/static/umap/map.css index 5ce24312..ef430474 100644 --- a/umap/static/umap/map.css +++ b/umap/static/umap/map.css @@ -221,6 +221,31 @@ ul.photon-autocomplete { .manage-datalayers { background-position: -36px -72px; } +.umap-edit-container h3:before, +.umap-feature-properties:before, +.umap-layer-properties-container h3:before { + height: 24px; + width: 24px; + background-repeat: no-repeat; + background-image: url('./img/16-white.svg'); + background-size: auto auto; + background-position: -98px -117px; + content: " "; + vertical-align: bottom; + display: inline-block; +} +.umap-edit-container h3:before { + background-position: -27px -93px; +} +.umap-feature-properties.marker:before { + background-position: -72px -117px; +} +.umap-feature-properties.polyline:before { + background-position: 0 -117px; +} +.umap-feature-properties.polygon:before { + background-position: -24px -117px; +} .umap-toolbar .update-map-permissions, .update-map-permissions { background-position: -36px -36px;