diff --git a/templates/comissoes/comissao_list.html b/templates/comissoes/comissao_list.html index 9fe9f75e8..24cae06ef 100644 --- a/templates/comissoes/comissao_list.html +++ b/templates/comissoes/comissao_list.html @@ -3,11 +3,11 @@ {% load crispy_forms_tags %} {% block base_content %} - +
+ + {% blocktrans with verbose_name=view.verbose_name %} Adicionar Comissão {% endblocktrans %} + +
{% block detail_content %} diff --git a/templates/compilacao/publicacao_detail.html b/templates/compilacao/publicacao_detail.html index 6092af0c2..c7e5a9ea1 100644 --- a/templates/compilacao/publicacao_detail.html +++ b/templates/compilacao/publicacao_detail.html @@ -9,10 +9,10 @@
  • {% trans 'Excluir' %}
  • {% endblock actions %} - +
    + {% block sections_nav %} + {% endblock %} +
    {% block detail_content %} {# TODO replace fieldset for something semantically correct, but with similar visual grouping style #} diff --git a/templates/compilacao/publicacao_list.html b/templates/compilacao/publicacao_list.html index f0472f4ce..abcb696d0 100644 --- a/templates/compilacao/publicacao_list.html +++ b/templates/compilacao/publicacao_list.html @@ -5,15 +5,15 @@ {% block base_content %} - + {% if not object_list %}

    {{ NO_ENTRIES_MSG }}

    diff --git a/templates/compilacao/textoarticulado_detail.html b/templates/compilacao/textoarticulado_detail.html index 5575b77c7..7c8e834ce 100644 --- a/templates/compilacao/textoarticulado_detail.html +++ b/templates/compilacao/textoarticulado_detail.html @@ -5,18 +5,18 @@ {% block sections_nav %} {%if object %} - + {% trans 'Texto' %} + {% trans 'Edição do Texto' %} + {%endif %} {% endblock %} diff --git a/templates/compilacao/textoarticulado_list.html b/templates/compilacao/textoarticulado_list.html index c8984285b..7df007eb7 100644 --- a/templates/compilacao/textoarticulado_list.html +++ b/templates/compilacao/textoarticulado_list.html @@ -5,21 +5,20 @@ {% block base_content %} {% block actions %}{{block.super}} - + {% endblock actions %} -{% block detail_content %} -{% endblock detail_content %} - +
    diff --git a/templates/compilacao/tipotextoarticulado_list.html b/templates/compilacao/tipotextoarticulado_list.html index b54299c3f..d8f89d7ad 100644 --- a/templates/compilacao/tipotextoarticulado_list.html +++ b/templates/compilacao/tipotextoarticulado_list.html @@ -5,14 +5,14 @@ {% block base_content %} - + {% if not object_list %}

    {{ NO_ENTRIES_MSG }}

    diff --git a/templates/crud/detail.html b/templates/crud/detail.html index 87385349b..b88bfef72 100644 --- a/templates/crud/detail.html +++ b/templates/crud/detail.html @@ -6,10 +6,10 @@ {# FIXME is this the best markup to use? #}
    {% block actions %} - +
    + {% trans 'Editar' %} + {% trans 'Excluir' %} +
    {% endblock actions %}
    diff --git a/templates/crud/list.html b/templates/crud/list.html index 90fb46bf1..f7100fff7 100644 --- a/templates/crud/list.html +++ b/templates/crud/list.html @@ -4,15 +4,15 @@ {% block base_content %} {# FIXME is this the best markup to use? #} - + {% if not rows %}

    {{ NO_ENTRIES_MSG }}

    diff --git a/templates/materia/proposicao_list.html b/templates/materia/proposicao_list.html index 391a44662..7aa17bd35 100644 --- a/templates/materia/proposicao_list.html +++ b/templates/materia/proposicao_list.html @@ -7,9 +7,9 @@ {% block sections_nav %}

    Proposições


    - +
    + Nova Proposição +
    {% endblock %} {% block detail_content %} @@ -20,7 +20,7 @@ - + {% for proposicao in page_obj %} {% if proposicao.data_envio %} diff --git a/templates/norma/normajuridica_detail.html b/templates/norma/normajuridica_detail.html index 27205d1a5..70e5131c1 100644 --- a/templates/norma/normajuridica_detail.html +++ b/templates/norma/normajuridica_detail.html @@ -1,16 +1,16 @@ {% extends "crud/detail.html" %} {% load i18n %} {% block sections_nav %} - + {% comment %} + Opção adicionada para chamar o TextoArticulado da norma. + para integração foram necessárias apenas criar a url norma_ta em urls.py + e a view NormaTa(IntegracaoTaView) em views.py + Em nada mais a integração interfere em Norma Jurídica + {% endcomment %} + {% trans 'Texto' %} + {% endblock sections_nav %} diff --git a/templates/parlamentares/parlamentares_detail.html b/templates/parlamentares/parlamentares_detail.html index 2dd5eb50e..d9a9da7da 100644 --- a/templates/parlamentares/parlamentares_detail.html +++ b/templates/parlamentares/parlamentares_detail.html @@ -1,9 +1,9 @@ {% extends "crud/detail.html" %} {% load i18n %} {% block actions %} - + {% endblock actions %} \ No newline at end of file diff --git a/templates/protocoloadm/detail_doc_detail.html b/templates/protocoloadm/detail_doc_detail.html index 48cd9b73e..59c9ac660 100644 --- a/templates/protocoloadm/detail_doc_detail.html +++ b/templates/protocoloadm/detail_doc_detail.html @@ -2,8 +2,9 @@ {% load i18n %} {% block sections_nav %} -
    Descrição Incorporada?
    {% for sessao in page_obj %}