Rename GOOGLE_API_KEY (and API_KEY) -> GOOGLE_MAPS_API_KEY

djnro/local_settings.py.dist

@@ -21,7 +21,7 @@ ALLOWED_HOSTS = []
 SECRET_KEY = '<put something really random here, eg. %$#%@#$^2312351345#$%3452345@#$%@#$234#@$hhzdavfsdcFDGVFSDGhn>'
 
 # 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

djnro/templates/edumanage/instrealmmon_edit.html

@@ -3,7 +3,7 @@
 {% load i18n %}
 
 {% block extrajs %}
-<script type="text/javascript" src="//maps.googleapis.com/maps/api/js?{% if API_KEY %}key={{ API_KEY }}{% endif %}"></script>
+<script type="text/javascript" src="//maps.googleapis.com/maps/api/js?{% if GOOGLE_MAPS_API_KEY %}key={{ GOOGLE_MAPS_API_KEY }}{% endif %}"></script>
 {% endblock %}
 
 {% block homeactive %}{% endblock %}

djnro/templates/edumanage/servers_edit.html

@@ -137,7 +137,7 @@
 
 {% block extrajs %}
 <script type="text/javascript" src="{% static 'js/showpass.js' %}"></script>
-<script type="text/javascript" src="//maps.googleapis.com/maps/api/js?{% if API_KEY %}key={{ API_KEY }}{% endif %}"></script>
+<script type="text/javascript" src="//maps.googleapis.com/maps/api/js?{% if GOOGLE_MAPS_API_KEY %}key={{ GOOGLE_MAPS_API_KEY }}{% endif %}"></script>
 <script type="text/javascript">
 $(document).ready(function() {
 	$('#id_secret').showPassword();

djnro/templates/edumanage/service_details.html

@@ -15,7 +15,7 @@
 		width: auto !important;
 	}
 </style>
-<script type="text/javascript" src="//maps.googleapis.com/maps/api/js?{% if API_KEY %}key={{ API_KEY }}{% endif %}"></script>
+<script type="text/javascript" src="//maps.googleapis.com/maps/api/js?{% if GOOGLE_MAPS_API_KEY %}key={{ GOOGLE_MAPS_API_KEY }}{% endif %}"></script>
 <script type="text/javascript">
         var map = '';
         var lat = "{{service.latitude}}";

djnro/templates/edumanage/services_edit.html

@@ -254,7 +254,7 @@
 
 {% block extrajs %}
 <script type="text/javascript" src="{% static 'js/jquery.formset.js' %}"></script>
-<script type="text/javascript" src="//maps.googleapis.com/maps/api/js?v=3.exp{% if API_KEY %}&amp;key={{ API_KEY }}{% endif %}&amp;language=en&amp;libraries=places"></script>
+<script type="text/javascript" src="//maps.googleapis.com/maps/api/js?v=3.exp{% if GOOGLE_MAPS_API_KEY %}&amp;key={{ GOOGLE_MAPS_API_KEY }}{% endif %}&amp;language=en&amp;libraries=places"></script>
 <script src="{% static 'js/jquery_csrf_protect.js' %}" type="text/javascript"></script>
 
 <script type="text/javascript">

djnro/templates/edumanage/welcome.html

@@ -89,6 +89,6 @@
 
 {% block extrajs %}
 <script type="text/javascript" src="{% static 'js/markerclusterer.js' %}"></script>
-<script type="text/javascript" src="//maps.googleapis.com/maps/api/js?{% if API_KEY %}key={{ API_KEY }}{% endif %}"></script>
+<script type="text/javascript" src="//maps.googleapis.com/maps/api/js?{% if GOOGLE_MAPS_API_KEY %}key={{ GOOGLE_MAPS_API_KEY }}{% endif %}"></script>
 <script type="text/javascript" src="{% static 'js/management-map.js' %}"></script>
 {% endblock %}

djnro/templates/front/geolocate.html

@@ -40,6 +40,6 @@
 {% endblock %}
 
 {% block extrajs %}
-<script type="text/javascript" src="//maps.google.com/maps/api/js?v=3.exp{% if API_KEY %}&amp;key={{ API_KEY }}{% endif %}&amp;language=en&amp;libraries=places"></script>
+<script type="text/javascript" src="//maps.google.com/maps/api/js?v=3.exp{% if GOOGLE_MAPS_API_KEY %}&amp;key={{ GOOGLE_MAPS_API_KEY }}{% endif %}&amp;language=en&amp;libraries=places"></script>
 <script type="text/javascript" src="{% static 'js/geolocate.js' %}"></script>
 {% endblock %}

djnro/templates/front/index.html

@@ -69,7 +69,7 @@
 
 {% block extrajs %}
 <script type="text/javascript" src="{% static 'js/markerclusterer.js' %}"></script>
-<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?v=3&amp;region={{COUNTRY_CODE}}{% if API_KEY %}&amp;key={{ API_KEY }}{% endif %}"></script>
+<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?v=3&amp;region={{COUNTRY_CODE}}{% if GOOGLE_MAPS_API_KEY %}&amp;key={{ GOOGLE_MAPS_API_KEY }}{% endif %}"></script>
 <script type="text/javascript" src="{% static 'js/jquery.adapt_height.js' %}"></script>
 <script type="text/javascript" src="{% static 'js/mapescape.js' %}"></script>
 <script type="text/javascript" src="{% static 'js/home-page-map.js' %}"></script>

djnro/templates/front/world.html

@@ -21,7 +21,7 @@
 
 {% block extrajs %}
 <script type="text/javascript" src="{% static 'js/markerclusterer.js' %}"></script>
-<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?v=3&amp;region={{COUNTRY_CODE}}{% if API_KEY %}&amp;key={{ API_KEY }}{% endif %}"></script>
+<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?v=3&amp;region={{COUNTRY_CODE}}{% if GOOGLE_MAPS_API_KEY %}&amp;key={{ GOOGLE_MAPS_API_KEY }}{% endif %}"></script>
 <script type="text/javascript" src="{% static 'js/jquery.adapt_height.js' %}"></script>
 <script type="text/javascript" src="{% static 'js/mapescape.js' %}"></script>
 <script type="text/javascript" src="{% static 'js/world-map.js' %}"></script>

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,
     }