From 24767dff8822ce20d4094a7789ce38e7d71bdcfb Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@proxience.com>
Date: Fri, 13 Feb 2015 14:10:45 +0100
Subject: Refactoring of templates. Add a new ishtar_pdl with custom templates
 and CSS

---
 ishtar_common/templates/base.html                         | 1 +
 ishtar_common/templates/blocks/extra_head.html            | 2 ++
 ishtar_common/templates/ishtar/wizard/default_wizard.html | 8 +++-----
 ishtar_common/templates/ishtar/wizard/parcels_wizard.html | 7 +++----
 ishtar_common/templates/ishtar/wizard/towns_wizard.html   | 6 +++---
 ishtar_common/templates/ishtar/wizard/validation_bar.html | 7 +++++++
 6 files changed, 19 insertions(+), 12 deletions(-)
 create mode 100644 ishtar_common/templates/blocks/extra_head.html
 create mode 100644 ishtar_common/templates/ishtar/wizard/validation_bar.html

(limited to 'ishtar_common/templates')

diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html
index 1ebebd815..92e61493b 100644
--- a/ishtar_common/templates/base.html
+++ b/ishtar_common/templates/base.html
@@ -19,6 +19,7 @@
     <link type="text/css" href="{{JQUERY_UI_URL}}css/smoothness/jquery-ui.css" rel="stylesheet" />
     <link rel="stylesheet" href="{{STATIC_URL}}/js/prettyPhoto/css/prettyPhoto.css" />
     <link rel="stylesheet" href="{{STATIC_URL}}/media/style.css" />
+    {% include "blocks/extra_head.html" %}
     {% block extra_head %}
     {% endblock %}
 </head>
diff --git a/ishtar_common/templates/blocks/extra_head.html b/ishtar_common/templates/blocks/extra_head.html
new file mode 100644
index 000000000..139597f9c
--- /dev/null
+++ b/ishtar_common/templates/blocks/extra_head.html
@@ -0,0 +1,2 @@
+
+
diff --git a/ishtar_common/templates/ishtar/wizard/default_wizard.html b/ishtar_common/templates/ishtar/wizard/default_wizard.html
index 62aafff45..a39037d10 100644
--- a/ishtar_common/templates/ishtar/wizard/default_wizard.html
+++ b/ishtar_common/templates/ishtar/wizard/default_wizard.html
@@ -41,11 +41,9 @@
 {% endif %}
 <input type="hidden" name="{{ step_field }}" value="{{ step0 }}" />
 {{ previous_fields|safe }}
-<div id='validation-bar'>
-  <input type="submit" id="submit_form" name='validate' value="{% trans "Validate" %}"/>
-  {% if next_steps %}<input type="submit" id="submit_end_form" name='validate_and_end' value="{% trans "Validate and end" %}"/>{% endif %}
-  <a href='{% url 'reset_wizards' %}' id="reset_wizards" class='button'>{% trans "Cancel" %}</a>
-</div>
+{% block "validation_bar" %}
+{% include 'ishtar/wizard/validation_bar.html' %}
+{% endblock %}
 </div>
 </form>
 {% endblock %}
diff --git a/ishtar_common/templates/ishtar/wizard/parcels_wizard.html b/ishtar_common/templates/ishtar/wizard/parcels_wizard.html
index 73e86e53f..ce2bc9780 100644
--- a/ishtar_common/templates/ishtar/wizard/parcels_wizard.html
+++ b/ishtar_common/templates/ishtar/wizard/parcels_wizard.html
@@ -23,10 +23,9 @@
 <p><button name="formset_modify" value="{{wizard.steps.current}}">{% trans "Add/Modify" %}</button></p>
 <input type="hidden" name="{{ step_field }}" value="{{ step0 }}" />
 {{ previous_fields|safe }}
-<div id='validation-bar'>
-<input type="submit" id="submit_form" name='validate' value="{% trans "Validate" %}"/>
-{% if next_steps %}<input type="submit" id="submit_end_form" name='validate_and_end' value="{% trans "Validate and end" %}"/>{% endif %}
-</div>
+{% block "validation_bar" %}
+{% include 'ishtar/wizard/validation_bar.html' %}
+{% endblock %}
 </div>
 </form>
 {% endblock %}
diff --git a/ishtar_common/templates/ishtar/wizard/towns_wizard.html b/ishtar_common/templates/ishtar/wizard/towns_wizard.html
index 07717d26a..4f9ff6c5f 100644
--- a/ishtar_common/templates/ishtar/wizard/towns_wizard.html
+++ b/ishtar_common/templates/ishtar/wizard/towns_wizard.html
@@ -28,9 +28,9 @@
 {% endif %}
 <input type="hidden" name="{{ step_field }}" value="{{ step0 }}" />
 {{ previous_fields|safe }}
-<div id='validation-bar'>
-  <input type="submit" id="submit_form" value="{% trans "Validate" %}"/>
-</div>
+{% block "validation_bar" %}
+{% include 'ishtar/wizard/validation_bar.html' %}
+{% endblock %}
 </div>
 </form>
 {% endblock %}
diff --git a/ishtar_common/templates/ishtar/wizard/validation_bar.html b/ishtar_common/templates/ishtar/wizard/validation_bar.html
new file mode 100644
index 000000000..09907af67
--- /dev/null
+++ b/ishtar_common/templates/ishtar/wizard/validation_bar.html
@@ -0,0 +1,7 @@
+{% load i18n %}
+{% load url from future %}
+<div id='validation-bar'>
+  <input type="submit" id="submit_form" name='validate' value="{% trans "Validate" %}"/>
+  {% if next_steps %}<input type="submit" id="submit_end_form" name='validate_and_end' value="{% trans "Validate and end" %}"/>{% endif %}
+  <a href='{% url 'reset_wizards' %}' id="reset_wizards" class='button'>{% trans "Cancel" %}</a>
+</div>
-- 
cgit v1.2.3