diff --git a/djnro/local_settings.py.dist b/djnro/local_settings.py.dist index df4bd610955b7c19819dc7e5bd7b784b5774ddfd..6245cfa067861d4d49148f936a67b9949ab93481 100644 --- a/djnro/local_settings.py.dist +++ b/djnro/local_settings.py.dist @@ -21,7 +21,7 @@ ALLOWED_HOSTS = [] SECRET_KEY = '' # Google Maps API key, see https://developers.google.com/maps/documentation/javascript/get-api-key#key -GOOGLE_API_KEY = 'thisisthelongapikey' +GOOGLE_MAPS_API_KEY = 'thisisthelongapikey' # Check for headers indicating the request was received on a secure SSL connection # Uncomment this if you are running DjNRO behind an HTTP proxy that sets this diff --git a/djnro/templates/edumanage/instrealmmon_edit.html b/djnro/templates/edumanage/instrealmmon_edit.html index a3f75b5baceb4c00b8bb64d00b3e50116be68324..19b3bdc4476e0b3d29f3a562d52545e2aaed022d 100644 --- a/djnro/templates/edumanage/instrealmmon_edit.html +++ b/djnro/templates/edumanage/instrealmmon_edit.html @@ -3,7 +3,7 @@ {% load i18n %} {% block extrajs %} - + {% endblock %} {% block homeactive %}{% endblock %} diff --git a/djnro/templates/edumanage/servers_edit.html b/djnro/templates/edumanage/servers_edit.html index 73933b8f034b351956c2ba8144c7c6c4360f2c35..1bac82dbbfea12315ba11ea763620fc2bbabf2cd 100644 --- a/djnro/templates/edumanage/servers_edit.html +++ b/djnro/templates/edumanage/servers_edit.html @@ -137,7 +137,7 @@ {% block extrajs %} - + + - + - + {% endblock %} diff --git a/djnro/templates/front/geolocate.html b/djnro/templates/front/geolocate.html index 5cc35bb7944b73334312cb2b5eafa69d0dc1c7e2..17d64d6083f48b3706412638fb9a57948c4aab2c 100644 --- a/djnro/templates/front/geolocate.html +++ b/djnro/templates/front/geolocate.html @@ -40,6 +40,6 @@ {% endblock %} {% block extrajs %} - + {% endblock %} diff --git a/djnro/templates/front/index.html b/djnro/templates/front/index.html index cf6ac39aacb0fd630d307f484aff8bce84066ca9..f3c4ed85a2279629305b1c129581f4e007c43fc5 100644 --- a/djnro/templates/front/index.html +++ b/djnro/templates/front/index.html @@ -69,7 +69,7 @@ {% block extrajs %} - + diff --git a/djnro/templates/front/world.html b/djnro/templates/front/world.html index 52da3c66e75e2bbbb3ca89b7c7b02014b63d1bc4..1a2e8518f861105ea17718dff130ea38302fa480 100644 --- a/djnro/templates/front/world.html +++ b/djnro/templates/front/world.html @@ -21,7 +21,7 @@ {% block extrajs %} - + diff --git a/edumanage/context_processors.py b/edumanage/context_processors.py index 3e11b105bdd2adfc989086229b25a3d9e78dcae6..2c826ac703aeeb6a669e12fd90e38d7bafdf14df 100644 --- a/edumanage/context_processors.py +++ b/edumanage/context_processors.py @@ -12,7 +12,7 @@ def country_code(context): 'PROV_TEAM': settings.NRO_PROV_BY_DICT, 'SOCIAL_MEDIA_LIST': settings.NRO_PROV_SOCIAL_MEDIA_CONTACT, 'VERSION': settings.SW_VERSION, - 'API_KEY': settings.GOOGLE_API_KEY if hasattr(settings,"GOOGLE_API_KEY") else None, + 'GOOGLE_MAPS_API_KEY': settings.GOOGLE_MAPS_API_KEY if hasattr(settings,"GOOGLE_MAPS_API_KEY") else None, }