From baebf992ffa6dcc4ba01918b9668c40ae2e0ed08 Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Mon, 6 Feb 2012 21:29:59 +0100
Subject: [PATCH 01/13] thanks for django

---
 THANKS | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/THANKS b/THANKS
index 2b99fa519..789f41898 100644
--- a/THANKS
+++ b/THANKS
@@ -3,6 +3,10 @@ THANKS file for OpenSlides
 
 OpenSlides uses parts of the following projects:
 
+* Django
+  <https://www.djangoproject.com/
+
+
 * Oxygen-Icons
   <http://www.oxygen-icons.org/>
 
@@ -10,4 +14,4 @@ OpenSlides uses parts of the following projects:
    <http://www.jquery.com>
 
 * Drupal (tabledrag function)
-  <http://www.drupal.org/> 
\ No newline at end of file
+  <http://www.drupal.org/> 

From a06d20a8d8b7ad836eab813fa674486d67b17b0c Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Wed, 28 Mar 2012 15:17:29 +0200
Subject: [PATCH 02/13] Reverted changset r282 from Default branch (because
 it's for 1.2-dev-branch only).

---
 openslides/agenda/templates/agenda/edit.html | 20 +++++++++++++++++++-
 openslides/agenda/views.py                   | 15 +++++++++++----
 openslides/beamer/api.py                     |  2 --
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/openslides/agenda/templates/agenda/edit.html b/openslides/agenda/templates/agenda/edit.html
index 849a61f82..3de773e3a 100644
--- a/openslides/agenda/templates/agenda/edit.html
+++ b/openslides/agenda/templates/agenda/edit.html
@@ -2,7 +2,25 @@
 {% block title %}{{ block.super }} - {%trans "Item" %}{% endblock %}
 
 {% block content %}
-    <h1>{%trans "Edit item" %}</h1>
+    {% if item %}
+        <h1>{%trans "Edit item" %}</h1>
+    {% else %}
+        <h1>{%trans "New item" %}</h1>
+
+        <p>{%trans "Choose item type:" %}</p>
+        <p>
+        <a href="{% url item_new 'ItemText' %}"
+          {% ifequal request.path '/agenda/new/ItemText/' %}style='font-size:15px; font-weight:bold;'{% endifequal %}
+          >{%trans "Item of Text" %}</a> |
+        <a href="{% url item_new 'ItemApplication' %}"
+          {% ifequal request.path '/agenda/new/ItemApplication/' %}style='font-size:15px; font-weight:bold;'{% endifequal %}
+          >{%trans "Item of Application" %}</a> |
+        <a href="{% url item_new 'ItemAssignment' %}"
+          {% ifequal request.path '/agenda/new/ItemAssignment/' %}style='font-size:15px; font-weight:bold;'{% endifequal %}
+          >{%trans "Item of Election" %}</a>
+        </p>
+    {% endif %}
+
     <form action="" method="post">{% csrf_token %}
         {{ form.as_p }}
         <button class="button" type="submit">
diff --git a/openslides/agenda/views.py b/openslides/agenda/views.py
index 9702b6b5b..e34734156 100644
--- a/openslides/agenda/views.py
+++ b/openslides/agenda/views.py
@@ -128,13 +128,13 @@ def set_closed(request, item_id, closed=True):
 
 @permission_required('agenda.can_manage_agenda')
 @template('agenda/edit.html')
-def edit(request, item_id=None):
+def edit(request, item_id=None, form='ItemText', default=None):
     """
     Show a form to edit an existing Item, or create a new one.
     """
     if item_id is not None:
         try:
-            item = Item.objects.get(pk=item_id)
+            item = Item.objects.get(id=item_id).cast()
         except Item.DoesNotExist:
             messages.error(request, _('Item ID %d does not exist.') % int(item_id))
             return redirect(reverse('item_overview'))
@@ -142,14 +142,21 @@ def edit(request, item_id=None):
         item = None
 
     if request.method == 'POST':
-        form = ItemFormText(request.POST, instance=item)
+        if item_id is None:
+            form = MODELFORM[form](request.POST)
+        else:
+            form = item.edit_form(request.POST)
 
         if form.is_valid():
             item = form.save()
             if item_id is None:
                 messages.success(request, _('New item was successfully created.'))
+                if "application" in request.POST:
+                    item.application.writelog(_('Agenda item created'), request.user)
             else:
                 messages.success(request, _('Item was successfully modified.'))
+                if "application" in request.POST:
+                    item.application.writelog(_('Agenda item modified'), request.user)
             if not 'apply' in request.POST:
                 return redirect(reverse('item_overview'))
             if item_id is None:
@@ -157,7 +164,7 @@ def edit(request, item_id=None):
         else:
             messages.error(request, _('Please check the form for errors.'))
     else:
-        form = ItemFormText(instance=item)
+        form = ItemFormText()
     return { 'form': form,
              'item': item }
 
diff --git a/openslides/beamer/api.py b/openslides/beamer/api.py
index 481785cf0..ae7f03374 100644
--- a/openslides/beamer/api.py
+++ b/openslides/beamer/api.py
@@ -7,8 +7,6 @@ def get_element_from_eid(eid):
         model, id = eid.split()
     except ValueError:
         return None # We need a elementError hier
-    except AttributeError:
-        return None
     return ELEMENT[model].objects.get(pk=id)
 
 

From c6a40f4dcb9bde0e2771322a6f7c70d349e51afb Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Wed, 28 Mar 2012 15:17:50 +0200
Subject: [PATCH 03/13] Reverted changset r281 from Default branch (because
 it's for 1.2-dev-branch only).

---
 openslides/agenda/admin.py                    |  3 +-
 openslides/agenda/api.py                      | 22 +++++-
 openslides/agenda/forms.py                    | 32 +++++++-
 openslides/agenda/models.py                   | 65 ++++++++++------
 .../agenda/templates/agenda/base_agenda.html  |  2 +-
 openslides/agenda/urls.py                     |  7 +-
 openslides/agenda/views.py                    | 43 +++++++----
 openslides/application/models.py              | 34 +++------
 .../templates/application/view.html           | 17 ++++-
 openslides/application/views.py               |  4 +-
 openslides/assignment/models.py               | 18 +----
 .../assignment/templates/assignment/view.html | 13 +++-
 openslides/assignment/views.py                |  4 +-
 openslides/beamer/api.py                      | 32 --------
 openslides/beamer/models.py                   | 39 +---------
 .../templates/beamer/ItemApplication.html}    | 18 ++---
 .../templates/beamer/ItemAssignment.html}     | 22 +++---
 .../beamer/templates/beamer/ItemPoll.html     | 19 +++++
 .../templates/beamer/ItemText.html}           |  0
 .../templates/beamer/overview.html}           |  0
 openslides/beamer/views.py                    | 75 +++++++++----------
 21 files changed, 246 insertions(+), 223 deletions(-)
 rename openslides/{application/templates/beamer/Application.html => beamer/templates/beamer/ItemApplication.html} (77%)
 rename openslides/{assignment/templates/beamer/Assignment.html => beamer/templates/beamer/ItemAssignment.html} (82%)
 create mode 100644 openslides/beamer/templates/beamer/ItemPoll.html
 rename openslides/{agenda/templates/beamer/AgendaText.html => beamer/templates/beamer/ItemText.html} (100%)
 rename openslides/{agenda/templates/beamer/AgendaSummary.html => beamer/templates/beamer/overview.html} (100%)

diff --git a/openslides/agenda/admin.py b/openslides/agenda/admin.py
index bfab6d8f6..52fa6ef0b 100644
--- a/openslides/agenda/admin.py
+++ b/openslides/agenda/admin.py
@@ -12,6 +12,7 @@
 
 from django.contrib import admin
 
-from openslides.agenda.models import Item
+from openslides.agenda.models import Item, ItemText
 
 admin.site.register(Item)
+admin.site.register(ItemText)
diff --git a/openslides/agenda/api.py b/openslides/agenda/api.py
index d07c306af..3c0b86ba0 100644
--- a/openslides/agenda/api.py
+++ b/openslides/agenda/api.py
@@ -15,7 +15,23 @@ from django.contrib import messages
 from django.core.context_processors import csrf
 
 from openslides.system.api import config_get
-from beamer.api import get_active_element
+
+
+def get_active_item(only_id=False):
+    """
+    Returns the active Item. If no item is active, or it can not find an Item,
+    it raise Item.DoesNotExist
+
+    if only_id is True, returns only the id of this item. Returns None if not Item
+    is active. Does not Raise Item.DoesNotExist
+    """
+    from agenda.models import Item
+    id = config_get("presentation", None)
+    if only_id:
+        if id is None:
+            return None
+        return int(id)
+    return Item.objects.get(pk=id)
 
 
 def is_summary():
@@ -24,7 +40,7 @@ def is_summary():
     """
     from agenda.models import Item
     try:
-        get_active_element()
+        get_active_item()
     except Item.DoesNotExist:
         return True
     if config_get('summary', False):
@@ -54,4 +70,4 @@ def del_confirm_form_for_items(request, object, name=None):
     if object.children:
         gen_confirm_form_for_items(request, _('Do you really want to delete <b>%s</b>?') % name, object.get_absolute_url('delete'), False)
     else:
-        gen_confirm_form_for_items(request, _('Do you really want to delete <b>%s</b>?') % name, object.get_absolute_url('delete'), True)
+        gen_confirm_form_for_items(request, _('Do you really want to delete <b>%s</b>?') % name, object.get_absolute_url('delete'), True)
\ No newline at end of file
diff --git a/openslides/agenda/forms.py b/openslides/agenda/forms.py
index fdd5b9c2d..69f761e75 100644
--- a/openslides/agenda/forms.py
+++ b/openslides/agenda/forms.py
@@ -13,7 +13,8 @@
 from django.forms import Form, ModelForm, IntegerField, ChoiceField, \
                          ModelChoiceField, HiddenInput, Select
 from django.utils.translation import ugettext as _
-from openslides.agenda.models import Item, ItemText
+from openslides.agenda.models import Item, ItemText, ItemApplication, \
+                                     ItemAssignment
 
 class ItemFormText(ModelForm):
     error_css_class = 'error'
@@ -25,6 +26,28 @@ class ItemFormText(ModelForm):
         exclude = ('closed', 'weight')
 
 
+class ItemFormApplication(ModelForm):
+    error_css_class = 'error'
+    required_css_class = 'required'
+    items = Item.objects.all().filter(parent=None).order_by('weight')
+    parent = ModelChoiceField(queryset=items, label=_("Parent item"), required=False)
+
+    class Meta:
+        model = ItemApplication
+        exclude = ('closed', 'weight')
+
+
+class ItemFormAssignment(ModelForm):
+    error_css_class = 'error'
+    required_css_class = 'required'
+    items = Item.objects.all().filter(parent=None).order_by('weight')
+    parent = ModelChoiceField(queryset=items, label=_("Parent item"), required=False)
+
+    class Meta:
+        model = ItemAssignment
+        exclude = ('closed', 'weight')
+
+
 def genweightchoices():
     l = []
     for i in range(-50, 51):
@@ -38,3 +61,10 @@ class ElementOrderForm(Form):
                          label="")
     self = IntegerField(widget=HiddenInput(attrs={'class': 'menu-mlid'}))
     parent = IntegerField(widget=HiddenInput(attrs={'class': 'menu-plid'}))
+
+
+MODELFORM = {
+    'ItemText': ItemFormText,
+    'ItemApplication': ItemFormApplication,
+    'ItemAssignment': ItemFormAssignment,
+}
diff --git a/openslides/agenda/models.py b/openslides/agenda/models.py
index f0228ef53..40bebf658 100644
--- a/openslides/agenda/models.py
+++ b/openslides/agenda/models.py
@@ -18,45 +18,40 @@ except ImportError:
 from django.db import models
 from django.utils.translation import ugettext as _
 
-from beamer.models import Element
-from beamer.api import element_register
-from system.api import config_set
-from application.models import Application
-from poll.models import Poll
-from assignment.models import Assignment
+from model_utils.models import InheritanceCastModel
+
+from openslides.agenda.api import get_active_item
+from openslides.system.api import config_set
+from openslides.application.models import Application
+from openslides.poll.models import Poll
+from openslides.assignment.models import Assignment
 
 
-class Item(models.Model, Element):
+class Item(InheritanceCastModel):
     """
-    An Agenda Item
+    The BasisItem.
+    Has all the attributes all Items need.
     """
     title = models.CharField(max_length=100, verbose_name=_("Title"))
-    text = models.TextField(null=True, blank=True, verbose_name=_("Text"))
-    transcript = models.TextField(null=True, blank=True, verbose_name=_("Transcript"))
     closed = models.BooleanField(default=False, verbose_name=_("Closed"))
     weight = models.IntegerField(default=0, verbose_name=_("Weight"))
     parent = models.ForeignKey('self', blank=True, null=True)
     hidden = models.BooleanField(default=False,
                                      verbose_name=_("Hidden (visible for agenda manager only)"))
-    prefix = 'item'
 
-
-    def beamer(self):
+    @property
+    def active(self):
         """
-        Return a map with all Data for the Beamer
+        Return True, if the the item is the active one.
         """
-        return {
-            'item': self,
-            'title': self.title,
-            'template': 'beamer/AgendaText.html',
-        }
+        return True if get_active_item(only_id=True) == self.id else False
 
     @property
     def active_parent(self):
         """
         Return True if the item has a activ parent
         """
-        if get_active_element(only_id=True) in \
+        if get_active_item(only_id=True) in \
         [parent.id for parent in self.parents]:
             return True
         return False
@@ -65,7 +60,7 @@ class Item(models.Model, Element):
         """
         Appoint this item as the active one.
         """
-        Element.set_active(self)
+        config_set("presentation", self.id)
         if summary:
             config_set("summary", True)
         else:
@@ -187,8 +182,32 @@ class Item(models.Model, Element):
         )
 
 
-ItemText = Item # ItemText is Depricated
+class ItemText(Item):
+    """
+    An Item with a TextField.
+    """
+    text = models.TextField(null=True, blank=True, verbose_name=_("Text"))
+
+    class Meta:
+        pass
 
 
+class ItemApplication(Item):
+    """
+    An Item which is connected to an application.
+    """
+    application = models.ForeignKey(Application, verbose_name=_("Application"))
 
-element_register(Item.prefix, Item)
+
+class ItemAssignment(Item):
+    """
+    An Item which is connected to an assignment.
+    """
+    assignment = models.ForeignKey(Assignment, verbose_name=_("Election"))
+
+
+class ItemPoll(Item):
+    """
+    An Item which is connected to a poll
+    """
+    poll = models.ForeignKey(Poll, verbose_name=_("Poll"))
diff --git a/openslides/agenda/templates/agenda/base_agenda.html b/openslides/agenda/templates/agenda/base_agenda.html
index 331f98d6f..8b4f73db0 100644
--- a/openslides/agenda/templates/agenda/base_agenda.html
+++ b/openslides/agenda/templates/agenda/base_agenda.html
@@ -8,7 +8,7 @@
     <ul>
         <li class="{% if request.path == url_itemoverview %}selected{% endif %}"><a href="{% url item_overview %}">{%trans "All items" %}</a></li>
         {% if perms.agenda.can_manage_agenda %}
-        <li class="{% active request '/agenda/new/' %}"><a href="{% url item_new %}">{%trans "New item" %}</a></li>
+        <li class="{% active request '/agenda/new/' %}"><a href="{% url item_new 'ItemText' %}">{%trans "New item" %}</a></li>
         {% endif %}
         {% if perms.agenda.can_see_projector %}
         <li><a href="{% url beamer_show %}"><img src="/static/images/icons/video-projector.png"> {%trans 'Projector view' %}</a></li>
diff --git a/openslides/agenda/urls.py b/openslides/agenda/urls.py
index c8cc08ea2..e890540db 100644
--- a/openslides/agenda/urls.py
+++ b/openslides/agenda/urls.py
@@ -40,9 +40,14 @@ urlpatterns = patterns('agenda.views',
     url(r'^agenda/new/$', 'edit',
         name='item_new_default'),
 
-    url(r'^agenda/new$', 'edit',
+    url(r'^agenda/new/(?P<form>ItemText|ItemApplication|ItemPoll|'
+                           r'ItemAssignment)/$', 'edit',
         name='item_new'),
 
+    url(r'^agenda/new/(?P<form>ItemText|ItemApplication|ItemPoll|'
+                           r'ItemAssignment)/(?P<default>\d+)/$', 'edit',
+        name='item_new_default'),
+
     url(r'^agenda/(?P<item_id>\d+)/del/$', 'delete',
         name='item_delete'),
 
diff --git a/openslides/agenda/views.py b/openslides/agenda/views.py
index e34734156..b7ae02247 100644
--- a/openslides/agenda/views.py
+++ b/openslides/agenda/views.py
@@ -17,19 +17,18 @@ from django.core.urlresolvers import reverse
 from django.contrib import messages
 from django.utils.translation import ugettext as _
 
-from beamer.api import get_active_element
-from agenda.models import Item
-from agenda.api import is_summary, children_list, \
+from openslides.agenda.models import Item
+from openslides.agenda.api import get_active_item, is_summary, children_list, \
                                   del_confirm_form_for_items
-from agenda.forms import ElementOrderForm, ItemFormText
-from application.models import Application
-from assignment.models import Assignment
-from poll.models import Poll
-from system.api import config_set, config_get
-from utils.template import render_block_to_string
-from utils.utils import template, permission_required, \
+from openslides.agenda.forms import ElementOrderForm, MODELFORM
+from openslides.application.models import Application
+from openslides.assignment.models import Assignment
+from openslides.poll.models import Poll
+from openslides.system.api import config_set, config_get
+from openslides.utils.template import render_block_to_string
+from openslides.utils.utils import template, permission_required, \
                                    del_confirm_form, ajax_request
-from utils.pdf import print_agenda
+from openslides.utils.pdf import print_agenda
 from poll.models import Poll, Option
 
 def view(request, item_id):
@@ -70,7 +69,7 @@ def overview(request):
     items = children_list(Item.objects.filter(parent=None).exclude(hidden=True).order_by('weight'))
     items_hidden = children_list(Item.objects.filter(parent=None).exclude(hidden=False).order_by('weight'))
     try:
-        overview = is_summary() and not get_active_element()
+        overview = is_summary() and not get_active_item()
     except Item.DoesNotExist:
         overview = True
     return {
@@ -164,7 +163,25 @@ def edit(request, item_id=None, form='ItemText', default=None):
         else:
             messages.error(request, _('Please check the form for errors.'))
     else:
-        form = ItemFormText()
+        initial = {}
+        if default:
+            if form == "ItemAssignment":
+                assignment = Assignment.objects.get(pk=default)
+                initial = {
+                    'assignment': assignment,
+                    'title': assignment.name,
+                }
+            elif form == "ItemApplication":
+                application = Application.objects.get(pk=default)
+                initial = {
+                    'application': application,
+                    'title': application.title,
+                }
+
+        if item_id is None:
+            form = MODELFORM[form](initial=initial)
+        else:
+            form = item.edit_form()
     return { 'form': form,
              'item': item }
 
diff --git a/openslides/application/models.py b/openslides/application/models.py
index 79404ed5e..0cedf991b 100644
--- a/openslides/application/models.py
+++ b/openslides/application/models.py
@@ -17,16 +17,12 @@ from django.db.models import Max
 from django.contrib.auth.models import User
 from django.utils.translation import ugettext as _
 
-from beamer.api import element_register
-from beamer.models import Element
-
-from participant.models import Profile
-from system.api import config_get
-from utils.utils import _propper_unicode
+from openslides.participant.models import Profile
+from openslides.system.api import config_get
+from openslides.utils.utils import _propper_unicode
 
 
-class Application(models.Model, Element):
-    prefix = "application"
+class Application(models.Model):
     STATUS = (
         ('pub', _('Published')),
         ('per', _('Permitted')),
@@ -332,7 +328,7 @@ class Application(models.Model, Element):
                 actions.append("support")
         except Profile.DoesNotExist:
             pass
-
+        
         if self.status == "pub" and user in self.supporter.all():
             actions.append("unsupport")
 
@@ -369,6 +365,12 @@ class Application(models.Model, Element):
                 actions.append("permitversion")
                 actions.append("rejectversion")
 
+        if self.number:
+            if self.itemapplication_set.all():
+                actions.append("activateitem")
+            else:
+                actions.append("createitem")
+
         return actions
 
     def delete(self, force=False):
@@ -429,17 +431,7 @@ class Application(models.Model, Element):
                 if poll.votesinvalid != None and poll.votescast != None:
                     results.append([option.yes, option.no, option.undesided, poll.votesinvalidf, poll.votescastf])
         return results
-
-    def beamer(self):
-        """
-        return the beamer dict
-        """
-        data = super(Application, self).beamer()
-        data['application'] = self
-        data['title'] = self.title
-        data['template'] = 'beamer/Application.html'
-        return data
-
+    
     @models.permalink
     def get_absolute_url(self, link='view'):
         if link == 'view':
@@ -482,5 +474,3 @@ class AVersion(models.Model):
                 .filter(application=self.application) \
                 .filter(id__lte=self.id).count()
             return self._aid
-
-element_register(Application.prefix, Application)
diff --git a/openslides/application/templates/application/view.html b/openslides/application/templates/application/view.html
index de52fb8bc..1e68decab 100644
--- a/openslides/application/templates/application/view.html
+++ b/openslides/application/templates/application/view.html
@@ -154,10 +154,19 @@
         </p>
     {% endif %}
 
-    <h4></h4>
-    <a href='{% url application_activate_item application.id %}'>
-        <span class="button"><span class="icon projector">{%trans 'Beam Application' %}</span></span>
-    </a>
+    {% if "createitem" in actions %}
+        <h4></h4>
+        <a href='{% url item_new_default 'ItemApplication' application.id %}'>
+            <span class="button"><span class="icon item">{%trans 'New agenda item' %}</span></span>
+        </a>
+    {% endif %}
+
+    {% if "activateitem" in actions %}
+        <h4></h4>
+        <a href='{% url application_activate_item application.id %}'>
+            <span class="button"><span class="icon projector">{%trans 'Show agenda item' %}</span></span>
+        </a>
+    {% endif %}
 
     {% if "acc" in actions or "rej" in actions %}
         <h4>{% trans "Result after vote" %}:</h4>
diff --git a/openslides/application/views.py b/openslides/application/views.py
index c0f98b0a6..3c1f3f266 100644
--- a/openslides/application/views.py
+++ b/openslides/application/views.py
@@ -332,8 +332,8 @@ def unsupport(request, application_id):
 
 @permission_required('application.can_manage_application')
 def set_active(request, application_id):
-    application = Application.objects.get(pk=application_id)
-    application.set_active()
+    item = Item.objects.get(itemapplication__application__id=application_id)
+    item.set_active(False)
     return redirect(reverse('application_view', args=[application_id]))
 
 
diff --git a/openslides/assignment/models.py b/openslides/assignment/models.py
index 337a6bb0b..899ca9af9 100644
--- a/openslides/assignment/models.py
+++ b/openslides/assignment/models.py
@@ -15,12 +15,8 @@ from django.utils.translation import ugettext as _
 
 from participant.models import Profile
 
-from beamer.models import Element
-from beamer.api import element_register
 
-
-class Assignment(models.Model, Element):
-    prefix = 'assignment'
+class Assignment(models.Model):
     STATUS = (
         ('sea', _('Searching for candidates')),
         ('vot', _('Voting')),
@@ -117,16 +113,6 @@ class Assignment(models.Model, Element):
             poll.add_option(candidate)
         return poll
 
-    def beamer(self):
-        """
-        return the beamer dict
-        """
-        data = super(Assignment, self).beamer()
-        data['assignment'] = self
-        data['title'] = self.name
-        data['template'] = 'beamer/Assignment.html'
-        return data
-
     @models.permalink
     def get_absolute_url(self, link='view'):
         if link == 'view':
@@ -144,5 +130,3 @@ class Assignment(models.Model, Element):
             ('can_nominate_self', "Can nominate themselves"),
             ('can_manage_assignment', "Can manage assignment"),
         )
-
-element_register(Assignment.prefix, Assignment)
diff --git a/openslides/assignment/templates/assignment/view.html b/openslides/assignment/templates/assignment/view.html
index 2a5d56754..49f590f98 100644
--- a/openslides/assignment/templates/assignment/view.html
+++ b/openslides/assignment/templates/assignment/view.html
@@ -36,14 +36,21 @@
     </span>
     </a>
 
-
+    {% if not assignment.itemassignment_set.all %}
+    <h4></h4>
+    <a href='{% url item_new_default 'ItemAssignment' assignment.id %}'>
+    <span class="button">
+        <span class="icon item">{%trans 'New agenda item' %}</span>
+    </span>
+    </a>
+    {% else %}
     <h4></h4>
     <a href='{% url assignment_activate_item assignment.id %}'>
     <span class="button">
-        <span class="icon projector">{%trans 'Beam assignment' %}</span>
+        <span class="icon projector">{%trans 'Show agenda item' %}</span>
     </span>
     </a>
-
+    {% endif %}
     </div>
     {% endif %}
 
diff --git a/openslides/assignment/views.py b/openslides/assignment/views.py
index 70e7394e7..9c06ac1b4 100644
--- a/openslides/assignment/views.py
+++ b/openslides/assignment/views.py
@@ -187,8 +187,8 @@ def delother(request, assignment_id, profile_id):
 
 @permission_required('assignment.can_manage_application')
 def set_active(request, assignment_id):
-    assignment = Assignment.objects.get(pk=assignment_id)
-    assignment.set_active()
+    item = Item.objects.get(itemassignment__assignment__id=assignment_id)
+    item.set_active(False)
     return redirect(reverse('assignment_view', args=[assignment_id]))
 
 @permission_required('assignment.can_manage_assignment')
diff --git a/openslides/beamer/api.py b/openslides/beamer/api.py
index ae7f03374..39f57d320 100644
--- a/openslides/beamer/api.py
+++ b/openslides/beamer/api.py
@@ -1,35 +1,3 @@
-from system.api import config_set, config_get
-from beamer.models import ELEMENT
-
-
-def get_element_from_eid(eid):
-    try:
-        model, id = eid.split()
-    except ValueError:
-        return None # We need a elementError hier
-    return ELEMENT[model].objects.get(pk=id)
-
-
-def get_active_element(only_eid=False):
-    """
-    Returns the active element. If no element is active, or it can not find an Item,
-    it raise Element.DoesNotExist
-
-    if only_id is True, returns only the id of this item. Returns None if not Item
-    is active. Does not Raise Item.DoesNotExist
-    """
-    from beamer.models import Element
-    eid = config_get("presentation", None)
-
-    if only_eid:
-        return eid
-    return get_element_from_eid(eid)
-
-
-def element_register(prefix, model):
-    ELEMENT[prefix] = model
-
-
 def assignment_votes(item):
     votes = []
     if item.type == "ItemAssignment":
diff --git a/openslides/beamer/models.py b/openslides/beamer/models.py
index 8e81c967e..71a836239 100644
--- a/openslides/beamer/models.py
+++ b/openslides/beamer/models.py
@@ -1,40 +1,3 @@
 from django.db import models
 
-from system.api import config_set, config_get
-
-ELEMENT = {}
-
-class Element(object):
-
-    def beamer(self):
-        """
-        Return a map with all Data for the Beamer
-        """
-        return {
-            'element': self,
-            'title': 'dummy-title',
-        }
-
-    @property
-    def eid(self):
-        """
-        Return the eid from this element
-        """
-        for key, value in ELEMENT.iteritems():
-            if type(self) == value:
-                return "%s %d" % (key, self.id)
-        return None
-
-    @property
-    def active(self):
-        """
-        Return True, if the the element is the active one.
-        """
-        from beamer.api import get_active_element
-        return True if get_active_element(only_eid=True) == self.eid else False
-
-    def set_active(self):
-        """
-        Appoint this item as the active one.
-        """
-        config_set("presentation", "%s %d" % (self.prefix, self.id))
+# Create your models here.
diff --git a/openslides/application/templates/beamer/Application.html b/openslides/beamer/templates/beamer/ItemApplication.html
similarity index 77%
rename from openslides/application/templates/beamer/Application.html
rename to openslides/beamer/templates/beamer/ItemApplication.html
index cad4db3e1..8bbde4567 100644
--- a/openslides/application/templates/beamer/Application.html
+++ b/openslides/beamer/templates/beamer/ItemApplication.html
@@ -6,19 +6,19 @@
     <div id="sidebar">
     <div class="box">
         <p><b>{%trans "Status" %}:</b><br>
-        {% if application.status != "pub" %}
-            {%trans application.get_status_display %}
+        {% if item.application.status != "pub" %}
+            {%trans item.application.get_status_display %}
             <br>
         {% else %}
-            {% for note in application.notes %}
+            {% for note in item.application.notes %}
             {{ note }}
             {% endfor %}
         {% endif %}
         </p>
 
         <p><b>{% trans "Submitter" %}:</b><br>
-        {{ application.submitter.profile }}</p>
-    {% with application.poll_set.all as polls %}
+        {{ item.application.submitter.profile }}</p>
+    {% with item.application.poll_set.all as polls %}
     {% if polls|length > 0 and polls.0.has_vote %}
     <p><b>{% trans "Poll result" %}:</b></p>
     {% for p in polls %}
@@ -47,14 +47,14 @@
     </div>
     </div>
 
-    <h1>{% trans "Application No." %} {{ application.number }}</h1>
+    <h1>{% trans "Application No." %} {{ item.application.number }}</h1>
     <b>{{ item.title }}</b>
     <p>
-    <div class="text">{{ application.public_version.text|linebreaks }}</div>
-    {% if application.public_version.reason %}
+    <div class="text">{{ item.application.public_version.text|linebreaks }}</div>
+    {% if item.application.public_version.reason %}
         <br>
         <div class="reason"><p><b>{% trans "Reason" %}:</b></p>
-        {{ application.public_version.reason|linebreaks }}</div>
+        {{ item.application.public_version.reason|linebreaks }}</div>
     {% endif %}
     </p>
 {% endblock %}
diff --git a/openslides/assignment/templates/beamer/Assignment.html b/openslides/beamer/templates/beamer/ItemAssignment.html
similarity index 82%
rename from openslides/assignment/templates/beamer/Assignment.html
rename to openslides/beamer/templates/beamer/ItemAssignment.html
index b0a6c38eb..6304d71f3 100644
--- a/openslides/assignment/templates/beamer/Assignment.html
+++ b/openslides/beamer/templates/beamer/ItemAssignment.html
@@ -5,31 +5,31 @@
     <script type="text/javascript" src="/static/javascript/assignment.js"></script>
 {% endblock %}
 {% block content %}
-    <h1>{% trans "Election" %}: {{ assignment }}</h1>
+    <h1>{% trans "Election" %}: {{ item.assignment }}</h1>
 
-    {% if assignment.status != "fin" %}
+    {% if item.assignment.status != "fin" %}
     <div id="sidebar">
     <div class="box">
     <p><b>{% trans "Status" %}:</b><br>
-    {% trans assignment.get_status_display %}</p>
-    {% if assignment.status == "sea" or assignment.status == "vot" %}
+    {% trans item.assignment.get_status_display %}</p>
+    {% if item.assignment.status == "sea" or item.assignment.status == "vot" %}
         <p><b>{% trans "Number of available posts" %}:</b><br>
-        {{ assignment.posts }}</p>
+        {{ item.assignment.posts }}</p>
     {% endif %}
     </div>
     </div>
     {% endif %}
 
-    {% if not assignment.profile.exists %}
+    {% if not item.assignment.profile.exists %}
     <p>
-    <div class="text">{{ assignment.description|linebreaks }}</div>
+    <div class="text">{{ item.assignment.description|linebreaks }}</div>
     </p>
     {% endif %}
 
-    {% if assignment.profile.exists and assignment.status != "fin" %}
+    {% if item.assignment.profile.exists and item.assignment.status != "fin" %}
     <h3>{% trans "Candidates" %}</h3>
     <ol>
-    {% for profile in assignment.profile.all|dictsort:"user.first_name" %}
+    {% for profile in item.assignment.profile.all|dictsort:"user.first_name" %}
         <li>{{ profile }} </li>
     {% empty %}
         <li style="list-style: none outside none;">
@@ -46,7 +46,7 @@
     <table>
     <tr>
         <th>{% trans "Candidates" %}</th>
-        {% for poll in assignment.poll_set.all %}
+        {% for poll in item.assignment.poll_set.all %}
             {% if poll.published %}
             <th><nobr>{{forloop.counter}}. {% trans "ballot" %}</nobr></th>
             {% endif %}
@@ -78,7 +78,7 @@
     </tr>
     {% empty %}
     <tr>
-        <td {% if assignment.profile.exist %}colspan="2"{% endif %}><i>{% trans "No ballots available." %}</i></td>
+        <td {% if item.assignment.profile.exist %}colspan="2"{% endif %}><i>{% trans "No ballots available." %}</i></td>
     </tr>
     {% endfor %}
     <tr>
diff --git a/openslides/beamer/templates/beamer/ItemPoll.html b/openslides/beamer/templates/beamer/ItemPoll.html
new file mode 100644
index 000000000..fe26c9197
--- /dev/null
+++ b/openslides/beamer/templates/beamer/ItemPoll.html
@@ -0,0 +1,19 @@
+{% extends "beamer.html" %}
+{% block title %}{{ block.super }} - {{ item.title }}{% endblock %}
+{% block content %}
+    {%trans "Poll about" %}:
+    <h1>{{ item.title }}</h1>
+
+    <table>
+    {% for option in item.poll.get_options %}
+        <tr>
+        <td>{{ option }}</td>
+        <td>{{ option.voteyes }}</td>
+        {% if item.poll.optiondecision %}
+        <td>{{ option.voteno }}</td>
+        <td>{{ option.voteundesided }}</td>
+        {% endif %}
+        </tr>
+    {% endfor %}
+    </table>
+{% endblock %}
diff --git a/openslides/agenda/templates/beamer/AgendaText.html b/openslides/beamer/templates/beamer/ItemText.html
similarity index 100%
rename from openslides/agenda/templates/beamer/AgendaText.html
rename to openslides/beamer/templates/beamer/ItemText.html
diff --git a/openslides/agenda/templates/beamer/AgendaSummary.html b/openslides/beamer/templates/beamer/overview.html
similarity index 100%
rename from openslides/agenda/templates/beamer/AgendaSummary.html
rename to openslides/beamer/templates/beamer/overview.html
diff --git a/openslides/beamer/views.py b/openslides/beamer/views.py
index 269e738f7..c1dfa9c73 100644
--- a/openslides/beamer/views.py
+++ b/openslides/beamer/views.py
@@ -24,11 +24,11 @@ from utils.template import render_block_to_string
 
 from system.api import config_set, config_get
 
-from agenda.api import is_summary, children_list, \
+from agenda.api import get_active_item, is_summary, children_list, \
                                   del_confirm_form_for_items
 from agenda.models import Item
 
-from beamer.api import get_active_element, assignment_votes, assignment_polls
+from beamer.api import assignment_votes, assignment_polls
 
 
 @permission_required('agenda.can_see_projector')
@@ -36,51 +36,46 @@ def beamer(request):
     """
     Shows the active Slide.
     """
+    data = {'ajax': 'on'}
+    template = ''
     try:
-        element = get_active_element()
-    except Item.DoesNotExist: #TODO: It has to be an Element.DoesNotExist
-        element = None
-
-
-    if element is None:
-        data = {}
-    else:
-        data = element.beamer()
-
-    data['ajax'] = 'on'
-
-    if element is None or (type(element) == Item and is_summary()):
-
-        if element is None:
-            items = Item.objects.filter(parent=None) \
-                    .filter(hidden=False).order_by('weight')
-            data['title'] = _("Agenda")
+        item = get_active_item()
+        votes = assignment_votes(item)
+        polls = assignment_polls(item)
+        if is_summary():
+            items = item.children.filter(hidden=False)
+            data['items'] = items
+            data['title'] = item.title
+            template = 'beamer/overview.html'
         else:
-            items = element.children.filter(hidden=False)
-            data['title'] = element.title
+            data['item'] = item.cast()
+            data['title'] = item.title
+            data['votes'] = votes
+            data['polls'] = polls
+            template = 'beamer/%s.html' % (item.type)
+    except Item.DoesNotExist:
+        items = Item.objects.filter(parent=None).filter(hidden=False) \
+                            .order_by('weight')
         data['items'] = items
-        data['template'] = 'beamer/AgendaSummary.html'
-
+        data['title'] = _("Agenda")
+        template = 'beamer/overview.html'
 
     if request.is_ajax():
-        content = render_block_to_string(data['template'], 'content', data)
-        jsondata = {
-            'content': content,
-            'title': data['title'],
-            'time': datetime.now().strftime('%H:%M'),
-            'bigger': config_get('bigger'),
-            'up': config_get('up'),
-            'countdown_visible': config_get('countdown_visible'),
-            'countdown_time': config_get('agenda_countdown_time'),
-            'countdown_control': config_get('countdown_control'),
-        }
+        content = render_block_to_string(template, 'content', data)
+        jsondata = {'content': content,
+                    'title': data['title'],
+                    'time': datetime.now().strftime('%H:%M'),
+                    'bigger': config_get('bigger'),
+                    'up': config_get('up'),
+                    'countdown_visible': config_get('countdown_visible'),
+                    'countdown_time': config_get('agenda_countdown_time'),
+                    'countdown_control': config_get('countdown_control'),
+                   }
         return ajax_request(jsondata)
     else:
-        return render_to_response(
-            data['template'],
-            data,
-            context_instance=RequestContext(request)
-        )
+        return render_to_response(template,
+                                  data,
+                                  context_instance=RequestContext(request))
 
 
 @permission_required('agenda.can_manage_agenda')

From ac9d31d7d4b6830e46c2dfac0aa2f6629c2176df Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Wed, 28 Mar 2012 15:18:18 +0200
Subject: [PATCH 04/13] Reverted changset r280 from Default branch (because
 it's for 1.2-dev-branch only).

---
 openslides/agenda/views.py | 35 +++++++++++++++++++++++++++++++++++
 openslides/beamer/api.py   | 34 ----------------------------------
 openslides/beamer/views.py |  4 +---
 3 files changed, 36 insertions(+), 37 deletions(-)
 delete mode 100644 openslides/beamer/api.py

diff --git a/openslides/agenda/views.py b/openslides/agenda/views.py
index b7ae02247..1c24f48d6 100644
--- a/openslides/agenda/views.py
+++ b/openslides/agenda/views.py
@@ -47,6 +47,41 @@ def view(request, item_id):
                              },
                              context_instance=RequestContext(request))
 
+def assignment_votes(item):
+    votes = []
+    if item.type == "ItemAssignment":
+        assignment = item.cast().assignment
+        publish_winner_results_only = config_get("assignment_publish_winner_results_only")
+        # list of votes
+        votes = []
+        for candidate in assignment.candidates:
+            tmplist = [[candidate, assignment.is_elected(candidate)], []]
+            for poll in assignment.poll_set.all():
+                if poll.published:
+                    if candidate in poll.options_values:
+                        # check config option 'publish_winner_results_only'
+                        if not publish_winner_results_only \
+                        or publish_winner_results_only and assignment.is_elected(candidate):
+                            option = Option.objects.filter(poll=poll).filter(user=candidate)[0]
+                            if poll.optiondecision:
+                                tmplist[1].append([option.yes, option.no, option.undesided])
+                            else:
+                                tmplist[1].append(option.yes)
+                        else:
+                            tmplist[1].append("")
+                    else:
+                        tmplist[1].append("-")
+            votes.append(tmplist)
+    return votes
+
+
+def assignment_polls(item):
+    polls = []
+    if item.type == "ItemAssignment":
+        for poll in item.cast().assignment.poll_set.filter(assignment=item.cast().assignment):
+            polls.append(poll)
+    return polls
+
 
 @permission_required('agenda.can_see_agenda')
 @template('agenda/overview.html')
diff --git a/openslides/beamer/api.py b/openslides/beamer/api.py
deleted file mode 100644
index 39f57d320..000000000
--- a/openslides/beamer/api.py
+++ /dev/null
@@ -1,34 +0,0 @@
-def assignment_votes(item):
-    votes = []
-    if item.type == "ItemAssignment":
-        assignment = item.cast().assignment
-        publish_winner_results_only = config_get("assignment_publish_winner_results_only")
-        # list of votes
-        votes = []
-        for candidate in assignment.candidates:
-            tmplist = [[candidate, assignment.is_elected(candidate)], []]
-            for poll in assignment.poll_set.all():
-                if poll.published:
-                    if candidate in poll.options_values:
-                        # check config option 'publish_winner_results_only'
-                        if not publish_winner_results_only \
-                        or publish_winner_results_only and assignment.is_elected(candidate):
-                            option = Option.objects.filter(poll=poll).filter(user=candidate)[0]
-                            if poll.optiondecision:
-                                tmplist[1].append([option.yes, option.no, option.undesided])
-                            else:
-                                tmplist[1].append(option.yes)
-                        else:
-                            tmplist[1].append("")
-                    else:
-                        tmplist[1].append("-")
-            votes.append(tmplist)
-    return votes
-
-
-def assignment_polls(item):
-    polls = []
-    if item.type == "ItemAssignment":
-        for poll in item.cast().assignment.poll_set.filter(assignment=item.cast().assignment):
-            polls.append(poll)
-    return polls
diff --git a/openslides/beamer/views.py b/openslides/beamer/views.py
index c1dfa9c73..f9e1959d2 100644
--- a/openslides/beamer/views.py
+++ b/openslides/beamer/views.py
@@ -28,13 +28,11 @@ from agenda.api import get_active_item, is_summary, children_list, \
                                   del_confirm_form_for_items
 from agenda.models import Item
 
-from beamer.api import assignment_votes, assignment_polls
-
 
 @permission_required('agenda.can_see_projector')
 def beamer(request):
     """
-    Shows the active Slide.
+    Shows a active Slide.
     """
     data = {'ajax': 'on'}
     template = ''

From 0976206eb4137f2f6a00491cf982462d81f8fd9c Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Wed, 28 Mar 2012 15:20:43 +0200
Subject: [PATCH 05/13] Reverted changset r279 from Default branch (because
 it's for 1.2-dev-branch only).

---
 .../agenda/templates/agenda/base_agenda.html  |   2 +-
 .../{beamer => agenda}/templates/beamer.html  |   0
 .../templates/beamer/ItemApplication.html     |   0
 .../templates/beamer/ItemAssignment.html      |   0
 .../templates/beamer/ItemPoll.html            |   0
 .../templates/beamer/ItemText.html            |   0
 .../templates/beamer/overview.html            |   0
 openslides/agenda/urls.py                     |  23 ++++
 openslides/agenda/views.py                    |  87 +++++++++++++
 openslides/beamer/models.py                   |   3 -
 openslides/beamer/tests.py                    |  16 ---
 openslides/beamer/urls.py                     |  47 -------
 openslides/beamer/views.py                    | 118 ------------------
 openslides/default.settings.py                |   1 -
 openslides/static/javascript/beamer.js        |   6 +-
 openslides/urls.py                            |   1 -
 16 files changed, 114 insertions(+), 190 deletions(-)
 rename openslides/{beamer => agenda}/templates/beamer.html (100%)
 rename openslides/{beamer => agenda}/templates/beamer/ItemApplication.html (100%)
 rename openslides/{beamer => agenda}/templates/beamer/ItemAssignment.html (100%)
 rename openslides/{beamer => agenda}/templates/beamer/ItemPoll.html (100%)
 rename openslides/{beamer => agenda}/templates/beamer/ItemText.html (100%)
 rename openslides/{beamer => agenda}/templates/beamer/overview.html (100%)
 delete mode 100644 openslides/beamer/models.py
 delete mode 100644 openslides/beamer/tests.py
 delete mode 100644 openslides/beamer/urls.py
 delete mode 100644 openslides/beamer/views.py

diff --git a/openslides/agenda/templates/agenda/base_agenda.html b/openslides/agenda/templates/agenda/base_agenda.html
index 8b4f73db0..457b531f8 100644
--- a/openslides/agenda/templates/agenda/base_agenda.html
+++ b/openslides/agenda/templates/agenda/base_agenda.html
@@ -11,7 +11,7 @@
         <li class="{% active request '/agenda/new/' %}"><a href="{% url item_new 'ItemText' %}">{%trans "New item" %}</a></li>
         {% endif %}
         {% if perms.agenda.can_see_projector %}
-        <li><a href="{% url beamer_show %}"><img src="/static/images/icons/video-projector.png"> {%trans 'Projector view' %}</a></li>
+        <li><a href="{% url item_beamer %}"><img src="/static/images/icons/video-projector.png"> {%trans 'Projector view' %}</a></li>
         {% endif %}
     </ul>
 {% endblock %}
diff --git a/openslides/beamer/templates/beamer.html b/openslides/agenda/templates/beamer.html
similarity index 100%
rename from openslides/beamer/templates/beamer.html
rename to openslides/agenda/templates/beamer.html
diff --git a/openslides/beamer/templates/beamer/ItemApplication.html b/openslides/agenda/templates/beamer/ItemApplication.html
similarity index 100%
rename from openslides/beamer/templates/beamer/ItemApplication.html
rename to openslides/agenda/templates/beamer/ItemApplication.html
diff --git a/openslides/beamer/templates/beamer/ItemAssignment.html b/openslides/agenda/templates/beamer/ItemAssignment.html
similarity index 100%
rename from openslides/beamer/templates/beamer/ItemAssignment.html
rename to openslides/agenda/templates/beamer/ItemAssignment.html
diff --git a/openslides/beamer/templates/beamer/ItemPoll.html b/openslides/agenda/templates/beamer/ItemPoll.html
similarity index 100%
rename from openslides/beamer/templates/beamer/ItemPoll.html
rename to openslides/agenda/templates/beamer/ItemPoll.html
diff --git a/openslides/beamer/templates/beamer/ItemText.html b/openslides/agenda/templates/beamer/ItemText.html
similarity index 100%
rename from openslides/beamer/templates/beamer/ItemText.html
rename to openslides/agenda/templates/beamer/ItemText.html
diff --git a/openslides/beamer/templates/beamer/overview.html b/openslides/agenda/templates/beamer/overview.html
similarity index 100%
rename from openslides/beamer/templates/beamer/overview.html
rename to openslides/agenda/templates/beamer/overview.html
diff --git a/openslides/agenda/urls.py b/openslides/agenda/urls.py
index e890540db..c04888ee1 100644
--- a/openslides/agenda/urls.py
+++ b/openslides/agenda/urls.py
@@ -13,6 +13,9 @@
 from django.conf.urls.defaults import *
 
 urlpatterns = patterns('agenda.views',
+    url(r'^beamer/$', 'beamer',
+        name='item_beamer'),
+
     url(r'^$', 'overview'),
 
     url(r'^agenda/$', 'overview',
@@ -53,4 +56,24 @@ urlpatterns = patterns('agenda.views',
 
     url(r'^agenda/print/$', 'print_agenda',
         name='print_agenda'),
+
+    url(r'^beamer/bigger$', 'beamer_edit', {'direction': 'bigger'}, name='beamer_bigger'),
+
+    url(r'^beamer/smaller$', 'beamer_edit', {'direction': 'smaller'}, name='beamer_smaller'),
+
+    url(r'^beamer/up$', 'beamer_edit', {'direction': 'up'}, name='beamer_up'),
+
+    url(r'^beamer/down$', 'beamer_edit', {'direction': 'down'}, name='beamer_down'),
+
+    url(r'^beamer/clean$', 'beamer_edit', {'direction': 'clean'}, name='beamer_clean'),
+
+    url(r'^beamer/countdown/show$', 'beamer_countdown', {'command': 'show'}, name='countdown_open'),
+
+    url(r'^beamer/countdown/hide$', 'beamer_countdown', {'command': 'hide'}, name='countdown_close'),
+
+    url(r'^beamer/countdown/reset/(?P<time>\d+)$', 'beamer_countdown', {'command': 'reset'}, name='countdown_reset'),
+
+    url(r'^beamer/countdown/start$', 'beamer_countdown', {'command': 'start'}, name='countdown_start'),
+
+    url(r'^beamer/countdown/stop$', 'beamer_countdown', {'command': 'stop'}, name='countdown_stop'),
 )
diff --git a/openslides/agenda/views.py b/openslides/agenda/views.py
index 1c24f48d6..18c793760 100644
--- a/openslides/agenda/views.py
+++ b/openslides/agenda/views.py
@@ -47,6 +47,93 @@ def view(request, item_id):
                              },
                              context_instance=RequestContext(request))
 
+
+@permission_required('agenda.can_see_projector')
+def beamer(request):
+    """
+    Shows a active Slide.
+    """
+    data = {'ajax': 'on'}
+    template = ''
+    try:
+        item = get_active_item()
+        votes = assignment_votes(item)
+        polls = assignment_polls(item)
+        if is_summary():
+            items = item.children.filter(hidden=False)
+            data['items'] = items
+            data['title'] = item.title
+            template = 'beamer/overview.html'
+        else:
+            data['item'] = item.cast()
+            data['title'] = item.title
+            data['votes'] = votes
+            data['polls'] = polls
+            template = 'beamer/%s.html' % (item.type)
+    except Item.DoesNotExist:
+        items = Item.objects.filter(parent=None).filter(hidden=False) \
+                            .order_by('weight')
+        data['items'] = items
+        data['title'] = _("Agenda")
+        template = 'beamer/overview.html'
+
+    if request.is_ajax():
+        content = render_block_to_string(template, 'content', data)
+        jsondata = {'content': content,
+                    'title': data['title'],
+                    'time': datetime.now().strftime('%H:%M'),
+                    'bigger': config_get('bigger'),
+                    'up': config_get('up'),
+                    'countdown_visible': config_get('countdown_visible'),
+                    'countdown_time': config_get('agenda_countdown_time'),
+                    'countdown_control': config_get('countdown_control'),
+                   }
+        return ajax_request(jsondata)
+    else:
+        return render_to_response(template,
+                                  data,
+                                  context_instance=RequestContext(request))
+
+@permission_required('agenda.can_manage_agenda')
+def beamer_edit(request, direction):
+    if direction == 'bigger':
+        config_set('bigger', int(config_get('bigger', 100)) + 10)
+    elif direction == 'smaller':
+        config_set('bigger', int(config_get('bigger', 100)) - 10)
+    elif direction == 'up':
+        config_set('up', int(config_get('up', 0)) - 10)
+    elif direction == 'down':
+        config_set('up', int(config_get('up', 0)) + 10)
+    elif direction == 'clean':
+        config_set('up', 0)
+        config_set('bigger', 100)
+
+    if request.is_ajax():
+        return ajax_request({})
+    return redirect(reverse('item_overview'))
+
+@permission_required('agenda.can_manage_agenda')
+def beamer_countdown(request, command, time=60):
+    if command == 'show':
+        config_set('countdown_visible', True)
+    elif command == 'hide':
+        config_set('countdown_visible', False)
+    elif command == 'reset':
+        config_set('countdown_control', 'reset')
+    elif command == 'start':
+        config_set('countdown_control', 'start')
+    elif command == 'stop':
+        config_set('countdown_control', 'stop')
+
+    if request.is_ajax():
+        if command == "show":
+            link = reverse('countdown_close')
+        else:
+            link = reverse('countdown_open')
+        return ajax_request({'countdown_visible': config_get('countdown_visible'),
+                             'link': link})
+    return redirect(reverse('item_overview'))
+
 def assignment_votes(item):
     votes = []
     if item.type == "ItemAssignment":
diff --git a/openslides/beamer/models.py b/openslides/beamer/models.py
deleted file mode 100644
index 71a836239..000000000
--- a/openslides/beamer/models.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from django.db import models
-
-# Create your models here.
diff --git a/openslides/beamer/tests.py b/openslides/beamer/tests.py
deleted file mode 100644
index 501deb776..000000000
--- a/openslides/beamer/tests.py
+++ /dev/null
@@ -1,16 +0,0 @@
-"""
-This file demonstrates writing tests using the unittest module. These will pass
-when you run "manage.py test".
-
-Replace this with more appropriate tests for your application.
-"""
-
-from django.test import TestCase
-
-
-class SimpleTest(TestCase):
-    def test_basic_addition(self):
-        """
-        Tests that 1 + 1 always equals 2.
-        """
-        self.assertEqual(1 + 1, 2)
diff --git a/openslides/beamer/urls.py b/openslides/beamer/urls.py
deleted file mode 100644
index 4fb419630..000000000
--- a/openslides/beamer/urls.py
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-"""
-    openslides.beamer.urls
-    ~~~~~~~~~~~~~~~~~~~~~~
-
-    URL list for the beamer app.
-
-    :copyright: 2011 by the OpenSlides team, see AUTHORS.
-    :license: GNU GPL, see LICENSE for more details.
-"""
-
-from django.conf.urls.defaults import *
-
-urlpatterns = patterns('beamer.views',
-    url(r'^$', 'beamer',
-        name='beamer_show'),
-
-    url(r'^bigger$', 'beamer_edit', {'direction': 'bigger'},
-        name='beamer_bigger'),
-
-    url(r'^smaller$', 'beamer_edit', {'direction': 'smaller'}, name='beamer_smaller'),
-
-    url(r'^up$', 'beamer_edit', {'direction': 'up'},
-        name='beamer_up'),
-
-    url(r'^beamer/down$', 'beamer_edit', {'direction': 'down'},
-        name='beamer_down'),
-
-    url(r'^beamer/clean$', 'beamer_edit', {'direction': 'clean'},
-        name='beamer_clean'),
-
-    url(r'^beamer/countdown/show$', 'beamer_countdown', {'command': 'show'},
-        name='countdown_open'),
-
-    url(r'^beamer/countdown/hide$', 'beamer_countdown', {'command': 'hide'},
-        name='countdown_close'),
-
-    url(r'^beamer/countdown/reset/(?P<time>\d+)$', 'beamer_countdown', {'command': 'reset'},
-        name='countdown_reset'),
-
-    url(r'^beamer/countdown/start$', 'beamer_countdown', {'command': 'start'},
-        name='countdown_start'),
-
-    url(r'^beamer/countdown/stop$', 'beamer_countdown', {'command': 'stop'},
-        name='countdown_stop'),
-)
diff --git a/openslides/beamer/views.py b/openslides/beamer/views.py
deleted file mode 100644
index f9e1959d2..000000000
--- a/openslides/beamer/views.py
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-"""
-    openslides.beamer.views
-    ~~~~~~~~~~~~~~~~~~~~~~~
-
-    Views for the beamer app.
-
-    :copyright: 2011 by the OpenSlides team, see AUTHORS.
-    :license: GNU GPL, see LICENSE for more details.
-"""
-from datetime import datetime
-
-from django.shortcuts import render_to_response, redirect
-from django.template import RequestContext
-from django.core.urlresolvers import reverse
-from django.contrib import messages
-from django.utils.translation import ugettext as _
-
-
-from utils.utils import template, permission_required, \
-                                   del_confirm_form, ajax_request
-from utils.template import render_block_to_string
-
-from system.api import config_set, config_get
-
-from agenda.api import get_active_item, is_summary, children_list, \
-                                  del_confirm_form_for_items
-from agenda.models import Item
-
-
-@permission_required('agenda.can_see_projector')
-def beamer(request):
-    """
-    Shows a active Slide.
-    """
-    data = {'ajax': 'on'}
-    template = ''
-    try:
-        item = get_active_item()
-        votes = assignment_votes(item)
-        polls = assignment_polls(item)
-        if is_summary():
-            items = item.children.filter(hidden=False)
-            data['items'] = items
-            data['title'] = item.title
-            template = 'beamer/overview.html'
-        else:
-            data['item'] = item.cast()
-            data['title'] = item.title
-            data['votes'] = votes
-            data['polls'] = polls
-            template = 'beamer/%s.html' % (item.type)
-    except Item.DoesNotExist:
-        items = Item.objects.filter(parent=None).filter(hidden=False) \
-                            .order_by('weight')
-        data['items'] = items
-        data['title'] = _("Agenda")
-        template = 'beamer/overview.html'
-
-    if request.is_ajax():
-        content = render_block_to_string(template, 'content', data)
-        jsondata = {'content': content,
-                    'title': data['title'],
-                    'time': datetime.now().strftime('%H:%M'),
-                    'bigger': config_get('bigger'),
-                    'up': config_get('up'),
-                    'countdown_visible': config_get('countdown_visible'),
-                    'countdown_time': config_get('agenda_countdown_time'),
-                    'countdown_control': config_get('countdown_control'),
-                   }
-        return ajax_request(jsondata)
-    else:
-        return render_to_response(template,
-                                  data,
-                                  context_instance=RequestContext(request))
-
-
-@permission_required('agenda.can_manage_agenda')
-def beamer_edit(request, direction):
-    if direction == 'bigger':
-        config_set('bigger', int(config_get('bigger', 100)) + 10)
-    elif direction == 'smaller':
-        config_set('bigger', int(config_get('bigger', 100)) - 10)
-    elif direction == 'up':
-        config_set('up', int(config_get('up', 0)) - 10)
-    elif direction == 'down':
-        config_set('up', int(config_get('up', 0)) + 10)
-    elif direction == 'clean':
-        config_set('up', 0)
-        config_set('bigger', 100)
-
-    if request.is_ajax():
-        return ajax_request({})
-    return redirect(reverse('item_overview'))
-
-
-@permission_required('agenda.can_manage_agenda')
-def beamer_countdown(request, command, time=60):
-    if command == 'show':
-        config_set('countdown_visible', True)
-    elif command == 'hide':
-        config_set('countdown_visible', False)
-    elif command == 'reset':
-        config_set('countdown_control', 'reset')
-    elif command == 'start':
-        config_set('countdown_control', 'start')
-    elif command == 'stop':
-        config_set('countdown_control', 'stop')
-
-    if request.is_ajax():
-        if command == "show":
-            link = reverse('countdown_close')
-        else:
-            link = reverse('countdown_open')
-        return ajax_request({'countdown_visible': config_get('countdown_visible'),
-                             'link': link})
-    return redirect(reverse('item_overview'))
diff --git a/openslides/default.settings.py b/openslides/default.settings.py
index 62ee6bd8d..ecc441257 100644
--- a/openslides/default.settings.py
+++ b/openslides/default.settings.py
@@ -130,7 +130,6 @@ INSTALLED_APPS = (
     'poll',
     'assignment',
     'utils',
-    'beamer',
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (
diff --git a/openslides/static/javascript/beamer.js b/openslides/static/javascript/beamer.js
index 0d125dbb8..4f6cf0fdf 100644
--- a/openslides/static/javascript/beamer.js
+++ b/openslides/static/javascript/beamer.js
@@ -2,7 +2,7 @@ function presentation_reload() {
     if ($('#config > #ajax').html() == 'on') {
         $.ajax({
             type: 'GET',
-            url: '/beamer',
+            url: '/beamer/',
             dataType: 'json',
             data: '',
             success: function(data) {
@@ -51,7 +51,7 @@ $(document).ready(function() {
     presentation_reload();
 });
 
-// *** Countdown variables and functions ***
+// *** Countdown variables and functions *** 
 var timer_value;
 var timer_is_running=false;
 var timer_is_visible=false;
@@ -93,4 +93,4 @@ function updateTimer() {
   if (timer_value >= 0) {
     $("#countdown").html(convertSeconds(timer_value));
   }
-}
+}
\ No newline at end of file
diff --git a/openslides/urls.py b/openslides/urls.py
index e52251d60..55bb349f8 100644
--- a/openslides/urls.py
+++ b/openslides/urls.py
@@ -24,7 +24,6 @@ urlpatterns = patterns('',
     (r'', include('openslides.participant.urls')),
     (r'', include('openslides.assignment.urls')),
     (r'', include('openslides.system.urls')),
-    (r'beamer', include('beamer.urls')),
     (r'^static/(?P<path>.*)$', 'django.views.static.serve',  {'document_root': settings.STATIC_DOC_ROOT}),
     (r'^i18n/', include('django.conf.urls.i18n')),
 )

From 0406966e5521401b93148afe704fb22650b8381f Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Wed, 28 Mar 2012 15:37:18 +0200
Subject: [PATCH 06/13] Removed new file from changeset r279 to clean up
 Default branch (because file already in 1.2-dev branch).

---
 openslides/beamer/__init__.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 openslides/beamer/__init__.py

diff --git a/openslides/beamer/__init__.py b/openslides/beamer/__init__.py
deleted file mode 100644
index e69de29bb..000000000

From e5ef0ac424ebe652524dc80e510b125adeb5ddf6 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Mon, 2 Apr 2012 07:30:52 +0200
Subject: [PATCH 07/13] #79: Replaced winner cup icon of elected candidates
 into green check.

---
 .../agenda/templates/beamer/ItemAssignment.html  |   2 +-
 .../assignment/templates/assignment/view.html    |   2 +-
 .../static/images/icons/games-highscores.png     | Bin 876 -> 0 bytes
 .../static/images/icons/voting-yes-grey.png      | Bin 0 -> 3134 bytes
 openslides/static/styles/assignment.css          |   4 ++--
 5 files changed, 4 insertions(+), 4 deletions(-)
 delete mode 100644 openslides/static/images/icons/games-highscores.png
 create mode 100644 openslides/static/images/icons/voting-yes-grey.png

diff --git a/openslides/agenda/templates/beamer/ItemAssignment.html b/openslides/agenda/templates/beamer/ItemAssignment.html
index 6304d71f3..e0b175128 100644
--- a/openslides/agenda/templates/beamer/ItemAssignment.html
+++ b/openslides/agenda/templates/beamer/ItemAssignment.html
@@ -57,7 +57,7 @@
         {% with vote|first as candidate %}
         <td class="candidate {% if candidate.1 %}elected{% endif %}">
             {% if candidate.1 %}
-                <a class="elected"><img src="/static/images/icons/games-highscores.png" title="{% trans 'Candidate is elected' %}"></a>
+                <a class="elected"><img src="/static/images/icons/voting-yes.png" title="{% trans 'Candidate is elected' %}"></a>
             {% endif %}
             {{ candidate.0 }}
         </td>
diff --git a/openslides/assignment/templates/assignment/view.html b/openslides/assignment/templates/assignment/view.html
index 49f590f98..f86ccd326 100644
--- a/openslides/assignment/templates/assignment/view.html
+++ b/openslides/assignment/templates/assignment/view.html
@@ -172,7 +172,7 @@
                 {% if perms.assignment.can_manage_assignment %}
                 <a class="election_link elected" href='{% url assignment_user_not_elected assignment.id candidate.0.id %}'></a>
                 {% else %}
-                <a class="elected"><img src="/static/images/icons/games-highscores.png" title="{% trans 'Candidate is elected' %}"></a>
+                <a class="elected"><img src="/static/images/icons/voting-yes.png" title="{% trans 'Candidate is elected' %}"></a>
                 {% endif %}
             {% else %}
                 {% if perms.assignment.can_manage_assignment %}
diff --git a/openslides/static/images/icons/games-highscores.png b/openslides/static/images/icons/games-highscores.png
deleted file mode 100644
index 34fa6d4a77972137fe5d4b7f237bc1b13daed5cc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 876
zcmV-y1C#uTP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2ipS=
z2`x0Gp}8Lb00QhuL_t(I%XQC7Y*bYo$MNqu_d1>F(3w&c4N{7=KAO5HA&^F6Ag0Es
z8)LMKQsRpU#7ANj9}7uvW7N0-743#ZYF!9Q3?XU^BxryHIs{>ATPjVZopwq)?c6($
zJ2Us5zYA@XI{I6k<otf0<gWmZeX!}pyyF!ge7JRZO>1*g$;scU!_j)Bb;O8L6Bm9j
z6-svImUXvJdam`yz{$jha&98j^T|lBeeA<cPe1YI`QHAw+dfTRnE0}B<CE0ZSx`)Z
zKPnQ;lb`xU{dO_L=FYoV5pyX!mENAuMt1hSe0R4ldp>~94kzD;*A+lT5xWH;4pvA7
z##g0WiM(s5R4N4G(a^lG4<PUjx@+&nZ;rgz{`~ImC^~a#j6@M@Jt&P>wTOyPDr&r(
zptZ(zD?Ix8bn5V~=4YSze6(NZ7hb`=ksmzzen(3&o4Z!_N+<-B4YmzfIGLL;Mq!5)
zg`9B??PzP%BI5u$T7Q7&4qQDm`{(TDx$BZFEDQ-!04oFv#2DtMgiypL67?lBEdwi}
zrgPgDW2XQ#|77RE(f)ZSlARtrtxUxMD+c1DOogli(UmobpHtbXu-mnN=+NSB37DBV
z!k*(dwx9p$9A0)<lpTklOi(OPC@XGTYe{;nLNHb65)rC^)vKRk|Mq)#ja+j2uAc5y
zfv-_mETps4#6qlVEUB4me7k<*ov$jTsLGy>+NJm5msai_{GmsJ%sVFeb&L7+qqzLI
zui@jx|D!M5vDEz!>hJWu*03RVb5laij}wgt_doP*_UyTXO?2!YU)IzA2L$Cz=$<Xz
z44ld`nJU)<RpTlkkw^g0*~op(59~Ozc8x1rA2T9`6W_l@2f*damzDulCtSIblvq5D
z=WD5}sZpL$R01VoomXzorLDDf*~b1iFq2L*HZjYplUvlP#~&fAEryPtP_tWqCTvU9
z301&kDn%${lWYHq>nR^&477I>%%#a$8o&aA#r|LAJy_X54i4@B0000<MNUMnLSTXd
CZkXc$

diff --git a/openslides/static/images/icons/voting-yes-grey.png b/openslides/static/images/icons/voting-yes-grey.png
new file mode 100644
index 0000000000000000000000000000000000000000..faac1de32e5e8e5c83dd26c7770b84a047928f5d
GIT binary patch
literal 3134
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
Y2R;A6=1J3k?*IS*07*qoM6N<$g72vY+yDRo

literal 0
HcmV?d00001

diff --git a/openslides/static/styles/assignment.css b/openslides/static/styles/assignment.css
index 270d7640d..84edb81f6 100644
--- a/openslides/static/styles/assignment.css
+++ b/openslides/static/styles/assignment.css
@@ -3,7 +3,7 @@ td.elected {
 }
 
 td.elected a.election_link {
-    background-image: url(/static/images/icons/games-highscores.png);
+    background-image: url(/static/images/icons/voting-yes.png);
     background-repeat: no-repeat;
     background-position: center;
     width: 16px;
@@ -14,7 +14,7 @@ td.elected a.election_link {
 }
 
 td a.election_link {
-    background-image: url(/static/images/icons/games-highscores-grey.png);
+    background-image: url(/static/images/icons/voting-yes-grey.png);
     background-repeat: no-repeat;
     background-position: center;
     width: 16px;

From ebbacfd443d7cbb235d83f5e87ca3ee767901abd Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Mon, 2 Apr 2012 07:32:42 +0200
Subject: [PATCH 08/13] #80: New participant status filter

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

diff --git a/openslides/participant/templates/participant/overview.html b/openslides/participant/templates/participant/overview.html
index 978d2acb7..73d517799 100644
--- a/openslides/participant/templates/participant/overview.html
+++ b/openslides/participant/templates/participant/overview.html
@@ -8,20 +8,20 @@
         {% csrf_token %}
         {%trans "Filter" %}:
         <select class="default-input" name="gender" onchange="document.forms['filter'].submit()">
-            <option value="---">-- {%trans "Gender" %}--</option>
+            <option value="---">-- {%trans "Gender" %} --</option>
             <option value="male" {% if 'male' in sortfilter.gender %}selected{% endif %}>{%trans "Male" %}</option>
             <option value="female" {% if 'female' in sortfilter.gender %}selected{% endif %}>{%trans "Female" %}</option>
             <option value="" {% if '' in sortfilter.gender %}selected{% endif %}>{%trans "Not specified" %}</option>
         </select>
         <select class="default-input" name="group" onchange="document.forms['filter'].submit()">
-            <option value="---">-- {%trans "Group" %}--</option>
+            <option value="---">-- {%trans "Group" %} --</option>
             {% for group in groups %}
                 <option value="{{ group }}" {% if group in sortfilter.group %}selected{% endif %}>
                 {{ group }}</option>
             {% endfor %}
         </select>
         <select class="default-input" name="type" onchange="document.forms['filter'].submit()">
-            <option value="---">-- {%trans "Type" %}--</option>
+            <option value="---">-- {%trans "Type" %} --</option>
             <option value="delegate" {% if 'delegate' in sortfilter.type %}selected{% endif %}>{%trans "Delegate" %}</option>
             <option value="observer" {% if 'observer' in sortfilter.type %}selected{% endif %}>{%trans "Observer" %}</option>
             <option value="staff" {% if 'staff' in sortfilter.type %}selected{% endif %}>{%trans "Staff" %}</option>
@@ -29,12 +29,17 @@
             <option value="" {% if '' in sortfilter.type %}selected{% endif %}>{%trans "Not specified" %}</option>
         </select>
         <select class="default-input" name="committee" onchange="document.forms['filter'].submit()">
-            <option value="---">-- {%trans "Committee" %}--</option>
+            <option value="---">-- {%trans "Committee" %} --</option>
             {% for committee in committees %}
                 <option value="{{ committee }}" {% if committee in sortfilter.committee %}selected{% endif %}>
                 {{ committee }}</option>
             {% endfor %}
         </select>
+        <select class="default-input" name="status" onchange="document.forms['filter'].submit()">
+            <option value="---">-- {%trans "Status" %} --</option>
+            <option value="1" {% if '1' in sortfilter.status %}selected{% endif %}>{%trans "Active" %}</option>
+            <option value="0" {% if '0' in sortfilter.status %}selected{% endif %}>{%trans "Inactive" %}</option>
+        </select>
         </form>
     </p>
     {{ users|length }} {% trans "Participant" %}
diff --git a/openslides/participant/views.py b/openslides/participant/views.py
index 3847101c2..a0a8bed7f 100644
--- a/openslides/participant/views.py
+++ b/openslides/participant/views.py
@@ -60,7 +60,7 @@ def get_overview(request):
     except KeyError:
         sortfilter = {}
 
-    for value in [u'gender', u'group', u'type', u'committee', u'sort', u'reverse']:
+    for value in [u'gender', u'group', u'type', u'committee', u'status', u'sort', u'reverse']:
         if value in request.REQUEST:
             if request.REQUEST[value] == '---':
                 try:
@@ -79,6 +79,8 @@ def get_overview(request):
         query = query.filter(profile__type__iexact=sortfilter['type'][0])
     if 'committee' in sortfilter:
         query = query.filter(profile__committee__iexact=sortfilter['committee'][0])
+    if 'status' in sortfilter:
+        query = query.filter(is_active=sortfilter['status'][0])
     if 'sort' in sortfilter:
         if sortfilter['sort'][0] in ['first_name', 'last_name','username','last_login','email']:
             query = query.order_by(sortfilter['sort'][0])

From beb8694cdc87e1966f03e75283205c24bd5fb780 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Mon, 2 Apr 2012 07:34:34 +0200
Subject: [PATCH 09/13] #81: Use AJAX code for participant status and superuser
 links in overview

---
 .../templates/participant/overview.html       | 27 +++++++----
 openslides/participant/urls.py                |  7 ++-
 openslides/participant/views.py               | 48 +++++++++++--------
 openslides/static/javascript/participant.js   | 39 +++++++++++++++
 openslides/static/styles/participant.css      | 33 +++++++++++++
 5 files changed, 123 insertions(+), 31 deletions(-)
 create mode 100644 openslides/static/javascript/participant.js
 create mode 100644 openslides/static/styles/participant.css

diff --git a/openslides/participant/templates/participant/overview.html b/openslides/participant/templates/participant/overview.html
index 73d517799..a8011bd8f 100644
--- a/openslides/participant/templates/participant/overview.html
+++ b/openslides/participant/templates/participant/overview.html
@@ -1,6 +1,13 @@
 {% extends "participant/base_participant.html" %}
 {% block title %}{{ block.super }} - {%trans "Participants" %}{% endblock %}
 
+{% block header %}
+    {% if perms.agenda.can_manage_agenda %}
+    <link type="text/css" rel="stylesheet" media="all" href="/static/styles/participant.css" />
+    <script type="text/javascript" src="/static/javascript/participant.js"></script>
+    {% endif %}
+{% endblock %}
+
 {% block content %}
     <h1>{% trans "Participants" %}</h1>
 
@@ -73,16 +80,16 @@
             <td><span style="width: 1px; white-space: nowrap;">
                 <a href="{% url user_edit user.id %}"><img src="/static/images/icons/document-edit.png" title="{%trans 'Edit participant' %}"></a>
                 <a href="{% url user_delete user.id %}"><img src="/static/images/icons/edit-delete.png" title="{%trans 'Delete participant' %}"></a>
-                {% if user.is_active %}
-                <a href="{% url user_set_active user.id %}"><img src="/static/images/icons/user-online.png" title="{%trans 'Participiant is activated. Click to deactivate!' %}"></a>
-                {% else %}
-                <a href="{% url user_set_active user.id %}"><img src="/static/images/icons/user-offline.png" title="{%trans 'Participiant is deactivated. Click to activate!' %}"></a>
-                {% endif %}
-                {% if user.is_superuser %}
-                <a href="{% url user_set_superuser user.id %}"><img src="/static/images/icons/meeting-chair.png" title="{%trans 'Administrator. Click to get normal user!' %}"></a>
-                {% else %}
-                <a href="{% url user_set_superuser user.id %}"><img src="/static/images/icons/im-user.png" title="{%trans 'Normal user. Click to get administrator!' %}"></a>
-                {% endif %}
+                <a class="status_link {% if user.is_active %}active{% else %}inactive{% endif %}"
+                    href="{% if user.is_active %}{% url user_inactive user.id %}{% else %}{% url user_active user.id %}{% endif %}"
+                    title="{%trans 'Change status (active/inactive)' %}">
+                    <span></span>
+                </a>
+                <a class="superuser_link {% if user.is_superuser %}superuser{% else %}normaluser{% endif %}"
+                    href="{% if user.is_superuser %}{% url user_normaluser user.id %}{% else %}{% url user_superuser user.id %}{% endif %}"
+                    title="{%trans 'Change administrator rights (Superuser/Normal user)' %}">
+                    <span></span>
+                </a>
                 </span>
             </td>
             {% endif %}
diff --git a/openslides/participant/urls.py b/openslides/participant/urls.py
index a665202a6..e7665dd69 100644
--- a/openslides/participant/urls.py
+++ b/openslides/participant/urls.py
@@ -19,8 +19,11 @@ urlpatterns = patterns('participant.views',
     url(r'^participant/(?P<user_id>\d+)/edit$', 'edit', name='user_edit'),
     url(r'^participant/print$', 'print_userlist', name='user_print'),
     url(r'^participant/(?P<user_id>\d+)/del$', 'user_delete', name='user_delete'),
-    url(r'^participant/(?P<user_id>\d+)/admin$', 'user_set_superuser', name='user_set_superuser'),
-    url(r'^participant/(?P<user_id>\d+)/active$', 'user_set_active', name='user_set_active'),
+    url(r'^participant/(?P<user_id>\d+)/active/$', 'user_set_active', {'active': True}, name='user_active'),
+    url(r'^participant/(?P<user_id>\d+)/inactive/$', 'user_set_active', {'active': False}, name='user_inactive'),
+    url(r'^participant/(?P<user_id>\d+)/superuser/$', 'user_set_superuser', {'superuser': True}, name='user_superuser'),
+    url(r'^participant/(?P<user_id>\d+)/normaluser/$', 'user_set_superuser', {'superuser': False}, name='user_normaluser'),
+
     url(r'^participant/import$', 'user_import', name='user_import'),
     url(r'^participant/group/$', 'get_group_overview', name='user_group_overview'),
     url(r'^participant/group/new$', 'group_edit', name='user_group_new'),
diff --git a/openslides/participant/views.py b/openslides/participant/views.py
index a0a8bed7f..b82ccdf39 100644
--- a/openslides/participant/views.py
+++ b/openslides/participant/views.py
@@ -34,7 +34,7 @@ from django.db import transaction
 from participant.models import Profile
 from participant.api import gen_username, gen_password
 from participant.forms import UserNewForm, UserEditForm, ProfileForm, UsersettingsForm, UserImportForm, GroupForm, AdminPasswordChangeForm
-from utils.utils import template, permission_required, gen_confirm_form
+from utils.utils import template, permission_required, gen_confirm_form, ajax_request
 from utils.pdf import print_userlist, print_passwords
 from system.api import config_get
 
@@ -176,30 +176,40 @@ def user_delete(request, user_id):
 
 @permission_required('participant.can_manage_participant')
 @template('confirm.html')
-def user_set_superuser(request, user_id):
-    user = User.objects.get(pk=user_id)
-    if user.is_superuser:
-        user.is_superuser = False
+def user_set_superuser(request, user_id, superuser=True):
+    try:
+        user = User.objects.get(pk=user_id)
+        user.is_superuser = superuser
         user.save()
-        messages.success(request, _('Participant <b>%s</b> is now a normal user.') % user)
-    else:
-        user.is_superuser = True
-        user.save()
-        messages.success(request, _('Participant <b>%s</b> is now administrator.') % user)
+    except User.DoesNotExist:
+        messages.error(request, _('Participant %d does not exist.') % int(user_id))
+
+    if request.is_ajax():
+        if superuser:
+            link = reverse('user_normaluser', args=[user.id])
+        else:
+            link = reverse('user_superuser', args=[user.id])
+        return ajax_request({'superuser': superuser,
+                             'link': link})
     return redirect(reverse('user_overview'))
 
 @permission_required('participant.can_manage_participant')
 @template('confirm.html')
-def user_set_active(request, user_id):
-    user = User.objects.get(pk=user_id)
-    if user.is_active:
-        user.is_active = False
+def user_set_active(request, user_id, active=True):
+    try:
+        user = User.objects.get(pk=user_id)
+        user.is_active = active
         user.save()
-        messages.success(request, _('Participant <b>%s</b> was successfully deactivated.') % user)
-    else:
-        user.is_active = True
-        user.save()
-        messages.success(request, _('Participant <b>%s</b> was successfully activated.') % user)
+    except User.DoesNotExist:
+        messages.error(request, _('Participant %d does not exist.') % int(user_id))
+
+    if request.is_ajax():
+        if active:
+            link = reverse('user_inactive', args=[user.id])
+        else:
+            link = reverse('user_active', args=[user.id])
+        return ajax_request({'active': active,
+                             'link': link})
     return redirect(reverse('user_overview'))
 
 @permission_required('participant.can_manage_participant')
diff --git a/openslides/static/javascript/participant.js b/openslides/static/javascript/participant.js
new file mode 100644
index 000000000..895456830
--- /dev/null
+++ b/openslides/static/javascript/participant.js
@@ -0,0 +1,39 @@
+$(function() {
+    $('.status_link').click(function(event) {
+        event.preventDefault();
+        link = $(this);
+        $.ajax({
+            type: 'GET',
+            url: link.attr('href'),
+            dataType: 'json',
+            success: function(data) {
+                if (data.active) {
+                    newclass = 'active';
+                } else {
+                    newclass = 'inactive';
+                }
+                link.removeClass('active inactive').addClass(newclass);
+                link.attr('href', data.link);
+            }
+        });
+    });
+
+    $('.superuser_link').click(function(event) {
+        event.preventDefault();
+        link = $(this);
+        $.ajax({
+            type: 'GET',
+            url: link.attr('href'),
+            dataType: 'json',
+            success: function(data) {
+                if (data.superuser) {
+                    newclass = 'superuser';
+                } else {
+                    newclass = 'normaluser';
+                }
+                link.removeClass('superuser normaluser').addClass(newclass);
+                link.attr('href', data.link);
+            }
+        });
+    });
+});
\ No newline at end of file
diff --git a/openslides/static/styles/participant.css b/openslides/static/styles/participant.css
new file mode 100644
index 000000000..5355ec87f
--- /dev/null
+++ b/openslides/static/styles/participant.css
@@ -0,0 +1,33 @@
+a.status_link.active span {
+    background-image: url(/static/images/icons/user-online.png);
+    background-repeat: no-repeat;
+    background-position: center;
+    width: 16px;
+    height: 16px;
+    display: inline-block;
+}
+a.status_link.inactive span {
+    background-image: url(/static/images/icons/user-offline.png);
+    background-repeat: no-repeat;
+    background-position: center;
+    width: 16px;
+    height: 16px;
+    display: inline-block;
+}
+
+a.superuser_link.superuser span {
+    background-image: url(/static/images/icons/meeting-chair.png);
+    background-repeat: no-repeat;
+    background-position: center;
+    width: 16px;
+    height: 16px;
+    display: inline-block;
+}
+a.superuser_link.normaluser span {
+    background-image: url(/static/images/icons/im-user.png);
+    background-repeat: no-repeat;
+    background-position: center;
+    width: 16px;
+    height: 16px;
+    display: inline-block;
+}
\ No newline at end of file

From a8fcba0f6937b4306aa52eabe2bc37252da9b875 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Mon, 2 Apr 2012 07:38:55 +0200
Subject: [PATCH 10/13] #82: New comment field for participant form (database
 changes: syncdb required)

---
 openslides/participant/models.py                          | 1 +
 openslides/participant/templates/participant/import.html  | 4 +++-
 .../participant/templates/participant/overview.html       | 6 ++----
 openslides/participant/views.py                           | 8 +++++---
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/openslides/participant/models.py b/openslides/participant/models.py
index 32c06d3a3..1442a5b0a 100644
--- a/openslides/participant/models.py
+++ b/openslides/participant/models.py
@@ -34,6 +34,7 @@ class Profile(models.Model):
     group = models.CharField(max_length=100, null=True, blank=True, verbose_name = _("Group"))
     type = models.CharField(max_length=100, choices=TYPE_CHOICE, blank=True, verbose_name = _("Typ"))
     committee = models.CharField(max_length=100, null=True, blank=True, verbose_name = _("Committee"))
+    comment = models.CharField(max_length=255, null=True, blank=True, verbose_name = _("Comment"))
     firstpassword = models.CharField(max_length=100, null=True, blank=True, verbose_name = _("First Password"))
 
 
diff --git a/openslides/participant/templates/participant/import.html b/openslides/participant/templates/participant/import.html
index 5acdee1b7..0d86d4c5c 100644
--- a/openslides/participant/templates/participant/import.html
+++ b/openslides/participant/templates/participant/import.html
@@ -5,7 +5,9 @@
     <h1>{% trans 'Import participants' %}</h1>
     <p>{% trans 'Select a CSV file to import participants!' %}</p>
 
-    <p>{% trans '(Required comma separated values: <code>first_name, last_name, gender, group, type, committee</code>)' %} </p>
+    <p>{% trans 'Required comma separated values: <code>first_name, last_name, gender, group, type, committee, comment</code>' %}<br>
+    {% trans 'CSV file encoding: UTF-8 (Unicode).' %}
+    </p>
     <form enctype="multipart/form-data" action="" method="post">{% csrf_token %}
         {{ form.as_p }}
         <button class="button" type="submit">
diff --git a/openslides/participant/templates/participant/overview.html b/openslides/participant/templates/participant/overview.html
index a8011bd8f..daee6eeda 100644
--- a/openslides/participant/templates/participant/overview.html
+++ b/openslides/participant/templates/participant/overview.html
@@ -58,8 +58,7 @@
             <th><a href="?sort=type&reverse={% if 'type' in sortfilter.sort and 'reverse' not in sortfilter %}1{% else %}---{%endif%}">{%trans "Type" %}</a></th>
             <th><a href="?sort=committee&reverse={% if 'committee' in sortfilter.sort and 'reverse' not in sortfilter %}1{% else %}---{%endif%}">{%trans "Committee" %}</a></th>
             {% if perms.participant.can_manage_participant %}
-            <th><a href="?sort=username&reverse={% if 'username' in sortfilter.sort and 'reverse' not in sortfilter %}1{% else %}---{%endif%}">{%trans "Username" %}</a></th>
-            <th><a href="?sort=email&reverse={% if 'email' in sortfilter.sort and 'reverse' not in sortfilter %}1{% else %}---{%endif%}">{%trans "Email" %}</a></th>
+            <th><a href="?sort=comment&reverse={% if 'comment' in sortfilter.sort and 'reverse' not in sortfilter %}1{% else %}---{%endif%}">{%trans "Comment" %}</a></th>
             <th><a href="?sort=last_login&reverse={% if 'last_login' in sortfilter.sort and 'reverse' not in sortfilter %}1{% else %}---{%endif%}">{%trans "Last Login" %}</a></th>
             <th>{%trans "Actions" %}</th>
             {% endif %}
@@ -72,8 +71,7 @@
             <td>{{ user.profile.get_type_display }}</td>
             <td>{{ user.profile.committee }}</td>
             {% if perms.participant.can_manage_participant %}
-            <td>{{ user.username }}</td>
-            <td>{{ user.email }}</td>
+            <td>{{ user.profile.comment }}</td>
             <td>{% if user.last_login > user.date_joined %}
                 {{ user.last_login }}
                 {% endif %}</td>
diff --git a/openslides/participant/views.py b/openslides/participant/views.py
index b82ccdf39..2b74c3c4f 100644
--- a/openslides/participant/views.py
+++ b/openslides/participant/views.py
@@ -82,9 +82,9 @@ def get_overview(request):
     if 'status' in sortfilter:
         query = query.filter(is_active=sortfilter['status'][0])
     if 'sort' in sortfilter:
-        if sortfilter['sort'][0] in ['first_name', 'last_name','username','last_login','email']:
+        if sortfilter['sort'][0] in ['first_name', 'last_name', 'last_login']:
             query = query.order_by(sortfilter['sort'][0])
-        elif sortfilter['sort'][0] in ['group', 'type', 'committee']:
+        elif sortfilter['sort'][0] in ['group', 'type', 'committee', 'comment']:
             query = query.order_by('profile__%s' % sortfilter['sort'][0])
     else:
         query = query.order_by('first_name')
@@ -338,7 +338,7 @@ def user_import(request):
                     for line in csv.reader(request.FILES['csvfile'], dialect=dialect):
                         i += 1
                         if i > 0:
-                            (first_name, last_name, gender, group, type, committee) = line[:6]
+                            (first_name, last_name, gender, group, type, committee, comment) = line[:7]
                             user = User()
                             user.last_name = last_name
                             user.first_name = first_name
@@ -351,6 +351,7 @@ def user_import(request):
                             profile.group = group
                             profile.type = type
                             profile.committee = committee
+                            profile.comment = comment
                             profile.firstpassword = gen_password()
                             profile.user.set_password(profile.firstpassword)
                             profile.save()
@@ -363,6 +364,7 @@ def user_import(request):
                                 user.groups.add(observer)
 
                     messages.success(request, _('%d new participants were successfully imported.') % i)
+                    return redirect(reverse('user_overview'))
             except csv.Error:
                 message.error(request, _('Import aborted because of severe errors in the input file.'))
         else:

From 95bf4c1cc8af21fdfc4bb4544f976bf58ab8ef9d Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Mon, 2 Apr 2012 07:47:38 +0200
Subject: [PATCH 11/13] #83: Show total number and percent value of filtered
 participants.

---
 .../templates/participant/overview.html        |  6 +++++-
 openslides/participant/views.py                | 18 ++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/openslides/participant/templates/participant/overview.html b/openslides/participant/templates/participant/overview.html
index daee6eeda..3156563b5 100644
--- a/openslides/participant/templates/participant/overview.html
+++ b/openslides/participant/templates/participant/overview.html
@@ -49,7 +49,11 @@
         </select>
         </form>
     </p>
-    {{ users|length }} {% trans "Participant" %}
+    {% if users|length == allusers|length %}
+        {{ users|length }} {% trans "Participants" %}
+    {% else %}
+        {{ users|length }} {% trans "of" %} {{ allusers|length }} {% trans "Participants" %} (= {{ percent }} %)
+    {% endif %}
     <table>
         <tr>
             <th><a href="?sort=first_name&reverse={% if 'first_name' in sortfilter.sort and 'reverse' not in sortfilter %}1{% else %}---{%endif%}">{%trans "First Name" %}</a></th>
diff --git a/openslides/participant/views.py b/openslides/participant/views.py
index 2b74c3c4f..958f5be40 100644
--- a/openslides/participant/views.py
+++ b/openslides/participant/views.py
@@ -91,6 +91,7 @@ def get_overview(request):
     if 'reverse' in sortfilter:
         query = query.reverse()
 
+    # list of filtered users (with profile)
     userlist = query.all()
     users = []
     for user in userlist:
@@ -99,10 +100,27 @@ def get_overview(request):
             users.append(user)
         except Profile.DoesNotExist:
             pass
+    # list of all existing users (with profile)
+    allusers = []
+    for user in User.objects.all():
+        try:
+            user.get_profile()
+            allusers.append(user)
+        except Profile.DoesNotExist:
+            pass
+    # quotient of selected users and all users
+    if len(allusers) > 0:
+        percent = float(len(users)) * 100 / float(len(allusers))
+    else:
+        percent = 0
+    # list of all existing groups
     groups = [p['group'] for p in Profile.objects.values('group').exclude(group='').distinct()]
+    # list of all existing committees
     committees = [p['committee'] for p in Profile.objects.values('committee').exclude(committee='').distinct()]
     return {
         'users': users,
+        'allusers': allusers,
+        'percent': round(percent, 1),
         'groups': groups,
         'committees': committees,
         'cookie': ['participant_sortfilter', urlencode(decodedict(sortfilter), doseq=True)],

From bf6a3d2d81386e5ddd7f55e81f2db120101880cd Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Mon, 2 Apr 2012 07:53:32 +0200
Subject: [PATCH 12/13] Updated translation

---
 openslides/locale/de/LC_MESSAGES/django.mo | Bin 28435 -> 28129 bytes
 openslides/locale/de/LC_MESSAGES/django.po | 442 +++++++++++----------
 2 files changed, 234 insertions(+), 208 deletions(-)

diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo
index 20f86dc9ee455bec8b1e51119814826d304ea8be..d75ab93e644b599a0e4237d729f6e9b821d3712e 100644
GIT binary patch
delta 9129
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

delta 9257
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

diff --git a/openslides/locale/de/LC_MESSAGES/django.po b/openslides/locale/de/LC_MESSAGES/django.po
index f62407ea2..28910ba3e 100644
--- a/openslides/locale/de/LC_MESSAGES/django.po
+++ b/openslides/locale/de/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-14 23:35+0100\n"
+"POT-Creation-Date: 2012-04-02 07:48+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -53,8 +53,8 @@ msgstr "Nein"
 msgid "Yes, with all child items."
 msgstr "Ja, mit allen Kindelementen."
 
-#: agenda/api.py:71 agenda/api.py:73 participant/views.py:168
-#: participant/views.py:271 utils/utils.py:40
+#: agenda/api.py:71 agenda/api.py:73 participant/views.py:192
+#: participant/views.py:305 utils/utils.py:40
 #, python-format
 msgid "Do you really want to delete <b>%s</b>?"
 msgstr "Soll <b>%s</b> wirklich gelöscht werden?"
@@ -64,7 +64,7 @@ msgid "Parent item"
 msgstr "Elternelement"
 
 #: agenda/models.py:35 application/forms.py:41
-#: application/templates/application/view.html:253
+#: application/templates/application/view.html:250
 msgid "Title"
 msgstr "Titel"
 
@@ -86,7 +86,7 @@ msgid "No Form for itemtype %s"
 msgstr "Kein Formular für Eintrag %s"
 
 #: agenda/models.py:189 application/forms.py:42
-#: application/templates/application/view.html:254 poll/models.py:136
+#: application/templates/application/view.html:251 poll/models.py:136
 msgid "Text"
 msgstr "Text"
 
@@ -94,7 +94,7 @@ msgstr "Text"
 #: agenda/templates/agenda/overview.html:220
 #: application/templates/application/edit.html:2
 #: application/templates/application/view.html:2
-#: application/templates/application/view.html:220 poll/models.py:23
+#: application/templates/application/view.html:217 poll/models.py:23
 #: poll/models.py:138 system/templates/system/base_system.html:14
 #: utils/pdf.py:458 utils/pdf.py:470
 msgid "Application"
@@ -125,40 +125,41 @@ msgstr "Abstimmung"
 msgid "Agenda"
 msgstr "Tagesordnung"
 
-#: agenda/views.py:216 agenda/views.py:234 agenda/views.py:257
+#: agenda/views.py:219 agenda/views.py:237 agenda/views.py:260
 #, python-format
 msgid "Item ID %d does not exist."
 msgstr "Eintrag %d existiert nicht."
 
-#: agenda/views.py:271
+#: agenda/views.py:274
 msgid "New item was successfully created."
 msgstr "Neuer Eintrag erfolgreich angelegt."
 
-#: agenda/views.py:273
+#: agenda/views.py:276
 msgid "Agenda item created"
 msgstr "Tagesordnungseintrag angelegt"
 
-#: agenda/views.py:275
+#: agenda/views.py:278
 msgid "Item was successfully modified."
 msgstr "Eintrag wurde erfolgreich geändert."
 
-#: agenda/views.py:277
+#: agenda/views.py:280
 msgid "Agenda item modified"
 msgstr "Tagesordnungseintrag geändert"
 
-#: agenda/views.py:283 application/views.py:531 participant/views.py:145
-#: participant/views.py:256 participant/views.py:285 participant/views.py:346
-#: system/views.py:37 system/views.py:55 system/views.py:79
-#: system/views.py:105 system/views.py:143
+#: agenda/views.py:286 application/views.py:181 application/views.py:538
+#: assignment/views.py:118 participant/views.py:169 participant/views.py:290
+#: participant/views.py:319 participant/views.py:389 system/views.py:37
+#: system/views.py:59 system/views.py:83 system/views.py:113
+#: system/views.py:152
 msgid "Please check the form for errors."
 msgstr "Bitte kontrollieren Sie das Formular nach Fehlern."
 
-#: agenda/views.py:317
+#: agenda/views.py:320
 #, python-format
 msgid "Item <b>%s</b> and his children were successfully deleted."
 msgstr "Eintrag <b>%s</b> und seine Kindelemente wurde erfolgreich gelöscht."
 
-#: agenda/views.py:323
+#: agenda/views.py:326
 #, python-format
 msgid "Item <b>%s</b> was successfully deleted."
 msgstr "Eintrag <b>%s</b> wurde erfolgreich gelöscht."
@@ -238,7 +239,7 @@ msgstr "Übernehmen"
 #: assignment/templates/assignment/poll_view.html:62
 #: participant/templates/participant/edit.html:25
 #: participant/templates/participant/group_edit.html:21
-#: participant/templates/participant/import.html:16
+#: participant/templates/participant/import.html:18
 #: participant/templates/participant/settings.html:19
 #: system/templates/system/agenda.html:14
 #: system/templates/system/application.html:14
@@ -309,14 +310,14 @@ msgid "Done"
 msgstr "Erledigt"
 
 #: agenda/templates/agenda/overview.html:79
-#: participant/templates/participant/overview.html:24
-#: participant/templates/participant/overview.html:45 utils/pdf.py:263
+#: participant/templates/participant/overview.html:31
+#: participant/templates/participant/overview.html:62 utils/pdf.py:263
 msgid "Type"
 msgstr "Typ"
 
 #: agenda/templates/agenda/overview.html:81
 #: assignment/templates/assignment/overview.html:25
-#: participant/templates/participant/overview.html:51
+#: participant/templates/participant/overview.html:67
 msgid "Actions"
 msgstr "Aktionen"
 
@@ -376,12 +377,13 @@ msgstr "Keine Einträge vorhanden."
 #: application/templates/application/view.html:35
 #: assignment/templates/assignment/overview.html:10
 #: assignment/templates/assignment/overview.html:23
-#: assignment/templates/assignment/view.html:8 utils/pdf.py:377
+#: assignment/templates/assignment/view.html:8
+#: participant/templates/participant/overview.html:46 utils/pdf.py:377
 msgid "Status"
 msgstr "Status"
 
 #: agenda/templates/beamer/ItemApplication.html:19 application/forms.py:51
-#: application/models.py:46 application/templates/application/overview.html:35
+#: application/models.py:47 application/templates/application/overview.html:35
 #: application/templates/application/view.html:9 utils/pdf.py:350
 msgid "Submitter"
 msgstr "Antragsteller/in"
@@ -434,14 +436,14 @@ msgstr "Keine Abstimmungen vorhanden."
 #: agenda/templates/beamer/ItemApplication.html:50
 #: application/templates/application/poll_view.html:8
 #: application/templates/application/poll_view.html:16
-#: application/templates/application/view.html:218 utils/pdf.py:342
+#: application/templates/application/view.html:215 utils/pdf.py:342
 #: utils/pdf.py:344 utils/pdf.py:445 utils/pdf.py:447 utils/pdf.py:479
 msgid "Application No."
 msgstr "Antrag Nr."
 
 #: agenda/templates/beamer/ItemApplication.html:56 application/forms.py:43
-#: application/templates/application/view.html:236
-#: application/templates/application/view.html:256 utils/pdf.py:421
+#: application/templates/application/view.html:233
+#: application/templates/application/view.html:253 utils/pdf.py:421
 msgid "Reason"
 msgstr "Begründung"
 
@@ -505,7 +507,7 @@ msgstr "Triviale Änderung"
 msgid "Trivial changes don't create a new version."
 msgstr "Triviale Änderungen erzeugen keine neue Version."
 
-#: application/forms.py:52 application/models.py:48
+#: application/forms.py:52 application/models.py:49
 #: application/templates/application/view.html:23 utils/pdf.py:363
 msgid "Supporters"
 msgstr "Unterstützer/innen"
@@ -514,129 +516,129 @@ msgstr "Unterstützer/innen"
 msgid "CSV File"
 msgstr "CSV-Datei"
 
-#: application/models.py:26
+#: application/models.py:27
 msgid "Published"
 msgstr "Veröffentlicht"
 
-#: application/models.py:27 application/templates/application/overview.html:19
+#: application/models.py:28 application/templates/application/overview.html:19
 msgid "Permitted"
 msgstr "Zugelassen"
 
-#: application/models.py:28 application/templates/application/overview.html:20
+#: application/models.py:29 application/templates/application/overview.html:20
 #: application/templates/application/view.html:175
 msgid "Accepted"
 msgstr "Angenommen"
 
-#: application/models.py:29 application/templates/application/overview.html:21
+#: application/models.py:30 application/templates/application/overview.html:21
 #: application/templates/application/view.html:180
 msgid "Rejected"
 msgstr "Abgelehnt"
 
-#: application/models.py:30
+#: application/models.py:31
 msgid "Withdrawed"
 msgstr "Zurückgezogen"
 
-#: application/models.py:31 application/templates/application/view.html:188
+#: application/models.py:32 application/templates/application/view.html:188
 msgid "Adjourned"
 msgstr "Vertagt"
 
 # please check!
-#: application/models.py:32 application/templates/application/view.html:191
+#: application/models.py:33 application/templates/application/view.html:191
 msgid "Not Concerned"
 msgstr "Nicht befasst"
 
 # please check!
-#: application/models.py:33 application/templates/application/view.html:194
+#: application/models.py:34 application/templates/application/view.html:194
 msgid "Commited a bill"
 msgstr "Verwiesen (in Ausschuss)"
 
-#: application/models.py:34
+#: application/models.py:35
 msgid "Rejected (not permitted)"
 msgstr "Verworfen (nicht zulässig)"
 
-#: application/models.py:117
+#: application/models.py:118
 msgid "Searching for supporters."
 msgstr "Auf Unterstützersuche."
 
-#: application/models.py:119
+#: application/models.py:120
 msgid "Not yet permitted."
 msgstr "Noch nicht zugelassen."
 
-#: application/models.py:121
+#: application/models.py:122
 msgid "Not yet permitted changes."
 msgstr "Noch nicht zugelassene Änderungen."
 
-#: application/models.py:181
+#: application/models.py:182
 #, python-format
 msgid "Version %s modified"
 msgstr "Version %s bearbeitet"
 
-#: application/models.py:190
+#: application/models.py:191
 #, python-format
 msgid "Version %s created"
 msgstr "Version %s erstellt"
 
-#: application/models.py:199
+#: application/models.py:200
 msgid "Supporters removed"
 msgstr "Unterstützer/innen gelöscht"
 
-#: application/models.py:208
+#: application/models.py:209
 #, python-format
 msgid "Status reseted to: %s"
 msgstr "Status zurückgesetzt auf: %s"
 
-#: application/models.py:221 application/views.py:157
+#: application/models.py:222 application/views.py:159
 #, python-format
 msgid "Supporter: +%s"
 msgstr "Unterstützer/in: +%s"
 
-#: application/models.py:231 application/views.py:168
+#: application/models.py:232 application/views.py:170
 #, python-format
 msgid "Supporter: -%s"
 msgstr "Unterstützer/in: -%s"
 
-#: application/models.py:247
+#: application/models.py:248
 #, python-format
 msgid "Number set: %s"
 msgstr "Nummer gesetzt: %s"
 
-#: application/models.py:260
+#: application/models.py:261
 #, python-format
 msgid "Version %s permitted"
 msgstr "Version %s zugelassen"
 
-#: application/models.py:274
+#: application/models.py:275
 #, python-format
 msgid "Version %s not permitted"
 msgstr "Version %s nicht zugelassen"
 
-#: application/models.py:300
+#: application/models.py:301
 msgid "Status modified"
 msgstr "Status geändert"
 
-#: application/models.py:419
+#: application/models.py:420
 msgid "Poll created"
 msgstr "Abstimmung erstellt"
 
-#: application/views.py:110
+#: application/views.py:112
 msgid "You have not the necessary rights to create or edit applications."
 msgstr ""
 "Sie haben nicht die nötigen Rechte, um Anträge zu erstellen oder zu "
 "bearbeiten."
 
-#: application/views.py:115
+#: application/views.py:117
 msgid "You can not edit this application. You are not the submitter."
 msgstr "Sie dürfen keine Anträge von anderen bearbeiten."
 
-#: application/views.py:170
+#: application/views.py:172
 msgid "New application was successfully created."
 msgstr "Neuer Antrag wurde erfolgreich angelegt."
 
-#: application/views.py:172
+#: application/views.py:174
 msgid "Application was successfully modified."
 msgstr "Antrag wurde erfolgreich geändert."
 
-#: application/views.py:184
+#: application/views.py:188
 msgid ""
 "Attention: Do you really want to edit this application? The supporters will "
 "<b>not</b> be removed automatically because you can manage applications. "
@@ -646,7 +648,7 @@ msgstr ""
 "werden <b>nicht</b> automatisch entfernt, da Sie Anträge verwalten dürfen. "
 "Prüfen Sie, ob die Unterstützungen noch gültig sind."
 
-#: application/views.py:186
+#: application/views.py:190
 #, python-format
 msgid ""
 "Attention: Do you really want to edit this application? All <b>%s</b> "
@@ -655,125 +657,125 @@ msgstr ""
 "Wollen Sie den Antrag wirklich ändern? Alle <b>%s</b> Unterstützer/innen "
 "werden dann automatisch entfernt. Versuchen Sie diese erneut zu gewinnen."
 
-#: application/views.py:216
+#: application/views.py:220
 #, python-format
 msgid "You can not delete application <b>%s</b>."
 msgstr "Sie können Antrag <b>%s</b> nicht löschen."
 
-#: application/views.py:222
+#: application/views.py:226
 #, python-format
 msgid "Application <b>%s</b> was successfully deleted."
 msgstr "Antrag <b>%s</b> wurde erfolgreich gelöscht."
 
-#: application/views.py:238
+#: application/views.py:242
 msgid "Application number was successfully set."
 msgstr "Antragsnummer wurde erfolgreich gesetzt."
 
-#: application/views.py:254
+#: application/views.py:258
 msgid "Application was successfully permitted."
 msgstr "Antrag wurde erfolgreich zugelassen."
 
-#: application/views.py:267
+#: application/views.py:271
 msgid "Application was successfully rejected."
 msgstr "Antrag wurde erfolgreich verworfen."
 
-#: application/views.py:281
+#: application/views.py:285
 #, python-format
 msgid "Application status was set to: <b>%s</b>."
 msgstr "Antragsstatus wurde gesetzt auf: <b>%s</b>"
 
-#: application/views.py:295
+#: application/views.py:299
 msgid "Application status was reset."
 msgstr "Antragsstatus wurde zurückgesetzt."
 
-#: application/views.py:309
+#: application/views.py:313
 msgid "You have support the application successfully."
 msgstr "Sie haben den Antrag erfolgreich unterstützt."
 
-#: application/views.py:323
+#: application/views.py:327
 msgid "You have unsupport the application successfully."
 msgstr "Sie haben dem Antrag erfolgreich Ihre Unterstützung entzogen."
 
-#: application/views.py:344
+#: application/views.py:348
 msgid "New vote was successfully created."
 msgstr "Neue Abstimmung erfolgreich angelegt."
 
-#: application/views.py:360
+#: application/views.py:364
 msgid "Poll was successfully deleted."
 msgstr "Abstimmung wurde erfolgreich gelöscht."
 
-#: application/views.py:362
+#: application/views.py:366
 #, python-format
 msgid "the %s. poll"
 msgstr "die %s. Abstimmung"
 
-#: application/views.py:392 assignment/views.py:227
+#: application/views.py:396 assignment/views.py:229
 msgid "Votes are successfully saved."
 msgstr "Stimmen erfolgreich gespeichert."
 
-#: application/views.py:416
+#: application/views.py:420
 #, python-format
 msgid "Version <b>%s</b> accepted."
 msgstr "Version <b>%s</b> akzeptiert."
 
-#: application/views.py:418
+#: application/views.py:422
 #, python-format
 msgid "Do you really want to permit version <b>%s</b>?"
 msgstr "Soll Version <b>%s</b> wirklich zugelassen werden?"
 
-#: application/views.py:428
+#: application/views.py:432
 #, python-format
 msgid "Version <b>%s</b> rejected."
 msgstr "Version <b>%s</b> zurückgewiesen."
 
-#: application/views.py:430
+#: application/views.py:434
 msgid "ERROR by rejecting the version."
 msgstr "FEHLER beim Zurückweisen der Version."
 
-#: application/views.py:432
+#: application/views.py:436
 #, python-format
 msgid "Do you really want to reject version <b>%s</b>?"
 msgstr "Soll Version <b>%s</b> wirklich zurückgewiesen werden?"
 
-#: application/views.py:440 participant/views.py:301
+#: application/views.py:444 participant/views.py:335
 msgid ""
 "The import function is available for the superuser (without user profile) "
 "only."
 msgstr ""
 "Die Importfunktion ist nur für den 'superuser' (ohne Nutzerprofil) verfügbar."
 
-#: application/views.py:463 application/views.py:467 application/views.py:473
-#: application/views.py:476
+#: application/views.py:470 application/views.py:474 application/views.py:480
+#: application/views.py:483
 #, python-format
 msgid "Ignoring malformed line %d in import file."
 msgstr "Fehlerhafte Zeile %d der Quelldatei wurde ignoriert."
 
-#: application/views.py:519
+#: application/views.py:526
 #, python-format
 msgid "%d application was successfully imported."
 msgid_plural "%d applications were successfully imported."
 msgstr[0] "%d Antrag wurde erfolgreich importiert."
 msgstr[1] "%d Anträge wurden erfolgreich importiert."
 
-#: application/views.py:522
+#: application/views.py:529
 #, python-format
 msgid "%d application was successfully modified."
 msgid_plural "%d applications were successfully modified."
 msgstr[0] "%d Antrag wurde erfolgreich geändert."
 msgstr[1] "%d Anträge wurden erfolgreich geändert."
 
-#: application/views.py:525
+#: application/views.py:532
 #, python-format
 msgid "%d new user was added."
 msgid_plural "%d new users were added."
 msgstr[0] "%d neuer Nutzer wurde erstellt."
 msgstr[1] "%d neue Nutzer wurden erstellt."
 
-#: application/views.py:529
+#: application/views.py:536 participant/views.py:387
 msgid "Import aborted because of severe errors in the input file."
 msgstr "Import auf Grund von schweren Fehlern in der Quelldatei abgebrochen."
 
-#: application/views.py:533
+#: application/views.py:540
 msgid ""
 "Attention: Existing applications will be modified if you import new "
 "applications with the same number."
@@ -781,7 +783,7 @@ msgstr ""
 "Achtung: Existierende Anträge werden geändert wenn Sie neue Anträge mit "
 "identischer Nummer importieren."
 
-#: application/views.py:534
+#: application/views.py:541
 msgid ""
 "Attention: Importing an application without a number multiple times will "
 "create duplicates."
@@ -792,7 +794,7 @@ msgstr ""
 #: application/templates/application/base_application.html:6
 #: application/templates/application/overview.html:2
 #: application/templates/application/overview.html:6
-#: application/templates/application/overview.html:26 system/models.py:22
+#: application/templates/application/overview.html:26 system/models.py:23
 #: templates/base.html:41 utils/pdf.py:429
 msgid "Applications"
 msgstr "Anträge"
@@ -839,13 +841,13 @@ msgstr ""
 "sind optional und können auch leer sein)"
 
 #: application/templates/application/import.html:12
-#: participant/templates/participant/import.html:12
+#: participant/templates/participant/import.html:14
 msgid "Import"
 msgstr "Importieren"
 
 #: application/templates/application/overview.html:8
 #: assignment/templates/assignment/overview.html:8
-#: participant/templates/participant/overview.html:9
+#: participant/templates/participant/overview.html:16
 msgid "Filter"
 msgstr "Filter"
 
@@ -1021,50 +1023,50 @@ msgstr "Nur zur Administration:"
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: application/templates/application/view.html:223
-#: application/templates/application/view.html:251
+#: application/templates/application/view.html:220
+#: application/templates/application/view.html:248
 msgid "Version"
 msgstr "Version"
 
-#: application/templates/application/view.html:226
+#: application/templates/application/view.html:223
 msgid "Show newest Version"
 msgstr "Neuste Version anzeigen"
 
-#: application/templates/application/view.html:228
+#: application/templates/application/view.html:225
 msgid "Show permitted Version"
 msgstr "Zugelassene Version anzeigen"
 
-#: application/templates/application/view.html:246
+#: application/templates/application/view.html:243
 msgid "Version History"
 msgstr "Versionshistorie"
 
-#: application/templates/application/view.html:252
+#: application/templates/application/view.html:249
 msgid "Time"
 msgstr "Zeit"
 
-#: application/templates/application/view.html:263
+#: application/templates/application/view.html:260
 msgid "Version accepted"
 msgstr "Version akzeptiert"
 
-#: application/templates/application/view.html:266
+#: application/templates/application/view.html:263
 msgid "Accept Version"
 msgstr "Zugelassene Version"
 
-#: application/templates/application/view.html:269
+#: application/templates/application/view.html:266
 msgid "Reject Version"
 msgstr "Verion zurückweisen"
 
-#: application/templates/application/view.html:273
+#: application/templates/application/view.html:270
 msgid "Version rejected"
 msgstr "Version zurückgewiesen"
 
-#: application/templates/application/view.html:283
-#: application/templates/application/view.html:290
-#: application/templates/application/view.html:297
+#: application/templates/application/view.html:280
+#: application/templates/application/view.html:287
+#: application/templates/application/view.html:294
 msgid "unchanged"
 msgstr "unverändert"
 
-#: application/templates/application/view.html:306
+#: application/templates/application/view.html:303
 msgid "Log"
 msgstr "Log"
 
@@ -1131,78 +1133,78 @@ msgstr "Neue Wahl wurde erfolgreich angelegt."
 msgid "Election was successfully modified."
 msgstr "Wahl wurde erfolgreich geändert."
 
-#: assignment/views.py:130
+#: assignment/views.py:132
 #, python-format
 msgid "Election <b>%s</b> was successfully deleted."
 msgstr "Wahl <b>%s</b> wurde erfolgreich gelöscht."
 
-#: assignment/views.py:143
+#: assignment/views.py:145
 #, python-format
 msgid "Election status was set to: <b>%s</b>."
 msgstr "Wahlstatus wurde gesetzt auf: <b>%s</b>."
 
-#: assignment/views.py:154
+#: assignment/views.py:156
 msgid "You have set your candidature successfully."
 msgstr "Sie haben Ihre Kandidatur erfolgreich gesetzt."
 
-#: assignment/views.py:159
+#: assignment/views.py:161
 msgid "You can't candidate. Your user account is only for administration."
 msgstr ""
 "Sie können nicht kandidieren. Ihr Nutzerkonto ist nur zur Administration."
 
-#: assignment/views.py:167
+#: assignment/views.py:169
 msgid "You have withdrawn your candidature successfully."
 msgstr "Sie haben Ihre Kandidatur erfolgreich zurückgezogen."
 
-#: assignment/views.py:178
+#: assignment/views.py:180
 #, python-format
 msgid "Candidate <b>%s</b> was withdrawn successfully."
 msgstr "Die Kandidatur von <b>%s</b> wurde erfolgreich zurückgezogen."
 
-#: assignment/views.py:181
+#: assignment/views.py:183
 #, python-format
 msgid "Do you really want to withdraw <b>%s</b> from the election?"
 msgstr "Soll <b>%s</b> wirklich von der Wahl zurückgezogen werden?"
 
-#: assignment/views.py:196
+#: assignment/views.py:198
 msgid "New ballot was successfully created."
 msgstr "Neuer Wahlgang erfolgreich angelegt."
 
-#: assignment/views.py:251
+#: assignment/views.py:253
 msgid "Poll successfully set to published."
 msgstr "Abstimmung wurde erfolgreich veröffentlicht."
 
-#: assignment/views.py:253
+#: assignment/views.py:255
 msgid "Poll successfully set to unpublished."
 msgstr "Abstimmung wurde erfolgreich unveröffentlicht."
 
-#: assignment/views.py:255
+#: assignment/views.py:257
 #, python-format
 msgid "Poll ID %d does not exist."
 msgstr "Abstimmungs-ID %d existiert nicht."
 
-#: assignment/views.py:265
+#: assignment/views.py:267
 #, python-format
 msgid "The %s. ballot was successfully deleted."
 msgstr "Der %s. Wahlgang wurde erfolgreich gelöscht."
 
-#: assignment/views.py:267
+#: assignment/views.py:269
 #, python-format
 msgid "the %s. ballot"
 msgstr "der %s. Wahlgang"
 
-#: assignment/views.py:279
+#: assignment/views.py:281
 msgid "not elected"
 msgstr "nicht gewählt"
 
-#: assignment/views.py:282 utils/pdf.py:623
+#: assignment/views.py:284 utils/pdf.py:623
 msgid "elected"
 msgstr "gewählt"
 
 #: assignment/templates/assignment/base_assignment.html:11
 #: assignment/templates/assignment/overview.html:2
 #: assignment/templates/assignment/overview.html:5
-#: assignment/templates/assignment/overview.html:21 system/models.py:23
+#: assignment/templates/assignment/overview.html:21 system/models.py:25
 #: templates/base.html:45 utils/pdf.py:642
 msgid "Elections"
 msgstr "Wahlen"
@@ -1317,117 +1319,101 @@ msgstr "Vorname"
 msgid "Last name"
 msgstr "Nachname"
 
-#: participant/models.py:22 participant/templates/participant/overview.html:14
-msgid "Not specified"
-msgstr "Nicht angegeben"
-
-#: participant/models.py:23 participant/templates/participant/overview.html:12
+#: participant/models.py:22 participant/templates/participant/overview.html:19
 msgid "Male"
 msgstr "Männlich"
 
-#: participant/models.py:24 participant/templates/participant/overview.html:13
+#: participant/models.py:23 participant/templates/participant/overview.html:20
 msgid "Female"
 msgstr "Weiblich"
 
-#: participant/models.py:27 participant/templates/participant/overview.html:25
+#: participant/models.py:26 participant/templates/participant/overview.html:32
 msgid "Delegate"
 msgstr "Delegierter"
 
-#: participant/models.py:28 participant/templates/participant/overview.html:26
+#: participant/models.py:27 participant/templates/participant/overview.html:33
 msgid "Observer"
 msgstr "Beobachter"
 
-#: participant/models.py:29 participant/templates/participant/overview.html:27
+#: participant/models.py:28 participant/templates/participant/overview.html:34
 msgid "Staff"
 msgstr "Mitarbeiter"
 
-#: participant/models.py:30 participant/templates/participant/overview.html:28
+#: participant/models.py:29 participant/templates/participant/overview.html:35
 msgid "Guest"
 msgstr "Gast"
 
-#: participant/models.py:34 participant/templates/participant/overview.html:11
+#: participant/models.py:33 participant/templates/participant/overview.html:18
 msgid "Gender"
 msgstr "Geschlecht"
 
-#: participant/models.py:35 participant/templates/participant/overview.html:17
-#: participant/templates/participant/overview.html:44 utils/pdf.py:263
+#: participant/models.py:34 participant/templates/participant/overview.html:24
+#: participant/templates/participant/overview.html:61 utils/pdf.py:263
 msgid "Group"
 msgstr "Gruppe"
 
-#: participant/models.py:36
+#: participant/models.py:35
 msgid "Typ"
 msgstr "Typ"
 
-#: participant/models.py:37 participant/templates/participant/overview.html:31
-#: participant/templates/participant/overview.html:46 utils/pdf.py:263
+#: participant/models.py:36 participant/templates/participant/overview.html:39
+#: participant/templates/participant/overview.html:63 utils/pdf.py:263
 msgid "Committee"
 msgstr "Amt"
 
+#: participant/models.py:37 participant/templates/participant/overview.html:65
+msgid "Comment"
+msgstr "Kommentar"
+
 #: participant/models.py:38
 msgid "First Password"
 msgstr "Erst-Passwort"
 
-#: participant/views.py:137
+#: participant/views.py:161
 msgid "New participant was successfully created."
 msgstr "Neue/r Teilnehmer/in wurde erfolgreich angelegt."
 
-#: participant/views.py:139
+#: participant/views.py:163
 msgid "Participant was successfully modified."
 msgstr "Teilnehmer/in wurde erfolgreich geändert."
 
-#: participant/views.py:166
+#: participant/views.py:190
 #, python-format
 msgid "Participant <b>%s</b> was successfully deleted."
 msgstr "Teilnehmer/in <b>%s</b> wurde erfolgreich gelöscht."
 
-#: participant/views.py:178
-#, python-format
-msgid "Participant <b>%s</b> is now a normal user."
-msgstr "Teilnehmer/in <b>%s</b> ist jetzt ein normaler Nutzer."
+#: participant/views.py:203 participant/views.py:222
+msgid "Participant %d does not exist."
+msgstr "Teinehmer/in %d existiert nicht."
 
-#: participant/views.py:182
-#, python-format
-msgid "Participant <b>%s</b> is now administrator."
-msgstr "Teilnehmer/in <b>%s</b> ist jetzt ein Administrator."
-
-#: participant/views.py:192
-#, python-format
-msgid "Participant <b>%s</b> was successfully deactivated."
-msgstr "Teilnehmer/in <b>%s</b> wurde erfolgreich deaktiviert."
-
-#: participant/views.py:196
-#, python-format
-msgid "Participant <b>%s</b> was successfully activated."
-msgstr "Teilnehmer/in <b>%s</b> wurde erfolgreich aktiviert."
-
-#: participant/views.py:234
+#: participant/views.py:268
 #, python-format
 msgid "Group name \"%s\" is reserved for internal use."
 msgstr "Der Gruppenname \"%s\" ist für interne Verwendung reserviert."
 
-#: participant/views.py:248
+#: participant/views.py:282
 msgid "New group was successfully created."
 msgstr "Neue Gruppe wurde erfolgreich angelegt."
 
-#: participant/views.py:250
+#: participant/views.py:284
 msgid "Group was successfully modified."
 msgstr "Gruppe wurde erfolgreich geändert."
 
-#: participant/views.py:269
+#: participant/views.py:303
 #, python-format
 msgid "Group <b>%s</b> was successfully deleted."
 msgstr "Gruppe <b>%s</b>  wurde erfolgreich gelöscht."
 
-#: participant/views.py:283
+#: participant/views.py:317
 msgid "User settings successfully saved."
 msgstr "Nutzereinstellungen wurden erfolgreich gespeichert."
 
-#: participant/views.py:344
+#: participant/views.py:384
 #, python-format
 msgid "%d new participants were successfully imported."
 msgstr "%d neue Teilnehmer/innen wurden erfolgreich importiert."
 
-#: participant/views.py:348
+#: participant/views.py:391
 msgid ""
 "Attention: All existing participants will be removed if you import new "
 "participants."
@@ -1435,19 +1421,21 @@ msgstr ""
 "Achtung: Alle existierenden Teilnehmer/innen werden gelöscht, wenn Sie neue "
 "Teilnehmer/innen importieren."
 
-#: participant/views.py:360
+#: participant/views.py:403
 #, python-format
 msgid "The Password for <b>%s</b> was successfully reset."
 msgstr "Das Passwort für <b>%s</b> wurde erfolgreich zurückgesetzt."
 
-#: participant/views.py:362
+#: participant/views.py:405
 #, python-format
 msgid "Do you really want to reset the password for <b>%s</b>?"
 msgstr "Soll das Passwort für <b>%s</b> wirklich zurückgesetzt werden?"
 
 #: participant/templates/participant/base_participant.html:9
 #: participant/templates/participant/overview.html:2
-#: participant/templates/participant/overview.html:5 templates/base.html:49
+#: participant/templates/participant/overview.html:12
+#: participant/templates/participant/overview.html:53
+#: participant/templates/participant/overview.html:55 templates/base.html:49
 msgid "Participants"
 msgstr "Teilnehmer/innen"
 
@@ -1483,13 +1471,12 @@ msgstr "Teilnehmerliste drucken"
 msgid "Print first time passwords"
 msgstr "Erst-Passwörter drucken"
 
-#: participant/templates/participant/edit.html:2
-#: participant/templates/participant/overview.html:39 poll/models.py:137
+#: participant/templates/participant/edit.html:2 poll/models.py:137
 msgid "Participant"
 msgstr "Teilnehmer/in"
 
 #: participant/templates/participant/edit.html:6
-#: participant/templates/participant/overview.html:68
+#: participant/templates/participant/overview.html:83
 msgid "Edit participant"
 msgstr "Teilnehmer/in bearbeiten"
 
@@ -1527,7 +1514,7 @@ msgid "Delete group"
 msgstr "Benutzergruppe löschen"
 
 #: participant/templates/participant/group_overview.html:22
-#: participant/templates/participant/overview.html:86
+#: participant/templates/participant/overview.html:101
 msgid "No participants available."
 msgstr "Keine Teilnehmer/innen vorhanden."
 
@@ -1537,11 +1524,15 @@ msgstr "Wählen Sie eine CSV-Datei zum Importieren von Teilnehmer/innen aus!"
 
 #: participant/templates/participant/import.html:8
 msgid ""
-"(Required comma separated values: <code>first_name, last_name, gender, "
-"group, type, committee</code>)"
+"Required comma separated values: <code>first_name, last_name, gender, group, "
+"type, committee, comment</code>"
 msgstr ""
 "(Erfordert kommaseparierte Werte: <code>Vorname, Nachname, Geschlecht, "
-"Gruppe, Typ, Amt</code>)"
+"Gruppe, Typ, Amt, Kommentar</code>)"
+
+#: participant/templates/participant/import.html:9
+msgid "CSV file encoding: UTF-8 (Unicode)."
+msgstr "CSV-Datei-Encoding: UTF-8 (Unicode)."
 
 #: participant/templates/participant/login.html:5
 #: participant/templates/participant/login.html:13
@@ -1562,45 +1553,46 @@ msgstr ""
 msgid "Continue as guest"
 msgstr "Weiter als Gast"
 
-#: participant/templates/participant/overview.html:42 utils/pdf.py:263
+#: participant/templates/participant/overview.html:21
+#: participant/templates/participant/overview.html:36
+msgid "Not specified"
+msgstr "Nicht angegeben"
+
+#: participant/templates/participant/overview.html:47
+msgid "Active"
+msgstr "Aktiv (anwesend)"
+
+#: participant/templates/participant/overview.html:48
+msgid "Inactive"
+msgstr "Inaktiv (abwesend)"
+
+#: participant/templates/participant/overview.html:55
+msgid "of"
+msgstr "von"
+
+#: participant/templates/participant/overview.html:59 utils/pdf.py:263
 msgid "First Name"
 msgstr "Vorname"
 
-#: participant/templates/participant/overview.html:43 utils/pdf.py:263
+#: participant/templates/participant/overview.html:60 utils/pdf.py:263
 msgid "Last Name"
 msgstr "Nachname"
 
-#: participant/templates/participant/overview.html:48
-msgid "Username"
-msgstr "Nutzername"
-
-#: participant/templates/participant/overview.html:49
-msgid "Email"
-msgstr "E-Mail"
-
-#: participant/templates/participant/overview.html:50
+#: participant/templates/participant/overview.html:66
 msgid "Last Login"
 msgstr "Letzer Login"
 
-#: participant/templates/participant/overview.html:69
+#: participant/templates/participant/overview.html:84
 msgid "Delete participant"
 msgstr "Teilnehmer/in löschen"
 
-#: participant/templates/participant/overview.html:71
-msgid "Participiant is activated. Click to deactivate!"
-msgstr "Teilnehmer/in ist aktiviert. Zum Deaktivieren klicken!"
+#: participant/templates/participant/overview.html:87
+msgid "Change status (active/inactive)"
+msgstr "Status ändern (aktiv/inaktiv)"
 
-#: participant/templates/participant/overview.html:73
-msgid "Participiant is deactivated. Click to activate!"
-msgstr "Teilnehmer/in ist deaktiviert, Zum Aktivieren klicken!"
-
-#: participant/templates/participant/overview.html:76
-msgid "Administrator. Click to get normal user!"
-msgstr "Administrator. Klicken, um normaler Nutzer zu werden!"
-
-#: participant/templates/participant/overview.html:78
-msgid "Normal user. Click to get administrator!"
-msgstr "Normaler Nutzer. Klicken, um Administrator zu werden!"
+#: participant/templates/participant/overview.html:92
+msgid "Change administrator rights (Superuser/Normal user)"
+msgstr "Adminstratorrechte ändern (Superuser/normaler Nutzer)"
 
 #: participant/templates/participant/settings.html:2
 #: participant/templates/participant/settings.html:8
@@ -1675,23 +1667,23 @@ msgstr "Mindestanzahl erforderlicher Unterstützer/innen für einen Antrag"
 msgid "Application preamble"
 msgstr "Antragseinleitung"
 
-#: system/forms.py:48 system/forms.py:59
+#: system/forms.py:48 system/forms.py:58
 msgid "Number of ballot papers (selection)"
 msgstr "Anzahl der Wahlscheine (Vorauswahl)"
 
-#: system/forms.py:48 system/forms.py:59
+#: system/forms.py:48 system/forms.py:58
 msgid "Number of all delegates"
 msgstr "Anzahl aller Delegierten"
 
-#: system/forms.py:48 system/forms.py:59
+#: system/forms.py:48 system/forms.py:58
 msgid "Number of all participants"
 msgstr "Anzahl aller Teilnehmer/innen"
 
-#: system/forms.py:48 system/forms.py:59
+#: system/forms.py:48 system/forms.py:58
 msgid "Use the following custum number"
 msgstr "Verwende die folgende benutzerdefinierte Anzahl"
 
-#: system/forms.py:49 system/forms.py:60
+#: system/forms.py:49 system/forms.py:59
 msgid "Custom number of ballot papers"
 msgstr "Benutzerdefinierte Anzahl von Wahlscheinen"
 
@@ -1704,10 +1696,14 @@ msgid "Preamble text for PDF document (all applications)"
 msgstr "Einleitungstext für PDF-Dokument (alle Anträge)"
 
 #: system/forms.py:57
+msgid "Only publish voting results for selected winners (Projector view only)"
+msgstr "Wahlergebnisse der nicht gewählten Kandidaten auf dem Beamer verbergen"
+
+#: system/forms.py:60
 msgid "Title for PDF document (all elections)"
 msgstr "Titel für PDF-Dokument (alle Wahlen)"
 
-#: system/forms.py:58
+#: system/forms.py:61
 msgid "Preamble text for PDF document (all elections)"
 msgstr "Einleitungstext für PDF-Dokument (alle Wahlen) "
 
@@ -1715,19 +1711,19 @@ msgstr "Einleitungstext für PDF-Dokument (alle Wahlen) "
 msgid "General settings successfully saved."
 msgstr "Allgemeine Einstellungen erfolgreich gespeichert."
 
-#: system/views.py:53
+#: system/views.py:57
 msgid "Agenda settings successfully saved."
 msgstr "Tagesordnungs-Einstellungen erfolgreich gespeichert."
 
-#: system/views.py:77
+#: system/views.py:81
 msgid "Application settings successfully saved."
 msgstr "Antrags-Einstellungen erfolgreich gespeichert."
 
-#: system/views.py:103
+#: system/views.py:111
 msgid "Election settings successfully saved."
 msgstr "Wahl-Einstellungen wurden erfolgreich gespeichert."
 
-#: system/views.py:137
+#: system/views.py:146
 msgid ""
 "Anonymous access enabled. Please modify the \"Anonymous\" group to fit your "
 "required permissions."
@@ -1735,7 +1731,7 @@ msgstr ""
 "Anonymer Zugriff aktiviert. Bitte setzen Sie die Rechte der Gruppe "
 "\"Anonymous\" passend zum gewünschten Zugriffslevel."
 
-#: system/views.py:141
+#: system/views.py:150
 msgid "System settings successfully saved."
 msgstr "Systemeinstellungen erfolgreich gespeichert."
 
@@ -1872,5 +1868,35 @@ msgstr "verfügbare Posten"
 msgid "Sorry, you have no rights to see this page."
 msgstr "Bedaure, Sie haben keine Berechtigung diese Seite zu sehen."
 
+#~ msgid "Participant <b>%s</b> is now a normal user."
+#~ msgstr "Teilnehmer/in <b>%s</b> ist jetzt ein normaler Nutzer."
+
+#~ msgid "Participant <b>%s</b> is now administrator."
+#~ msgstr "Teilnehmer/in <b>%s</b> ist jetzt ein Administrator."
+
+#~ msgid "Participant <b>%s</b> was successfully deactivated."
+#~ msgstr "Teilnehmer/in <b>%s</b> wurde erfolgreich deaktiviert."
+
+#~ msgid "Participant <b>%s</b> was successfully activated."
+#~ msgstr "Teilnehmer/in <b>%s</b> wurde erfolgreich aktiviert."
+
+#~ msgid "Username"
+#~ msgstr "Nutzername"
+
+#~ msgid "Email"
+#~ msgstr "E-Mail"
+
+#~ msgid "Participiant is activated. Click to deactivate!"
+#~ msgstr "Teilnehmer/in ist aktiviert. Zum Deaktivieren klicken!"
+
+#~ msgid "Participiant is deactivated. Click to activate!"
+#~ msgstr "Teilnehmer/in ist deaktiviert, Zum Aktivieren klicken!"
+
+#~ msgid "Administrator. Click to get normal user!"
+#~ msgstr "Administrator. Klicken, um normaler Nutzer zu werden!"
+
+#~ msgid "Normal user. Click to get administrator!"
+#~ msgstr "Normaler Nutzer. Klicken, um Administrator zu werden!"
+
 #~ msgid "Event"
 #~ msgstr "Veranstaltung"

From 07a83f142b740160db41bc870d3511777f82c538 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rene=CC=81=20Ko=CC=88cher?= <shirk@bitspin.org>
Date: Wed, 11 Apr 2012 14:49:24 +0200
Subject: [PATCH 13/13] #84: Participants CSV import deletes applications

---
 openslides/application/models.py              |   6 +
 .../templates/application/overview.html       |   1 +
 .../templates/application/view.html           |   5 +-
 openslides/locale/de/LC_MESSAGES/django.mo    | Bin 28129 -> 30044 bytes
 openslides/locale/de/LC_MESSAGES/django.po    | 229 ++++++++++++------
 openslides/participant/forms.py               |   9 +-
 openslides/participant/views.py               |  79 ++++++
 7 files changed, 248 insertions(+), 81 deletions(-)

diff --git a/openslides/application/models.py b/openslides/application/models.py
index 0cedf991b..fb5404816 100644
--- a/openslides/application/models.py
+++ b/openslides/application/models.py
@@ -33,6 +33,7 @@ class Application(models.Model):
         ('noc', _('Not Concerned')),
         ('com', _('Commited a bill')),
         ('nop', _('Rejected (not permitted)')),
+        ('rev', _('Needs Review')),
         #additional actions:
         # edit
         # delete
@@ -319,6 +320,11 @@ class Application(models.Model):
         or (self.status == "per" \
           and user.has_perm("application.can_manage_application")):
             actions.append("wit")
+        #Check if the user can review the application
+        if self.status == "rev" \
+        and (self.submitter == user \
+          or user.has_perm("application.can_manage_application")):
+            actions.append("pub")
         try:
         # Check if the user can support and unspoort the application
             if  self.status == "pub" \
diff --git a/openslides/application/templates/application/overview.html b/openslides/application/templates/application/overview.html
index c1a42d47e..ed9a56a34 100644
--- a/openslides/application/templates/application/overview.html
+++ b/openslides/application/templates/application/overview.html
@@ -20,6 +20,7 @@
             <option value="acc" {% if 'on' in request.GET.status and 'acc' in request.GET.statusvalue %}selected{% endif %}>{%trans "Accepted" %}</option>
             <option value="rej" {% if 'on' in request.GET.status and 'rej' in request.GET.statusvalue %}selected{% endif %}>{%trans "Rejected" %}</option>
             <option value="wit" {% if 'on' in request.GET.status and 'wit' in request.GET.statusvalue %}selected{% endif %}>{%trans "Withdrawed (by submitter)" %}</option>
+            <option value="rev" {% if 'rev' in request.GET.statusvalue %}selected{% endif %}>{%trans "Needs Review" %}</option>
         </select>
         </form>
     </p>
diff --git a/openslides/application/templates/application/view.html b/openslides/application/templates/application/view.html
index 1e68decab..21ab53c79 100644
--- a/openslides/application/templates/application/view.html
+++ b/openslides/application/templates/application/view.html
@@ -140,8 +140,11 @@
     <div class="box">
     <h4><b>{% trans "Manage application" %}</b></h4>
 
-    {% if "per" in actions or "nop" in actions or "setnumber" in actions %}
+    {% if "pub" in actions or "per" in actions or "nop" in actions or "setnumber" in actions %}
         <h4>{% trans "Formal validation" %}:</h4>
+        {% if "pub" in actions %}
+        <a href='{% url application_set_status application.id 'pub' %}'><span class="button"><span class="icon ok-blue">{% trans 'Publish' %}</span></span></a>
+        {% endif %}
         {% if "per" in actions %}
         <a href='{% url application_permit application.id %}'><span class="button"><span class="icon ok-blue">{% trans 'Permit' %}</span></span></a>
         {% endif %}
diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo
index d75ab93e644b599a0e4237d729f6e9b821d3712e..0b96e3e243495743599cd6c4226874dbd4ec12c5 100644
GIT binary patch
delta 10263
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
W1$OVuonOF<6<iWbtsLvFjrlJ`-18Oy

delta 8544
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

diff --git a/openslides/locale/de/LC_MESSAGES/django.po b/openslides/locale/de/LC_MESSAGES/django.po
index 28910ba3e..63058f599 100644
--- a/openslides/locale/de/LC_MESSAGES/django.po
+++ b/openslides/locale/de/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-02 07:48+0200\n"
+"POT-Creation-Date: 2012-04-11 14:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -53,8 +53,8 @@ msgstr "Nein"
 msgid "Yes, with all child items."
 msgstr "Ja, mit allen Kindelementen."
 
-#: agenda/api.py:71 agenda/api.py:73 participant/views.py:192
-#: participant/views.py:305 utils/utils.py:40
+#: agenda/api.py:71 agenda/api.py:73 participant/views.py:193
+#: participant/views.py:306 utils/utils.py:40
 #, python-format
 msgid "Do you really want to delete <b>%s</b>?"
 msgstr "Soll <b>%s</b> wirklich gelöscht werden?"
@@ -64,7 +64,7 @@ msgid "Parent item"
 msgstr "Elternelement"
 
 #: agenda/models.py:35 application/forms.py:41
-#: application/templates/application/view.html:250
+#: application/templates/application/view.html:253
 msgid "Title"
 msgstr "Titel"
 
@@ -86,7 +86,7 @@ msgid "No Form for itemtype %s"
 msgstr "Kein Formular für Eintrag %s"
 
 #: agenda/models.py:189 application/forms.py:42
-#: application/templates/application/view.html:251 poll/models.py:136
+#: application/templates/application/view.html:254 poll/models.py:136
 msgid "Text"
 msgstr "Text"
 
@@ -94,7 +94,7 @@ msgstr "Text"
 #: agenda/templates/agenda/overview.html:220
 #: application/templates/application/edit.html:2
 #: application/templates/application/view.html:2
-#: application/templates/application/view.html:217 poll/models.py:23
+#: application/templates/application/view.html:220 poll/models.py:23
 #: poll/models.py:138 system/templates/system/base_system.html:14
 #: utils/pdf.py:458 utils/pdf.py:470
 msgid "Application"
@@ -147,8 +147,8 @@ msgid "Agenda item modified"
 msgstr "Tagesordnungseintrag geändert"
 
 #: agenda/views.py:286 application/views.py:181 application/views.py:538
-#: assignment/views.py:118 participant/views.py:169 participant/views.py:290
-#: participant/views.py:319 participant/views.py:389 system/views.py:37
+#: assignment/views.py:118 participant/views.py:170 participant/views.py:291
+#: participant/views.py:320 participant/views.py:465 system/views.py:37
 #: system/views.py:59 system/views.py:83 system/views.py:113
 #: system/views.py:152
 msgid "Please check the form for errors."
@@ -373,7 +373,7 @@ msgstr "Keine Einträge vorhanden."
 #: agenda/templates/beamer/ItemApplication.html:8
 #: agenda/templates/beamer/ItemAssignment.html:13
 #: application/templates/application/overview.html:16
-#: application/templates/application/overview.html:34
+#: application/templates/application/overview.html:35
 #: application/templates/application/view.html:35
 #: assignment/templates/assignment/overview.html:10
 #: assignment/templates/assignment/overview.html:23
@@ -383,7 +383,7 @@ msgid "Status"
 msgstr "Status"
 
 #: agenda/templates/beamer/ItemApplication.html:19 application/forms.py:51
-#: application/models.py:47 application/templates/application/overview.html:35
+#: application/models.py:48 application/templates/application/overview.html:36
 #: application/templates/application/view.html:9 utils/pdf.py:350
 msgid "Submitter"
 msgstr "Antragsteller/in"
@@ -436,14 +436,14 @@ msgstr "Keine Abstimmungen vorhanden."
 #: agenda/templates/beamer/ItemApplication.html:50
 #: application/templates/application/poll_view.html:8
 #: application/templates/application/poll_view.html:16
-#: application/templates/application/view.html:215 utils/pdf.py:342
+#: application/templates/application/view.html:218 utils/pdf.py:342
 #: utils/pdf.py:344 utils/pdf.py:445 utils/pdf.py:447 utils/pdf.py:479
 msgid "Application No."
 msgstr "Antrag Nr."
 
 #: agenda/templates/beamer/ItemApplication.html:56 application/forms.py:43
-#: application/templates/application/view.html:233
-#: application/templates/application/view.html:253 utils/pdf.py:421
+#: application/templates/application/view.html:236
+#: application/templates/application/view.html:256 utils/pdf.py:421
 msgid "Reason"
 msgstr "Begründung"
 
@@ -507,12 +507,12 @@ msgstr "Triviale Änderung"
 msgid "Trivial changes don't create a new version."
 msgstr "Triviale Änderungen erzeugen keine neue Version."
 
-#: application/forms.py:52 application/models.py:49
+#: application/forms.py:52 application/models.py:50
 #: application/templates/application/view.html:23 utils/pdf.py:363
 msgid "Supporters"
 msgstr "Unterstützer/innen"
 
-#: application/forms.py:62 participant/forms.py:93
+#: application/forms.py:62 participant/forms.py:99
 msgid "CSV File"
 msgstr "CSV-Datei"
 
@@ -525,12 +525,12 @@ msgid "Permitted"
 msgstr "Zugelassen"
 
 #: application/models.py:29 application/templates/application/overview.html:20
-#: application/templates/application/view.html:175
+#: application/templates/application/view.html:178
 msgid "Accepted"
 msgstr "Angenommen"
 
 #: application/models.py:30 application/templates/application/overview.html:21
-#: application/templates/application/view.html:180
+#: application/templates/application/view.html:183
 msgid "Rejected"
 msgstr "Abgelehnt"
 
@@ -538,17 +538,17 @@ msgstr "Abgelehnt"
 msgid "Withdrawed"
 msgstr "Zurückgezogen"
 
-#: application/models.py:32 application/templates/application/view.html:188
+#: application/models.py:32 application/templates/application/view.html:191
 msgid "Adjourned"
 msgstr "Vertagt"
 
 # please check!
-#: application/models.py:33 application/templates/application/view.html:191
+#: application/models.py:33 application/templates/application/view.html:194
 msgid "Not Concerned"
 msgstr "Nicht befasst"
 
 # please check!
-#: application/models.py:34 application/templates/application/view.html:194
+#: application/models.py:34 application/templates/application/view.html:197
 msgid "Commited a bill"
 msgstr "Verwiesen (in Ausschuss)"
 
@@ -556,67 +556,71 @@ msgstr "Verwiesen (in Ausschuss)"
 msgid "Rejected (not permitted)"
 msgstr "Verworfen (nicht zulässig)"
 
-#: application/models.py:118
+#: application/models.py:36 application/templates/application/overview.html:23
+msgid "Needs Review"
+msgstr "Benötigt Review"
+
+#: application/models.py:119
 msgid "Searching for supporters."
 msgstr "Auf Unterstützersuche."
 
-#: application/models.py:120
+#: application/models.py:121
 msgid "Not yet permitted."
 msgstr "Noch nicht zugelassen."
 
-#: application/models.py:122
+#: application/models.py:123
 msgid "Not yet permitted changes."
 msgstr "Noch nicht zugelassene Änderungen."
 
-#: application/models.py:182
+#: application/models.py:183
 #, python-format
 msgid "Version %s modified"
 msgstr "Version %s bearbeitet"
 
-#: application/models.py:191
+#: application/models.py:192
 #, python-format
 msgid "Version %s created"
 msgstr "Version %s erstellt"
 
-#: application/models.py:200
+#: application/models.py:201
 msgid "Supporters removed"
 msgstr "Unterstützer/innen gelöscht"
 
-#: application/models.py:209
+#: application/models.py:210
 #, python-format
 msgid "Status reseted to: %s"
 msgstr "Status zurückgesetzt auf: %s"
 
-#: application/models.py:222 application/views.py:159
+#: application/models.py:223 application/views.py:159
 #, python-format
 msgid "Supporter: +%s"
 msgstr "Unterstützer/in: +%s"
 
-#: application/models.py:232 application/views.py:170
+#: application/models.py:233 application/views.py:170
 #, python-format
 msgid "Supporter: -%s"
 msgstr "Unterstützer/in: -%s"
 
-#: application/models.py:248
+#: application/models.py:249
 #, python-format
 msgid "Number set: %s"
 msgstr "Nummer gesetzt: %s"
 
-#: application/models.py:261
+#: application/models.py:262
 #, python-format
 msgid "Version %s permitted"
 msgstr "Version %s zugelassen"
 
-#: application/models.py:275
+#: application/models.py:276
 #, python-format
 msgid "Version %s not permitted"
 msgstr "Version %s nicht zugelassen"
 
-#: application/models.py:301
+#: application/models.py:302
 msgid "Status modified"
 msgstr "Status geändert"
 
-#: application/models.py:420
+#: application/models.py:426
 msgid "Poll created"
 msgstr "Abstimmung erstellt"
 
@@ -737,7 +741,7 @@ msgstr "FEHLER beim Zurückweisen der Version."
 msgid "Do you really want to reject version <b>%s</b>?"
 msgstr "Soll Version <b>%s</b> wirklich zurückgewiesen werden?"
 
-#: application/views.py:444 participant/views.py:335
+#: application/views.py:444 participant/views.py:336
 msgid ""
 "The import function is available for the superuser (without user profile) "
 "only."
@@ -771,7 +775,7 @@ msgid_plural "%d new users were added."
 msgstr[0] "%d neuer Nutzer wurde erstellt."
 msgstr[1] "%d neue Nutzer wurden erstellt."
 
-#: application/views.py:536 participant/views.py:387
+#: application/views.py:536 participant/views.py:463
 msgid "Import aborted because of severe errors in the input file."
 msgstr "Import auf Grund von schweren Fehlern in der Quelldatei abgebrochen."
 
@@ -794,7 +798,7 @@ msgstr ""
 #: application/templates/application/base_application.html:6
 #: application/templates/application/overview.html:2
 #: application/templates/application/overview.html:6
-#: application/templates/application/overview.html:26 system/models.py:23
+#: application/templates/application/overview.html:27 system/models.py:23
 #: templates/base.html:41 utils/pdf.py:429
 msgid "Applications"
 msgstr "Anträge"
@@ -867,24 +871,24 @@ msgstr "Noch nicht zugelassen"
 msgid "Withdrawed (by submitter)"
 msgstr "Zurückgezogen (durch Antragsteller/in)"
 
-#: application/templates/application/overview.html:29
+#: application/templates/application/overview.html:30
 msgid "Number"
 msgstr "Nummer"
 
-#: application/templates/application/overview.html:30
+#: application/templates/application/overview.html:31
 msgid "Application title"
 msgstr "Antragstitel"
 
-#: application/templates/application/overview.html:32
+#: application/templates/application/overview.html:33
 msgid "Number of supporters"
 msgstr "Anzahl der Unterstützer/innen"
 
-#: application/templates/application/overview.html:36
+#: application/templates/application/overview.html:37
 #: application/templates/application/view.html:102
 msgid "Creation Time"
 msgstr "Erstellungszeit"
 
-#: application/templates/application/overview.html:58
+#: application/templates/application/overview.html:59
 msgid "No applications available."
 msgstr "Keine Anträge vorhanden."
 
@@ -982,91 +986,95 @@ msgid "Formal validation"
 msgstr "Formale Gültigkeitsprüfung"
 
 #: application/templates/application/view.html:146
+msgid "Publish"
+msgstr "Veröffentlichen"
+
+#: application/templates/application/view.html:149
 msgid "Permit"
 msgstr "Zulassen"
 
-#: application/templates/application/view.html:149
+#: application/templates/application/view.html:152
 msgid "Not permit (reject)"
 msgstr "Nicht zulassen (verwerfen)"
 
-#: application/templates/application/view.html:152
+#: application/templates/application/view.html:155
 msgid "Set Number"
 msgstr "Setze Nummer"
 
-#: application/templates/application/view.html:160
+#: application/templates/application/view.html:163
 #: assignment/templates/assignment/view.html:43
 msgid "New agenda item"
 msgstr "Neuer Tagesordnungseintrag"
 
-#: application/templates/application/view.html:167
+#: application/templates/application/view.html:170
 #: assignment/templates/assignment/view.html:50
 msgid "Show agenda item"
 msgstr "Zeige Tagesordnungseintrag"
 
-#: application/templates/application/view.html:172
+#: application/templates/application/view.html:175
 msgid "Result after vote"
 msgstr "Ergebnis nach der Abstimmung"
 
-#: application/templates/application/view.html:186
+#: application/templates/application/view.html:189
 msgid "Result after debate"
 msgstr "Ergebnis nach der Debatte"
 
-#: application/templates/application/view.html:197
+#: application/templates/application/view.html:200
 msgid "Withdrawed by Submitter"
 msgstr "Zurückgezogen durch Antragsteller/in"
 
-#: application/templates/application/view.html:203
+#: application/templates/application/view.html:206
 msgid "For Administration only:"
 msgstr "Nur zur Administration:"
 
-#: application/templates/application/view.html:205
+#: application/templates/application/view.html:208
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: application/templates/application/view.html:220
-#: application/templates/application/view.html:248
+#: application/templates/application/view.html:223
+#: application/templates/application/view.html:251
 msgid "Version"
 msgstr "Version"
 
-#: application/templates/application/view.html:223
+#: application/templates/application/view.html:226
 msgid "Show newest Version"
 msgstr "Neuste Version anzeigen"
 
-#: application/templates/application/view.html:225
+#: application/templates/application/view.html:228
 msgid "Show permitted Version"
 msgstr "Zugelassene Version anzeigen"
 
-#: application/templates/application/view.html:243
+#: application/templates/application/view.html:246
 msgid "Version History"
 msgstr "Versionshistorie"
 
-#: application/templates/application/view.html:249
+#: application/templates/application/view.html:252
 msgid "Time"
 msgstr "Zeit"
 
-#: application/templates/application/view.html:260
+#: application/templates/application/view.html:263
 msgid "Version accepted"
 msgstr "Version akzeptiert"
 
-#: application/templates/application/view.html:263
+#: application/templates/application/view.html:266
 msgid "Accept Version"
 msgstr "Zugelassene Version"
 
-#: application/templates/application/view.html:266
+#: application/templates/application/view.html:269
 msgid "Reject Version"
 msgstr "Verion zurückweisen"
 
-#: application/templates/application/view.html:270
+#: application/templates/application/view.html:273
 msgid "Version rejected"
 msgstr "Version zurückgewiesen"
 
-#: application/templates/application/view.html:280
-#: application/templates/application/view.html:287
-#: application/templates/application/view.html:294
+#: application/templates/application/view.html:283
+#: application/templates/application/view.html:290
+#: application/templates/application/view.html:297
 msgid "unchanged"
 msgstr "unverändert"
 
-#: application/templates/application/view.html:303
+#: application/templates/application/view.html:306
 msgid "Log"
 msgstr "Log"
 
@@ -1311,14 +1319,30 @@ msgstr "Abstimmung löschen"
 msgid "New ballot"
 msgstr "Neuer Wahlgang"
 
-#: participant/forms.py:37 participant/forms.py:48
+#: participant/forms.py:34
+msgid "Keep applications, try to reassign submitter"
+msgstr "Anträge beibehalten, versuchen Antragssteller erneut zuzuweisen"
+
+#: participant/forms.py:35
+msgid "Keep applications, set status to \"needs review\""
+msgstr "Anträge beibehalten, Stauts auf \"Benötigt Review\" setzen"
+
+#: participant/forms.py:36
+msgid "Discard applications"
+msgstr "Alle Anträge löschen"
+
+#: participant/forms.py:43 participant/forms.py:54
 msgid "First name"
 msgstr "Vorname"
 
-#: participant/forms.py:38 participant/forms.py:49
+#: participant/forms.py:44 participant/forms.py:55
 msgid "Last name"
 msgstr "Nachname"
 
+#: participant/forms.py:100
+msgid "For existing applications"
+msgstr "Bei existierenden Anträgen"
+
 #: participant/models.py:22 participant/templates/participant/overview.html:19
 msgid "Male"
 msgstr "Männlich"
@@ -1369,51 +1393,86 @@ msgstr "Kommentar"
 msgid "First Password"
 msgstr "Erst-Passwort"
 
-#: participant/views.py:161
+#: participant/views.py:162
 msgid "New participant was successfully created."
 msgstr "Neue/r Teilnehmer/in wurde erfolgreich angelegt."
 
-#: participant/views.py:163
+#: participant/views.py:164
 msgid "Participant was successfully modified."
 msgstr "Teilnehmer/in wurde erfolgreich geändert."
 
-#: participant/views.py:190
+#: participant/views.py:191
 #, python-format
 msgid "Participant <b>%s</b> was successfully deleted."
 msgstr "Teilnehmer/in <b>%s</b> wurde erfolgreich gelöscht."
 
-#: participant/views.py:203 participant/views.py:222
+#: participant/views.py:204 participant/views.py:223
+#, python-format
 msgid "Participant %d does not exist."
 msgstr "Teinehmer/in %d existiert nicht."
 
-#: participant/views.py:268
+#: participant/views.py:269
 #, python-format
 msgid "Group name \"%s\" is reserved for internal use."
 msgstr "Der Gruppenname \"%s\" ist für interne Verwendung reserviert."
 
-#: participant/views.py:282
+#: participant/views.py:283
 msgid "New group was successfully created."
 msgstr "Neue Gruppe wurde erfolgreich angelegt."
 
-#: participant/views.py:284
+#: participant/views.py:285
 msgid "Group was successfully modified."
 msgstr "Gruppe wurde erfolgreich geändert."
 
-#: participant/views.py:303
+#: participant/views.py:304
 #, python-format
 msgid "Group <b>%s</b> was successfully deleted."
 msgstr "Gruppe <b>%s</b>  wurde erfolgreich gelöscht."
 
-#: participant/views.py:317
+#: participant/views.py:318
 msgid "User settings successfully saved."
 msgstr "Nutzereinstellungen wurden erfolgreich gespeichert."
 
 #: participant/views.py:384
+msgid "Supporters removed after user import."
+msgstr "Unterstützer/innen nach Benutzerimport zurückgesetzt."
+
+#: participant/views.py:431
+#, python-format
+msgid "Reassigned to \"%s\" after (re)importing users."
+msgstr "Nach Benutzerimport erneut \"%s\" zugeordnet."
+
+#: participant/views.py:434 participant/views.py:448
+#, python-format
+msgid "Could not reassing application %d - object not found!"
+msgstr "Antrag Id#%d konnte nicht neu zugewiesen werden - "
+"Das Objekt wurde nicht gefunden!"
+
+#: participant/views.py:451
+#, python-format
+msgid "%d application could not be reassigned and needs a review!"
+msgid_plural "%d applications could not be reassigned and need a review!"
+msgstr[0] "%d Antrag konnte nicht neu zugewiesen werden and benötigt ein Review!"
+msgstr[1] "%d Anträge konnten nicht neu zugewiesen werden und benötigen ein Review!"
+
+#: participant/views.py:454
+msgid "%d application was successfully reassigned."
+msgid_plural "%d applications were successfully reassigned."
+msgstr[0] "%d Antrag wurde erfolgreich neu zugewiesen."
+msgstr[1] "%d Anträge wurden erfolgreich neu zugewiesen."
+
+#: participant/views.py:457
+msgid "%d application was discarded."
+msgid_plural "%d applications were discarded."
+msgstr[0] "%d Antrag wurde gelöscht."
+msgstr[1] "%d Anträge wurden gelöscht."
+
+#: participant/views.py:460
 #, python-format
 msgid "%d new participants were successfully imported."
 msgstr "%d neue Teilnehmer/innen wurden erfolgreich importiert."
 
-#: participant/views.py:391
+#: participant/views.py:467
 msgid ""
 "Attention: All existing participants will be removed if you import new "
 "participants."
@@ -1421,12 +1480,24 @@ msgstr ""
 "Achtung: Alle existierenden Teilnehmer/innen werden gelöscht, wenn Sie neue "
 "Teilnehmer/innen importieren."
 
-#: participant/views.py:403
+#: participant/views.py:469
+msgid "Attention: Supporters from all existing applications will be removed."
+msgstr ""
+"Achtung: Alle Unterstützer/innen werden von existiernden Anträgen gelöscht."
+
+#: participant/views.py:470
+msgid ""
+"Attention: Applications which can't be mapped to new users will be set to "
+"'Needs Review'."
+msgstr "Achtung: Anträge welche keinem Nutzer zugeordnet werden können"
+" bekommen automatisch den Status \"Benötigt Review\"."
+
+#: participant/views.py:482
 #, python-format
 msgid "The Password for <b>%s</b> was successfully reset."
 msgstr "Das Passwort für <b>%s</b> wurde erfolgreich zurückgesetzt."
 
-#: participant/views.py:405
+#: participant/views.py:484
 #, python-format
 msgid "Do you really want to reset the password for <b>%s</b>?"
 msgstr "Soll das Passwort für <b>%s</b> wirklich zurückgesetzt werden?"
diff --git a/openslides/participant/forms.py b/openslides/participant/forms.py
index c9c099e46..a212ae559 100644
--- a/openslides/participant/forms.py
+++ b/openslides/participant/forms.py
@@ -10,7 +10,7 @@
     :license: GNU GPL, see LICENSE for more details.
 """
 
-from django.forms import Form, ModelForm, CharField, EmailField, FileField, FileInput, MultipleChoiceField, ModelMultipleChoiceField
+from django.forms import Form, ModelForm, CharField, EmailField, FileField, FileInput, MultipleChoiceField, ModelMultipleChoiceField, ChoiceField, BooleanField
 from django.contrib.auth.models import User, Group, Permission
 from django.contrib.auth.forms import AdminPasswordChangeForm
 from django.utils.translation import ugettext as _
@@ -30,6 +30,12 @@ USER_VISIBLE_PERMISSIONS = reduce(list.__add__, [
     [p[0] for p in Config._meta.permissions]
 ])
 
+USER_APPLICATION_IMPORT_OPTIONS = [
+    ('REASSIGN', _('Keep applications, try to reassign submitter')),
+    ('INREVIEW', _('Keep applications, set status to "needs review"')),
+    ('DISCARD' , _('Discard applications'))
+]
+
 class UserNewForm(ModelForm):
     error_css_class = 'error'
     required_css_class = 'required'
@@ -91,3 +97,4 @@ class UserImportForm(Form):
     required_css_class = 'required'
 
     csvfile = FileField(widget=FileInput(attrs={'size':'50'}), label=_("CSV File"))
+    application_handling = ChoiceField(required=True, choices=USER_APPLICATION_IMPORT_OPTIONS, label=_("For existing applications"))
diff --git a/openslides/participant/views.py b/openslides/participant/views.py
index 958f5be40..91d73807d 100644
--- a/openslides/participant/views.py
+++ b/openslides/participant/views.py
@@ -34,6 +34,7 @@ from django.db import transaction
 from participant.models import Profile
 from participant.api import gen_username, gen_password
 from participant.forms import UserNewForm, UserEditForm, ProfileForm, UsersettingsForm, UserImportForm, GroupForm, AdminPasswordChangeForm
+from application.models import Application
 from utils.utils import template, permission_required, gen_confirm_form, ajax_request
 from utils.pdf import print_userlist, print_passwords
 from system.api import config_get
@@ -345,6 +346,43 @@ def user_import(request):
         if form.is_valid():
             try:
                 with transaction.commit_on_success():
+                    
+                    old_users = {}
+                    applications_mapped = 0
+                    applications_review = 0
+                    applications_removed = 0
+
+                    try:
+                        janitor = User.objects.get(username='__system__.janitor')
+                    except User.DoesNotExist:
+                        janitor = User()
+                        janitor.first_name = ''
+                        janitor.last_name = ''
+                        janitor.username = '__system__.janitor'
+                        janitor.save()
+
+                    applications = Application.objects.all()
+                    for application in applications:
+                        if form.cleaned_data['application_handling'] == 'DISCARD':
+                            # need to do this explicit since some applications may belong
+                            # to __system__.janitor which is a permanent user
+                            application.delete(force=True)
+                            applications_removed += 1
+                        else:
+                            # collect all applications and map them to their submitters
+                            submitter = application.submitter
+                            skey = '%s_%s' % (submitter.first_name, submitter.last_name)
+
+                            if not skey in old_users:
+                                old_users[skey] = []
+                            old_users[skey].append(application.id)
+
+                            application.submitter = janitor
+                            application.save()
+
+                            if application.supporter.all():
+                                application.writelog(_('Supporters removed after user import.'), user=request.user)
+
                     profiles = Profile.objects.all()
                     for profile in profiles:
                         profile.user.delete()
@@ -381,6 +419,44 @@ def user_import(request):
                                 observer = Group.objects.get(name='Beobachter')
                                 user.groups.add(observer)
 
+                            if form.cleaned_data['application_handling'] == 'REASSIGN':
+                                # live remap
+                                skey = '%s_%s' % (user.first_name, user.last_name)
+                                if skey in old_users:
+                                    for appid in old_users[skey]:
+                                        try:
+                                            application = Application.objects.get(id=appid)
+                                            application.submitter = user
+                                            application.save()
+                                            application.writelog(_('Reassigned to "%s" after (re)importing users.') % ("%s %s" % (user.first_name, user.last_name)), user=request.user)
+                                            applications_mapped += 1
+                                        except Application.DoesNotExist:
+                                            messages.error(request, _('Could not reassing application %d - object not found!') % appid)
+                                    del old_users[skey]
+
+                    if old_users:
+                        # mark all applications without a valid user as 'needs review'
+                        # this will account for *all* applications if application_mode == 'INREVIEW'
+                        for skey in old_users:
+                            for appid in old_users[skey]:
+                                try:
+                                    application = Application.objects.get(id=appid)
+                                    if application.status != 'rev':
+                                        application.set_status(user=request.user, status='rev', force=True)
+                                    applications_review += 1
+                                except Application.DoesNotExist:
+                                    messages.error(request, _('Could not reassing application %d - object not found!') % appid)
+
+                    if applications_review:
+                        messages.warning(request, ungettext('%d application could not be reassigned and needs a review!',
+                                                    '%d applications could not be reassigned and need a review!', applications_review) % applications_review)
+                    if applications_mapped:
+                        messages.success(request, ungettext('%d application was successfully reassigned.',
+                                                    '%d applications were successfully reassigned.', applications_mapped) % applications_mapped)
+                    if applications_removed:
+                        messages.warning(request, ungettext('%d application was discarded.',
+                                                    '%d applications were discarded.', applications_removed) % applications_removed)
+
                     messages.success(request, _('%d new participants were successfully imported.') % i)
                     return redirect(reverse('user_overview'))
             except csv.Error:
@@ -389,6 +465,9 @@ def user_import(request):
             messages.error(request, _('Please check the form for errors.'))
     else:
         messages.warning(request, _("Attention: All existing participants will be removed if you import new participants."))
+        if Application.objects.all():
+            messages.warning(request, _("Attention: Supporters from all existing applications will be removed."))
+            messages.warning(request, _("Attention: Applications which can't be mapped to new users will be set to 'Needs Review'."))
         form = UserImportForm()
     return {
         'form': form,