diff --git a/README.md b/README.md index 5482e9478..b2857b225 100644 --- a/README.md +++ b/README.md @@ -193,3 +193,10 @@ The code is available under GPL; all map data comes from OpenStreetMap (both for Background layer selection: curated by https://github.com/osmlab/editor-layer-index Icons are attributed in various 'license_info.json'-files and can be found in the app. + + +This project is funded through [NGI0 Entrust](https://nlnet.nl/entrust), a fund established by [NLnet](https://nlnet.nl) with financial support from the European Commission's [Next Generation Internet](https://ngi.eu) program. Learn more at the [NLnet project page](https://nlnet.nl/project/Mapcomplete). + +[NLnet foundation logo](https://nlnet.nl) +[NGI Zero Logo](https://nlnet.nl/entrust) + diff --git a/assets/svg/NGI0Entrust_tag.svg b/assets/svg/NGI0Entrust_tag.svg new file mode 100644 index 000000000..0d211b388 --- /dev/null +++ b/assets/svg/NGI0Entrust_tag.svg @@ -0,0 +1,121 @@ + + + +image/svg+xml + + + + + + +NGI Zero Entrust + + + + diff --git a/assets/svg/NGI0Entrust_tag.svg.license b/assets/svg/NGI0Entrust_tag.svg.license new file mode 100644 index 000000000..60a777eed --- /dev/null +++ b/assets/svg/NGI0Entrust_tag.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: NlNet +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/svg/license_info.json b/assets/svg/license_info.json index e493a9b2f..c19b3d9c2 100644 --- a/assets/svg/license_info.json +++ b/assets/svg/license_info.json @@ -1,4 +1,14 @@ [ + { + "path": "NGI0Entrust_tag.svg", + "license": "LOGO", + "authors": [ + "NlNet" + ], + "sources": [ + "https://nlnet.nl/logo/" + ] + }, { "path": "Panorama360.svg", "license": "CC0-1.0", @@ -835,6 +845,16 @@ ], "sources": [] }, + { + "path": "nlnet.svg", + "license": "LOGO", + "authors": [ + "NLNet" + ], + "sources": [ + "https://nlnet.nl/logo/" + ] + }, { "path": "not_found.svg", "license": "CC-BY-4.0", diff --git a/assets/svg/nlnet.svg b/assets/svg/nlnet.svg new file mode 100644 index 000000000..8a062ee83 --- /dev/null +++ b/assets/svg/nlnet.svg @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + diff --git a/assets/svg/nlnet.svg.license b/assets/svg/nlnet.svg.license new file mode 100644 index 000000000..1c359df5b --- /dev/null +++ b/assets/svg/nlnet.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: NLNet +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/langs/en.json b/langs/en.json index 1bc60c2a4..237d888a8 100644 --- a/langs/en.json +++ b/langs/en.json @@ -185,6 +185,7 @@ "editJosm": "Edit here with JOSM", "emailCreators": "Send an email to the creators", "followOnMastodon": "Follow MapComplete on Mastodon", + "fundByNlNet": "a fund established by NLnet", "gotoSourceCode": "View the source code", "iconAttribution": { "title": "Used icons" @@ -195,6 +196,9 @@ "mapContributionsBy": "The current visible data has edits made by {contributors}", "mapContributionsByAndHidden": "The current visible data has edits made by {contributors} and {hiddenCount} more contributors", "mapillaryHelp": "Mapillary is an online service which gathers street-level pictures and offers them under a free license. Contributors are allowed to use these pictures to improve OpenStreetMap", + "ngiProgram": "with financial support from the European Commission's Next Generation Internet program.", + "ngiZero": "This project is funded through NGI0 Entrust", + "nlNetMapComplete": "Learn more at the NlNet Project Page", "openIssueTracker": "File a bug", "openMapillary": "Open Mapillary here", "openOsmcha": "See latest edits made with {theme}", diff --git a/public/css/index-tailwind-output.css b/public/css/index-tailwind-output.css index f0eababf8..eb467efcb 100644 --- a/public/css/index-tailwind-output.css +++ b/public/css/index-tailwind-output.css @@ -2822,10 +2822,6 @@ input[type="range"].range-lg::-moz-range-thumb { white-space: nowrap; } -.overflow-ellipsis { - text-overflow: ellipsis; -} - .text-ellipsis { text-overflow: ellipsis; } diff --git a/src/UI/BigComponents/CopyrightPanel.svelte b/src/UI/BigComponents/CopyrightPanel.svelte index 31dff49d6..e52ed9cfe 100644 --- a/src/UI/BigComponents/CopyrightPanel.svelte +++ b/src/UI/BigComponents/CopyrightPanel.svelte @@ -16,6 +16,9 @@ import type { MapProperties } from "../../Models/MapProperties" import ThemeConfig from "../../Models/ThemeConfig/ThemeConfig" import { ImmutableStore } from "../../Logic/UIEventSource" + import NGI0Entrust_tag from "../../assets/svg/NGI0Entrust_tag.svelte" + import Nlnet from "../../assets/svg/Nlnet.svelte" + import Liberapay from "../../assets/svg/Liberapay.svelte" export let state: { theme?: ThemeConfig; mapProperties?: MapProperties } @@ -68,7 +71,7 @@ sorted.splice(10, sorted.length - 10) } const links = sorted.map( - (kv) => `${kv.name}` + (kv) => `${kv.name}`, ) const contribs = links.join(", ") @@ -90,7 +93,7 @@ function codeContributors( contributors, - translation: TypedTranslation<{ contributors; hiddenCount }> + translation: TypedTranslation<{ contributors; hiddenCount }>, ): Translation { const total = contributors.contributors.length let filtered = [...contributors.contributors] @@ -147,6 +150,42 @@ +
+
+ + + + + + + + + +
+ + + + + , + + + + + + + + + + +
+ + + + + +
+
+
MapComplete {Constants.vNumber}
diff --git a/src/assets/svg/NGI0Entrust_tag.svelte b/src/assets/svg/NGI0Entrust_tag.svelte new file mode 100644 index 000000000..6ab860c6b --- /dev/null +++ b/src/assets/svg/NGI0Entrust_tag.svelte @@ -0,0 +1,4 @@ + + image/svg+xml NGI Zero Entrust \ No newline at end of file diff --git a/src/assets/svg/Nlnet.svelte b/src/assets/svg/Nlnet.svelte new file mode 100644 index 000000000..5c2512237 --- /dev/null +++ b/src/assets/svg/Nlnet.svelte @@ -0,0 +1,4 @@ + + \ No newline at end of file