Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
djnro
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
itminedu
djnro
Commits
f71829e0
Commit
f71829e0
authored
Sep 08, 2016
by
Zenon Mousmoulas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename GOOGLE_API_KEY (and API_KEY) -> GOOGLE_MAPS_API_KEY
parent
a78cce46
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
10 additions
and
10 deletions
+10
-10
djnro/local_settings.py.dist
djnro/local_settings.py.dist
+1
-1
djnro/templates/edumanage/instrealmmon_edit.html
djnro/templates/edumanage/instrealmmon_edit.html
+1
-1
djnro/templates/edumanage/servers_edit.html
djnro/templates/edumanage/servers_edit.html
+1
-1
djnro/templates/edumanage/service_details.html
djnro/templates/edumanage/service_details.html
+1
-1
djnro/templates/edumanage/services_edit.html
djnro/templates/edumanage/services_edit.html
+1
-1
djnro/templates/edumanage/welcome.html
djnro/templates/edumanage/welcome.html
+1
-1
djnro/templates/front/geolocate.html
djnro/templates/front/geolocate.html
+1
-1
djnro/templates/front/index.html
djnro/templates/front/index.html
+1
-1
djnro/templates/front/world.html
djnro/templates/front/world.html
+1
-1
edumanage/context_processors.py
edumanage/context_processors.py
+1
-1
No files found.
djnro/local_settings.py.dist
View file @
f71829e0
...
...
@@ -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
View file @
f71829e0
...
...
@@ -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
View file @
f71829e0
...
...
@@ -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
View file @
f71829e0
...
...
@@ -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
View file @
f71829e0
...
...
@@ -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 %}&key={{
API_KEY }}{% endif %}&language=en&libraries=places"
></script>
<script
type=
"text/javascript"
src=
"//maps.googleapis.com/maps/api/js?v=3.exp{% if
GOOGLE_MAPS_API_KEY %}&key={{ GOOGLE_MAPS_
API_KEY }}{% endif %}&language=en&libraries=places"
></script>
<script
src=
"{% static 'js/jquery_csrf_protect.js' %}"
type=
"text/javascript"
></script>
<script
type=
"text/javascript"
>
...
...
djnro/templates/edumanage/welcome.html
View file @
f71829e0
...
...
@@ -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
View file @
f71829e0
...
...
@@ -40,6 +40,6 @@
{% endblock %}
{% block extrajs %}
<script
type=
"text/javascript"
src=
"//maps.google.com/maps/api/js?v=3.exp{% if
API_KEY %}&key={{
API_KEY }}{% endif %}&language=en&libraries=places"
></script>
<script
type=
"text/javascript"
src=
"//maps.google.com/maps/api/js?v=3.exp{% if
GOOGLE_MAPS_API_KEY %}&key={{ GOOGLE_MAPS_
API_KEY }}{% endif %}&language=en&libraries=places"
></script>
<script
type=
"text/javascript"
src=
"{% static 'js/geolocate.js' %}"
></script>
{% endblock %}
djnro/templates/front/index.html
View file @
f71829e0
...
...
@@ -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&region={{COUNTRY_CODE}}{% if
API_KEY %}&key={{
API_KEY }}{% endif %}"
></script>
<script
type=
"text/javascript"
src=
"https://maps.googleapis.com/maps/api/js?v=3&region={{COUNTRY_CODE}}{% if
GOOGLE_MAPS_API_KEY %}&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
View file @
f71829e0
...
...
@@ -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&region={{COUNTRY_CODE}}{% if
API_KEY %}&key={{
API_KEY }}{% endif %}"
></script>
<script
type=
"text/javascript"
src=
"https://maps.googleapis.com/maps/api/js?v=3&region={{COUNTRY_CODE}}{% if
GOOGLE_MAPS_API_KEY %}&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
View file @
f71829e0
...
...
@@ -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
,
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment