From d962cfc4de09e28f77433386b98fedfdc258495e Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 16 Feb 2015 02:51:17 +0100 Subject: SRA PdL files: raw field for organization (refs #2279) --- .../ishtar/wizard/wizard_generalcontractor.html | 38 ++++--------- .../ishtar/wizard/wizard_person_orga.html | 66 ++++++++++++++++++++++ .../ishtar/wizard/wizard_planningservice.html | 15 +++++ 3 files changed, 92 insertions(+), 27 deletions(-) create mode 100644 archaeological_files_pdl/templates/ishtar/wizard/wizard_person_orga.html create mode 100644 archaeological_files_pdl/templates/ishtar/wizard/wizard_planningservice.html (limited to 'archaeological_files_pdl/templates') diff --git a/archaeological_files_pdl/templates/ishtar/wizard/wizard_generalcontractor.html b/archaeological_files_pdl/templates/ishtar/wizard/wizard_generalcontractor.html index 34dc75b08..e43e336c4 100644 --- a/archaeological_files_pdl/templates/ishtar/wizard/wizard_generalcontractor.html +++ b/archaeological_files_pdl/templates/ishtar/wizard/wizard_generalcontractor.html @@ -1,31 +1,15 @@ -{% extends "ishtar/wizard/default_wizard.html" %} -{% load i18n range table_form %} -{% block wizard_form %} -
{% csrf_token %} -
-{{ wizard.form.media }} -{{ wizard.management_form }} +{% extends "ishtar/wizard/wizard_person_orga.html" %} - - - - - +{% block corporation %} + + + - - - - -
Statut
{{ wizard.form.raw_general_contractor.label_tag }} {{ wizard.form.raw_general_contractor.errors }}{{wizard.form.raw_general_contractor|safe}}
- - -{% table_form wizard.form %} -
- -{{ previous_fields|safe }} -{% block "validation_bar" %} -{% include 'ishtar/wizard/validation_bar.html' %} {% endblock %} -
-
+ +{% block natural %} + + {{ wizard.form.general_contractor.label_tag }} + {{ wizard.form.general_contractor.errors }}{{wizard.form.general_contractor|safe}} + {% endblock %} diff --git a/archaeological_files_pdl/templates/ishtar/wizard/wizard_person_orga.html b/archaeological_files_pdl/templates/ishtar/wizard/wizard_person_orga.html new file mode 100644 index 000000000..91dd7e042 --- /dev/null +++ b/archaeological_files_pdl/templates/ishtar/wizard/wizard_person_orga.html @@ -0,0 +1,66 @@ +{% extends "ishtar/wizard/default_wizard.html" %} +{% load i18n range table_form %} +{% block wizard_form %} + +
{% csrf_token %} +
+{% if wizard.form.media %}{{ wizard.form.media }}{% endif %} +{{ wizard.management_form }} + + + + + + + + + + + +
Statut
+ + + {% if wizard.form.non_field_errors %} + + {%endif%} + +{% block corporation %} +{% endblock %} +
{{wizard.form.non_field_errors}}
+ +
+ + {% if wizard.form.non_field_errors %} + + {%endif%} + +{% block natural %} +{% endblock %} +
{{wizard.form.non_field_errors}}
+
+ +{% block otherfields %} +{% endblock %} + + +{{ previous_fields|safe }} +{% block "validation_bar" %} +{% include 'ishtar/wizard/validation_bar.html' %} +{% endblock %} +
+
+{% endblock %} + diff --git a/archaeological_files_pdl/templates/ishtar/wizard/wizard_planningservice.html b/archaeological_files_pdl/templates/ishtar/wizard/wizard_planningservice.html new file mode 100644 index 000000000..29bc2397c --- /dev/null +++ b/archaeological_files_pdl/templates/ishtar/wizard/wizard_planningservice.html @@ -0,0 +1,15 @@ +{% extends "ishtar/wizard/wizard_person_orga.html" %} + +{% block corporation %} + + {{ wizard.form.raw_town_planning_service.label_tag }} + {{ wizard.form.raw_town_planning_service.errors }}{{wizard.form.raw_town_planning_service|safe}} + +{% endblock %} + +{% block natural %} + + {{ wizard.form.responsible_town_planning_service.label_tag }} + {{ wizard.form.responsible_town_planning_service.errors }}{{wizard.form.responsible_town_planning_service|safe}} + +{% endblock %} -- cgit v1.2.3