diff --git a/css/80_app.css b/css/80_app.css index c85c99b9e..60c2ae826 100644 --- a/css/80_app.css +++ b/css/80_app.css @@ -3598,11 +3598,14 @@ img.tile-debug { /* Success Modal ------------------------------------------------------- */ .save-summary, -.save-shareLinks, .save-communityLinks { padding: 0px 20px 15px 20px; } +.save-communityLinks { + border-top: 1px solid #ccc; +} + .save-success table, .save-success p { margin-top: 15px; @@ -3635,34 +3638,6 @@ img.tile-debug { white-space: nowrap; } -.save-shareLinks, -.save-communityLinks { - border-top: 1px solid #ccc; -} - -.save-shareLinks a.button.social { - height: auto; - border-bottom: none; -} -.save-shareLinks .icon.social { - height: 40px; - width: 40px; - color: #7092ff; -} - -.save-success a.button { - font-weight: normal; - color: #7092ff; - border-bottom: 1px solid #ccc; - border-radius: 0; - height: 40px; - width: 40px; - text-align: center; - display: inline-block; -} -.save-success a.button:hover { - background-color: #ececec; -} /* Splash Modal ------------------------------------------------------- */ diff --git a/data/core.yaml b/data/core.yaml index c3ed4645d..7371bae3c 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -535,10 +535,6 @@ en: help_link_url: "https://wiki.openstreetmap.org/wiki/FAQ#I_have_just_made_some_changes_to_the_map._How_do_I_get_to_see_my_changes.3F" view_on_osm: "View Changes on OSM" changeset_id: "Changeset #: {changeset_id}" - edited_osm: "Edited OSM!" - facebook: "Share on Facebook" - twitter: "Share on Twitter" - google: "Share on Google+" like_osm: "Like OpenStreetMap? Connect with others:" confirm: okay: "OK" diff --git a/dist/locales/en.json b/dist/locales/en.json index dadc23e62..1611cbb83 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -652,10 +652,6 @@ "help_link_url": "https://wiki.openstreetmap.org/wiki/FAQ#I_have_just_made_some_changes_to_the_map._How_do_I_get_to_see_my_changes.3F", "view_on_osm": "View Changes on OSM", "changeset_id": "Changeset #: {changeset_id}", - "edited_osm": "Edited OSM!", - "facebook": "Share on Facebook", - "twitter": "Share on Twitter", - "google": "Share on Google+", "like_osm": "Like OpenStreetMap? Connect with others:" }, "confirm": { diff --git a/modules/ui/success.js b/modules/ui/success.js index 98ae60806..8b37ce5a1 100644 --- a/modules/ui/success.js +++ b/modules/ui/success.js @@ -5,7 +5,6 @@ import { select as d3_select } from 'd3-selection'; import { t } from '../util/locale'; import { data } from '../../data'; -import { tooltip } from '../util/tooltip'; import { svgIcon } from '../svg'; import { utilRebind } from '../util/rebind'; @@ -105,44 +104,11 @@ export function uiSuccess(context) { }); if (matchResources.length) { - body - .call(showCommunityLinks, matchResources); - } else { - body - .call(showShareLinks, changesetURL); + body.call(showCommunityLinks, matchResources); } } - function showShareLinks(selection, changesetURL) { - var shareLinks = selection - .append('div') - .attr('class', 'save-shareLinks'); - - var message = (_changeset.tags.comment || t('success.edited_osm')).substring(0, 130) + - ' ' + changesetURL; - - var sharing = [ - { key: 'facebook', value: 'https://facebook.com/sharer/sharer.php?u=' + encodeURIComponent(changesetURL) }, - { key: 'twitter', value: 'https://twitter.com/intent/tweet?source=webclient&text=' + encodeURIComponent(message) }, - { key: 'google', value: 'https://plus.google.com/share?url=' + encodeURIComponent(changesetURL) } - ]; - - shareLinks.selectAll('.button.social') - .data(sharing) - .enter() - .append('a') - .attr('class', 'button social col4') - .attr('target', '_blank') - .attr('href', function(d) { return d.value; }) - .call(tooltip() - .title(function(d) { return t('success.' + d.key); }) - .placement('bottom') - ) - .each(function(d) { d3_select(this).call(svgIcon('#logo-' + d.key, 'social')); }); - } - - function showCommunityLinks(selection, matchResources) { var communityLinks = selection .append('div')