diff --git a/umap/context_processors.py b/umap/context_processors.py index 00d72b7f..26c1c0f0 100644 --- a/umap/context_processors.py +++ b/umap/context_processors.py @@ -1,12 +1,15 @@ -from django.conf import settings +from django.conf import settings as djsettings from . import __version__ -def feedback_link(request): + +def settings(request): return { - 'UMAP_FEEDBACK_LINK': settings.UMAP_FEEDBACK_LINK + 'UMAP_FEEDBACK_LINK': djsettings.UMAP_FEEDBACK_LINK, + 'SITE_NAME': djsettings.SITE_NAME } + def version(request): return { 'UMAP_VERSION': __version__ diff --git a/umap/settings/base.py b/umap/settings/base.py index aae04fa3..c7e3a4a4 100644 --- a/umap/settings/base.py +++ b/umap/settings/base.py @@ -117,7 +117,7 @@ TEMPLATES = [ "django.core.context_processors.tz", 'social.apps.django_app.context_processors.backends', 'social.apps.django_app.context_processors.login_redirect', - 'umap.context_processors.feedback_link', + 'umap.context_processors.settings', 'umap.context_processors.version', ) } @@ -154,6 +154,7 @@ LEAFLET_STORAGE_EXTRA_URLS = { 'ajax_proxy': '/ajax-proxy/?url={url}' } SITE_URL = "http://umap.org" +SITE_NAME = 'uMap' UMAP_DEMO_SITE = False UMAP_EXCLUDE_DEFAULT_MAPS = False UMAP_MAPS_PER_PAGE = 5 diff --git a/umap/templates/base.html b/umap/templates/base.html index b4883387..6d7f2fdf 100644 --- a/umap/templates/base.html +++ b/umap/templates/base.html @@ -2,7 +2,7 @@ - {% block head_title %}uMap{% endblock %} + {% block head_title %}{{ SITE_NAME }}{% endblock %} {% compress css %} diff --git a/umap/templates/leaflet_storage/map_detail.html b/umap/templates/leaflet_storage/map_detail.html index 261540ff..07c629ef 100644 --- a/umap/templates/leaflet_storage/map_detail.html +++ b/umap/templates/leaflet_storage/map_detail.html @@ -1,6 +1,6 @@ {% extends "base.html" %} {% load leaflet_storage_tags compress i18n %} -{% block head_title %}{{ map.name }} - uMap{% endblock %} +{% block head_title %}{{ map.name }} - {{ SITE_NAME }}{% endblock %} {% block body_class %}map_detail{% endblock %} {% block extra_head %}