diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-06 20:07:45 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-06 20:07:45 +0100 |
| commit | 51dc338f873efa8f5c79f5ec4a5723ee9e5be26c (patch) | |
| tree | 058d8317204500766ffc94701a2a40d52851cdc3 /archaeological_files_pdl | |
| parent | 6979f76c94daae084eb0c5525e1a65734c97555f (diff) | |
| parent | 53c4caf13113c8f84bb037e325c4a3c982c49682 (diff) | |
| download | Ishtar-51dc338f873efa8f5c79f5ec4a5723ee9e5be26c.tar.bz2 Ishtar-51dc338f873efa8f5c79f5ec4a5723ee9e5be26c.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'archaeological_files_pdl')
4 files changed, 32 insertions, 12 deletions
diff --git a/archaeological_files_pdl/templates/ishtar/wizard/wizard_instruction.html b/archaeological_files_pdl/templates/ishtar/wizard/wizard_instruction.html index f579a9d47..72dc1d35d 100644 --- a/archaeological_files_pdl/templates/ishtar/wizard/wizard_instruction.html +++ b/archaeological_files_pdl/templates/ishtar/wizard/wizard_instruction.html @@ -58,9 +58,14 @@ <input type="hidden" name="{{ step_field }}" value="{{ step0 }}" /> {{ previous_fields|safe }} -{% block "validation_bar" %} -{% include 'ishtar/wizard/validation_bar.html' %} -{% endblock %} + {% block "footer" %} + <div id="footer"> + {% block "validation_bar" %} + {% include 'ishtar/wizard/validation_bar.html' %} + {% endblock %} + {% include 'ishtar/blocks/footer.html' %} + </div> + {% endblock %} </div> </form> <script type='text/javascript'> diff --git a/archaeological_files_pdl/templates/ishtar/wizard/wizard_person_orga.html b/archaeological_files_pdl/templates/ishtar/wizard/wizard_person_orga.html index d520c1ec8..36f1aa4f8 100644 --- a/archaeological_files_pdl/templates/ishtar/wizard/wizard_person_orga.html +++ b/archaeological_files_pdl/templates/ishtar/wizard/wizard_person_orga.html @@ -62,9 +62,14 @@ $(function() { <input type="hidden" name="{{ step_field }}" value="{{ step0 }}" /> {{ previous_fields|safe }} -{% block "validation_bar" %} -{% include 'ishtar/wizard/validation_bar.html' %} -{% endblock %} + {% block "footer" %} + <div id="footer"> + {% block "validation_bar" %} + {% include 'ishtar/wizard/validation_bar.html' %} + {% endblock %} + {% include 'ishtar/blocks/footer.html' %} + </div> + {% endblock %} </div> </form> {% endblock %} diff --git a/archaeological_files_pdl/templates/ishtar/wizard/wizard_planningservice.html b/archaeological_files_pdl/templates/ishtar/wizard/wizard_planningservice.html index bfa490680..5eb7c014b 100644 --- a/archaeological_files_pdl/templates/ishtar/wizard/wizard_planningservice.html +++ b/archaeological_files_pdl/templates/ishtar/wizard/wizard_planningservice.html @@ -37,9 +37,14 @@ <input type="hidden" name="{{ step_field }}" value="{{ step0 }}" /> {{ previous_fields|safe }} -{% block "validation_bar" %} -{% include 'ishtar/wizard/validation_bar.html' %} -{% endblock %} + {% block "footer" %} + <div id="footer"> + {% block "validation_bar" %} + {% include 'ishtar/wizard/validation_bar.html' %} + {% endblock %} + {% include 'ishtar/blocks/footer.html' %} + </div> + {% endblock %} </div> </form> {% endblock %} diff --git a/archaeological_files_pdl/templates/ishtar/wizard/wizard_preventiveplanning.html b/archaeological_files_pdl/templates/ishtar/wizard/wizard_preventiveplanning.html index 304b58b76..95e8e8841 100644 --- a/archaeological_files_pdl/templates/ishtar/wizard/wizard_preventiveplanning.html +++ b/archaeological_files_pdl/templates/ishtar/wizard/wizard_preventiveplanning.html @@ -103,9 +103,14 @@ <input type="hidden" name="{{ step_field }}" value="{{ step0 }}" /> {{ previous_fields|safe }} -{% block "validation_bar" %} -{% include 'ishtar/wizard/validation_bar.html' %} -{% endblock %} + {% block "footer" %} + <div id="footer"> + {% block "validation_bar" %} + {% include 'ishtar/wizard/validation_bar.html' %} + {% endblock %} + {% include 'ishtar/blocks/footer.html' %} + </div> + {% endblock %} </div> </form> {% endblock %} |