diff --git a/compilacao/forms.py b/compilacao/forms.py index dd7a96f19..c84bb224e 100644 --- a/compilacao/forms.py +++ b/compilacao/forms.py @@ -65,7 +65,7 @@ class TipoTaForm(ModelForm): self.helper = FormHelper() self.helper.layout = SaplFormLayout( Fieldset(_('Identificação Básica'), - row1, css_class="large-12")) + row1, css_class="col-md-12")) super(TipoTaForm, self).__init__(*args, **kwargs) @@ -131,13 +131,13 @@ class TaForm(ModelForm): self.helper = FormHelper() self.helper.layout = SaplFormLayout( - Fieldset(_('Identificação Básica'), row1, css_class="large-12"), + Fieldset(_('Identificação Básica'), row1, css_class="col-md-12"), Fieldset( TextoArticulado._meta.get_field('ementa').verbose_name, - Column('ementa'), css_class="large-12"), + Column('ementa'), css_class="col-md-12"), Fieldset( TextoArticulado._meta.get_field('observacao').verbose_name, - Column('observacao'), css_class="large-12"), + Column('observacao'), css_class="col-md-12"), ) @@ -222,7 +222,7 @@ class NotaForm(ModelForm): 'titulo', placeholder=_('Título da Nota (opcional)') ), - css_class='columns large-8')) + css_class='col-md-8')) row3 = to_row([ ('publicidade', 3), @@ -431,7 +431,7 @@ class PublicacaoForm(ModelForm): self.helper = FormHelper() self.helper.layout = SaplFormLayout( Fieldset(Publicacao._meta.verbose_name, - row1, row2, row3, css_class="large-12")) + row1, row2, row3, css_class="col-md-12")) super(PublicacaoForm, self).__init__(*args, **kwargs) pass diff --git a/materia/views.py b/materia/views.py index 89202145d..76e93a5d4 100644 --- a/materia/views.py +++ b/materia/views.py @@ -1768,7 +1768,7 @@ class ProposicaoForm(ModelForm): [('texto_original', 10)]) row4.append( - Column(form_actions(), css_class='columns large-2')) + Column(form_actions(), css_class='col-md-2')) self.helper = FormHelper() self.helper.layout = Layout( diff --git a/sapl/layout.py b/sapl/layout.py index cb9716374..e085a0a1e 100644 --- a/sapl/layout.py +++ b/sapl/layout.py @@ -5,7 +5,7 @@ from django.utils.translation import ugettext as _ def to_column(name_span): fieldname, span = name_span - return Div(fieldname, css_class='col-sm-%d' % span) + return Div(fieldname, css_class='col-md-%d' % span) def to_row(names_spans): diff --git a/sessao/views.py b/sessao/views.py index ac7957064..b19a2121c 100644 --- a/sessao/views.py +++ b/sessao/views.py @@ -2503,7 +2503,7 @@ class AcompanharMateriaForm(ModelForm): row1 = sapl.layout.to_row([('email', 10)]) row1.append( - Column(form_actions(save_label='Cadastrar'), css_class='columns-large-2') + Column(form_actions(save_label='Cadastrar'), css_class='col-md-2') ) self.helper = FormHelper() diff --git a/templates/compilacao/publicacao_detail.html b/templates/compilacao/publicacao_detail.html index c4b3e8991..6092af0c2 100644 --- a/templates/compilacao/publicacao_detail.html +++ b/templates/compilacao/publicacao_detail.html @@ -20,19 +20,19 @@ {%trans 'Identificação Básica'%}
-
+

{{ object.tipo_publicacao}}

-
+

{{ object.veiculo_publicacao}}

-
+

{{ object.ano}}

@@ -40,25 +40,25 @@
-
+

{{ object.data}}

-
+

{{ object.hora|time:"H:i:s"}}

-
+

{{ object.numero|default:''}}

-
+

{{ object.edicao|default:''}}

@@ -66,25 +66,25 @@
-
+

{{ object.pagina_inicio|default:''}}

-
+

{{ object.pagina_fim|default:''}}

-
+

{{ object.url_externa|default:''}}

- +
{% endblock detail_content %} diff --git a/templates/compilacao/textoarticulado_detail.html b/templates/compilacao/textoarticulado_detail.html index e638b3881..5575b77c7 100644 --- a/templates/compilacao/textoarticulado_detail.html +++ b/templates/compilacao/textoarticulado_detail.html @@ -11,7 +11,7 @@ {%else%}
{% trans 'Início' %}
{%endif%} - +
{% model_verbose_name_plural 'compilacao.models.Publicacao' %}
{% trans 'Texto' %}
@@ -24,7 +24,7 @@
{% block actions %}
    - + {%if object %}
  • {% trans 'Edição dos Metadados do Texto Articulado' %}
  • {% trans 'Excluir' %}
  • @@ -50,7 +50,7 @@
    -
    +

    {{ object.tipo_ta}}

    @@ -58,7 +58,7 @@
    {% if object.content_object and object.content_object.tipo%} -
    +

    {{ object.content_object.tipo}}

    @@ -66,21 +66,21 @@
    {%endif%} -
    +

    {{ object.numero}}

    -
    +

    {{ object.ano}}

    -
    +

    {{ object.data}}

    @@ -89,7 +89,7 @@

    -
    +

    {{ object.ementa|safe}}

    diff --git a/templates/compilacao/tipotextoarticulado_detail.html b/templates/compilacao/tipotextoarticulado_detail.html index da03e5676..02807e505 100644 --- a/templates/compilacao/tipotextoarticulado_detail.html +++ b/templates/compilacao/tipotextoarticulado_detail.html @@ -21,27 +21,27 @@
    -
    +

    {{ object.sigla}}

    -
    +

    {{ object.descricao}}

    -
    +

    {{ object.content_type|default:""}}

    -
    +

    {{ object.get_participacao_social_display}}