diff --git a/media/css/base_site.css b/media/css/base_site.css index 800207a..f8648d6 100644 --- a/media/css/base_site.css +++ b/media/css/base_site.css @@ -91,6 +91,9 @@ div.breadcrumbs { display:none; } /* CONTENT */ +.module{ + height:300px; +} .module h2, .module caption, .inline-group h2 { background: #00367b diff --git a/sigi/apps/casas/admin.py b/sigi/apps/casas/admin.py index 9145e9b..41307db 100644 --- a/sigi/apps/casas/admin.py +++ b/sigi/apps/casas/admin.py @@ -1,17 +1,17 @@ # -*- coding: utf-8 -*- from django.contrib import admin from django.contrib.contenttypes import generic -from apps.casas.forms import CasaLegislativaForm -from apps.casas.models import CasaLegislativa -from apps.contatos.models import Contato, Telefone -from apps.convenios.models import Projeto, Convenio, EquipamentoPrevisto, Anexo +from sigi.apps.casas.forms import CasaLegislativaForm +from sigi.apps.casas.models import CasaLegislativa +from sigi.apps.contatos.models import Contato, Telefone +from sigi.apps.convenios.models import Projeto, Convenio, EquipamentoPrevisto, Anexo from django.http import HttpResponse, HttpResponseRedirect -from apps.casas.reports import CasasLegislativasLabels, CasasLegislativasReport +from sigi.apps.casas.reports import CasasLegislativasLabels, CasasLegislativasReport from geraldo.generators import PDFGenerator -from apps.casas.views import report_complete, labels_report, export_csv, \ +from sigi.apps.casas.views import report_complete, labels_report, export_csv, \ labels_report_sem_presidente, report, \ adicionar_casas_carrinho -from apps.utils import queryset_ascii +from sigi.apps.utils import queryset_ascii class ContatosInline(generic.GenericTabularInline): model = Contato diff --git a/sigi/apps/casas/views.py b/sigi/apps/casas/views.py index 0d0db98..5bfd389 100644 --- a/sigi/apps/casas/views.py +++ b/sigi/apps/casas/views.py @@ -2,20 +2,19 @@ from django.http import HttpResponse, HttpResponseRedirect from django.shortcuts import render_to_response from geraldo.generators import PDFGenerator -from apps.casas.models import CasaLegislativa +from sigi.apps.casas.models import CasaLegislativa -from apps.casas.reports import CasasLegislativasLabels -from apps.casas.reports import CasasLegislativasLabelsSemPresidente -from apps.casas.reports import CasasLegislativasReport -from apps.casas.reports import CasasSemConvenioReport -from apps.casas.reports import InfoCasaLegislativa +from sigi.apps.casas.reports import CasasLegislativasLabels +from sigi.apps.casas.reports import CasasLegislativasLabelsSemPresidente +from sigi.apps.casas.reports import CasasLegislativasReport +from sigi.apps.casas.reports import CasasSemConvenioReport +from sigi.apps.casas.reports import InfoCasaLegislativa from django.core.paginator import Paginator, InvalidPage, EmptyPage from django.conf import settings import csv -from bzrlib.switch import switch def query_ordena(qs,o,ot): list_display = ('nome','municipio','presidente','logradouro') diff --git a/sigi/apps/convenios/admin.py b/sigi/apps/convenios/admin.py index 3f968ae..f0ef6d6 100644 --- a/sigi/apps/convenios/admin.py +++ b/sigi/apps/convenios/admin.py @@ -1,14 +1,14 @@ # -*- coding: utf-8 -*- from django.contrib import admin -from apps.convenios.models import Projeto, Convenio, EquipamentoPrevisto, Anexo -from apps.casas.models import CasaLegislativa -from apps.servicos.models import Servico +from sigi.apps.convenios.models import Projeto, Convenio, EquipamentoPrevisto, Anexo +from sigi.apps.casas.models import CasaLegislativa +from sigi.apps.servicos.models import Servico from django.http import HttpResponse, HttpResponseRedirect -from apps.convenios.reports import ConvenioReport -from apps.utils import queryset_ascii +from sigi.apps.convenios.reports import ConvenioReport +from sigi.apps.utils import queryset_ascii from geraldo.generators import PDFGenerator -from apps.convenios.views import adicionar_convenios_carrinho +from sigi.apps.convenios.views import adicionar_convenios_carrinho class AnexosInline(admin.TabularInline): model = Anexo diff --git a/sigi/apps/convenios/views.py b/sigi/apps/convenios/views.py index 67e957a..c14a1de 100644 --- a/sigi/apps/convenios/views.py +++ b/sigi/apps/convenios/views.py @@ -2,14 +2,14 @@ from django.http import HttpResponse, HttpResponseRedirect from django.shortcuts import render_to_response, get_list_or_404 from geraldo.generators import PDFGenerator -from apps.convenios.models import Convenio -from apps.convenios.reports import ConvenioReport \ +from sigi.apps.convenios.models import Convenio +from sigi.apps.convenios.reports import ConvenioReport \ ,ConvenioPorCMReport \ ,ConvenioPorALReport \ ,ConvenioReportSemAceiteAL \ ,ConvenioReportSemAceiteCM -from apps.casas.models import CasaLegislativa -from apps.contatos.models import UnidadeFederativa +from sigi.apps.casas.models import CasaLegislativa +from sigi.apps.contatos.models import UnidadeFederativa import ho.pisa as pisa from django.template import Context, loader