From 4db3e720c00b49ea1aa528af8b98f15d4c0af76c Mon Sep 17 00:00:00 2001 From: "Milos Brzakovic (E-Search)" Date: Fri, 26 Nov 2021 12:25:12 +0100 Subject: [PATCH] close icon button --- data/core.yaml | 1 + modules/ui/commit.js | 1 + modules/ui/conflicts.js | 1 + modules/ui/data_editor.js | 1 + modules/ui/entity_editor.js | 1 + modules/ui/field_help.js | 1 + modules/ui/improveOSM_editor.js | 1 + modules/ui/info.js | 1 + modules/ui/init.js | 2 ++ modules/ui/keepRight_editor.js | 1 + modules/ui/modal.js | 2 ++ modules/ui/note_editor.js | 1 + modules/ui/note_header.js | 1 + modules/ui/osmose_editor.js | 1 + modules/ui/pane.js | 3 ++- modules/ui/photoviewer.js | 2 ++ modules/ui/success.js | 1 + 17 files changed, 21 insertions(+), 1 deletion(-) diff --git a/data/core.yaml b/data/core.yaml index 1c6692d9f..d31bf15ad 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -12,6 +12,7 @@ en: list: list text: text deselect: deselect + close: close toolbar: inspect: Inspect undo_redo: Undo / Redo diff --git a/modules/ui/commit.js b/modules/ui/commit.js index b641ea3d8..14a672cf4 100644 --- a/modules/ui/commit.js +++ b/modules/ui/commit.js @@ -226,6 +226,7 @@ export function uiCommit(context) { headerTitle .append('button') .attr('class', 'close') + .attr('title', t('icons.close')) .on('click', function() { dispatch.call('cancel', this); }) diff --git a/modules/ui/conflicts.js b/modules/ui/conflicts.js index 078a494d4..48895284d 100644 --- a/modules/ui/conflicts.js +++ b/modules/ui/conflicts.js @@ -60,6 +60,7 @@ export function uiConflicts(context) { headerEnter .append('button') .attr('class', 'fr') + .attr('title', t('icons.close')) .on('click', cancel) .call(svgIcon('#iD-icon-close')); diff --git a/modules/ui/data_editor.js b/modules/ui/data_editor.js index 0fe80cad4..6049788d2 100644 --- a/modules/ui/data_editor.js +++ b/modules/ui/data_editor.js @@ -26,6 +26,7 @@ export function uiDataEditor(context) { headerEnter .append('button') .attr('class', 'close') + .attr('title', t('icons.close')) .on('click', function() { context.enter(modeBrowse(context)); }) diff --git a/modules/ui/entity_editor.js b/modules/ui/entity_editor.js index 5d4a20697..aa966e0bd 100644 --- a/modules/ui/entity_editor.js +++ b/modules/ui/entity_editor.js @@ -50,6 +50,7 @@ export function uiEntityEditor(context) { headerEnter .append('button') .attr('class', 'close') + .attr('title', t('icons.close')) .on('click', function() { context.enter(modeBrowse(context)); }) .call(svgIcon(_modified ? '#iD-icon-apply' : '#iD-icon-close')); diff --git a/modules/ui/field_help.js b/modules/ui/field_help.js index 806fa04a5..b79b0f06d 100644 --- a/modules/ui/field_help.js +++ b/modules/ui/field_help.js @@ -201,6 +201,7 @@ export function uiFieldHelp(context, fieldName) { titleEnter .append('button') .attr('class', 'fr close') + .attr('title', t('icons.close')) .on('click', function(d3_event) { d3_event.stopPropagation(); d3_event.preventDefault(); diff --git a/modules/ui/improveOSM_editor.js b/modules/ui/improveOSM_editor.js index 81557e863..b61a05610 100644 --- a/modules/ui/improveOSM_editor.js +++ b/modules/ui/improveOSM_editor.js @@ -31,6 +31,7 @@ export function uiImproveOsmEditor(context) { headerEnter .append('button') .attr('class', 'close') + .attr('title', t('icons.close')) .on('click', () => context.enter(modeBrowse(context))) .call(svgIcon('#iD-icon-close')); diff --git a/modules/ui/info.js b/modules/ui/info.js index 6f756f3c3..f06f9dd8d 100644 --- a/modules/ui/info.js +++ b/modules/ui/info.js @@ -63,6 +63,7 @@ export function uiInfo(context) { title .append('button') .attr('class', 'close') + .attr('title', t('icons.close')) .on('click', function(d3_event, d) { d3_event.stopImmediatePropagation(); d3_event.preventDefault(); diff --git a/modules/ui/init.js b/modules/ui/init.js index 9a6470397..3235364a5 100644 --- a/modules/ui/init.js +++ b/modules/ui/init.js @@ -320,6 +320,7 @@ export function uiInit(context) { .append('a') .attr('target', '_blank') .attr('href', 'https://github.com/openstreetmap/iD/issues') + .attr('aria-label', t('report_a_bug')) .call(svgIcon('#iD-icon-bug', 'light')) .call(uiTooltip().title(t.html('report_a_bug')).placement('top')); @@ -327,6 +328,7 @@ export function uiInit(context) { .append('a') .attr('target', '_blank') .attr('href', 'https://github.com/openstreetmap/iD/blob/develop/CONTRIBUTING.md#translating') + .attr('aria-label', t('help_translate')) .call(svgIcon('#iD-icon-translate', 'light')) .call(uiTooltip().title(t.html('help_translate')).placement('top')); diff --git a/modules/ui/keepRight_editor.js b/modules/ui/keepRight_editor.js index 39fc36ec5..b5ef0d3df 100644 --- a/modules/ui/keepRight_editor.js +++ b/modules/ui/keepRight_editor.js @@ -30,6 +30,7 @@ export function uiKeepRightEditor(context) { headerEnter .append('button') .attr('class', 'close') + .attr('title', t('icons.close')) .on('click', () => context.enter(modeBrowse(context))) .call(svgIcon('#iD-icon-close')); diff --git a/modules/ui/modal.js b/modules/ui/modal.js index 874aa5092..bb81844b8 100644 --- a/modules/ui/modal.js +++ b/modules/ui/modal.js @@ -1,5 +1,6 @@ import { select as d3_select } from 'd3-selection'; +import { t } from './../core/localizer'; import { svgIcon } from '../svg/icon'; import { utilKeybinding } from '../util'; @@ -55,6 +56,7 @@ export function uiModal(selection, blocking) { modal .append('button') .attr('class', 'close') + .attr('title', t('icons.close')) .on('click', shaded.close) .call(svgIcon('#iD-icon-close')); diff --git a/modules/ui/note_editor.js b/modules/ui/note_editor.js index 6c56c72d5..86124873d 100644 --- a/modules/ui/note_editor.js +++ b/modules/ui/note_editor.js @@ -46,6 +46,7 @@ export function uiNoteEditor(context) { headerEnter .append('button') .attr('class', 'close') + .attr('title', t('icons.close')) .on('click', function() { context.enter(modeBrowse(context)); }) diff --git a/modules/ui/note_header.js b/modules/ui/note_header.js index c496e5b8c..a6cd0a60c 100644 --- a/modules/ui/note_header.js +++ b/modules/ui/note_header.js @@ -42,6 +42,7 @@ export function uiNoteHeader() { iconEnter .append('div') .attr('class', 'note-icon-annotation') + .attr('title', t('icons.close')) .call(svgIcon(statusIcon, 'icon-annotation')); }); diff --git a/modules/ui/osmose_editor.js b/modules/ui/osmose_editor.js index 887e91e89..6e63af635 100644 --- a/modules/ui/osmose_editor.js +++ b/modules/ui/osmose_editor.js @@ -30,6 +30,7 @@ export function uiOsmoseEditor(context) { headerEnter .append('button') .attr('class', 'close') + .attr('title', t('icons.close')) .on('click', () => context.enter(modeBrowse(context))) .call(svgIcon('#iD-icon-close')); diff --git a/modules/ui/pane.js b/modules/ui/pane.js index ebf9b2328..6b41fd8a8 100644 --- a/modules/ui/pane.js +++ b/modules/ui/pane.js @@ -3,7 +3,7 @@ import { } from 'd3-selection'; import { svgIcon } from '../svg/icon'; -import { localizer } from '../core/localizer'; +import { t, localizer } from '../core/localizer'; import { uiTooltip } from './tooltip'; @@ -110,6 +110,7 @@ export function uiPane(id, context) { heading .append('button') + .attr('title', t('icons.close')) .on('click', hidePane) .call(svgIcon('#iD-icon-close')); diff --git a/modules/ui/photoviewer.js b/modules/ui/photoviewer.js index 04febcf72..51b92b7be 100644 --- a/modules/ui/photoviewer.js +++ b/modules/ui/photoviewer.js @@ -2,6 +2,7 @@ import { select as d3_select } from 'd3-selection'; +import { t } from '../core/localizer'; import { dispatch as d3_dispatch } from 'd3-dispatch'; import { svgIcon } from '../svg/icon'; import { utilGetDimensions } from '../util/dimensions'; @@ -18,6 +19,7 @@ export function uiPhotoviewer(context) { selection .append('button') .attr('class', 'thumb-hide') + .attr('title', t('icons.close')) .on('click', function () { if (services.streetside) { services.streetside.hideViewer(context); } if (services.mapillary) { services.mapillary.hideViewer(context); } diff --git a/modules/ui/success.js b/modules/ui/success.js index 719b4a677..ae8b3c9be 100644 --- a/modules/ui/success.js +++ b/modules/ui/success.js @@ -87,6 +87,7 @@ export function uiSuccess(context) { header .append('button') .attr('class', 'close') + .attr('title', t('icons.close')) .on('click', () => dispatch.call('cancel')) .call(svgIcon('#iD-icon-close'));