diff --git a/UI/BigComponents/CopyrightPanel.ts b/UI/BigComponents/CopyrightPanel.ts index 01c2d3dd3..e64624ee3 100644 --- a/UI/BigComponents/CopyrightPanel.ts +++ b/UI/BigComponents/CopyrightPanel.ts @@ -25,6 +25,7 @@ import Img from "../Base/Img"; import {TypedTranslation} from "../i18n/Translation"; import TranslatorsPanel from "./TranslatorsPanel"; import {MapillaryLink} from "./MapillaryLink"; +import FullWelcomePaneWithTabs from "./FullWelcomePaneWithTabs"; export class OpenIdEditor extends VariableUiElement { constructor(state: { locationControl: UIEventSource }, iconStyle?: string, objectId?: string) { @@ -119,6 +120,16 @@ export default class CopyrightPanel extends Combine { url: Utils.OsmChaLinkFor(31, state.layoutToUse.id), newTab: true }), + new SubtleButton(Svg.mastodon_ui().SetStyle(iconStyle), + new Combine([t.followOnMastodon.SetClass("font-bold"), t.followBridge]).SetClass("flex flex-col"), + { + url:"https://en.osm.town/web/notifications", + newTab: true + }), + new SubtleButton(Svg.twitter_ui().SetStyle(iconStyle), t.followOnTwitter, { + url:"https://twitter.com/mapcomplete", + newTab: true + }), new OpenIdEditor(state, iconStyle), new MapillaryLink(state, iconStyle), new OpenJosm(state, iconStyle), @@ -178,7 +189,7 @@ export default class CopyrightPanel extends Combine { CopyrightPanel.CodeContributors(contributors, t.codeContributionsBy), CopyrightPanel.CodeContributors(translators, t.translatedBy), new FixedUiElement("MapComplete " + Constants.vNumber).SetClass("font-bold"), - new Combine(actionButtons).SetClass("block w-full"), + new Combine(actionButtons).SetClass("block w-full link-no-underline"), new Title(t.iconAttribution.title, 3), ...iconAttributions ].map(e => e?.SetClass("mt-4"))); diff --git a/UI/Popup/NearbyImages.ts b/UI/Popup/NearbyImages.ts index 772da20c7..7fbaa34e2 100644 --- a/UI/Popup/NearbyImages.ts +++ b/UI/Popup/NearbyImages.ts @@ -179,7 +179,7 @@ export default class NearbyImages extends Lazy { towardscenter: false }) ).map(images => { - if (images === undefined && nearbyImages.length === 0) { + if (images === undefined) { return undefined } images = (images ?? []).concat(nearbyImages) diff --git a/assets/SocialImageBanner.png b/assets/SocialImageBanner.png new file mode 100644 index 000000000..073f3b674 Binary files /dev/null and b/assets/SocialImageBanner.png differ diff --git a/assets/SocialImageBanner.svg b/assets/SocialImageBanner.svg new file mode 100644 index 000000000..be23eec04 --- /dev/null +++ b/assets/SocialImageBanner.svg @@ -0,0 +1,2376 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/svg/license_info.json b/assets/svg/license_info.json index f7a1da48c..f992a5304 100644 --- a/assets/svg/license_info.json +++ b/assets/svg/license_info.json @@ -803,6 +803,16 @@ "https://www.mapillary.com/" ] }, + { + "path": "mastodon.svg", + "license": "Logo; GNU Affero General Public License", + "authors": [ + "Mastodon" + ], + "sources": [ + "https://commons.wikimedia.org/wiki/File:Mastodon_Logotype_(Simple).svg" + ] + }, { "path": "min.svg", "license": "CC0; trivial", @@ -1309,6 +1319,16 @@ "https://commons.wikimedia.org/wiki/File:OOjs_UI_icon_language-ltr.svg" ] }, + { + "path": "twitter.svg", + "license": "Logo - all rights reserved", + "authors": [ + "Twitter Inc." + ], + "sources": [ + "https://about.twitter.com/en/who-we-are/brand-toolkit" + ] + }, { "path": "up.svg", "license": "CC0; trivial", diff --git a/assets/svg/mastodon.svg b/assets/svg/mastodon.svg new file mode 100644 index 000000000..87ec2c5a9 --- /dev/null +++ b/assets/svg/mastodon.svg @@ -0,0 +1,4 @@ + + + + diff --git a/assets/svg/osm-logo.svg b/assets/svg/osm-logo.svg index 2a2839dff..cf07cd89d 100644 --- a/assets/svg/osm-logo.svg +++ b/assets/svg/osm-logo.svg @@ -1,19 +1,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + xlink:href="#linearGradient4744-9" /> - - - - - - - - @@ -693,13 +374,6 @@ d="m 9,12.25 c 0,0 7.5,13 11.75,27.75 C 25,54.75 27,65.5 27,65.5 c 0,0 -5.5,12.75 -8.25,24.75 -2.75,12 -5.75,23 -5.75,23 0,0 5.75,16 9.25,30 3.5,14 3.75,24.25 3.75,24.25 0,0 -4,10.25 -7.5,24.25 -3.5,14 -5,30.75 -5,30.75 0,0 9.25,-2 28.5,1.25 19.25,3.25 32.25,6 32.25,6 0,0 12.75,-2.75 24,-6.25 11.25,-3.5 16.25,-6.5 16.25,-6.5 0,0 5.5,0.5 22.5,6.25 17,5.75 29.25,8.5 29.25,8.5 0,0 13,-2.75 26,-5.75 13,-3 26.5,-8 26.5,-8 0,0 -0.75,-5 4.25,-24.5 5,-19.5 8.75,-28 8.75,-28 0,0 -0.5,-4.5 -3.75,-19.75 C 224.75,130.5 218,116 218,116 c 0,0 1.75,-10.5 6.75,-23.75 C 229.75,79 235,65.5 235,65.5 c 0,0 -4.75,-15.25 -7.5,-29.75 C 224.75,21.25 219.25,10 219.25,10 c 0,0 -24.25,9 -31.75,10.5 -7.5,1.5 -21,5.25 -21,5.25 0,0 -9.75,-4.25 -22,-8.5 -12.25,-4.25 -29.75,-5.5 -29.75,-5.5 0,0 -3.25,3.5 -22,8 -18.75,4.5 -27.5,5.75 -27.5,5.75 0,0 -18.5,-9 -31.5,-11.5 -13,-2.5 -24,-2 -24.75,-1.75 z" id="path5385" /> - @@ -708,13 +382,6 @@ d="m 9,12.25 c 0,0 7.5,13 11.75,27.75 C 25,54.75 27,65.5 27,65.5 c 0,0 -5.5,12.75 -8.25,24.75 -2.75,12 -5.75,23 -5.75,23 0,0 5.75,16 9.25,30 3.5,14 3.75,24.25 3.75,24.25 0,0 -4,10.25 -7.5,24.25 -3.5,14 -5,30.75 -5,30.75 0,0 9.25,-2 28.5,1.25 19.25,3.25 32.25,6 32.25,6 0,0 12.75,-2.75 24,-6.25 11.25,-3.5 16.25,-6.5 16.25,-6.5 0,0 5.5,0.5 22.5,6.25 17,5.75 29.25,8.5 29.25,8.5 0,0 13,-2.75 26,-5.75 13,-3 26.5,-8 26.5,-8 0,0 -0.75,-5 4.25,-24.5 5,-19.5 8.75,-28 8.75,-28 0,0 -0.5,-4.5 -3.75,-19.75 C 224.75,130.5 218,116 218,116 c 0,0 1.75,-10.5 6.75,-23.75 C 229.75,79 235,65.5 235,65.5 c 0,0 -4.75,-15.25 -7.5,-29.75 C 224.75,21.25 219.25,10 219.25,10 c 0,0 -24.25,9 -31.75,10.5 -7.5,1.5 -21,5.25 -21,5.25 0,0 -9.75,-4.25 -22,-8.5 -12.25,-4.25 -29.75,-5.5 -29.75,-5.5 0,0 -3.25,3.5 -22,8 -18.75,4.5 -27.5,5.75 -27.5,5.75 0,0 -18.5,-9 -31.5,-11.5 -13,-2.5 -24,-2 -24.75,-1.75 z" id="path5428" /> - @@ -723,64 +390,7 @@ d="m 9,12.25 c 0,0 7.5,13 11.75,27.75 C 25,54.75 27,65.5 27,65.5 c 0,0 -5.5,12.75 -8.25,24.75 -2.75,12 -5.75,23 -5.75,23 0,0 5.75,16 9.25,30 3.5,14 3.75,24.25 3.75,24.25 0,0 -4,10.25 -7.5,24.25 -3.5,14 -5,30.75 -5,30.75 0,0 9.25,-2 28.5,1.25 19.25,3.25 32.25,6 32.25,6 0,0 12.75,-2.75 24,-6.25 11.25,-3.5 16.25,-6.5 16.25,-6.5 0,0 5.5,0.5 22.5,6.25 17,5.75 29.25,8.5 29.25,8.5 0,0 13,-2.75 26,-5.75 13,-3 26.5,-8 26.5,-8 0,0 -0.75,-5 4.25,-24.5 5,-19.5 8.75,-28 8.75,-28 0,0 -0.5,-4.5 -3.75,-19.75 C 224.75,130.5 218,116 218,116 c 0,0 1.75,-10.5 6.75,-23.75 C 229.75,79 235,65.5 235,65.5 c 0,0 -4.75,-15.25 -7.5,-29.75 C 224.75,21.25 219.25,10 219.25,10 c 0,0 -24.25,9 -31.75,10.5 -7.5,1.5 -21,5.25 -21,5.25 0,0 -9.75,-4.25 -22,-8.5 -12.25,-4.25 -29.75,-5.5 -29.75,-5.5 0,0 -3.25,3.5 -22,8 -18.75,4.5 -27.5,5.75 -27.5,5.75 0,0 -18.5,-9 -31.5,-11.5 -13,-2.5 -24,-2 -24.75,-1.75 z" id="path5468" /> - - - - - - - - - + xlink:href="#linearGradient5762-9-6" /> - - @@ -923,13 +509,6 @@ offset="1" id="stop5866-3-5" /> - @@ -967,13 +545,6 @@ offset="1" id="stop5866-3-6" /> - @@ -1011,13 +581,6 @@ offset="1" id="stop5866-3-2" /> - - - + xlink:href="#linearGradient4680" /> - - + xlink:href="#linearGradient4744-9-9" /> - - + xlink:href="#linearGradient6589-6" /> - - + xlink:href="#linearGradient4744-9-4" /> - + xlink:href="#linearGradient4744-9-49" /> + xlink:href="#linearGradient4744-9-9-1" /> + xlink:href="#linearGradient4744-9-9-1" /> + xlink:href="#linearGradient4744-9-9-1" /> + xlink:href="#linearGradient4744-9-9-1" /> + xlink:href="#linearGradient4744-9-9-1" /> - - - - - @@ -2234,7 +1646,6 @@ + xlink:href="#linearGradient4744-9-7-8" /> - + id="path8619" /> - - - + style="opacity:0.03913042;fill:url(#linearGradient8754);fill-opacity:1;stroke:none" /> - @@ -2726,9 +2060,7 @@ @@ -2831,8 +2159,6 @@ + id="path5327-3" /> + id="rect5757-8-7-7-9" /> + id="path5604-26" /> + id="path5604-9-13" /> + id="path5604-9-1-3" /> + id="rect5757-8-7-2" /> + id="rect5757-8-6" /> + id="rect5757-8-6-3" /> - + + diff --git a/langs/en.json b/langs/en.json index fd27dcbb9..6670119a2 100644 --- a/langs/en.json +++ b/langs/en.json @@ -82,6 +82,9 @@ "donate": "Support MapComplete financially", "editId": "Open the OpenStreetMap online editor here", "editJosm": "Edit here with JOSM", + "followBridge": "The Mastodon- and Twitter-accounts are bridged", + "followOnMastodon": "Follow MapComplete on Mastodon", + "followOnTwitter": "Follow MapComplete on twitter", "iconAttribution": { "title": "Used icons" },