From 8d50736c3723b36f35ee1b5a00258ecf7fdebc34 Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Mon, 18 Jan 2016 11:49:00 -0200 Subject: [PATCH] Refactor sub-nav parlamentares --- .../parlamentares/parlamentares_cadastro.html | 12 +---------- .../parlamentares_dependentes.html | 16 ++------------ .../parlamentares_dependentes_edit.html | 20 +++--------------- .../parlamentares/parlamentares_detail.html | 10 +++++++++ .../parlamentares/parlamentares_filiacao.html | 16 ++------------ .../parlamentares_filiacao_edit.html | 21 +++---------------- .../parlamentares/parlamentares_list.html | 1 - .../parlamentares/parlamentares_mandato.html | 16 ++------------ .../parlamentares_mandato_edit.html | 20 +++--------------- 9 files changed, 26 insertions(+), 106 deletions(-) diff --git a/templates/parlamentares/parlamentares_cadastro.html b/templates/parlamentares/parlamentares_cadastro.html index 49a579c06..354d3aa46 100644 --- a/templates/parlamentares/parlamentares_cadastro.html +++ b/templates/parlamentares/parlamentares_cadastro.html @@ -1,17 +1,7 @@ {% extends "parlamentares/parlamentares_detail.html" %} {% load i18n %} {% load crispy_forms_tags %} -{% block sections_nav %} - -{% endblock sections_nav %} - +{% block actions %}{% endblock %} {% block detail_content %} {% crispy form %} {% endblock %} \ No newline at end of file diff --git a/templates/parlamentares/parlamentares_dependentes.html b/templates/parlamentares/parlamentares_dependentes.html index 525ff9dbd..0aedd1330 100644 --- a/templates/parlamentares/parlamentares_dependentes.html +++ b/templates/parlamentares/parlamentares_dependentes.html @@ -1,19 +1,7 @@ -{% extends "crud/detail.html" %} +{% extends "parlamentares/parlamentares_detail.html" %} {% load i18n %} {% load crispy_forms_tags %} -{% block actions %} - -{% endblock %} +{% block actions %}{% endblock %} {% block detail_content %} Parlamentar: {{ parlamentar.nome_parlamentar }} diff --git a/templates/parlamentares/parlamentares_dependentes_edit.html b/templates/parlamentares/parlamentares_dependentes_edit.html index 05b37468d..6f7121b7d 100644 --- a/templates/parlamentares/parlamentares_dependentes_edit.html +++ b/templates/parlamentares/parlamentares_dependentes_edit.html @@ -1,21 +1,7 @@ -{% extends "crud/detail.html" %} +{% extends "parlamentares/parlamentares_detail.html" %} {% load i18n %} {% load crispy_forms_tags %} -{% block actions %} - -{% endblock %} +{% block actions %}{% endblock %} {% block detail_content %} - -{% crispy form %} - + {% crispy form %} {% endblock detail_content %} diff --git a/templates/parlamentares/parlamentares_detail.html b/templates/parlamentares/parlamentares_detail.html index 20b486ed1..5d35ff5c7 100644 --- a/templates/parlamentares/parlamentares_detail.html +++ b/templates/parlamentares/parlamentares_detail.html @@ -7,3 +7,13 @@ {% endif %} {% endblock actions %} +{% block sections_nav %} + +{% endblock sections_nav %} \ No newline at end of file diff --git a/templates/parlamentares/parlamentares_filiacao.html b/templates/parlamentares/parlamentares_filiacao.html index d11283a2c..253470f98 100644 --- a/templates/parlamentares/parlamentares_filiacao.html +++ b/templates/parlamentares/parlamentares_filiacao.html @@ -1,19 +1,7 @@ -{% extends "crud/detail.html" %} +{% extends "parlamentares/parlamentares_detail.html" %} {% load i18n %} {% load crispy_forms_tags %} -{% block actions %} - -{% endblock %} +{% block actions %}{% endblock %} {% block detail_content %} Parlamentar: {{ parlamentar.nome_parlamentar }} diff --git a/templates/parlamentares/parlamentares_filiacao_edit.html b/templates/parlamentares/parlamentares_filiacao_edit.html index cd3c46e53..1c63e6179 100644 --- a/templates/parlamentares/parlamentares_filiacao_edit.html +++ b/templates/parlamentares/parlamentares_filiacao_edit.html @@ -1,23 +1,8 @@ -{% extends "crud/detail.html" %} +{% extends "parlamentares/parlamentares_detail.html" %} {% load i18n %} {% load crispy_forms_tags %} -{% block actions %} - -{% endblock %} +{% block actions %}{% endblock %} {% block detail_content %} - {% if mensagem_erro %}
{{ mensagem_erro }}
{% endif %} - -{% crispy form %} - + {% crispy form %} {% endblock detail_content %} diff --git a/templates/parlamentares/parlamentares_list.html b/templates/parlamentares/parlamentares_list.html index e3340db18..53743e974 100644 --- a/templates/parlamentares/parlamentares_list.html +++ b/templates/parlamentares/parlamentares_list.html @@ -1,7 +1,6 @@ {% extends "parlamentares/parlamentares_detail.html" %} {% load i18n %} {% load crispy_forms_tags %} - {% block detail_content %}
Selecione o Período diff --git a/templates/parlamentares/parlamentares_mandato.html b/templates/parlamentares/parlamentares_mandato.html index db009d26b..b78451e52 100644 --- a/templates/parlamentares/parlamentares_mandato.html +++ b/templates/parlamentares/parlamentares_mandato.html @@ -1,19 +1,7 @@ -{% extends "crud/detail.html" %} +{% extends "parlamentares/parlamentares_detail.html" %} {% load i18n %} {% load crispy_forms_tags %} -{% block actions %} - -{% endblock %} +{% block actions %}{% endblock %} {% block detail_content %} Parlamentar: {{ parlamentar.nome_parlamentar }} diff --git a/templates/parlamentares/parlamentares_mandato_edit.html b/templates/parlamentares/parlamentares_mandato_edit.html index 05b37468d..6f7121b7d 100644 --- a/templates/parlamentares/parlamentares_mandato_edit.html +++ b/templates/parlamentares/parlamentares_mandato_edit.html @@ -1,21 +1,7 @@ -{% extends "crud/detail.html" %} +{% extends "parlamentares/parlamentares_detail.html" %} {% load i18n %} {% load crispy_forms_tags %} -{% block actions %} - -{% endblock %} +{% block actions %}{% endblock %} {% block detail_content %} - -{% crispy form %} - + {% crispy form %} {% endblock detail_content %}