From eedc79ca8f56720f9a664de7b730c051b7dead43 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Thu, 16 May 2013 23:29:01 +0200
Subject: [PATCH] Added non_field.errors in form.html.

---
 openslides/participant/templates/participant/edit.html | 1 -
 openslides/templates/form.html                         | 9 +++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/openslides/participant/templates/participant/edit.html b/openslides/participant/templates/participant/edit.html
index 6d890dae1..d0dfc143a 100644
--- a/openslides/participant/templates/participant/edit.html
+++ b/openslides/participant/templates/participant/edit.html
@@ -24,7 +24,6 @@
     </h1>
 
     <form action="" method="post">{% csrf_token %}
-        {{ form.non_field_errors }}
         {% include "form.html" %}
         {% if edit_user %}
             <p style="margin: -15px 0 25px 0;">
diff --git a/openslides/templates/form.html b/openslides/templates/form.html
index cdebfb2ce..6c4d70afd 100644
--- a/openslides/templates/form.html
+++ b/openslides/templates/form.html
@@ -1,3 +1,12 @@
+{% if form.non_field_errors %}
+    <div class="alert alert-error">
+        <button type="button" class="close" data-dismiss="alert">&times;</button>
+        {% for msg in form.non_field_errors %}
+            {{ msg }}
+            {% if not forloop.last %}<br />{% endif %}
+        {% endfor %}
+    </div>
+{% endif %}
 {% for field in form %}
     <div class="control-group {% if field.errors %}error{% endif%}">
         <label for="id_{{ field.name }}">{{ field.label }}{% if field.field.required %}<span class="required">*</span>{% endif %}:</label>