From 7f1dc5e03caf2ca95a1859a1ca0ef587e2830547 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Mon, 20 Nov 2017 17:32:16 -0500 Subject: [PATCH] Remove pre-text style from icons, remove "icons and tools" section Between keyboard shortcuts screen and onscreen hover text, I think we have the icons covered well enough and don't need to add it to the help. Having it in help means that translators need to do double work. --- data/core.yaml | 73 ---------------------------------- modules/ui/help.js | 99 +++++++++++++++++++++++----------------------- 2 files changed, 49 insertions(+), 123 deletions(-) diff --git a/data/core.yaml b/data/core.yaml index dd2be9118..c600a99d8 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -938,79 +938,6 @@ en: the imagery so that it matches the existing data by clicking 'Fix alignment' at the bottom of the Background Settings. - iconstools: - icons: | - # Icons & Tools - - The icons used in this editor are made to be easily understandable - and all give you more information with mouse-over. - Here icons are often used. - - ### Feature editor - {search} Search features - {apply} Apply - {close} Close - - ### Top row - {point} 'Add point' mode - {line} 'Add line' mode - {area} 'Add area' mode - {undo} Undo changes - {redo} Redo changes - {save} Save changes - - ### Right column - {plus} Zoom in - {minus} Zoom out - {geolocate} Show my location - {layers} Background settings - {data} Map data - {help} Help - - ### Bottom row - {bug} Report a bug - {translate} Help translate - - tools: | - ## Tools in the Editing Menu - - With right-click on features you can use these tools. - - {move} Move - {rotate} Rotate - {reflect_long} Reflect at long axis - {reflect_short} Reflect at short axis - {continue} Continue line - {reverse} Reverse direction - {straighten} Straighten line - {merge} Merge selected features - {split} Split in two - {disconnect} Disconnect - {circularize} Circularize - {orthogonalize} Square corners - {delete} Delete - - reserved: | - ### Reserved for later use are: - {forward} Forward - {backward} Backward - {up} Up - {down} Down - {fullscreen} Full screen - {collapsescreen} Collapse screen - {relation} Relation - {vertex} Vertex - {copy} Copy - {paste} Paste - {load} Load - {simplify} Simplify - {smooth} Smooth - {alert} Alert - {inspect} Inspect - {nearby} Nearby - {avatar} Avatar - {outlink} Share - relations: intro: | # Relations & Members diff --git a/modules/ui/help.js b/modules/ui/help.js index 364e74427..9ce698cb3 100644 --- a/modules/ui/help.js +++ b/modules/ui/help.js @@ -28,60 +28,59 @@ export function uiHelp(context) { ['help.addresses.',['intro','nodup','recommendation','points']], ['help.feature_editor.',['intro','select','fields','tags','undo']], ['help.imagery.',['intro','background','offset']], - ['help.iconstools.',['icons','tools']], ['help.relations.',['intro','types','multipolygons','turnrestrictions','maintain','edit']] ]; var icont = { - more: icon('#icon-more', 'pre-text'), - apply: icon('#icon-apply', 'pre-text'), - alert: icon('#icon-alert', 'pre-text'), - avatar: icon('#icon-avatar', 'pre-text'), - forward: icon('#icon-forward', 'pre-text'), - backward: icon('#icon-backward', 'pre-text'), - fullscreen: icon('#icon-full-screen', 'pre-text'), - collapsescreen: icon('#icon-collapse-screen', 'pre-text'), - geolocate: icon('#icon-geolocate', 'pre-text'), - load: icon('#icon-load', 'pre-text'), - search: icon('#icon-search', 'pre-text'), - bug: icon('#icon-bug', 'pre-text'), - point: icon('#icon-point', 'pre-text'), - line: icon('#icon-line', 'pre-text'), - area: icon('#icon-area', 'pre-text'), - help: icon('#icon-help', 'pre-text'), - plus: icon('#icon-plus', 'pre-text'), - minus: icon('#icon-minus', 'pre-text'), - nearby: icon('#icon-nearby', 'pre-text'), - outlink: icon('#icon-out-link', 'pre-text'), - relation: icon('#icon-relation', 'pre-text'), - translate: icon('#icon-translate', 'pre-text'), - circularize: icon('#operation-circularize', 'pre-text'), - orthogonalize: icon('#operation-orthogonalize', 'pre-text'), - split: icon('#operation-split', 'pre-text'), - reflect_long: icon('#operation-reflect-long', 'pre-text'), - reflect_short: icon('#operation-reflect-short', 'pre-text'), - simplify: icon('#operation-simplify', 'pre-text'), - smooth: icon('#operation-smooth', 'pre-text'), - straighten: icon('#operation-straighten', 'pre-text'), - rotate: icon('#operation-rotate', 'pre-text'), - reverse: icon('#operation-reverse', 'pre-text'), - continue: icon('#operation-continue', 'pre-text'), - disconnect: icon('#operation-disconnect', 'pre-text'), - layers: icon('#icon-layers', 'pre-text'), - vertex: icon('#icon-vertex', 'pre-text'), - data: icon('#icon-data', 'pre-text'), - down: icon('#icon-down', 'pre-text'), - up: icon('#icon-up', 'pre-text'), - inspect: icon('#icon-inspect', 'pre-text'), - move: icon('#operation-move', 'pre-text'), - merge: icon('#operation-merge', 'pre-text'), - copy: icon('#operation-copy', 'pre-text'), - paste: icon('#operation-paste', 'pre-text'), - delete: icon('#operation-delete', 'pre-text'), - close: icon('#icon-close', 'pre-text'), - undo: icon('#icon-undo', 'pre-text'), - redo: icon('#icon-redo', 'pre-text'), - save: icon('#icon-save', 'pre-text'), + more: icon('#icon-more'), + apply: icon('#icon-apply'), + alert: icon('#icon-alert'), + avatar: icon('#icon-avatar'), + forward: icon('#icon-forward'), + backward: icon('#icon-backward'), + fullscreen: icon('#icon-full-screen'), + collapsescreen: icon('#icon-collapse-screen'), + geolocate: icon('#icon-geolocate'), + load: icon('#icon-load'), + search: icon('#icon-search'), + bug: icon('#icon-bug'), + point: icon('#icon-point'), + line: icon('#icon-line'), + area: icon('#icon-area'), + help: icon('#icon-help'), + plus: icon('#icon-plus'), + minus: icon('#icon-minus'), + nearby: icon('#icon-nearby'), + outlink: icon('#icon-out-link'), + relation: icon('#icon-relation'), + translate: icon('#icon-translate'), + circularize: icon('#operation-circularize'), + orthogonalize: icon('#operation-orthogonalize'), + split: icon('#operation-split'), + reflect_long: icon('#operation-reflect-long'), + reflect_short: icon('#operation-reflect-short'), + simplify: icon('#operation-simplify'), + smooth: icon('#operation-smooth'), + straighten: icon('#operation-straighten'), + rotate: icon('#operation-rotate'), + reverse: icon('#operation-reverse'), + continue: icon('#operation-continue'), + disconnect: icon('#operation-disconnect'), + layers: icon('#icon-layers'), + vertex: icon('#icon-vertex'), + data: icon('#icon-data'), + down: icon('#icon-down'), + up: icon('#icon-up'), + inspect: icon('#icon-inspect'), + move: icon('#operation-move'), + merge: icon('#operation-merge'), + copy: icon('#operation-copy'), + paste: icon('#operation-paste'), + delete: icon('#operation-delete'), + close: icon('#icon-close'), + undo: icon('#icon-undo'), + redo: icon('#icon-redo'), + save: icon('#icon-save'), version: context.version };