cleanup sharebox changes

* "data" moved to helptext * drop css introduced in previous draft * prettier.js
umap-project · Dec 29, 2023 · dbf0179 · dbf0179
1 parent 3f6c705
commit dbf0179
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/umap/static/umap/base.css b/umap/static/umap/base.css
@@ -227,8 +227,7 @@ button.flat,
     font-size: 10px;
     border-radius: 0 2px;
 }
-.content .helptext,
-#umap-ui-container .help-text {
+.content .helptext {
     background-color: #eee;
     color: #000;
 }
@@ -410,7 +409,6 @@ input.switch:checked ~ label:after {
 .umap-multiplechoice.by5 {
     grid-template-columns: 1fr 1fr 1fr;
 }
-.button-bar.by4,
 .umap-multiplechoice.by4 {
     grid-template-columns: 1fr 1fr 1fr 1fr;
 }

diff --git a/umap/static/umap/js/umap.controls.js b/umap/static/umap/js/umap.controls.js
@@ -1069,7 +1069,6 @@ L.U.TileLayerControl = L.Control.IconLayers.extend({
     L.Control.IconLayers.prototype.setLayers.call(this, layers.slice(0, maxShown))
     if (this.map.selected_tilelayer) this.setActiveLayer(this.map.selected_tilelayer)
   },
-
 })
 
 /* Used in edit mode to define the default tilelayer */

diff --git a/umap/static/umap/js/umap.share.js b/umap/static/umap/js/umap.share.js
@@ -55,7 +55,12 @@ L.U.Share = L.Class.extend({
       () => navigator.clipboard.writeText(this.mapUrl.value),
       this
     )
-    const mapUrlLabel = L.DomUtil.add('label', '', this.container, L._('Link to view the map'))
+    const mapUrlLabel = L.DomUtil.add(
+      'label',
+      '',
+      this.container,
+      L._('Link to view the map')
+    )
     this.mapUrl = L.DomUtil.create('input', 'umap-share-url', mapUrlLabel)
     this.mapUrl.type = 'text'
     this.mapUrl.readOnly = true
@@ -80,27 +85,32 @@ L.U.Share = L.Class.extend({
     L.DomUtil.create('hr', '', this.container)
 
     L.DomUtil.add('h4', '', this.container, L._('Download'))
-    L.DomUtil.add('small', 'label', this.container, L._('Only visible layers'))
+    L.DomUtil.add('small', 'label', this.container, L._("Only visible layers' data"))
     for (const key in this.EXPORT_TYPES) {
       if (this.EXPORT_TYPES.hasOwnProperty(key)) {
         L.DomUtil.createButton(
           'download-file',
           this.container,
-          this.EXPORT_TYPES[key].name || key + ' data',
+          this.EXPORT_TYPES[key].name || key,
           () => this.download(key),
           this
         )
       }
     }
     L.DomUtil.create('div', 'vspace', this.container)
-    L.DomUtil.add('small', 'label', this.container, L._('All data and settings of the map'))
+    L.DomUtil.add(
+      'small',
+      'label',
+      this.container,
+      L._('All data and settings of the map')
+    )
     const downloadUrl = L.Util.template(this.map.options.urls.map_download, {
       map_id: this.map.options.umap_id,
     })
     const link = L.DomUtil.createLink(
       'download-backup',
       this.container,
-      L._('Download full backup'),
+      L._('full backup'),
       downloadUrl
     )
     let name = this.map.options.name || 'data'

diff --git a/umap/tests/integration/test_export_map.py b/umap/tests/integration/test_export_map.py
@@ -9,7 +9,7 @@
 
 def test_umap_export(map, live_server, datalayer, page):
     page.goto(f"{live_server.url}{map.get_absolute_url()}?share")
-    link = page.get_by_role("link", name="Download full backup")
+    link = page.get_by_role("link", name="full backup")
     expect(link).to_be_visible()
     with page.expect_download() as download_info:
         link.click()