autonomic-cooperative/ojuso-map
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete trailing spaces and rogue newlines

Browse Source
This commit is contained in:
Anna Sidwell 2018-03-31 21:05:09 +11:00
parent fafb475869
commit ee440617d9
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/map/templates/map/index.html
View File

@ -32,7 +32,7 @@
{% leaflet_js %} {% leaflet_js %}
<script type="text/javascript" src="{% static 'map/plugins/leaflet-hash.js' %}"></script> <script type="text/javascript" src="{% static 'map/plugins/leaflet-hash.js' %}"></script>
<script type="text/javascript"> <script type="text/javascript">
// This takes HTML as a string and returns an element // This takes HTML as a string and returns an element
function create(htmlStr) { function create(htmlStr) {
var frag = document.createDocumentFragment(), var frag = document.createDocumentFragment(),
@ -43,7 +43,7 @@
} }
return frag; return frag;
} }
// This is called when the map is initialized // This is called when the map is initialized
function main_app_init(map, options) { function main_app_init(map, options) {
var hash = new L.hash(map); var hash = new L.hash(map);
@ -107,7 +107,7 @@
} }
}).addTo(map); }).addTo(map);
}); });
<!--// Add an on-click listener for map click events. Show popup with button to submit a casestudy--> <!--// Add an on-click listener for map click events. Show popup with button to submit a casestudy-->
<!--map.on('click', function(e) {--> <!--map.on('click', function(e) {-->
<!--var popup = L.popup()--> <!--var popup = L.popup()-->

8
docker-compose.yml
View File

@ -22,7 +22,7 @@ services:
env_file: env_file:
- ./environment - ./environment
command: /bin/sh -c "DEBUG=1 python3 manage.py collectstatic --noinput && python3 manage.py compilemessages && python3 manage.py migrate && gunicorn --bind 0.0.0.0:8000 ojusomap.wsgi" command: /bin/sh -c "DEBUG=1 python3 manage.py collectstatic --noinput && python3 manage.py compilemessages && python3 manage.py migrate && gunicorn --bind 0.0.0.0:8000 ojusomap.wsgi"
db: db:
restart: always restart: always
image: mdillon/postgis:9.6-alpine image: mdillon/postgis:9.6-alpine
@ -35,7 +35,7 @@ services:
- "127.0.0.1:5432:5432" - "127.0.0.1:5432:5432"
env_file: env_file:
- ./environment - ./environment
weblate: weblate:
image: weblate/weblate image: weblate/weblate
links: links:
@ -50,14 +50,13 @@ services:
- "traefik.frontend.passHostHeader=true" - "traefik.frontend.passHostHeader=true"
volumes: volumes:
- weblate-data:/app/data - weblate-data:/app/data
env_file: env_file:
- ./environment - ./environment
environment: environment:
- "POSTGRES_USER=weblate" - "POSTGRES_USER=weblate"
- "POSTGRES_DATABASE=weblate" - "POSTGRES_DATABASE=weblate"
restart: always restart: always
cache: cache:
image: memcached:1.4 image: memcached:1.4
restart: always restart: always
@ -78,7 +77,6 @@ services:
- /containers/jenkins:/var/jenkins_home - /containers/jenkins:/var/jenkins_home
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
weblate_static: weblate_static:
image: nginx:alpine image: nginx:alpine
restart: always restart: always