From 9b84a0874bba4c492615f2730bdf0b9219b137a5 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Tue, 13 Aug 2013 15:49:03 -0700 Subject: [PATCH] After editing, give a sense when map is updated Fixes #1660 --- css/app.css | 12 ++++++++---- data/core.yaml | 8 +++++--- dist/locales/en.json | 6 +++--- js/id/ui/success.js | 13 ++++++++----- 4 files changed, 24 insertions(+), 15 deletions(-) diff --git a/css/app.css b/css/app.css index 8fd47702e..fd4381efb 100644 --- a/css/app.css +++ b/css/app.css @@ -2227,7 +2227,7 @@ img.wiki-image { } .modal-actions button, -.save-success a { +.save-success a.button { font-weight: normal; color: #7092FF; border-bottom: 1px solid #CCC; @@ -2238,12 +2238,12 @@ img.wiki-image { } .modal-actions button:hover -.save-success a:hover { +.save-success a.button:hover { background-color: #ececec; } .modal-actions button:before, -.save-success a:before, +.save-success a.button:before, .walkthrough a:before { display: block; content: ''; @@ -2272,7 +2272,11 @@ img.wiki-image { /* Success Modal ------------------------------------------------------- */ -.save-success a { +.save-success p { + padding: 15px; +} + +.save-success .button { padding-top: 15px; } diff --git a/data/core.yaml b/data/core.yaml index 135cb1f92..25fe9264b 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -136,9 +136,7 @@ en: tooltip: "Redo: {action}" nothing: Nothing to redo. tooltip_keyhint: "Shortcut:" - just_edited: "You just edited OpenStreetMap!" browser_notice: "This editor is supported in Firefox, Chrome, Safari, Opera, and Internet Explorer 9 and above. Please upgrade your browser or use Potlatch 2 to edit the map." - view_on_osm: "View on OSM" translate: translate: Translate localized_translation_label: Multilingual name @@ -213,9 +211,13 @@ en: unsaved_changes: You have unsaved changes success: edited_osm: "Edited OSM!" + just_edited: "You just edited OpenStreetMap!" + view_on_osm: "View on OSM" facebook: "Share on Facebook" tweet: "Tweet" - okay: "Okay" + help_html: | + Your changes should appear in the "Standard" layer in a few minutes. Other layers, and certain features, may take longer + (details). confirm: okay: "Okay" splash: diff --git a/dist/locales/en.json b/dist/locales/en.json index 0e16b706b..e63f7775e 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -175,9 +175,7 @@ "nothing": "Nothing to redo." }, "tooltip_keyhint": "Shortcut:", - "just_edited": "You just edited OpenStreetMap!", "browser_notice": "This editor is supported in Firefox, Chrome, Safari, Opera, and Internet Explorer 9 and above. Please upgrade your browser or use Potlatch 2 to edit the map.", - "view_on_osm": "View on OSM", "translate": { "translate": "Translate", "localized_translation_label": "Multilingual name", @@ -262,9 +260,11 @@ }, "success": { "edited_osm": "Edited OSM!", + "just_edited": "You just edited OpenStreetMap!", + "view_on_osm": "View on OSM", "facebook": "Share on Facebook", "tweet": "Tweet", - "okay": "Okay" + "help_html": "Your changes should appear in the \"Standard\" layer in a few minutes. Other layers, and certain features, may take longer\n(details).\n" }, "confirm": { "okay": "Okay" diff --git a/js/id/ui/success.js b/js/id/ui/success.js index 1dbe7f500..148269bf9 100644 --- a/js/id/ui/success.js +++ b/js/id/ui/success.js @@ -16,21 +16,24 @@ iD.ui.Success = function(context) { .on('click', function() { event.cancel(success) }); header.append('h3') - .text(t('just_edited')); + .text(t('success.just_edited')); var body = selection.append('div') .attr('class', 'body save-success'); + body.append('p') + .html(t('success.help_html')); + body.append('a') - .attr('class', 'col12 osm') + .attr('class', 'button col12 osm') .attr('target', '_blank') .attr('href', function() { return context.connection().changesetURL(changeset.id); }) - .text(t('view_on_osm')); + .text(t('success.view_on_osm')); body.append('a') - .attr('class', 'col12 twitter') + .attr('class', 'button col12 twitter') .attr('target', '_blank') .attr('href', function() { return 'https://twitter.com/intent/tweet?source=webclient&text=' + @@ -39,7 +42,7 @@ iD.ui.Success = function(context) { .text(t('success.tweet')); body.append('a') - .attr('class', 'col12 facebook') + .attr('class', 'button col12 facebook') .attr('target', '_blank') .attr('href', function() { return 'https://facebook.com/sharer/sharer.php?u=' +