From 9e16f641803744bee1495bf6552a812255ff1372 Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Mon, 14 Jan 2019 23:21:55 -0200 Subject: [PATCH] altera btn-default/bootstrap3 para btn-outline-dark/bootstrap4 --- sapl/base/forms.py | 2 +- sapl/crud/base.py | 2 +- sapl/templates/auth/user_list.html | 2 +- .../base/EstatisticasAcessoNormas_filter.html | 2 +- sapl/templates/base/RelatorioAtas_filter.html | 2 +- .../base/RelatorioAudiencia_filter.html | 2 +- ...elatorioDataFimPrazoTramitacao_filter.html | 2 +- .../RelatorioHistoricoTramitacao_filter.html | 2 +- ...latorioMateriasPorAnoAutorTipo_filter.html | 2 +- .../RelatorioMateriasPorAutor_filter.html | 2 +- ...RelatorioMateriasPorTramitacao_filter.html | 2 +- .../base/RelatorioNormaMes_filter.html | 2 +- .../base/RelatorioNormasVigencia_filter.html | 2 +- .../base/RelatorioPresencaSessao_filter.html | 2 +- .../base/RelatorioReuniao_filter.html | 2 +- sapl/templates/base/casalegislativa_list.html | 2 +- sapl/templates/comissoes/composicao_list.html | 4 +- .../compilacao/ajax_actions_dinamic_edit.html | 12 +-- .../compilacao/dispositivo_form.html | 2 +- .../compilacao/dispositivo_form_parents.html | 4 +- .../compilacao/dispositivo_form_search.html | 2 +- .../layout/bootstrap_btn_checkbox.html | 2 +- .../compilacao/publicacao_detail.html | 4 +- .../templates/compilacao/publicacao_list.html | 2 +- sapl/templates/compilacao/text_edit.html | 6 +- .../templates/compilacao/text_edit_bloco.html | 2 +- sapl/templates/compilacao/text_list.html | 6 +- .../compilacao/text_list__embedded.html | 4 +- .../compilacao/textoarticulado_detail.html | 6 +- .../compilacao/textoarticulado_list.html | 2 +- .../tipotextoarticulado_detail.html | 73 +++++++++++++++++++ .../compilacao/tipotextoarticulado_list.html | 50 +++++++++++++ sapl/templates/crud/detail.html | 12 +-- sapl/templates/crud/detail_detail.html | 14 ++-- sapl/templates/crud/list.html | 4 +- .../floppyforms/image_thumbnail.html | 2 +- .../materia/adicionar_varias_autorias.html | 2 +- sapl/templates/materia/autoria_list.html | 2 +- .../materia/confirmar_proposicao.html | 4 +- .../materia/materialegislativa_detail.html | 2 +- .../materia/materialegislativa_filter.html | 6 +- .../materia/materialegislativa_list.html | 2 +- .../materia/proposicao_confirm_return.html | 2 +- sapl/templates/materia/proposicao_detail.html | 8 +- .../templates/norma/normajuridica_filter.html | 6 +- .../templates/parlamentares/votante_list.html | 2 +- .../protocoloadm/anular_protocoloadm.html | 2 +- .../protocoloadm/detail_doc_detail.html | 6 +- .../documentoadministrativo_filter.html | 4 +- .../pesquisa_documento_detail.html | 2 +- .../protocoloadm/proposicoes_detail.html | 8 +- .../protocoloadm/protocolar_documento.html | 2 +- .../protocoloadm/protocolar_materia.html | 2 +- .../protocoloadm/protocolo_filter.html | 2 +- .../protocoloadm/protocolo_mostrar.html | 2 +- .../protocoloadm/protocoloadm_detail.html | 10 +-- .../tramitacaoadministrativo_detail.html | 6 +- .../adicionar_varias_materias_expediente.html | 4 +- .../adicionar_varias_materias_ordem.html | 4 +- .../sessao/expedientemateria_list.html | 4 +- sapl/templates/sessao/ordemdia_list.html | 4 +- .../sessao/sessaoplenaria_filter.html | 2 +- .../templates/sessao/sessaoplenaria_list.html | 2 +- 63 files changed, 235 insertions(+), 112 deletions(-) create mode 100644 sapl/templates/compilacao/tipotextoarticulado_detail.html create mode 100644 sapl/templates/compilacao/tipotextoarticulado_list.html diff --git a/sapl/base/forms.py b/sapl/base/forms.py index f24868ff6..10ddaeafa 100644 --- a/sapl/base/forms.py +++ b/sapl/base/forms.py @@ -394,7 +394,7 @@ class AutorForm(ModelForm): placeholder=_('Pesquisar por possíveis autores para ' 'o Tipo de Autor selecionado.')), StrictButton( - _('Filtrar'), css_class='btn-default btn-filtrar-autor', + _('Filtrar'), css_class='btn-outline-dark btn-filtrar-autor', type='button')), css_class='hidden', data_action='create', diff --git a/sapl/crud/base.py b/sapl/crud/base.py index faa0e1287..a2485c2ad 100644 --- a/sapl/crud/base.py +++ b/sapl/crud/base.py @@ -160,7 +160,7 @@ class ListWithSearchForm(forms.Form): placeholder=_('Filtrar Lista'), css_class='input-lg'), StrictButton( - _('Filtrar'), css_class='btn-default btn-lg', + _('Filtrar'), css_class='btn-outline-dark btn-lg', type='submit')) ) diff --git a/sapl/templates/auth/user_list.html b/sapl/templates/auth/user_list.html index 960d17003..60c694063 100644 --- a/sapl/templates/auth/user_list.html +++ b/sapl/templates/auth/user_list.html @@ -29,7 +29,7 @@ {% endif %} - Criar Usuário + Criar Usuário {% include 'paginacao.html'%} {% endblock base_content %} diff --git a/sapl/templates/base/EstatisticasAcessoNormas_filter.html b/sapl/templates/base/EstatisticasAcessoNormas_filter.html index a067a2112..e23722fc2 100644 --- a/sapl/templates/base/EstatisticasAcessoNormas_filter.html +++ b/sapl/templates/base/EstatisticasAcessoNormas_filter.html @@ -7,7 +7,7 @@ {% crispy form %} {% else %}
- {% trans 'Fazer nova pesquisa' %} + {% trans 'Fazer nova pesquisa' %}




PARÂMETROS DE PESQUISA:
diff --git a/sapl/templates/base/RelatorioAtas_filter.html b/sapl/templates/base/RelatorioAtas_filter.html index 5c0912f22..98cd979b4 100644 --- a/sapl/templates/base/RelatorioAtas_filter.html +++ b/sapl/templates/base/RelatorioAtas_filter.html @@ -9,7 +9,7 @@ {% if filter_url %}
- {% trans 'Fazer nova pesquisa' %} + {% trans 'Fazer nova pesquisa' %}



PERÍODO: {{ periodo }}


diff --git a/sapl/templates/base/RelatorioAudiencia_filter.html b/sapl/templates/base/RelatorioAudiencia_filter.html index b264524b5..983b94abe 100644 --- a/sapl/templates/base/RelatorioAudiencia_filter.html +++ b/sapl/templates/base/RelatorioAudiencia_filter.html @@ -9,7 +9,7 @@ {% if show_results %}
- {% trans 'Fazer nova pesquisa' %} + {% trans 'Fazer nova pesquisa' %}




{% if object_list|length > 0 %} diff --git a/sapl/templates/base/RelatorioDataFimPrazoTramitacao_filter.html b/sapl/templates/base/RelatorioDataFimPrazoTramitacao_filter.html index 2345ce624..eab8f6acc 100644 --- a/sapl/templates/base/RelatorioDataFimPrazoTramitacao_filter.html +++ b/sapl/templates/base/RelatorioDataFimPrazoTramitacao_filter.html @@ -9,7 +9,7 @@ {% if show_results %}
- {% trans 'Fazer nova pesquisa' %} + {% trans 'Fazer nova pesquisa' %}




PARÂMETROS DE PESQUISA:
diff --git a/sapl/templates/base/RelatorioHistoricoTramitacao_filter.html b/sapl/templates/base/RelatorioHistoricoTramitacao_filter.html index 1151cd094..0d0dae1df 100644 --- a/sapl/templates/base/RelatorioHistoricoTramitacao_filter.html +++ b/sapl/templates/base/RelatorioHistoricoTramitacao_filter.html @@ -9,7 +9,7 @@ {% if show_results %}
- {% trans 'Fazer nova pesquisa' %} + {% trans 'Fazer nova pesquisa' %}




PARÂMETROS DE PESQUISA:
diff --git a/sapl/templates/base/RelatorioMateriasPorAnoAutorTipo_filter.html b/sapl/templates/base/RelatorioMateriasPorAnoAutorTipo_filter.html index bcbdce1a3..90c5d35e1 100644 --- a/sapl/templates/base/RelatorioMateriasPorAnoAutorTipo_filter.html +++ b/sapl/templates/base/RelatorioMateriasPorAnoAutorTipo_filter.html @@ -9,7 +9,7 @@ {% if show_results %}
- {% trans 'Fazer nova pesquisa' %} + {% trans 'Fazer nova pesquisa' %}




PARÂMETROS DE PESQUISA:
diff --git a/sapl/templates/base/RelatorioMateriasPorAutor_filter.html b/sapl/templates/base/RelatorioMateriasPorAutor_filter.html index 35e9aa50c..3cff14d7d 100644 --- a/sapl/templates/base/RelatorioMateriasPorAutor_filter.html +++ b/sapl/templates/base/RelatorioMateriasPorAutor_filter.html @@ -9,7 +9,7 @@ {% if show_results %}
- {% trans 'Fazer nova pesquisa' %} + {% trans 'Fazer nova pesquisa' %}




PARÂMETROS DE PESQUISA:
diff --git a/sapl/templates/base/RelatorioMateriasPorTramitacao_filter.html b/sapl/templates/base/RelatorioMateriasPorTramitacao_filter.html index 343cebd61..d822d9d9e 100644 --- a/sapl/templates/base/RelatorioMateriasPorTramitacao_filter.html +++ b/sapl/templates/base/RelatorioMateriasPorTramitacao_filter.html @@ -9,7 +9,7 @@ {% if filter_url %}
- {% trans 'Fazer nova pesquisa' %} + {% trans 'Fazer nova pesquisa' %}




PARÂMETROS DE PESQUISA:
diff --git a/sapl/templates/base/RelatorioNormaMes_filter.html b/sapl/templates/base/RelatorioNormaMes_filter.html index d4f8d5b30..85945b308 100644 --- a/sapl/templates/base/RelatorioNormaMes_filter.html +++ b/sapl/templates/base/RelatorioNormaMes_filter.html @@ -9,7 +9,7 @@ {% if show_results %}
- {% trans 'Fazer nova pesquisa' %} + {% trans 'Fazer nova pesquisa' %}




PARÂMETROS DE PESQUISA:
diff --git a/sapl/templates/base/RelatorioNormasVigencia_filter.html b/sapl/templates/base/RelatorioNormasVigencia_filter.html index 6412b5b20..5e5deac62 100644 --- a/sapl/templates/base/RelatorioNormasVigencia_filter.html +++ b/sapl/templates/base/RelatorioNormasVigencia_filter.html @@ -9,7 +9,7 @@ {% if show_results %}
- {% trans 'Fazer nova pesquisa' %} + {% trans 'Fazer nova pesquisa' %}




PARÂMETROS DE PESQUISA:
diff --git a/sapl/templates/base/RelatorioPresencaSessao_filter.html b/sapl/templates/base/RelatorioPresencaSessao_filter.html index 9836235ca..75df26af3 100644 --- a/sapl/templates/base/RelatorioPresencaSessao_filter.html +++ b/sapl/templates/base/RelatorioPresencaSessao_filter.html @@ -16,7 +16,7 @@
- {% trans 'Fazer nova pesquisa' %} + {% trans 'Fazer nova pesquisa' %}




PERÍODO: {{periodo}}
diff --git a/sapl/templates/base/RelatorioReuniao_filter.html b/sapl/templates/base/RelatorioReuniao_filter.html index dba1fcf87..1f853f960 100644 --- a/sapl/templates/base/RelatorioReuniao_filter.html +++ b/sapl/templates/base/RelatorioReuniao_filter.html @@ -9,7 +9,7 @@ {% if show_results %}
- {% trans 'Fazer nova pesquisa' %} + {% trans 'Fazer nova pesquisa' %}




{% if object_list|length > 0 %} diff --git a/sapl/templates/base/casalegislativa_list.html b/sapl/templates/base/casalegislativa_list.html index 223d33b1b..8b872a0c8 100644 --- a/sapl/templates/base/casalegislativa_list.html +++ b/sapl/templates/base/casalegislativa_list.html @@ -5,7 +5,7 @@ {% if not rows %}

{{ NO_ENTRIES_MSG }}

- + {% blocktrans with verbose_name=view.verbose_name %} Adicionar {{ verbose_name }} {% endblocktrans %}
diff --git a/sapl/templates/comissoes/composicao_list.html b/sapl/templates/comissoes/composicao_list.html index 3f543b0c5..c2cfc663a 100644 --- a/sapl/templates/comissoes/composicao_list.html +++ b/sapl/templates/comissoes/composicao_list.html @@ -7,7 +7,7 @@ {% block actions %}
{% if view.create_url %} - + {% blocktrans with verbose_name=view.verbose_name %} Adicionar {{ verbose_name }} {% endblocktrans %} {% endif %} @@ -32,7 +32,7 @@
{% if user.is_authenticated and perms.comissoes.add_participacao %} diff --git a/sapl/templates/compilacao/ajax_actions_dinamic_edit.html b/sapl/templates/compilacao/ajax_actions_dinamic_edit.html index d0812ff6c..d0f3bcfad 100644 --- a/sapl/templates/compilacao/ajax_actions_dinamic_edit.html +++ b/sapl/templates/compilacao/ajax_actions_dinamic_edit.html @@ -4,14 +4,14 @@ {% if perms.compilacao.change_dispositivo_registros_compilacao %} {% if object.tipo_dispositivo.dispositivo_de_articulacao and object.tipo_dispositivo.dispositivo_de_alteracao %}
- - - @@ -19,7 +19,7 @@ {%endif%} {% endif %}
-