diff --git a/docs/config/settings.md b/docs/config/settings.md index 8d12d55d..67ed970a 100644 --- a/docs/config/settings.md +++ b/docs/config/settings.md @@ -199,7 +199,7 @@ Possible values: Set to True if you want to display a message saying that your instance is not ready for production use (no backup, etc.) -#### UMAP_FEEDBACK_LINK +#### UMAP_HELP_URL Link to show on the header under the "Feedback and help" label. @@ -211,6 +211,19 @@ Which feed to display on the home page. Three valid values: - `"highlighted"`, which shows the maps that have been starred by a staff member - `None`, which does not show any map on the home page +#### UMAP_HOST_INFOS + +Informations about the entity hosting this uMap instance. + +``` +UMAP_HOST_INFOS = { + "name": "OpenStreetMap France", + "url": "https://openstreetmap.fr", + "contact": "blah@openstreetmap.fr" +} +``` + + #### UMAP_IMPORTERS Activate preset importers to connect uMap with external sources. diff --git a/umap/context_processors.py b/umap/context_processors.py index 825d6943..735f759a 100644 --- a/umap/context_processors.py +++ b/umap/context_processors.py @@ -5,12 +5,13 @@ from . import VERSION def settings(request): return { - "UMAP_FEEDBACK_LINK": djsettings.UMAP_FEEDBACK_LINK, + "UMAP_HELP_URL": djsettings.UMAP_HELP_URL, "SITE_NAME": djsettings.SITE_NAME, "SITE_URL": djsettings.SITE_URL, "ENABLE_ACCOUNT_LOGIN": djsettings.ENABLE_ACCOUNT_LOGIN, "UMAP_READONLY": djsettings.UMAP_READONLY, "UMAP_DEMO_SITE": djsettings.UMAP_DEMO_SITE, + "UMAP_HOST_INFOS": djsettings.UMAP_HOST_INFOS, } diff --git a/umap/settings/__init__.py b/umap/settings/__init__.py index 914e8dc6..42c4b39a 100644 --- a/umap/settings/__init__.py +++ b/umap/settings/__init__.py @@ -41,5 +41,7 @@ if path: globals()["TEMPLATES"][0]["DIRS"] = [value] elif key == "UMAP_CUSTOM_STATICS": globals()["STATICFILES_DIRS"].insert(0, value) + elif key == "UMAP_FEEDBACK_LINK": + globals()["UMAP_HELP_URL"] = value else: globals()[key] = value diff --git a/umap/settings/base.py b/umap/settings/base.py index f6a9a2ac..7ea8249f 100644 --- a/umap/settings/base.py +++ b/umap/settings/base.py @@ -251,7 +251,7 @@ UMAP_MAPS_PER_PAGE = 5 UMAP_MAPS_PER_SEARCH = 25 UMAP_MAPS_PER_PAGE_OWNER = 10 UMAP_SEARCH_CONFIGURATION = "simple" -UMAP_FEEDBACK_LINK = "https://wiki.openstreetmap.org/wiki/UMap#Feedback_and_help" +UMAP_HELP_URL = "https://wiki.openstreetmap.org/wiki/UMap#Feedback_and_help" USER_MAPS_URL = "user_maps" DATABASES = {"default": env.db(default="postgis://localhost:5432/umap")} UMAP_DEFAULT_SHARE_STATUS = None @@ -259,6 +259,7 @@ UMAP_DEFAULT_EDIT_STATUS = None UMAP_DEFAULT_FEATURES_HAVE_OWNERS = False UMAP_HOME_FEED = "latest" UMAP_IMPORTERS = {} +UMAP_HOST_INFOS = {} UMAP_READONLY = env("UMAP_READONLY", default=False) UMAP_GZIP = True diff --git a/umap/static/umap/nav.css b/umap/static/umap/nav.css index 33658df9..6d771110 100644 --- a/umap/static/umap/nav.css +++ b/umap/static/umap/nav.css @@ -3,15 +3,17 @@ header { } footer { - height: 140px; + min-height: 140px; margin-top: 40px; - background-color: #2E3641; - text-align: center; - line-height: 140px; - color: #fff; + background-color: var(--color-darkBlue); + color: var(--color-light); + display: flex; + align-items: center; + justify-content: space-evenly; + flex-wrap: wrap; } footer a { - color: #fff; + color: var(--color-light); text-decoration: underline; } footer a.branding { @@ -20,8 +22,9 @@ footer a.branding { background-repeat: no-repeat; background-size: 60px auto; font-size: 30px; + height: 60px; + line-height: 60px; font-weight: bold; - height: 140px; padding-inline-start: 70px; display: inline-block; } diff --git a/umap/templates/umap/content_footer.html b/umap/templates/umap/content_footer.html index 2441a71f..27418e42 100644 --- a/umap/templates/umap/content_footer.html +++ b/umap/templates/umap/content_footer.html @@ -2,8 +2,11 @@