diff --git a/sigi/apps/diagnosticos/templates/diagnosticos/mapa.html b/sigi/apps/diagnosticos/templates/diagnosticos/mapa.html index 006b52c..072201c 100644 --- a/sigi/apps/diagnosticos/templates/diagnosticos/mapa.html +++ b/sigi/apps/diagnosticos/templates/diagnosticos/mapa.html @@ -29,7 +29,7 @@ map: map, position: new google.maps.LatLng(municipio.lat, municipio.lng), title: municipio.nome, - icon: '{{ MEDIA_URL }}images/mapmarker.png' + icon: "{% static 'img/mapmarker.png' %}" } var mark = new google.maps.Marker(markData); var infoWin = new google.maps.InfoWindow({content: diff --git a/sigi/apps/metas/views.py b/sigi/apps/metas/views.py index 30867f3..f6e0cd7 100644 --- a/sigi/apps/metas/views.py +++ b/sigi/apps/metas/views.py @@ -295,7 +295,7 @@ def gera_map_data_file(cronjob=False): if c.pk not in casas: casa = { 'nome': c.nome + ', ' + c.municipio.uf.sigla, - 'icone': '/static/img/' + 'mapmarker' + '.png', + 'icone': '/static/img/mapmarker.png', 'lat': str(c.municipio.latitude), 'lng': str(c.municipio.longitude), 'estado': c.municipio.uf.sigla, diff --git a/sigi/apps/servicos/templates/servicos/mapa.html b/sigi/apps/servicos/templates/servicos/mapa.html index c5493c7..cf7debd 100644 --- a/sigi/apps/servicos/templates/servicos/mapa.html +++ b/sigi/apps/servicos/templates/servicos/mapa.html @@ -4,7 +4,7 @@ {% block extrahead %} {{ block.super }} - {% load staticfiles %} + {% load static from staticfiles %} @@ -18,7 +18,7 @@ center: latlng, mapTypeId: google.maps.MapTypeId.ROADMAP }; - + var map = new google.maps.Map(document.getElementById("map"), myOptions); @@ -29,7 +29,7 @@ map: map, position: new google.maps.LatLng(municipio.lat, municipio.lng), title: municipio.nome, - icon: '{{ MEDIA_URL }}images/mapmarker.png' + icon: "{% static 'img/mapmarker.png' %}" } var mark = new google.maps.Marker(markData); var infoWin = new google.maps.InfoWindow({content: @@ -38,12 +38,12 @@ linkMarkMessage(mark, infoWin, map); } }); - + function linkMarkMessage(mark, infoWin, map) { - google.maps.event.addListener(mark, 'click', function() { + google.maps.event.addListener(mark, 'click', function() { infoWin.open(map, mark);}); } - })})(django.jQuery); + })})(django.jQuery); {% endblock %} diff --git a/templates/index.html b/templates/index.html index 024f23c..ddcca82 100644 --- a/templates/index.html +++ b/templates/index.html @@ -32,7 +32,7 @@ map: map, position: new google.maps.LatLng(municipio.lat, municipio.lng), title: municipio.nome, - icon: '{{ STATIC_URL }}img/mapmarker.png' + icon: "{% static 'img/mapmarker.png' %}" } var mark = new google.maps.Marker(markData); var infoWin = new google.maps.InfoWindow({content: