From 830f85109dd863caa04ccc177372c26d64cac740 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Wed, 21 Nov 2012 23:03:14 +0100
Subject: [PATCH 1/3] Minor formatting work.

---
 .../templates/participant/personal_info_widget.html         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/openslides/participant/templates/participant/personal_info_widget.html b/openslides/participant/templates/participant/personal_info_widget.html
index 260469b59..c9e405552 100644
--- a/openslides/participant/templates/participant/personal_info_widget.html
+++ b/openslides/participant/templates/participant/personal_info_widget.html
@@ -14,7 +14,7 @@
             {% endif %}
         </li>
     {% empty %}
-        <li>{% trans "None" %}</li>
+        <li><i>{% trans "None" %}</i></li>
     {% endfor %}
 </ul>
 
@@ -33,7 +33,7 @@
             {% endif %}
         </li>
     {% empty %}
-        <li>{% trans "None" %}</li>
+        <li><i>{% trans "None" %}</i></li>
     {% endfor %}
 </ul>
 {% endif %}
@@ -44,6 +44,6 @@
     {% for assignment in assignments %}
         <li><a href="{% model_url assignment 'view' %}">{{ assignment }}</a></li>
     {% empty %}
-        <li>{% trans "None" %}</li>
+        <li><i>{% trans "None" %}</i></li>
     {% endfor %}
 </ul>

From 8aec9473035f63cff9f8004d889513897cc13cdb Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Wed, 21 Nov 2012 23:05:38 +0100
Subject: [PATCH 2/3] Removed unused widget file (duplicate of
 welcome_widget.html).

---
 openslides/projector/templates/projector/static_info_widget.html | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 openslides/projector/templates/projector/static_info_widget.html

diff --git a/openslides/projector/templates/projector/static_info_widget.html b/openslides/projector/templates/projector/static_info_widget.html
deleted file mode 100644
index b99a5cbd9..000000000
--- a/openslides/projector/templates/projector/static_info_widget.html
+++ /dev/null
@@ -1 +0,0 @@
-{{ welcometext|safe|linebreaks }}

From cbd04327bb445b0b16ccb68e1e3c44b1f4f93a34 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Wed, 21 Nov 2012 23:26:54 +0100
Subject: [PATCH 3/3] Reverted: Administrator can be deleted by other manager.
 (partly reverted 533c65562d6ad96e77d2281868065a8f73e44e77 after discus it
 with oskar because import also possible as non-admin)

---
 openslides/participant/templates/participant/overview.html | 4 +++-
 openslides/participant/views.py                            | 2 --
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/openslides/participant/templates/participant/overview.html b/openslides/participant/templates/participant/overview.html
index f61afe04f..310cbf04c 100644
--- a/openslides/participant/templates/participant/overview.html
+++ b/openslides/participant/templates/participant/overview.html
@@ -93,10 +93,12 @@
                             <a href="{% url user_edit user.id %}">
                                 <img src="{% static 'images/icons/edit.png' %}" title="{% trans 'Edit participant' %}">
                             </a>
-                            {% if user != request_user and not user.is_superuser %}
+                            {% if user != request_user %}
                             <a href="{% url user_delete user.id %}">
                                 <img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Delete participant' %}">
                             </a>
+                            {% endif %}
+                            {% if user != request_user and not user.is_superuser %}
                             <a class="status_link deactivate" href="{% url user_status_deactivate user.id %}" title="{% trans 'Change status to inactive' %}"{% if not user.is_active %} style="display:none"{% endif %}>
                                 <span></span>
                             </a>
diff --git a/openslides/participant/views.py b/openslides/participant/views.py
index a055beefb..5b1097295 100644
--- a/openslides/participant/views.py
+++ b/openslides/participant/views.py
@@ -208,8 +208,6 @@ class UserDeleteView(DeleteView):
     def pre_redirect(self, request, *args, **kwargs):
         if self.get_object() == self.request.user:
             messages.error(request, _("You can not delete yourself."))
-        elif self.get_object().is_superuser:
-            messages.error(request, _("You can not delete the administrator."))
         else:
             super(DeleteView, self).pre_redirect(request, *args, **kwargs)