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 /ishtar_common/templates | |
| parent | 6979f76c94daae084eb0c5525e1a65734c97555f (diff) | |
| parent | 53c4caf13113c8f84bb037e325c4a3c982c49682 (diff) | |
| download | Ishtar-51dc338f873efa8f5c79f5ec4a5723ee9e5be26c.tar.bz2 Ishtar-51dc338f873efa8f5c79f5ec4a5723ee9e5be26c.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'ishtar_common/templates')
4 files changed, 32 insertions, 15 deletions
diff --git a/ishtar_common/templates/ishtar/wizard/confirm_wizard.html b/ishtar_common/templates/ishtar/wizard/confirm_wizard.html index 1fbaadcd1..565256552 100644 --- a/ishtar_common/templates/ishtar/wizard/confirm_wizard.html +++ b/ishtar_common/templates/ishtar/wizard/confirm_wizard.html @@ -37,10 +37,17 @@ </table> {% endif %} {% block "extra_informations" %}{% endblock %} -<div id='validation-bar' class='big'> - <p>{%if confirm_end_msg %}{{confirm_end_msg|safe}}{%else%}{% trans "Would you like to save them?" %}{%endif%}</p> - <input type="submit" value="{% trans "Validate" %}"/> -</div> + + {% block "footer" %} + <div id="footer"> + {% block "validation_bar" %} + <p class="confirm-message">{%if confirm_end_msg %}{{confirm_end_msg|safe}}{%else%}{% trans "Would you like to save them?" %}{%endif%}</p> + {% include 'ishtar/wizard/validation_bar.html' %} + {% endblock %} + {% include 'ishtar/blocks/footer.html' %} + </div> + {% endblock %} + </div> </form> {% endblock %} diff --git a/ishtar_common/templates/ishtar/wizard/default_wizard.html b/ishtar_common/templates/ishtar/wizard/default_wizard.html index e77484e61..204feeebe 100644 --- a/ishtar_common/templates/ishtar/wizard/default_wizard.html +++ b/ishtar_common/templates/ishtar/wizard/default_wizard.html @@ -46,12 +46,12 @@ {{ previous_fields|safe }} {% block "footer" %} <div id="footer"> -{% block "validation_bar" %} -{% include 'ishtar/wizard/validation_bar.html' %} -{% endblock %} -{% include 'ishtar/blocks/footer.html' %} -{% endblock %} + {% block "validation_bar" %} + {% include 'ishtar/wizard/validation_bar.html' %} + {% endblock %} + {% include 'ishtar/blocks/footer.html' %} </div> +{% 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 e417b5e4d..28ec962f4 100644 --- a/ishtar_common/templates/ishtar/wizard/parcels_wizard.html +++ b/ishtar_common/templates/ishtar/wizard/parcels_wizard.html @@ -24,9 +24,14 @@ <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 }} -{% 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/ishtar_common/templates/ishtar/wizard/relations_wizard.html b/ishtar_common/templates/ishtar/wizard/relations_wizard.html index 9ca592ca8..3f12bcd60 100644 --- a/ishtar_common/templates/ishtar/wizard/relations_wizard.html +++ b/ishtar_common/templates/ishtar/wizard/relations_wizard.html @@ -23,9 +23,14 @@ <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 }} -{% 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 %} |