Merge branch 'master' into v0.9

Conflicts:
	ishtar_common/views.py

1 files changed, 14 insertions, 0 deletions

diff --git a/ishtar_common/templates/ishtar/form_delete.html b/ishtar_common/templates/ishtar/form_delete.html
new file mode 100644
index 000000000..6243e9423
--- /dev/null
+++ b/ishtar_common/templates/ishtar/form_delete.html
@@ -0,0 +1,14 @@
+{% extends "base.html" %}
+{% load i18n inline_formset %}
+{% block content %}
+<h2>{{page_name}}</h2>
+<div class='form'>
+<form enctype="multipart/form-data" action="." method="post"
+    onsubmit="return confirm('Do you really want to delete this item?');">{% csrf_token %}
+<table>
+{{form}}
+</table>
+<input type="submit" value="{% trans "Delete" %}"/>
+</form>
+</div>
+{% endblock %}