diff --git a/sigi/apps/diagnosticos/models.py b/sigi/apps/diagnosticos/models.py
index 29603c9..2392e1b 100644
--- a/sigi/apps/diagnosticos/models.py
+++ b/sigi/apps/diagnosticos/models.py
@@ -132,7 +132,7 @@ class Diagnostico(BaseEntity):
return str(self.casa_legislativa).decode('utf8')
def get_absolute_url(self):
- return "/sigi/diagnosticos/diagnostico/%i.pdf" % (self.id, )
+ return "/diagnosticos/diagnostico/%i.pdf" % (self.id, )
class Categoria(models.Model):
diff --git a/sigi/apps/diagnosticos/templates/diagnosticos/graficos.html b/sigi/apps/diagnosticos/templates/diagnosticos/graficos.html
index cf96ed9..60c587f 100644
--- a/sigi/apps/diagnosticos/templates/diagnosticos/graficos.html
+++ b/sigi/apps/diagnosticos/templates/diagnosticos/graficos.html
@@ -48,7 +48,7 @@ jQuery(document).ready(function () {
{{ pergunta }}
{% if pergunta.datatype == 'many' or pergunta.datatype == 'one' %}
- {{ pergunta.title }}
+ {{ pergunta.title }}
diff --git a/sigi/apps/diagnosticos/templates/diagnosticos/mapa.html b/sigi/apps/diagnosticos/templates/diagnosticos/mapa.html
index 565059b..3488e4c 100644
--- a/sigi/apps/diagnosticos/templates/diagnosticos/mapa.html
+++ b/sigi/apps/diagnosticos/templates/diagnosticos/mapa.html
@@ -22,14 +22,14 @@
var map = new google.maps.Map(document.getElementById("map"),
myOptions);
- $.get("/sigi/diagnosticos/mundiagjson/", function(municipios) {
+ $.get("/diagnosticos/mundiagjson/", function(municipios) {
for (var i in municipios) {
var municipio = municipios[i];
var markData = {
map: map,
position: new google.maps.LatLng(municipio.lat, municipio.lng),
title: municipio.nome,
- icon: '{{ MEDIA_URL }}images/mapmarker.png' //'/sigi/media/images/mapmarker.png'
+ icon: '{{ MEDIA_URL }}images/mapmarker.png'
}
var mark = new google.maps.Marker(markData);
var infoWin = new google.maps.InfoWindow({content:
diff --git a/sigi/apps/diagnosticos/tests.py b/sigi/apps/diagnosticos/tests.py
index acf958e..dfe01f4 100644
--- a/sigi/apps/diagnosticos/tests.py
+++ b/sigi/apps/diagnosticos/tests.py
@@ -10,6 +10,6 @@ class DiagnosticosViewsTest(TestCase):
def test_diagnostico_list_success(self):
- response = self.client.get('/sigi/mobile/diagnosticos')
+ response = self.client.get('/mobile/diagnosticos')
self.assertEquals(200, response.status_code)
self.assertTemplateUsed(response, 'diagnosticos/diagnosticos_list.html')
diff --git a/sigi/apps/diagnosticos/urls.py b/sigi/apps/diagnosticos/urls.py
index 98286e2..881ca50 100644
--- a/sigi/apps/diagnosticos/urls.py
+++ b/sigi/apps/diagnosticos/urls.py
@@ -3,7 +3,7 @@ from django.conf.urls import patterns, url
from django.views.generic import TemplateView
-LOGIN_REDIRECT_URL = '/sigi/diagnosticos/mobile/login'
+LOGIN_REDIRECT_URL = '/diagnosticos/mobile/login'
urlpatterns = patterns('sigi.apps.diagnosticos.views',
# Lista de Diagnósticos
diff --git a/sigi/apps/metas/templates/metas/mapa.html b/sigi/apps/metas/templates/metas/mapa.html
index 0bf22d4..5dc64e5 100644
--- a/sigi/apps/metas/templates/metas/mapa.html
+++ b/sigi/apps/metas/templates/metas/mapa.html
@@ -29,9 +29,9 @@
diff --git a/sigi/apps/metas/views.py b/sigi/apps/metas/views.py
index 231bad1..5a62f65 100644
--- a/sigi/apps/metas/views.py
+++ b/sigi/apps/metas/views.py
@@ -300,7 +300,7 @@ def gera_map_data_file(cronjob=False):
}
for sv in c.servico_set.all():
- casa['info'].append(u"%s ativado em %s " % (
+ casa['info'].append(u"%s ativado em %s " % (
sv.tipo_servico.nome, sv.data_ativacao.strftime('%d/%m/%Y') if sv.data_ativacao else
u'', sv.url))
casa['seit'].append(sv.tipo_servico.sigla)
diff --git a/sigi/apps/servicos/templates/servicos/mapa.html b/sigi/apps/servicos/templates/servicos/mapa.html
index 53b28f6..c5493c7 100644
--- a/sigi/apps/servicos/templates/servicos/mapa.html
+++ b/sigi/apps/servicos/templates/servicos/mapa.html
@@ -22,14 +22,14 @@
var map = new google.maps.Map(document.getElementById("map"),
myOptions);
- $.get("/sigi/servicos/munatenjson/{{ params.servico }}", function(municipios) {
+ $.get("/servicos/munatenjson/{{ params.servico }}", function(municipios) {
for (var i in municipios) {
var municipio = municipios[i];
var markData = {
map: map,
position: new google.maps.LatLng(municipio.lat, municipio.lng),
title: municipio.nome,
- icon: '{{ MEDIA_URL }}images/mapmarker.png' //'/sigi/media/images/mapmarker.png'
+ icon: '{{ MEDIA_URL }}images/mapmarker.png'
}
var mark = new google.maps.Marker(markData);
var infoWin = new google.maps.InfoWindow({content:
diff --git a/sigi/apps/servidores/templates/admin/servidores/servidor/change_list.html b/sigi/apps/servidores/templates/admin/servidores/servidor/change_list.html
index f688d16..c9ba500 100644
--- a/sigi/apps/servidores/templates/admin/servidores/servidor/change_list.html
+++ b/sigi/apps/servidores/templates/admin/servidores/servidor/change_list.html
@@ -4,10 +4,10 @@
{% block object-tools %}