summaryrefslogtreecommitdiff
path: root/ishtar_common/templates
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-02-06 19:58:59 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-02-06 19:58:59 +0100
commit7938386037a49801ef4e1823a97c403db77663b5 (patch)
treed47bf8042fc11bf36e829cb16b3a59dfacfaad7e /ishtar_common/templates
parent6e59ba6ea1a7c79a4aa5fb88086ca8cc8dbff2df (diff)
downloadIshtar-7938386037a49801ef4e1823a97c403db77663b5.tar.bz2
Ishtar-7938386037a49801ef4e1823a97c403db77663b5.zip
Fix UI bug: validation button at the bottom of the page (refs #3441)
Diffstat (limited to 'ishtar_common/templates')
-rw-r--r--ishtar_common/templates/ishtar/wizard/confirm_wizard.html15
-rw-r--r--ishtar_common/templates/ishtar/wizard/default_wizard.html10
-rw-r--r--ishtar_common/templates/ishtar/wizard/parcels_wizard.html11
-rw-r--r--ishtar_common/templates/ishtar/wizard/relations_wizard.html11
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 %}