Browse Source

modificacoes feitas em producao, wrong!

diagnosticos
Felipe Vieira 13 years ago
parent
commit
6d1b6a11f0
  1. 10
      etc/apache/django.wsgi
  2. 0
      etc/apache/sites-available/sigi.erb
  3. 4
      media/css/base_site.css
  4. 12
      sigi/apps/casas/forms.py
  5. 6
      sigi/settings.py
  6. 2
      sigi/templates/admin/base_site.html
  7. 2
      sigi/templates/index.html
  8. 2
      sigi/templates/snippets/modules/actions.html
  9. 10
      sigi/templates/snippets/modules/charts-convenios.html

10
etc/apache/django.wsgi

@ -2,8 +2,16 @@
# -*- mode: python -*- # -*- mode: python -*-
import os, sys import os, sys
sys.path.insert(0, '/var/aplicacoes/django/SIGI') sys.path.insert(0, '/var/aplicacoes/django/sigi')
os.environ['DJANGO_SETTINGS_MODULE'] = 'sigi.settings' os.environ['DJANGO_SETTINGS_MODULE'] = 'sigi.settings'
from django.core.management.validation import get_validation_errors
try:
from cStringIO import StringIO
except ImportError:
from StringIO import StringIO
s = StringIO()
num_errors = get_validation_errors(s, None)
import django.core.handlers.wsgi import django.core.handlers.wsgi
application = django.core.handlers.wsgi.WSGIHandler() application = django.core.handlers.wsgi.WSGIHandler()

0
etc/apache/apache.conf → etc/apache/sites-available/sigi.erb

4
media/css/base_site.css

@ -153,7 +153,7 @@ img.chart {
/* JQuery */ /* JQuery */
.tabs-conteudo li { .tabs-conteudo li {
border: 1px solid #CCC; border: 1px solid #CCC;
background-image: url("/admin_media/img/admin/nav-bg.gif"); background-image: url("/sigi/admin_media/img/admin/nav-bg.gif");
display: inline; display: inline;
padding: 4px 8px; padding: 4px 8px;
} }
@ -164,7 +164,7 @@ img.chart {
.conteudo_regiao li{ .conteudo_regiao li{
border: 1px solid #CCC; border: 1px solid #CCC;
background-image: url("/admin_media/img/admin/nav-bg.gif"); background-image: url("/sigi/admin_media/img/admin/nav-bg.gif");
padding: 4px 8px; padding: 4px 8px;
width: 30%; width: 30%;
list-style: none; list-style: none;

12
sigi/apps/casas/forms.py

@ -4,12 +4,12 @@ from django.contrib.localflavor.br.forms import BRCNPJField, BRZipCodeField
from sigi.apps.casas.models import CasaLegislativa from sigi.apps.casas.models import CasaLegislativa
class CasaLegislativaForm(forms.ModelForm): class CasaLegislativaForm(forms.ModelForm):
cnpj = BRCNPJField( #cnpj = BRCNPJField(
label='CNPJ', # label='CNPJ',
required=False, # required=False,
help_text='Utilize o formato <em>XX.XXX.XXX/XXXX-XX</em> ou ' # help_text='Utilize o formato <em>XX.XXX.XXX/XXXX-XX</em> ou '
'insira apenas os dígitos.' # 'insira apenas os dígitos.'
) #)
cep = BRZipCodeField(label='CEP', help_text='Formato: <em>XXXXX-XXX</em>.') cep = BRZipCodeField(label='CEP', help_text='Formato: <em>XXXXX-XXX</em>.')
class Meta: class Meta:

6
sigi/settings.py

@ -33,13 +33,15 @@ DATABASE_PORT = '5432'
TIME_ZONE = 'Brazil/East' TIME_ZONE = 'Brazil/East'
LANGUAGE_CODE = 'pt-br' LANGUAGE_CODE = 'pt-br'
DEFAULT_CHARSET = 'utf-8'
SITE_ID = 1 SITE_ID = 1
USE_I18N = True USE_I18N = True
USE_L10N = True
MEDIA_ROOT = BASE_DIR + '/media/' MEDIA_ROOT = BASE_DIR + '/media/'
MEDIA_URL = '/media/' MEDIA_URL = '/sigi/media/'
ADMIN_MEDIA_PREFIX = '/admin_media/' ADMIN_MEDIA_PREFIX = '/sigi/admin_media/'
CACHE_BACKEND = 'dummy:///' CACHE_BACKEND = 'dummy:///'
CACHE_MIDDLEWARE_SECONDS = 60 CACHE_MIDDLEWARE_SECONDS = 60

2
sigi/templates/admin/base_site.html

@ -15,7 +15,7 @@
{% block branding %} {% block branding %}
<h1 id="site-name"> <h1 id="site-name">
<a href="/">Sistema de Informações Gerenciais do Interlegis</a> <a href="/sigi">Sistema de Informações Gerenciais do Interlegis</a>
</h1> </h1>
{% endblock %} {% endblock %}

2
sigi/templates/index.html

@ -1,6 +1,6 @@
{% extends "admin/index.html" %} {% extends "admin/index.html" %}
{% block title %}Dashboard | SIGI{% endblock %} {% block title %}SIGI{% endblock %}
{% block content_title %}<h1>Dashboard</h1>{% endblock %} {% block content_title %}<h1>Dashboard</h1>{% endblock %}
{% block content %} {% block content %}

2
sigi/templates/snippets/modules/actions.html

@ -11,7 +11,7 @@
<li class="{% if entry.is_addition %}addlink{% endif %} <li class="{% if entry.is_addition %}addlink{% endif %}
{% if entry.is_change %}changelink{% endif %} {% if entry.is_change %}changelink{% endif %}
{% if entry.is_deletion %}deletelink{% endif %}"> {% if entry.is_deletion %}deletelink{% endif %}">
{% if not entry.is_deletion %}<a href="{{ entry.get_admin_url }}">{% endif %} {% if not entry.is_deletion %}<a href="sigi/{{ entry.get_admin_url }}">{% endif %}
{{ entry.object_repr|escape|truncatewords_html:3 }} {{ entry.object_repr|escape|truncatewords_html:3 }}
{% if not entry.is_deletion %}</a>{% endif %} {% if not entry.is_deletion %}</a>{% endif %}
<br /> <br />

10
sigi/templates/snippets/modules/charts-convenios.html

@ -68,11 +68,11 @@
</p> </p>
<ul class="conteudo_regiao"> <ul class="conteudo_regiao">
<li><a href="reportsRegiao/CO">Centro Oeste</a></li> <li><a href="sigi/reportsRegiao/CO">Centro Oeste</a></li>
<li><a href="reportsRegiao/NE">Nordeste</a></li> <li><a href="sigi/reportsRegiao/NE">Nordeste</a></li>
<li><a href="reportsRegiao/NO">Norte</a></li> <li><a href="sigi/reportsRegiao/NO">Norte</a></li>
<li><a href="reportsRegiao/SD">Sudeste</a></li> <li><a href="sigi/reportsRegiao/SD">Sudeste</a></li>
<li><a href="reportsRegiao/SL">Sul</a></li> <li><a href="sigi/reportsRegiao/SL">Sul</a></li>
</ul> </ul>
</div> </div>

Loading…
Cancel
Save