Browse Source

bump django-floppyforms

pull/2446/head
Leandro Roberto 6 years ago
parent
commit
82fb5613c3
  1. 2
      requirements/requirements.txt
  2. 8
      sapl/sessao/forms.py
  3. 19
      sapl/settings.py
  4. 3
      sapl/static/styles/app.scss
  5. 6
      sapl/templates/parlamentares/parlamentares_list.html
  6. 4
      setup.py

2
requirements/requirements.txt

@ -7,10 +7,10 @@ dj-database-url==0.5.0
django-bower==5.2.0
django-braces==1.9.0
django-crispy-forms==1.7.2
django-floppyforms==1.7.0
django-extensions==1.9.8
django-extra-views==0.11.0
django-floppyforms==1.6.2
django-model-utils==3.1.1
django-sass-processor==0.5.8
easy-thumbnails==2.5

8
sapl/sessao/forms.py

@ -3,7 +3,6 @@ from datetime import datetime
from crispy_forms.helper import FormHelper
from crispy_forms.layout import HTML, Button, Fieldset, Layout
from django import forms
from django.contrib import messages
from django.contrib.contenttypes.models import ContentType
from django.core.exceptions import ObjectDoesNotExist, ValidationError
from django.db import transaction
@ -12,22 +11,21 @@ from django.forms import ModelForm
from django.forms.widgets import CheckboxSelectMultiple
from django.utils.translation import ugettext_lazy as _
import django_filters
from floppyforms import widgets
from sapl.base.models import Autor, TipoAutor
from sapl.crispy_layout_mixin import form_actions, to_row, SaplFormLayout
from sapl.materia.forms import MateriaLegislativaFilterSet
from sapl.materia.models import (MateriaLegislativa, StatusTramitacao,
TipoMateriaLegislativa)
from sapl.parlamentares.models import Parlamentar, Legislatura, Mandato
from sapl.parlamentares.models import Parlamentar, Mandato
from sapl.utils import (RANGE_DIAS_MES, RANGE_MESES,
MateriaPesquisaOrderingFilter, autor_label,
autor_modal, timezone, choice_anos_com_sessaoplenaria)
from .models import (Bancada, Bloco, ExpedienteMateria, JustificativaAusencia,
Orador, OradorExpediente, OrdemDia, PresencaOrdemDia, SessaoPlenaria,
SessaoPlenariaPresenca, TipoJustificativa, TipoResultadoVotacao,
OcorrenciaSessao, RegistroVotacao, RetiradaPauta, TipoRetiradaPauta)
SessaoPlenariaPresenca, TipoResultadoVotacao,
OcorrenciaSessao, RetiradaPauta, TipoRetiradaPauta)
MES_CHOICES = RANGE_MESES

19
sapl/settings.py

@ -79,20 +79,25 @@ INSTALLED_APPS = (
'django.contrib.messages',
'django.contrib.staticfiles',
# more
'django_extensions',
'djangobower',
'bootstrap3', # basically for django_admin_bootstrapped
'bootstrap3',
'crispy_forms',
'easy_thumbnails',
'image_cropping',
'floppyforms',
'haystack',
'sass_processor',
'rest_framework',
'django_filters',
'django_extensions',
'easy_thumbnails',
'image_cropping',
'sass_processor',
'reversion',
'reversion_compare',
'haystack',
'whoosh',
'speedinfo',

3
sapl/static/styles/app.scss

@ -451,6 +451,9 @@ nav {
overflow-x: auto;
}
}
.lista-parlamentares .table td {
vertical-align: middle;
}
@media (min-width: 1092px) and (max-width: 1199px) {
.container {

6
sapl/templates/parlamentares/parlamentares_list.html

@ -21,7 +21,7 @@
{% if not rows %}
<p>{{ NO_ENTRIES_MSG }}</p>
{% else %}
<div class="container-table">
<div class="container-table lista-parlamentares">
<div class="result-count">{% blocktrans with verbose_name_plural=view.verbose_name_plural %}Total de {{ verbose_name_plural }}: <strong>{{count}}</strong>{% endblocktrans %}</div>
<table class="table table-striped table-hover table-link-ordering">
<thead>
@ -43,7 +43,9 @@
{% for value, href, obj in value_list %}
{% if forloop.first %}
<td>
<img class="avatar-parlamentar" src="{% cropped_thumbnail obj "cropping" %}">
{% if obj.fotografia %}
<img class="avatar-parlamentar" src="{% cropped_thumbnail obj "cropping" %}">
{% endif %}
</td>
{% endif %}
<td>

4
setup.py

@ -18,10 +18,10 @@ install_requires = [
'django-bower==5.2.0',
'django-braces==1.9.0',
'django-crispy-forms==1.7.2',
'django-floppyforms==1.7.0',
'django-extensions==1.9.8',
'django-extra-views==0.11.0',
'django-floppyforms==1.6.2',
'django-extensions==1.9.8',
'django-model-utils==3.1.1',
'django-sass-processor==0.5.8',
'drfdocs',

Loading…
Cancel
Save