From 89dbf946703cd63cf0f14531c555ec3c9ae6a87e Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Mon, 12 Sep 2016 15:05:16 +0200
Subject: Manual merge action (refs #3176)

---
 ishtar_common/templates/ishtar/form.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'ishtar_common/templates/ishtar/form.html')

diff --git a/ishtar_common/templates/ishtar/form.html b/ishtar_common/templates/ishtar/form.html
index 1e795c540..539bd0408 100644
--- a/ishtar_common/templates/ishtar/form.html
+++ b/ishtar_common/templates/ishtar/form.html
@@ -3,11 +3,12 @@
 {% block content %}
 <h2>{{page_name}}</h2>
 <div class='form'>
-<form enctype="multipart/form-data" action="." method="post">{% csrf_token %}
+<form enctype="multipart/form-data" action="." method="post"{% if confirm %}
+    onsubmit='return confirm("{{confirm}}");'{% endif %}>{% csrf_token %}
 <table>
 {{form}}
 </table>
-<input type="submit" value="{% trans "Validate" %}"/>
+<input id="submit_form" type="submit" value="{% if submit_label %}{{submit_label}}{% else%}{% trans "Validate" %}{% endif %}"/>
 </form>
 </div>
 {% endblock %}
-- 
cgit v1.2.3