From e2e42bd068e94791edab44ac474a930223e8d42d 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

---
 .../templates/ishtar/wizard/wizard_generalcontractor.html  |  7 +++----
 .../templates/ishtar/wizard/wizard_instruction.html        |  7 +++----
 .../templates/ishtar/wizard/wizard_preventiveplanning.html |  7 +++----
 example_project/settings.py                                |  6 +++++-
 ishtar_common/static/media/style.css                       | 12 ------------
 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 +++++++
 ishtar_pdl/__init__.py                                     |  1 +
 ishtar_pdl/models.py                                       |  1 +
 ishtar_pdl/static/pdl/styles.css                           | 14 ++++++++++++++
 ishtar_pdl/templates/blocks/extra_head.html                |  1 +
 15 files changed, 50 insertions(+), 37 deletions(-)
 create mode 100644 ishtar_common/templates/blocks/extra_head.html
 create mode 100644 ishtar_common/templates/ishtar/wizard/validation_bar.html
 create mode 100644 ishtar_pdl/__init__.py
 create mode 100644 ishtar_pdl/models.py
 create mode 100644 ishtar_pdl/static/pdl/styles.css
 create mode 100644 ishtar_pdl/templates/blocks/extra_head.html

diff --git a/archaeological_files_pdl/templates/ishtar/wizard/wizard_generalcontractor.html b/archaeological_files_pdl/templates/ishtar/wizard/wizard_generalcontractor.html
index 4788a41fc..34dc75b08 100644
--- a/archaeological_files_pdl/templates/ishtar/wizard/wizard_generalcontractor.html
+++ b/archaeological_files_pdl/templates/ishtar/wizard/wizard_generalcontractor.html
@@ -23,10 +23,9 @@
 </table>
 <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/archaeological_files_pdl/templates/ishtar/wizard/wizard_instruction.html b/archaeological_files_pdl/templates/ishtar/wizard/wizard_instruction.html
index c2c4fc4d7..4162a3764 100644
--- a/archaeological_files_pdl/templates/ishtar/wizard/wizard_instruction.html
+++ b/archaeological_files_pdl/templates/ishtar/wizard/wizard_instruction.html
@@ -56,10 +56,9 @@
 
 <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>
 <script type='text/javascript'>
diff --git a/archaeological_files_pdl/templates/ishtar/wizard/wizard_preventiveplanning.html b/archaeological_files_pdl/templates/ishtar/wizard/wizard_preventiveplanning.html
index 5b3228cfb..66569a66d 100644
--- a/archaeological_files_pdl/templates/ishtar/wizard/wizard_preventiveplanning.html
+++ b/archaeological_files_pdl/templates/ishtar/wizard/wizard_preventiveplanning.html
@@ -72,10 +72,9 @@
 
 <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/example_project/settings.py b/example_project/settings.py
index f81e3e984..618c817df 100644
--- a/example_project/settings.py
+++ b/example_project/settings.py
@@ -190,16 +190,20 @@ ISHTAR_DOC_TYPES = {u"undefined":u"Undefined"}
 
 ISHTAR_DPTS = []
 
+PRE_APPS = []
 EXTRA_APPS = []
 
 try:
     from local_settings import *
 except ImportError, e:
-    print 'Unable to load local_settings.py:', e
+    print('Unable to load local_settings.py:', e)
 
 if 'test' in sys.argv:
     SOUTH_TESTS_MIGRATE = False
 
+for app in PRE_APPS:
+    INSTALLED_APPS.insert(INSTALLED_APPS.index('ishtar_common'), app)
+
 if 'archaeological_files' in EXTRA_APPS:
     EXTRA_APPS.pop(EXTRA_APPS.index('archaeological_files'))
     INSTALLED_APPS.insert(INSTALLED_APPS.index('archaeological_operations'),
diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css
index c9143b026..96e8be596 100644
--- a/ishtar_common/static/media/style.css
+++ b/ishtar_common/static/media/style.css
@@ -242,16 +242,6 @@ div#logo{
     background-repeat:no-repeat;
 }
 
-div#validation-bar{
-    position: fixed;
-    bottom: 0px;
-    background-color: #CCC;
-    width: 100%;
-    left: 0px;
-    height: 40px;
-    padding: 5px;
-}
-
 div#validation-bar p{
     margin:0;
 }
@@ -269,8 +259,6 @@ a.button{
 }
 
 #reset_wizards{
-    right:50px;
-    position:absolute;
     color: white;
 }
 
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>
diff --git a/ishtar_pdl/__init__.py b/ishtar_pdl/__init__.py
new file mode 100644
index 000000000..8d1c8b69c
--- /dev/null
+++ b/ishtar_pdl/__init__.py
@@ -0,0 +1 @@
+ 
diff --git a/ishtar_pdl/models.py b/ishtar_pdl/models.py
new file mode 100644
index 000000000..8d1c8b69c
--- /dev/null
+++ b/ishtar_pdl/models.py
@@ -0,0 +1 @@
+ 
diff --git a/ishtar_pdl/static/pdl/styles.css b/ishtar_pdl/static/pdl/styles.css
new file mode 100644
index 000000000..f7a73f8eb
--- /dev/null
+++ b/ishtar_pdl/static/pdl/styles.css
@@ -0,0 +1,14 @@
+div#validation-bar{
+    position: fixed;
+    bottom: 0px;
+    background-color: #CCC;
+    width: 100%;
+    left: 0px;
+    height: 40px;
+    padding: 5px;
+}
+
+#reset_wizards{
+    right:50px;
+    position:absolute;
+}
diff --git a/ishtar_pdl/templates/blocks/extra_head.html b/ishtar_pdl/templates/blocks/extra_head.html
new file mode 100644
index 000000000..5a75d0728
--- /dev/null
+++ b/ishtar_pdl/templates/blocks/extra_head.html
@@ -0,0 +1 @@
+    <link rel="stylesheet" href="{{STATIC_URL}}/pdl/styles.css" />
-- 
cgit v1.2.3