almet/umap
1
0
Fork 0
mirror of https://github.com/umap-project/umap.git synced 2025-04-28 19:42:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

chore: refine undo/redo buttons

Browse source 
Co-authored-by: David Larlet <david@larlet.fr>
Co-authored-by: Aurélie Jallut <aurelie.jallut@beta.gouv.fr>
This commit is contained in:
Yohan Boniface 2025-04-07 15:55:10 +02:00
parent 190cac3105
commit 82b8564520
8 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
umap/static/umap/css/bar.css
View file

@ -13,9 +13,14 @@
padding: 0 var(--text-margin); padding: 0 var(--text-margin);
background-color: inherit; background-color: inherit;
} }
.leaflet-container .edit-undo {
margin-left: var(--box-margin);
}
.leaflet-container .edit-undo[disabled],
.leaflet-container .edit-redo[disabled] {
filter: invert(.5);
}
.leaflet-container .edit-save, .leaflet-container .edit-save,
.leaflet-container .edit-undo,
.leaflet-container .edit-redo,
.leaflet-container .edit-disable, .leaflet-container .edit-disable,
.leaflet-container .connected-peers .leaflet-container .connected-peers
{ {
@ -40,8 +45,6 @@
color: var(--color-darkGray); color: var(--color-darkGray);
} }
.leaflet-container .edit-undo:hover,
.leaflet-container .edit-redo:hover,
.leaflet-container .edit-disable:hover { .leaflet-container .edit-disable:hover {
border: 0.5px solid rgba(153, 153, 153, 0.80); border: 0.5px solid rgba(153, 153, 153, 0.80);
text-decoration: none; text-decoration: none;

6
umap/static/umap/js/modules/ui/bar.js
View file

@ -11,13 +11,11 @@ const TOP_BAR_TEMPLATE = `
<div class="logo"><a class="" href="/" title="${translate('Go to the homepage')}">uMap</a></div> <div class="logo"><a class="" href="/" title="${translate('Go to the homepage')}">uMap</a></div>
<button class="map-name flat truncate" type="button" data-ref="name"></button> <button class="map-name flat truncate" type="button" data-ref="name"></button>
<button class="share-status flat truncate" type="button" data-ref="share"></button> <button class="share-status flat truncate" type="button" data-ref="share"></button>
<button class="edit-undo round" type="button" data-ref="undo" disabled> <button class="edit-undo round flat" type="button" data-ref="undo" disabled>
<i class="icon icon-16 icon-undo"></i> <i class="icon icon-16 icon-undo"></i>
<span>${translate('Undo')}</span>
</button> </button>
<button class="edit-redo round" type="button" data-ref="redo" disabled> <button class="edit-redo round flat" type="button" data-ref="redo" disabled>
<i class="icon icon-16 icon-redo"></i> <i class="icon icon-16 icon-redo"></i>
<span>${translate('Redo')}</span>
</button> </button>
</div> </div>
<div class="umap-right-edit-toolbox" data-ref="right"> <div class="umap-right-edit-toolbox" data-ref="right">

2
umap/tests/integration/test_browser.py
View file

@ -350,7 +350,7 @@ def test_should_redraw_list_on_feature_delete(live_server, openmap, page, bootst
buttons.first.click() buttons.first.click()
page.locator("dialog").get_by_role("button", name="OK").click() page.locator("dialog").get_by_role("button", name="OK").click()
expect(buttons).to_have_count(2) expect(buttons).to_have_count(2)
page.get_by_role("button", name="Undo").click() page.locator(".edit-undo").click()
expect(buttons).to_have_count(3) expect(buttons).to_have_count(3)

2
umap/tests/integration/test_conditional_rules.py
View file

@ -261,7 +261,7 @@ def test_can_create_new_rule(live_server, page, openmap):
page.get_by_title("AliceBlue").first.click() page.get_by_title("AliceBlue").first.click()
colors = getColors(markers) colors = getColors(markers)
assert colors.count("rgb(240, 248, 255)") == 3 assert colors.count("rgb(240, 248, 255)") == 3
page.get_by_role("button", name="Undo").click() page.locator(".edit-undo").click()
colors = getColors(markers) colors = getColors(markers)
assert colors.count("rgb(240, 248, 255)") == 0 assert colors.count("rgb(240, 248, 255)") == 0

2
umap/tests/integration/test_edit_datalayer.py
View file

@ -64,7 +64,7 @@ def test_cancel_deleting_datalayer_should_restore(
page.get_by_role("button", name="OK").click() page.get_by_role("button", name="OK").click()
expect(markers).to_have_count(0) expect(markers).to_have_count(0)
expect(page.get_by_text("test datalayer")).to_be_hidden() expect(page.get_by_text("test datalayer")).to_be_hidden()
page.get_by_role("button", name="Undo").click() page.locator(".edit-undo").click()
expect(markers).to_have_count(1) expect(markers).to_have_count(1)
expect(page.locator(".umap-browser").get_by_text("test datalayer")).to_be_visible() expect(page.locator(".umap-browser").get_by_text("test datalayer")).to_be_visible()

2
umap/tests/integration/test_edit_polygon.py
View file

@ -117,7 +117,7 @@ def test_should_reset_style_on_cancel(live_server, openmap, page, bootstrap):
expect(page.locator(".leaflet-overlay-pane path[fill='GoldenRod']")).to_have_count( expect(page.locator(".leaflet-overlay-pane path[fill='GoldenRod']")).to_have_count(
1 1
) )
page.get_by_role("button", name="Undo").click() page.locator(".edit-undo").click()
expect(page.locator(".leaflet-overlay-pane path[fill='DarkBlue']")).to_have_count(1) expect(page.locator(".leaflet-overlay-pane path[fill='DarkBlue']")).to_have_count(1)

2
umap/tests/integration/test_save.py
View file

@ -16,7 +16,7 @@ def test_reseting_map_would_remove_from_save_queue(
page.on("request", register_request) page.on("request", register_request)
page.locator('input[name="name"]').click() page.locator('input[name="name"]').click()
page.locator('input[name="name"]').fill("new name") page.locator('input[name="name"]').fill("new name")
page.get_by_role("button", name="Undo").click() page.locator(".edit-undo").click()
page.wait_for_timeout(500) page.wait_for_timeout(500)
page.get_by_role("button", name="Manage layers").click() page.get_by_role("button", name="Manage layers").click()
page.get_by_role("button", name="Edit", exact=True).click() page.get_by_role("button", name="Edit", exact=True).click()

2
umap/tests/integration/test_websocket_sync.py
View file

@ -686,7 +686,7 @@ def test_should_sync_datalayer_clear(
expect(peerB.locator(".leaflet-marker-icon")).to_have_count(0) expect(peerB.locator(".leaflet-marker-icon")).to_have_count(0)
# Undo in peer A # Undo in peer A
peerA.get_by_role("button", name="Undo").click() peerA.locator(".edit-undo").click()
expect(peerA.locator(".leaflet-marker-icon")).to_have_count(1) expect(peerA.locator(".leaflet-marker-icon")).to_have_count(1)
expect(peerB.locator(".leaflet-marker-icon")).to_have_count(1) expect(peerB.locator(".leaflet-marker-icon")).to_have_count(1)