From ecd847fb2a2921851eb47ef0d8c6d3848b69ea96 Mon Sep 17 00:00:00 2001 From: Marcio Mazza Date: Wed, 8 Oct 2014 16:56:11 -0300 Subject: [PATCH] Abstract common template for parliament and paliamentarian change_form --- .../casas/templates/casas/change_form.html | 19 +------------------ .../parlamentar/change_form.html | 15 +-------------- .../templates/parlamentares/change_form.html | 14 -------------- .../change_form_with_report_and_labels.html | 18 ++++++++++++++++++ 4 files changed, 20 insertions(+), 46 deletions(-) delete mode 100644 sigi/apps/parlamentares/templates/parlamentares/change_form.html create mode 100644 templates/change_form_with_report_and_labels.html diff --git a/sigi/apps/casas/templates/casas/change_form.html b/sigi/apps/casas/templates/casas/change_form.html index a3a43fb..30bf990 100644 --- a/sigi/apps/casas/templates/casas/change_form.html +++ b/sigi/apps/casas/templates/casas/change_form.html @@ -1,18 +1 @@ -{% extends "base_change_form.html" %} -{% load i18n %} - -{% block object-tools-items %} -
  • - - Relatório -
  • -
  • - - Etiqueta -
  • -
  • - - Etiqueta sem presidente -
  • - {{ block.super }} -{% endblock %} +{% extends "change_form_with_report_and_labels.html" %} diff --git a/sigi/apps/parlamentares/templates/admin/parlamentares/parlamentar/change_form.html b/sigi/apps/parlamentares/templates/admin/parlamentares/parlamentar/change_form.html index b59cb99..30bf990 100644 --- a/sigi/apps/parlamentares/templates/admin/parlamentares/parlamentar/change_form.html +++ b/sigi/apps/parlamentares/templates/admin/parlamentares/parlamentar/change_form.html @@ -1,14 +1 @@ -{% extends "admin/change_form.html" %} -{% load i18n reporting_tags %} - -{% block object-tools %} -{% if change %}{% if not is_popup %} - -{% endif %}{% endif %} -{% endblock %} +{% extends "change_form_with_report_and_labels.html" %} diff --git a/sigi/apps/parlamentares/templates/parlamentares/change_form.html b/sigi/apps/parlamentares/templates/parlamentares/change_form.html deleted file mode 100644 index b59cb99..0000000 --- a/sigi/apps/parlamentares/templates/parlamentares/change_form.html +++ /dev/null @@ -1,14 +0,0 @@ -{% extends "admin/change_form.html" %} -{% load i18n reporting_tags %} - -{% block object-tools %} -{% if change %}{% if not is_popup %} - -{% endif %}{% endif %} -{% endblock %} diff --git a/templates/change_form_with_report_and_labels.html b/templates/change_form_with_report_and_labels.html new file mode 100644 index 0000000..a3a43fb --- /dev/null +++ b/templates/change_form_with_report_and_labels.html @@ -0,0 +1,18 @@ +{% extends "base_change_form.html" %} +{% load i18n %} + +{% block object-tools-items %} +
  • + + Relatório +
  • +
  • + + Etiqueta +
  • +
  • + + Etiqueta sem presidente +
  • + {{ block.super }} +{% endblock %}