From 7fde53a09e1ba9c7ba01f61f39fbddae1c685a65 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Wed, 5 Sep 2012 00:20:28 +0200
Subject: [PATCH 01/88] Updated template with twitter bootstrap. Step 1: agenda
 and application.

---
 openslides/agenda/static/styles/agenda.css    |    4 -
 openslides/agenda/templates/agenda/edit.html  |   50 +-
 .../agenda/templates/agenda/item_row.html     |    2 +-
 .../agenda/templates/agenda/overview.html     |   42 +-
 openslides/agenda/templates/agenda/view.html  |    2 +-
 openslides/agenda/views.py                    |    1 +
 .../application/base_application.html         |   66 -
 .../templates/application/edit.html           |   41 +-
 .../templates/application/import.html         |   37 +-
 .../templates/application/overview.html       |   31 +-
 .../templates/application/poll_view.html      |   77 +-
 .../templates/application/view.html           |  587 +-
 openslides/application/views.py               |    1 +
 .../templates/assignment/overview.html        |    2 +-
 openslides/assignment/views.py                |    1 +
 openslides/config/views.py                    |    1 +
 openslides/locale/de/LC_MESSAGES/django.mo    |  Bin 35724 -> 32910 bytes
 openslides/locale/de/LC_MESSAGES/django.po    |  932 ++-
 .../templates/participant/login.html          |   15 +-
 .../templates/participant/overview.html       |    2 +-
 openslides/participant/views.py               |    1 +
 openslides/projector/views.py                 |    1 +
 openslides/static/img/favicon.png             |  Bin 0 -> 1060 bytes
 .../static/img/glyphicons-halflings-white.png |  Bin 0 -> 8777 bytes
 .../static/img/glyphicons-halflings.png       |  Bin 0 -> 12799 bytes
 openslides/static/img/logo.png                |  Bin 0 -> 7273 bytes
 openslides/static/javascript/bootstrap.min.js |    6 +
 openslides/static/javascript/utils.js         |  112 +
 openslides/static/styles/base.css             |  727 +--
 .../static/styles/bootstrap-responsive.css    | 1040 +++
 openslides/static/styles/bootstrap.css        | 5624 +++++++++++++++++
 openslides/static/styles/tabledrag.css        |    2 -
 openslides/templates/base.html                |  178 +-
 openslides/utils/template.py                  |    3 +-
 openslides/utils/utils.py                     |    4 +-
 openslides/utils/views.py                     |    2 +-
 36 files changed, 7987 insertions(+), 1607 deletions(-)
 delete mode 100644 openslides/application/templates/application/base_application.html
 create mode 100644 openslides/static/img/favicon.png
 create mode 100644 openslides/static/img/glyphicons-halflings-white.png
 create mode 100644 openslides/static/img/glyphicons-halflings.png
 create mode 100644 openslides/static/img/logo.png
 create mode 100644 openslides/static/javascript/bootstrap.min.js
 create mode 100644 openslides/static/styles/bootstrap-responsive.css
 create mode 100644 openslides/static/styles/bootstrap.css

diff --git a/openslides/agenda/static/styles/agenda.css b/openslides/agenda/static/styles/agenda.css
index 611d19646..2f9c3d6ab 100644
--- a/openslides/agenda/static/styles/agenda.css
+++ b/openslides/agenda/static/styles/agenda.css
@@ -18,7 +18,3 @@
 .close_link.closed span {
     background-image: url(../images/icons/close.png);
 }
-
-table#menu-overview {
-    white-space: nowrap;
-}
diff --git a/openslides/agenda/templates/agenda/edit.html b/openslides/agenda/templates/agenda/edit.html
index c91176fe4..39b319c96 100644
--- a/openslides/agenda/templates/agenda/edit.html
+++ b/openslides/agenda/templates/agenda/edit.html
@@ -1,4 +1,4 @@
-{% extends "agenda/base_agenda.html" %}
+{% extends "base.html" %}
 
 {% load i18n %}
 
@@ -12,26 +12,42 @@
 {% endblock %}
 
 {% block content %}
+    <h1>
     {% if item %}
-        <h1>{% trans "Edit item" %}</h1>
+        {% trans "Edit item" %}
     {% else %}
-        <h1>{% trans "New item" %}</h1>
+        {% trans "New item" %}
     {% endif %}
+    <small class="pull-right">
+    <a href="{% url item_overview %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
+    </small>
+    </h1>
     <form action="" method="post">{% csrf_token %}
-        {{ form.as_p }}
-        <p>
-        <button class="button" type="submit">
-            <span class="icon ok">{% trans 'Save' %}</span>
-        </button>
-        <button class="button" type="submit" name="apply">
-            <span class="icon apply">{% trans 'Apply' %}</span>
-        </button>
-        <a href='{% url item_overview %}'>
-        <button class="button" type="button" onclick="window.location='{% url item_overview %}'">
-            <span class="icon cancel">{% trans 'Cancel' %}</span>
-        </button>
-        </a>
-        </p>
+        {% for field in form %}
+        <div class="control-group{% if field.errors %} error{% endif%}">
+            <label for="id_{{ field.name }}">{{ field.label }}{% if field.field.required %}<span class="required">*</span>{% endif %}:</label>
+            {{ field }}
+            {% if field.errors %}
+            <span class="help-inline">{{ field.errors }}</span>
+            {% endif %}
+            {% if field.help_text %}
+            <span class="help-inline">{{ field.help_text }})</span>
+            {% endif %}
+        </div>
+        {% endfor %}
+        <div class="control-group">
+            <button class="btn btn-primary" type="submit">
+                {% trans 'Save' %}
+            </button>
+            <button class="btn" type="submit" name="apply">
+                {% trans 'Apply' %}
+            </button>
+            <a href='{% url item_overview %}'>
+            <button class="btn" type="button" onclick="window.location='{% url item_overview %}'">
+                {% trans 'Cancel' %}</span>
+            </button>
+            </a>
+        </div>
         <small>* {% trans "required" %}</small>
     </form>
 {% endblock %}
diff --git a/openslides/agenda/templates/agenda/item_row.html b/openslides/agenda/templates/agenda/item_row.html
index a198f6bae..4846b62e5 100644
--- a/openslides/agenda/templates/agenda/item_row.html
+++ b/openslides/agenda/templates/agenda/item_row.html
@@ -49,7 +49,7 @@
     </td>
     {% endif %}
     {% if perms.agenda.can_manage_agenda %}
-    <td class="tabledrag-hide">
+    <td class="tabledrag-hide" style="display: none;">
         {% with form=item.weight_form %}
             {{ form.weight }}
             {{ form.self }}
diff --git a/openslides/agenda/templates/agenda/overview.html b/openslides/agenda/templates/agenda/overview.html
index f847d9704..f529f693b 100644
--- a/openslides/agenda/templates/agenda/overview.html
+++ b/openslides/agenda/templates/agenda/overview.html
@@ -1,4 +1,4 @@
-{% extends "agenda/base_agenda.html" %}
+{% extends "base.html" %}
 
 {% load tags %}
 {% load i18n %}
@@ -10,6 +10,9 @@
 {% block header %}
     <link type="text/css" rel="stylesheet" media="all" href="{% static 'styles/tabledrag.css' %}" />
     <link type="text/css" rel="stylesheet" media="all" href="{% static 'styles/agenda.css' %}" />
+{% endblock %}
+
+{% block javascript %}
     <script type="text/javascript" src="{% static 'javascript/agenda.js' %}"></script>
     <script type="text/javascript" src="{% static 'javascript/jquery.cookie.js' %}"></script>
     {% if perms.agenda.can_manage_agenda %}
@@ -37,29 +40,38 @@
     {% endif %}
 {% endblock %}
 
-
 {% block content %}
    <form action="" method="post">{% csrf_token %}
        {% if perms.agenda.can_manage_agenda %}
-       <div id="changed-order-message" style="display:none" class="notification warning">
-           <em>{% trans "Do you want to save the changed order of agenda items?" %}<br>
-               <input type="submit" value="{% trans 'Yes' %}">
-               <input type="button" onclick="window.location.href='{% url item_overview %}';" value="{% trans 'No' %}">
-           </em>
+       <div id="changed-order-message" style="display:none" class="alert alert-warning">
+           <button type="button" class="close" data-dismiss="alert">×</button>
+           <p>{% trans "Do you want to save the changed order of agenda items?" %}</p>
+           <p>
+               <button class="btn" type="submit">{% trans 'Yes' %}</button>
+               <a href="{% url item_overview %}" class="btn">{% trans 'No' %}</a>
+            </p>
        </div>
        {% endif %}
 
-        <h1>{% trans "Agenda" %}</h1>
+        <h1>{% trans "Agenda" %} 
+        <small class="pull-right">
+        {% if perms.agenda.can_manage_agenda %}
+        <a href="{% url item_new %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'New item' %}"><i class="icon-plus"></i> {% trans "New" %}</a>
+        {% endif %}
+        <a href="{% url print_agenda %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print agenda as PDF' %}"><i class="icon-print"></i> PDF</a>
+        </small>
+        </h1>
 
-        <p>
-        {% trans "Filter" %}:
+        <label class="checkbox">
         <input type="checkbox" id="hide_closed_items"> {% trans "Hide closed items" %}
-        </p>
-        {{ items|length }}
+        </label>
+
+        <small><i>{{ items|length }}
         {% blocktrans count counter=items|length %}item{% plural %}items{% endblocktrans %}<span id="hiddencount"></span>
-        <table id="menu-overview" class="agendatable">
+        </i></small>
+        <table id="menu-overview" class="table table-striped table-bordered">
             <tr>
-                <th width="50">{% trans "Done" %}</th>
+                <th width="10px"></th>
                 <th>{% trans "Item" %}</th>
                 {% if perms.agenda.can_manage_agenda %}
                     <th width="200">{% trans "Comment" %}</th>
@@ -68,7 +80,7 @@
                     <th width="50">{% trans "Actions" %}</th>
                 {% endif %}
                 {% if perms.agenda.can_manage_agenda %}
-                    <th class="tabledrag-hide">{% trans "Weight" %}</th>
+                    <th class="tabledrag-hide" style="display: none;">{% trans "Weight" %}</th>
                 {% endif %}
             </tr>
             <tr class="topline{% if active_sid == 'agenda' %} activeline{% endif %}">
diff --git a/openslides/agenda/templates/agenda/view.html b/openslides/agenda/templates/agenda/view.html
index 6fb6b8cfd..94ad22f00 100644
--- a/openslides/agenda/templates/agenda/view.html
+++ b/openslides/agenda/templates/agenda/view.html
@@ -1,4 +1,4 @@
-{% extends "agenda/base_agenda.html" %}
+{% extends "base.html" %}
 
 {% load i18n %}
 
diff --git a/openslides/agenda/views.py b/openslides/agenda/views.py
index deb3e69a6..e87ab4ceb 100644
--- a/openslides/agenda/views.py
+++ b/openslides/agenda/views.py
@@ -212,6 +212,7 @@ def register_tab(request):
     selected = request.path.startswith('/agenda/')
     return Tab(
         title=_('Agenda'),
+        app='agenda',
         url=reverse('item_overview'),
         permission=request.user.has_perm('agenda.can_see_agenda')
             or request.user.has_perm('agenda.can_manage_agenda'),
diff --git a/openslides/application/templates/application/base_application.html b/openslides/application/templates/application/base_application.html
deleted file mode 100644
index c886215ef..000000000
--- a/openslides/application/templates/application/base_application.html
+++ /dev/null
@@ -1,66 +0,0 @@
-{% extends "base.html" %}
-
-{% load tags %}
-{% load i18n %}
-{% load staticfiles %}
-
-{% block submenu %}
-    {% url application_overview as url_applicationoverview %}
-    <h4>{% trans "Motions" %}</h4>
-    <ul>
-        <li class="{% if request.path == url_applicationoverview %}selected{% endif %}"><a href="{% url application_overview %}">{% trans "All motions" %}</a></li>
-        {% if perms.application.can_create_application or perms.application.can_manage_application %}
-            <li class="{% active request '/application/new' %}"><a href="{%  url application_new %}">{% trans "New motion" %}</a></li>
-        {% endif %}
-        {% if perms.application.can_manage_application %}
-            <li class="{% active request '/application/import' %}"><a href="{%  url application_import %}">{% trans 'Import motions' %}</a></li>
-        {% endif %}
-        <li><a href="{% url print_applications %}"><img src="{% static 'images/icons/pdf.png' %}"> {% trans 'All motions as PDF' %}</a></li>
-    </ul>
-
-    {# second submenu #}
-    {% if application %}
-        <br>
-        <h3>{% trans "Application No." %}
-            {% if application.number != None %}
-                {{ application.number }}
-            {% else %}
-                <i>[-]</i>
-            {% endif %}
-        </h3>
-        <ul>
-        {# view application #}
-            {% url application_view application.id as url_applicationview %}
-            <li class="{% if request.path == url_applicationview %}selected{% endif %}"><a href="{% url application_view application.id  %}">{% trans 'View motion' %}</a></li>
-        {# edit application #}
-            {% if "edit" in actions %}
-            {% url application_edit application.id as url_applicationedit %}
-            <li class="{% if request.path == url_applicationedit %}selected{% endif %}"><a href="{% url application_edit application.id  %}"><img src="{% static 'images/icons/edit.png' %}"> {% trans 'Edit motion' %}</a></li>
-            {% endif %}
-        {# delete application #}
-            {% if "delete" in actions %}
-            <li><a href="{% url application_delete application.id  %}"><img src="{% static 'images/icons/delete.png' %}"> {% trans 'Delete motion' %}</a></li>
-            {% endif %}
-        {# PDF #}
-            <li><a href="{% url print_application application.id  %}"><img src="{% static 'images/icons/pdf.png' %}"> {% trans 'Motion as PDF' %}</a></li>
-        {# activate and polls #}
-            {% if perms.projector.can_manage_projector %}
-                <li>
-                    <a class="activate_link {% if item.active %}active{% endif %}" href="{% url projector_activate_slide application.sid  %}"><img src="{% static 'images/icons/projector.png' %}"> {% trans 'Show Application' %}</a>
-                </li>
-            {% endif %}
-            {% if perms.application.can_manage_application %}
-                {% for poll in application.polls %}
-                    {% url application_poll_view poll.id as url_applicationpollview %}
-                    <li class="{% if request.path == url_applicationpollview %}selected{% endif %}"><a href="{% url application_poll_view poll.id %}"><img src="{% static 'images/icons/edit.png' %}"> {{ forloop.counter }}. {% trans "Vote" %}</a></li>
-                {% endfor %}
-            {% endif %}
-        {# Agenda Item #}
-            {% if perms.agenda.can_manage_agenda %}
-            <li>
-                <a href="{% url application_create_agenda application.id  %}">{% trans 'New agenda item' %}</a>
-            </li>
-            {% endif %}
-        </ul>
-    {% endif %}
-{% endblock %}
diff --git a/openslides/application/templates/application/edit.html b/openslides/application/templates/application/edit.html
index aa97ecc04..edae46880 100644
--- a/openslides/application/templates/application/edit.html
+++ b/openslides/application/templates/application/edit.html
@@ -1,4 +1,4 @@
-{% extends "application/base_application.html" %}
+{% extends "base.html" %}
 
 {% load i18n %}
 
@@ -12,28 +12,43 @@
 {% endblock %}
 
 {% block content %}
+    <h1>
     {% if application %}
-        <h1>{% trans "Edit motion" %}</h1>
+        {% trans "Edit motion" %}
     {% else %}
-        <h1>{% trans "New motion" %}</h1>
+        {% trans "New motion" %}
     {% endif %}
-
+    <small class="pull-right">
+    <a href="{% url application_overview %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
+    </small>
+    </h1>
     <form action="" method="post">{% csrf_token %}
-        {{ form.as_p }}
+        {% for field in form %}
+        <div class="control-group{% if field.errors %} error{% endif%}">
+            <label for="id_{{ field.name }}">{{ field.label }}{% if field.field.required %}<span class="required">*</span>{% endif %}:</label>
+            {{ field }}
+            {% if field.errors %}
+            <span class="help-inline">{{ field.errors }}</span>
+            {% endif %}
+            {% if field.help_text %}
+            <span class="help-inline">{{ field.help_text }})</span>
+            {% endif %}
+        </div>
+        {% endfor %}
         {{ managerform.as_p }}
-        <p>
-        <button class="button" type="submit">
-            <span class="icon ok">{% trans 'Save' %}</span>
+        <div class="control-group">
+        <button class="btn btn-primary" type="submit">
+            {% trans 'Save' %}
         </button>
-        <button class="button" type="submit" name="apply">
-            <span class="icon apply">{% trans 'Apply' %}</span>
+        <button class="btn" type="submit" name="apply">
+            {% trans 'Apply' %}
         </button>
         <a href='{% url application_overview %}'>
-        <button class="button" type="button" onclick="window.location='{% url application_overview %}'">
-            <span class="icon cancel">{% trans 'Cancel' %}</span>
+        <button class="btn" type="button" onclick="window.location='{% url application_overview %}'">
+            {% trans 'Cancel' %}</span>
         </button>
         </a>
-        </p>
+        </div>
         <small>* {% trans "required" %}</small>
     </form>
 
diff --git a/openslides/application/templates/application/import.html b/openslides/application/templates/application/import.html
index a3bf756a7..e87ca7436 100644
--- a/openslides/application/templates/application/import.html
+++ b/openslides/application/templates/application/import.html
@@ -1,13 +1,17 @@
-{% extends "application/base_application.html" %}
+{% extends "base.html" %}
 
 {% load i18n %}
 
 {% block title %}{{ block.super }} – {% trans "Import motions" %} {% endblock %}
 
 {% block content %}
-    <h1>{% trans "Import motions" %}</h1>
-    <p>{% trans 'Select a CSV file to import motions!' %}</p>
+    <h1>{% trans "Import motions" %}
+    <small class="pull-right">
+    <a href="{% url application_overview %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
+    </small>
+    </h1>
 
+    <p>{% trans 'Select a CSV file to import motions!' %}</p>
     <p>{% trans 'Required comma separated values: <code>{number, title, text, reason, first_name, last_name}</code> (<code>number</code> and <code>reason</code> are optional and may be empty)' %}
     <br>
     {% trans 'Required CSV file encoding: UTF-8 (Unicode).' %}
@@ -17,17 +21,26 @@
     </p>
 
     <form enctype="multipart/form-data" action="" method="post">{% csrf_token %}
-        {{ form.as_p }}
-        <p>
-        <button class="button" type="submit">
-            <span class="icon import">{% trans 'Import' %}</span>
-        </button>
-        <a href="{% url application_overview%}">
-        <button class="button" type="button"  onclick="window.location='{% url application_overview %}'">
-            <span class="icon cancel">{% trans 'Cancel' %}</span>
+        {% for field in form %}
+        <div class="control-group{% if field.errors %} error{% endif%}">
+            <label for="id_{{ field.name }}">{{ field.label }}{% if field.field.required %}<span class="required">*</span>{% endif %}:</label>
+            {{ field }}
+            {% if field.errors %}
+            <span class="help-inline">{{ field.errors }}</span>
+            {% endif %}
+            {% if field.help_text %}
+            <span class="help-inline">{{ field.help_text }})</span>
+            {% endif %}
+        </div>
+        {% endfor %}
+        <div class="control-group">
+        <button class="btn btn-primary" type="submit">
+            {% trans 'Import' %}
         </button>
+        <a href='{% url application_overview %}' class="btn">
+            {% trans 'Cancel' %}
         </a>
-        </p>
+        </div>
         <small>* {% trans "required" %}</small>
     </form>
 {% endblock %}
diff --git a/openslides/application/templates/application/overview.html b/openslides/application/templates/application/overview.html
index 2291b55ac..de3c29eae 100644
--- a/openslides/application/templates/application/overview.html
+++ b/openslides/application/templates/application/overview.html
@@ -1,4 +1,4 @@
-{% extends "application/base_application.html" %}
+{% extends "base.html" %}
 
 {% load tags %}
 {% load i18n %}
@@ -7,17 +7,31 @@
 {% block title %}{{ block.super }} – {% trans "Motions" %}{% endblock %}
 
 {% block content %}
-    <h1>{% trans "Motions" %}</h1>
-    <p><form action="{{ request.url }}" name="filter" method="get">
-        {% trans "Filter" %}:
+    <h1>{% trans "Motions" %}
+    <small class="pull-right">
+        {% if perms.application.can_manage_application %}
+            <a href="{% url application_new %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'New motion' %}"><i class="icon-plus"></i> {% trans "New" %}</a>
+            <a href="{% url application_import %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Import motions' %}"><i class="icon-share-alt"></i> {% trans 'Import' %}</a>
+        {% endif %}
+        <a href="{% url print_applications %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print all motions as PDF' %}"><i class="icon-print"></i> PDF</a>
+        </small>
+    </h1>
+
+    <form action="{{ request.url }}" name="filter" method="get" class="form-inline">
         {% if min_supporters > 0 %}
+        <label class="checkbox">
         <input type="checkbox" name="needsup" onchange="document.forms['filter'].submit()"
             {% if 'on' in request.GET.needsup %}checked{% endif %}> {% trans "Need supporters" %} &nbsp;
+        </label>
         {% endif %}
+        <label class="checkbox">
         <input type="checkbox" name="number" onchange="document.forms['filter'].submit()"
             {% if 'on' in request.GET.number %}checked{% endif %}> {% trans "Without number" %} &nbsp;
+        </label>
+        <label class="checkbox">
         <input type="checkbox" name="status" onchange="document.forms['filter'].submit()"
             {% if 'on' in request.GET.status %}checked{% endif %}> {% trans "Status" %}:
+        </label>
         <select class="default-input" name="statusvalue" onchange="{% if 'on' in request.GET.status %}document.forms['filter'].submit(){% endif %}">
             <option value="pub" {% if 'pub' in request.GET.statusvalue %}selected{% endif %}>{% trans "Not yet authorized" %}</option>
             <option value="per" {% if 'on' in request.GET.status and 'per' in request.GET.statusvalue %}selected{% endif %}>{% trans "Authorized" %}</option>
@@ -26,11 +40,12 @@
             <option value="wit" {% if 'on' in request.GET.status and 'wit' in request.GET.statusvalue %}selected{% endif %}>{% trans "Withdrawen (by submitter)" %}</option>
             <option value="rev" {% if 'rev' in request.GET.statusvalue %}selected{% endif %}>{% trans "Needs Review" %}</option>
         </select>
-        </form>
-    </p>
-    {{ applications|length }}
+
+    </form>
+    <small><i>{{ applications|length }}
     {% blocktrans count counter=applications|length %}motion{% plural %}motions{% endblocktrans %}
-    <table>
+    </i></small>
+    <table class="table table-striped table-bordered">
         <tr>
             <th><a href="?sort=number{% if 'number' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Number" %}</a></th>
             <th><a href="?sort=title{% if 'title' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Motion title" %}</a></th>
diff --git a/openslides/application/templates/application/poll_view.html b/openslides/application/templates/application/poll_view.html
index 67facddf5..e459abe33 100644
--- a/openslides/application/templates/application/poll_view.html
+++ b/openslides/application/templates/application/poll_view.html
@@ -1,22 +1,48 @@
-{% extends 'application/base_application.html' %}
+{% extends 'base.html' %}
 
 {% load i18n %}
 {% load staticfiles %}
 
 {% block title %}
-    {{ block.super }} – {% trans "Motion" %} "{{ application.public_version.title }}"
-    – {{ ballot }}. {% trans "Vote" %}
+    {{ block.super }} - {% trans "Motion" %} {{ application.number }}, {{ ballot }}. {% trans "Vote" %}
 {% endblock %}
 
 {% block content %}
-    <h1>{{ application.public_version.title }} ({% trans "Motion" %}
-    {{ application.number }}) – {{ ballot }}. {% trans "Vote" %}</h1>
-    <i class="helptext">{% trans "Special values" %}: -1 = {% trans 'majority' %}; -2 = {% trans 'undocumented' %}</i>
+<h1>
+    {{ application.title }}
+    <small>
+    {% trans "Motion" %} {{ application.number }}, {{ ballot }}. {% trans "Vote" %}
+    </small>
+    <small class="pull-right">
+    <div class="btn-toolbar">
+        <a href="{% url application_view application.id %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to motion" %}</a>
+        <div class="btn-group">
+            <a data-toggle="dropdown" href="#" class="btn btn-mini dropdown-toggle">
+                {% trans 'More actions' %}
+                <span class="caret"></span>
+            </a>
+            <ul class="dropdown-menu pull-right">
+                <!-- delete -->
+                {% if "delete" in actions %}
+                    <li><a href="{% url application_poll_delete poll.id %}"><i class="icon-remove"></i> {% trans 'Delete Vote' %}</a></li>
+                {% endif %}
+                <!-- activate projector -->
+                {% if perms.projector.can_manage_projector %}
+                    <li>
+                        <a class="activate_link {% if item.active %}active{% endif %}" href="{% url projector_activate_slide application.sid  %}"><i class="icon-facetime-video"></i> {% trans 'Show Application' %}</a>
+                    </li>
+                {% endif %}
+            </ul>
+        </div>
+    </div>
+    </small>
+</h1>
+
+<i class="helptext">{% trans "Special values" %}: -1 = {% trans 'majority' %}; -2 = {% trans 'undocumented' %}</i>
     <form action="" method="post" class="small-form">{% csrf_token %}
         {{ pre_form }}
         <span id="poll_id" style="display:none">{{ poll.id }}</span>
-
-        <table class="table" style="width: auto;">
+        <table class="table table-striped table-bordered" style="width: auto;">
             <tr>
                 <th>{% trans "Option" %}</th>
                 <th>{% trans "Votes" %}</th>
@@ -36,29 +62,24 @@
                 <td>{{ pollform.votescast.errors }}{{ pollform.votescast }}</td>
             </tr>
         </table>
-
         {{ post_form }}
-
+        <!-- ballot paper button -->
         <p>
-        <a href='{% url print_application_poll poll.id %}'>
-        <button class="button" type="button" onclick="window.location='{% url print_application_poll poll.id %}'">
-            <span class="icon pdf">{% trans 'Ballot paper as PDF' %}</span>
-        </button>
-        </a>
-        </p>
-
-        <p>
-        <button class="button" type="submit">
-            <span class="icon ok">{% trans 'Save' %}</span>
-        </button>
-        <button class="button" type="submit" name="apply">
-            <span class="icon apply">{% trans 'Apply' %}</span>
-        </button>
-        <a href='{% url application_view application.id %}'>
-        <button class="button" type="button" onclick="window.location='{% url application_view application.id %}'">
-            <span class="icon cancel">{% trans 'Cancel' %}</span>
-        </button>
+        <a href='{% url print_application_poll poll.id %}' class="btn">
+            <i class="icon-print"></i> {% trans 'Ballot paper as PDF' %}
         </a>
         </p>
+        <!-- Control buttons -->
+        <div class="control-group">
+            <button type="submit" class="btn btn-primary">
+                {% trans 'Save' %}
+            </button>
+            <button type="submit" name="apply" class="btn">
+                {% trans 'Apply' %}
+            </button>
+            <a href='{% url application_view application.id %}' class="btn">
+                {% trans 'Cancel' %}
+            </a>
+        </div>
     </form>
 {% endblock %}
diff --git a/openslides/application/templates/application/view.html b/openslides/application/templates/application/view.html
index d902777b1..f1ad2ca2c 100644
--- a/openslides/application/templates/application/view.html
+++ b/openslides/application/templates/application/view.html
@@ -1,221 +1,73 @@
-{% extends "application/base_application.html" %}
+{% extends "base.html" %}
 
 {% load tags %}
 {% load i18n %}
 {% load staticfiles %}
 
-{% block title %}{{ block.super }} – {% trans "Motion" %} "{{ version.title }}"{% endblock %}
-
-
-{% block submenu %}
-    {{ block.super }}
-
+{% block title %}
+    {{ block.super }} - {% trans "Motion" %}
+    {% if application.number != None %}
+        {{ application.number }}
+    {% else %}
+        [{% trans "no number" %}]
+    {% endif %}
 {% endblock %}
 
 {% block content %}
-<div id="sidebar">
-    <div class="box">
-    <h4>{% trans "Submitter" %}:</h4>
-    {{ application.submitter }}
-    {% if user == application.submitter.user %}
-    <img src="{% static 'images/icons/user-information.png' %}" title="{% trans 'You!' %}">
+<h1>
+    {{ version.title }}
+    <small>
+    {% if application.number != None %}
+        {% trans "Motion" %} {{ application.number }},
+    {% else %}
+        <i>[{% trans "no number" %}]</i>,
     {% endif %}
-
-    {% if min_supporters > 0 %}
-        <h4>{% trans "Supporters" %}: *</h4>
-        {% if not application.supporters %}
-        -
-        {% else %}
-            <ol>
-            {% for supporter in application.supporters %}
-                <li> {{ supporter }}</li>
-            {% endfor %}
-            </ol>
-        {% endif %}
-    {% endif %}
-
-    <h4>{% trans "Status" %}:</h4>
-    {% if application.status != "pub" %}
-    {% trans application.get_status_display %}
-    <br>
-    {% endif %}
-    {% for note in application.notes %}
-        {{ note }}
-    {% if not forloop.last %}<br>{% endif %}
-    {% endfor %}
-
-    <h4>{% trans "Vote results" %}:</h4>
-        {% with application.polls as polls %}
-        {% if not polls.exists %}
-            {% if perms.application.can_manage_application %}
-                {% if "genpoll" in actions %}
-                <a href='{% url application_gen_poll application.id %}'>
-                    <span class="button">
-                        <span class="icon statistics">{% trans 'New vote' %}</span>
-                    </span>
-                </a>
-                {% else %}
-                -
-                {% endif %}
-            {% else %}
-            -
-            {% endif %}
-        {% endif %}
-        <ul class="results">
-        {% for poll in polls %}
-        {% if perms.application.can_manage_application or poll.has_votes %}
-            <li>
-                {% if perms.application.can_manage_application %}
-                    <strong>{{ forloop.counter }}. {% trans "Vote" %} </strong>
-                    <a class="icon edit" href="{% url application_poll_view poll.id %}" title="{% trans 'Edit Vote' %}">
-                            <span></span>
-                    </a>
-                    <a class="icon delete" href="{% url application_poll_delete poll.id %}" title="{% trans 'Delete Vote' %}">
-                        <span></span>
-                    </a>
-                {% elif poll.has_votes %}
-                    <strong>{{ forloop.counter }}. {% trans "Vote" %}:</strong>
-                {% endif %}
-                <br>
-                {% if poll.has_votes %}
-                    {% with poll.get_options.0 as option %}
-                        <img src="{% static 'images/icons/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ option.Yes }}<br>
-                        <img src="{% static 'images/icons/voting-no.png' %}" title="{% trans 'No' %}"> {{ option.No }}<br>
-                        <img src="{% static 'images/icons/voting-abstention.png' %}" title="{% trans 'Abstention' %}"> {{ option.Abstain }}<br>
-                        <img src="{% static 'images/icons/voting-invalid.png' %}" title="{% trans 'Invalid' %}"> {{ poll.print_votesinvalid }}<br>
-                        <div style="border-top: 1px solid; padding-top: 5px; margin: 5px 0; width: 10em;">
-                            <img src="{% static 'images/icons/voting-total.png' %}" title="{% trans 'Votes cast' %}"> {{ poll.print_votescast }}
-                        </div>
-                    {% endwith %}
-                    {% if perms.application.can_manage_application %}
-                        {% if forloop.last %}
-                        {% if "genpoll" in actions %}
-                        <a href='{% url application_gen_poll application.id %}'>
-                            <span class="button"><span class="icon statistics">{% trans 'New vote' %}</span></span>
-                        </a>
-                        {% endif %}
-                        {% endif %}
-                    {% endif %}
-                {% else %}
-                    {% if perms.application.can_manage_application %}
-                        <a href='{% url application_poll_view poll.id %}'>
-                            <span class="button"><span class="icon statistics">{% trans 'Enter result' %}</span></span>
-                        </a>
-                     {% endif %}
-                {% endif %}
-            </li>
-        {% endif %}
-        {% endfor %}
-        </ul>
-        {% endwith %}
-
-    <h4>{% trans "Creation Time" %}:</h4>
-    {{ application.creation_time }}
-
-    <p></p>
-    {% if "wit" in actions and user == application.submitter.user %}
-    <p></p>
-        <a href='{% url application_set_status application.id 'wit' %}'>
-            <span class="button"><span class="icon revert">{% trans 'Withdraw' %}</span></span>
-        </a>
-    {% endif %}
-
-    {% if perms.application.can_support_application and min_supporters > 0 %}
-        {% if "unsupport" in actions %}
-        <p></p>
-        <a href='{% url application_unsupport application.id %}'>
-            <span class="button"><span class="icon remove">{% trans 'Unsupport' %}</span></span>
-        </a>
-        {% endif %}
-        {% if "support" in actions %}
-        <p></p>
-        <a href='{% url application_support application.id %}'>
-            <span class="button"><span class="icon add">{% trans 'Support' %}</span></span>
-        </a>
-        {% endif %}
-    {% endif %}
-    </div>
-    {% if min_supporters > 0 %}
-    <small>* {% trans "minimum required supporters" %}: {{ min_supporters }}</small>
-    {% endif %}
-
-    <br><br>
-
-    {% if perms.application.can_manage_application %}
-    <div class="box">
-    <h4><b>{% trans "Manage motion" %}</b></h4>
-
-    {% 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 %}
-        {% if "nop" in actions %}
-        <a href='{% url application_notpermit application.id %}'><span class="button"><span class="icon reject">{% trans 'Not permit (reject)' %}</span></span></a>
-        {% endif %}
-        {% if "setnumber" in actions %}
-        <a href='{% url application_set_number application.id %}'><span class="button"><span class="icon number">{% trans 'Set Number' %}</span></span></a>
-        {% endif %}
-        </p>
-    {% endif %}
-
-    <h4></h4>
-    {% if "acc" in actions or "rej" in actions %}
-        <h4>{% trans "Result after vote" %}:</h4>
-        {% if "acc" in actions %}
-        <a href='{% url application_set_status application.id 'acc' %}'>
-            <span class="button"><span class="icon done">{% trans 'Accepted' %}</span></span>
-        </a>
-        {% endif %}
-        {% if "rej" in actions %}
-        <a href='{% url application_set_status application.id 'rej' %}'>
-            <span class="button"><span class="icon reject">{% trans 'Rejected' %}</span></span>
-        </a>
-        {% endif %}
-    {% endif %}
-
-    {% if "adj" in actions or "noc" in actions or "com" in actions or "wit" in actions %}
-        <h4>{% trans 'Result after debate' %}:</h4>
-        {% if "adj" in actions %}
-        <a href='{% url application_set_status application.id 'adj' %}'><span class="button">{% trans 'Adjourned' %}</span></a><br>
-        {% endif %}
-        {% if "noc" in actions %}
-        <a href='{% url application_set_status application.id 'noc' %}'><span class="button">{% trans 'Not Concerned' %}</span></a><br>
-        {% endif %}
-        {% if "com" in actions %}
-        <a href='{% url application_set_status application.id 'com' %}'><span class="button">{% trans 'Commited a bill' %}</span></a><br>
-        {% endif %}
-        {% if "wit" in actions %}
-        <a href='{% url application_set_status application.id 'wit' %}'><span class="button">{% trans 'Withdrawed by Submitter' %}</span></a>
-        {% endif %}
-    {% endif %}
-    <p></p>
-    <hr>
-    <h4>{% trans "For Administration only:" %}</h4>
-    <a href='{% url application_reset application.id %}'>
-        <span class="button"><span class="icon undo">{% trans 'Reset' %}</span></span>
-    </a>
-    </div>
-    {% endif %} {# end perms.application.can_support_application #}
-</div> <!-- end sidebar -->
-
-
-<div id="main">
-    <h1>
-        {{ version.title }}
-        ({% trans "Motion" %}
-        {% if application.number != None %}
-            {{ application.number }})
-        {% else %}
-            <i>[{% trans "no number" %}]</i>)
-        {% endif %}
-    </h1>
-
     {% trans "Version" %} {{ version.aid }}
+    </small>
+    <small class="pull-right">
+    <div class="btn-toolbar">
+        <a href="{% url application_overview %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
+        <a href="{% url print_application application.id  %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print this motion as PDF' %}"><i class="icon-print"></i> PDF</a>
+        <div class="btn-group">
+            <a data-toggle="dropdown" href="#" class="btn btn-mini dropdown-toggle">
+                {% trans 'More actions' %}
+                <span class="caret"></span>
+            </a>
+            <ul class="dropdown-menu pull-right">
+                <!-- edit -->
+                {% if "edit" in actions %}
+                     <li><a href="{% url application_edit application.id  %}"><i class="icon-edit"></i> {% trans 'Edit motion' %}</a></li>
+                {% endif %}
+                <!-- delete -->
+                {% if "delete" in actions %}
+                    <li><a href="{% url application_delete application.id  %}"><i class="icon-remove"></i> {% trans 'Delete motion' %}</a></li>
+                {% endif %}
+                <!-- activate projector -->
+                {% if perms.projector.can_manage_projector %}
+                    <li>
+                        <a class="activate_link {% if item.active %}active{% endif %}" href="{% url projector_activate_slide application.sid  %}"><i class="icon-facetime-video"></i> {% trans 'Show Application' %}</a>
+                    </li>
+                {% endif %}
+                <!-- edit poll -->
+                {% if perms.application.can_manage_application %}
+                    {% for poll in application.polls %}
+                        <li><a href="{% url application_poll_view poll.id %}"><i class="icon-edit"></i> {{ forloop.counter }}. {% trans "Vote" %}</a></li>
+                    {% endfor %}
+                {% endif %}
+                <!-- create agenda item -->
+                {% if perms.agenda.can_manage_agenda %}
+                <li>
+                    <a href="{% url application_create_agenda application.id  %}"><i class="icon-plus"></i> {% trans 'New agenda item' %}</a>
+                </li>
+                {% endif %}
+            </ul>
+        </div>
+    </div>
+    </small>
+</h1>
 
+<div class="row-fluid">
+<div class="span9">
     {% if application.public_version != application.last_version %}
         &#8901;
         {% if version == application.public_version %}
@@ -225,82 +77,271 @@
         {% endif %}
     {% endif %}
 
-    <h2>{% trans "Motion" %}:</h2>
-
+    <!-- Text -->
+    <h4>{% trans "Motion text" %}:</h4>
     {{ version.text|linebreaks }}
-
-    <h2>{% trans "Reason" %}:</h2>
-
+    <br>
+    <!-- Reason -->
+    <h4>{% trans "Reason" %}:</h4>
     {% if version.reason %}
         {{ version.reason|linebreaks }}
     {% else %}
         –
     {% endif %}
-
-
+    <br>
+    <!-- Version history -->
     {% if application.versions|length > 1 %}
-    <h2>{% trans "Version History" %}:</h2>
-
-    <table class="table valigntop" style="width: auto;">
-    <tr>
-        <th></th>
-        <th>{% trans "Version" %}</th>
-        <th>{% trans "Time" %}</th>
-        <th>{% trans "Title" %}</th>
-        <th>{% trans "Text" %}</th>
-
-        <th>{% trans "Reason" %}</th>
-    </tr>
-    {% for revision in application.versions  %}
-    <tr class="{% cycle 'odd' '' %}">
-        <td style="white-space:nowrap;">
-        {% if application.status != "pub" %}
-        {% if revision == application.permitted %}
-             <img title="{% trans 'Version authorized' %}" src="{% static 'images/icons/accept.png' %}">
-        {% else %}
-             {% if perms.application.can_manage_application %}
-                 <a href="{% url application_version_permit revision.id %}"><img title="{% trans 'Permit Version' %}" src="{% static 'images/icons/accept-grey.png' %}"></a>
-             {% endif %}
-             {% if not revision.rejected and revision.id > application.permitted.id and perms.application.can_manage_application %}
-                 <a href="{% url application_version_reject revision.id %}"><img title="{% trans 'Reject Version' %}" src="{% static 'images/icons/reject-grey.png' %}"></a>
-             {% endif %}
-        {% endif %}
-        {% if revision.rejected %}
-            <img title="{% trans 'Version rejected' %}" src="{% static 'images/icons/reject.png' %}">
-        {% endif %}
-        {% endif %}
-        </td>
-        <td>{{ revision.aid }}</td>
-        <td><i>{{ revision.time }}</i></td>
-        <td>
-            {% ifchanged %}
-            <b>{{ revision.title }}</b>
+        <h4>{% trans "Version History" %}:</h4>
+        <table class="table table-striped table-bordered">
+        <tr>
+            <th></th>
+            <th>{% trans "Version" %}</th>
+            <th>{% trans "Time" %}</th>
+            <th>{% trans "Title" %}</th>
+            <th>{% trans "Text" %}</th>
+            <th>{% trans "Reason" %}</th>
+        </tr>
+        {% for revision in application.versions  %}
+        <tr>
+            <td style="white-space:nowrap;">
+            {% if application.status != "pub" %}
+            {% if revision == application.permitted %}
+                 <img title="{% trans 'Version authorized' %}" src="{% static 'images/icons/accept.png' %}">
             {% else %}
-            <i>[{% trans "unchanged" %}]</i>
-            {% endifchanged %}
-        </td>
-        <td>
-            {% ifchanged %}
-            {{ revision.text|linebreaks }}
-            {% else %}
-            <i>[{% trans "unchanged" %}]</i>
-            {% endifchanged %}
-        </td>
-        <td>
-            {% ifchanged %}
-            {{ revision.reason|linebreaks }}
-            {% else %}
-            <i>[{% trans "unchanged" %}]</i>
-            {% endifchanged %}
-        </td>
-    </tr>
-    {% endfor %}
-    </table>
+                 {% if perms.application.can_manage_application %}
+                     <a href="{% url application_version_permit revision.id %}"><img title="{% trans 'Permit Version' %}" src="{% static 'images/icons/accept-grey.png' %}"></a>
+                 {% endif %}
+                 {% if not revision.rejected and revision.id > application.permitted.id and perms.application.can_manage_application %}
+                     <a href="{% url application_version_reject revision.id %}"><img title="{% trans 'Reject Version' %}" src="{% static 'images/icons/reject-grey.png' %}"></a>
+                 {% endif %}
+            {% endif %}
+            {% if revision.rejected %}
+                <img title="{% trans 'Version rejected' %}" src="{% static 'images/icons/reject.png' %}">
+            {% endif %}
+            {% endif %}
+            </td>
+            <td>{{ revision.aid }}</td>
+            <td><i>{{ revision.time }}</i></td>
+            <td>
+                {% ifchanged %}
+                <b>{{ revision.title }}</b>
+                {% else %}
+                <i>[{% trans "unchanged" %}]</i>
+                {% endifchanged %}
+            </td>
+            <td>
+                {% ifchanged %}
+                {{ revision.text|linebreaks }}
+                {% else %}
+                <i>[{% trans "unchanged" %}]</i>
+                {% endifchanged %}
+            </td>
+            <td>
+                {% ifchanged %}
+                {{ revision.reason|linebreaks }}
+                {% else %}
+                <i>[{% trans "unchanged" %}]</i>
+                {% endifchanged %}
+            </td>
+        </tr>
+        {% endfor %}
+        </table>
     {% endif %}
+    <!-- Log -->
+    {% if perms.application.can_manage_application %}
+        <h4>{% trans "Log" %}:</h4>
+        <small>{{ application.log|linebreaks }}</small>
+    {% endif %}
+
+</div> <!--/span-->
+
+<div class="span3">
+    <div class="well">
+        <!-- Submitter -->
+        <h5>{% trans "Submitter" %}:</h5>
+        {{ application.submitter }}
+        {% if user == application.submitter.user %}
+            <img src="{% static 'images/icons/user-information.png' %}" title="{% trans 'Me' %}">
+        {% endif %}
+        <!-- Supporters -->
+        {% if min_supporters > 0 %}
+            <h5>{% trans "Supporters" %}: *</h5>
+            {% if not application.supporters %}
+                -
+            {% else %}
+                <ol>
+                {% for supporter in application.supporters %}
+                    <li> {{ supporter }}</li>
+                {% endfor %}
+                </ol>
+            {% endif %}
+        {% endif %}
+        <!-- Status -->
+        <h5>{% trans "Status" %}:</h5>
+        {% if application.status != "pub" %}
+            {% trans application.get_status_display %}
+            <br>
+        {% endif %}
+        {% for note in application.notes %}
+            {{ note }}
+            {% if not forloop.last %}<br>{% endif %}
+        {% endfor %}
+        <!-- Vote results -->
+        <h5>{% trans "Vote results" %}:</h5>
+            {% with application.polls as polls %}
+            {% if not polls.exists %}
+                {% if perms.application.can_manage_application %}
+                    {% if "genpoll" in actions %}
+                    <a href='{% url application_gen_poll application.id %}' class="btn btn-mini">
+                        <i class="icon-signal"></i> {% trans 'New vote' %}
+                    </a>
+                    {% else %}
+                    -
+                    {% endif %}
+                {% else %}
+                -
+                {% endif %}
+            {% endif %}
+            <ol>
+            {% for poll in polls %}
+            {% if perms.application.can_manage_application or poll.has_votes %}
+                <li>{% trans "Vote" %}
+                    {% if perms.application.can_manage_application %}
+                        <a class="btn btn-mini" href="{% url application_poll_view poll.id %}" title="{% trans 'Edit Vote' %}"><i class="icon-edit"></i></a>
+                        <a class="btn btn-mini" href="{% url application_poll_delete poll.id %}" title="{% trans 'Delete Vote' %}"><i class="icon-remove"></i></a>
+                    {% endif %}
+                    <br>
+                    {% if poll.has_votes %}
+                        {% with poll.get_options.0 as option %}
+                            <img src="{% static 'images/icons/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ option.Yes }}<br>
+                            <img src="{% static 'images/icons/voting-no.png' %}" title="{% trans 'No' %}"> {{ option.No }}<br>
+                            <img src="{% static 'images/icons/voting-abstention.png' %}" title="{% trans 'Abstention' %}"> {{ option.Abstain }}<br>
+                            <img src="{% static 'images/icons/voting-invalid.png' %}" title="{% trans 'Invalid' %}"> {{ poll.print_votesinvalid }}<br>
+                            <div style="border-top: 1px solid; padding-top: 5px; margin: 5px 0; width: 10em;">
+                                <img src="{% static 'images/icons/voting-total.png' %}" title="{% trans 'Votes cast' %}"> {{ poll.print_votescast }}
+                            </div>
+                        {% endwith %}
+                        {% if perms.application.can_manage_application %}
+                            {% if forloop.last %}
+                            {% if "genpoll" in actions %}
+                            <a href='{% url application_gen_poll application.id %}' class="btn btn-mini">
+                                <i class="icon-signal"></i> {% trans 'New vote' %}
+                            </a>
+                            {% endif %}
+                            {% endif %}
+                        {% endif %}
+                    {% else %}
+                        {% if perms.application.can_manage_application %}
+                            <span class="label label-info">{% trans 'No results' %}</span>
+                         {% endif %}
+                    {% endif %}
+                </li>
+            {% endif %}
+            {% endfor %}
+            </ol>
+            {% endwith %}
+        <!-- Creation Time -->
+        <h5>{% trans "Creation Time" %}:</h5>
+        {{ application.creation_time }}
+        <!-- Widthdraw button -->
+        {% if "wit" in actions and user == application.submitter.user %}
+            <br><br>
+            <a href='{% url application_set_status application.id 'wit' %}' class="btn">
+                <span class="icon revert">{% trans 'Withdraw motion' %}</span>
+            </a>
+        {% endif %}
+        <!-- Support/Unsupport button -->
+        {% if perms.application.can_support_application and min_supporters > 0 %}
+            {% if "unsupport" in actions %}
+                <br><br>
+                <a href='{% url application_unsupport application.id %}' class="btn">
+                    {% trans 'Unsupport motion' %}
+                </a>
+            {% endif %}
+            {% if "support" in actions %}
+                <br><br>
+                <a href='{% url application_support application.id %}'>
+                    {% trans 'Support' %}
+                </a>
+            {% endif %}
+        {% endif %}
+        <!-- Footnote: requried supporters -->
+        {% if min_supporters > 0 %}
+            <br><br>
+            <small>* {% trans "minimum required supporters" %}: {{ min_supporters }}</small>
+        {% endif %}
+    </div> <!--/well-->
 
     {% if perms.application.can_manage_application %}
-    <h2>{% trans "Log" %}:</h2>
-    {{ application.log|linebreaks }}
+    <!-- Manage application box -->
+    <div class="well">
+    <h4>{% trans "Manage motion" %}</h4>
+    <!-- Formal validation -->
+    {% if "pub" in actions or "per" in actions or "nop" in actions or "setnumber" in actions %}
+        <h5>{% trans "Formal validation" %}:</h5>
+        <div class="btn-group btn-group-vertical">
+            {% if "pub" in actions %}
+                <a href='{% url application_set_status application.id 'pub' %}' class="btn">{% trans 'Publish' %}</a>
+            {% endif %}
+            {% if "per" in actions %}
+                <a href='{% url application_permit application.id %}' class="btn btn-info">{% trans 'Permit' %}</a>
+            {% endif %}
+            {% if "nop" in actions %}
+                <a href='{% url application_notpermit application.id %}' class="btn">{% trans 'Not permit' %}</a>
+            {% endif %}
+            {% if "setnumber" in actions %}
+                <a href='{% url application_set_number application.id %}' class="btn">{% trans 'Set number' %}</a>
+            {% endif %}
+        </div>
     {% endif %}
-</div>
+    <!-- Result after vote -->
+    {% if "acc" in actions or "rej" in actions %}
+        <h5>{% trans "Result after vote" %}:</h5>
+        <div class="btn-group btn-group-vertical">
+            {% if "acc" in actions %}
+            <a href='{% url application_set_status application.id 'acc' %}' class="btn btn-success">
+                <i class="icon-ok icon-white"></i> {% trans 'Accepted' %}
+            </a>
+            {% endif %}
+            {% if "rej" in actions %}
+            <a href='{% url application_set_status application.id 'rej' %}' class="btn btn-danger">
+                <i class="icon-ban-circle icon-white"></i> {% trans 'Rejected' %}
+            </a>
+            {% endif %}
+        </div>
+    {% endif %}
+    <!-- Result after debate -->
+    {% if "adj" in actions or "noc" in actions or "com" in actions or "wit" in actions %}
+        <br><br>
+        <div class="btn-group">
+            <a data-toggle="dropdown" href="#" class="btn dropdown-toggle">
+                {% trans 'More actions' %}
+                <span class="caret"></span>
+            </a>
+            <ul class="dropdown-menu pull-right">
+                {% if "adj" in actions %}
+                    <li><a href='{% url application_set_status application.id 'adj' %}'>{% trans 'Adjourned' %}</a></li>
+                {% endif %}
+                {% if "noc" in actions %}
+                    <li><a href='{% url application_set_status application.id 'noc' %}'>{% trans 'Not Concerned' %}</a></li>
+                {% endif %}
+                {% if "com" in actions %}
+                    <li><a href='{% url application_set_status application.id 'com' %}'>{% trans 'Commited a bill' %}</a></li>
+                {% endif %}
+                {% if "wit" in actions %}
+                    <li><a href='{% url application_set_status application.id 'wit' %}'>{% trans 'Withdrawed by Submitter' %}</a></li>
+                {% endif %}
+            </ul>
+        </div>
+    {% endif %}
+    <p></p>
+    <hr>
+    <h5>{% trans "For Administration only:" %}</h5>
+    <a href='{% url application_reset application.id %}' class="btn btn-danger">
+        {% trans 'Reset' %}
+    </a>
+    </div> <!--/well-->
+    {% endif %} {# end perms.application.can_support_application #}
+  </div> <!--/span-->
+</div> <!--/row-->
 {% endblock %}
diff --git a/openslides/application/views.py b/openslides/application/views.py
index 37a0e08b4..41b1d091c 100644
--- a/openslides/application/views.py
+++ b/openslides/application/views.py
@@ -909,6 +909,7 @@ def register_tab(request):
     selected = True if request.path.startswith('/application/') else False
     return Tab(
         title=_('Applications'),
+        app='application',
         url=reverse('application_overview'),
         permission=request.user.has_perm('application.can_see_application') or request.user.has_perm('application.can_support_application') or request.user.has_perm('application.can_support_application') or request.user.has_perm('application.can_manage_application'),
         selected=selected,
diff --git a/openslides/assignment/templates/assignment/overview.html b/openslides/assignment/templates/assignment/overview.html
index 2d9e3b8e0..6719b429c 100644
--- a/openslides/assignment/templates/assignment/overview.html
+++ b/openslides/assignment/templates/assignment/overview.html
@@ -20,7 +20,7 @@
     </p>
    {{ assignments|length }}
    {% blocktrans count counter=assignments|length %}election{% plural %}elections{% endblocktrans %}
-    <table>
+    <table class="table table-striped table-bordered">
         <tr>
             <th><a href="?sort=name{% if 'name' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Election" %}</a></th>
             <th>{% trans "Candidates" %}</th>
diff --git a/openslides/assignment/views.py b/openslides/assignment/views.py
index 7bffaa18e..28277c756 100644
--- a/openslides/assignment/views.py
+++ b/openslides/assignment/views.py
@@ -646,6 +646,7 @@ def register_tab(request):
     selected = request.path.startswith('/assignment/')
     return Tab(
         title=_('Elections'),
+        app='assignment',
         url=reverse('assignment_overview'),
         permission=request.user.has_perm('assignment.can_see_assignment')
             or request.user.has_perm('assignment.can_nominate_other')
diff --git a/openslides/config/views.py b/openslides/config/views.py
index fc2d5037e..5472be8fa 100644
--- a/openslides/config/views.py
+++ b/openslides/config/views.py
@@ -117,6 +117,7 @@ def register_tab(request):
     selected = request.path.startswith('/config/')
     return Tab(
         title=_('Configuration'),
+        app='config',
         url=reverse('config_general'),
         permission=request.user.has_perm('config.can_manage_config'),
         selected=selected,
diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo
index 328c8ebc10e2d5a9823b7ac1ff85cc1391d91aa8..b828d33a6ff48616c810661bfffc1c744e6e0cc7 100644
GIT binary patch
delta 11257
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
auX!CktUU>=xN2PViB*GL(H~cDb^Rah{(}Sn

delta 13426
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
Q>q}v$%u4+0!tK8Q0nJ88H~;_u

diff --git a/openslides/locale/de/LC_MESSAGES/django.po b/openslides/locale/de/LC_MESSAGES/django.po
index 824b47d29..3dd8e3600 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: OpenSlides 1.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 19:14+0200\n"
+"POT-Creation-Date: 2012-09-04 23:59+0200\n"
 "PO-Revision-Date: 2012-07-28 11:07+0200\n"
 "Last-Translator: Oskar Hahn <mail@oshahn.de>\n"
 "Language-Team: Deutsch <mail@oshahn.de>\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: openslides_settings.py:48
+#: openslides_global_settings.py:36
 msgid "German"
 msgstr "Deutsch"
 
-#: openslides_settings.py:49
+#: openslides_global_settings.py:37
 msgid "English"
 msgstr "Englisch"
 
@@ -30,17 +30,17 @@ msgid "Parent item"
 msgstr "Elternelement"
 
 #: agenda/models.py:42 application/forms.py:22 application/models.py:540
-#: application/templates/application/view.html:249 config/forms.py:61
+#: application/templates/application/view.html:100 config/forms.py:61
 #: projector/models.py:32
 msgid "Title"
 msgstr "Titel"
 
 #: agenda/models.py:43 application/forms.py:23 application/models.py:541
-#: application/templates/application/view.html:250 projector/models.py:33
+#: application/templates/application/view.html:101 projector/models.py:33
 msgid "Text"
 msgstr "Text"
 
-#: agenda/models.py:44 agenda/templates/agenda/overview.html:65
+#: agenda/models.py:44 agenda/templates/agenda/overview.html:79
 #: agenda/templates/agenda/view.html:13 participant/models.py:52
 #: participant/templates/participant/overview.html:72
 msgid "Comment"
@@ -50,7 +50,7 @@ msgstr "Kommentar"
 msgid "Closed"
 msgstr "Abgeschlossen"
 
-#: agenda/models.py:46 agenda/templates/agenda/overview.html:71
+#: agenda/models.py:46 agenda/templates/agenda/overview.html:85
 msgid "Weight"
 msgstr "Gewichtung"
 
@@ -64,10 +64,10 @@ msgstr "Darf die Tagesordung verwalten"
 
 #: agenda/models.py:189 agenda/slides.py:20 agenda/views.py:194
 #: agenda/views.py:195 agenda/views.py:214
-#: agenda/templates/agenda/base_agenda.html:10
+#: agenda/templates/agenda/base_agenda.html:13
 #: agenda/templates/agenda/overview.html:8
-#: agenda/templates/agenda/overview.html:52
-#: agenda/templates/agenda/overview.html:77
+#: agenda/templates/agenda/overview.html:58
+#: agenda/templates/agenda/overview.html:91
 #: agenda/templates/projector/AgendaSummary.html:6
 #: agenda/templates/projector/AgendaSummary.html:10
 msgid "Agenda"
@@ -105,41 +105,36 @@ msgstr "Eintrag %s und seine Kindelemente wurde erfolgreich gelöscht."
 msgid "Item %s was successfully deleted."
 msgstr "Eintrag %s wurde erfolgreich gelöscht."
 
-#: agenda/templates/agenda/base_agenda.html:12
+#: agenda/templates/agenda/base_agenda.html:15
 msgid "All items"
 msgstr "Alle Einträge"
 
-#: agenda/templates/agenda/base_agenda.html:14
-#: agenda/templates/agenda/edit.html:10 agenda/templates/agenda/edit.html:18
+#: agenda/templates/agenda/base_agenda.html:17
+#: agenda/templates/agenda/edit.html:10 agenda/templates/agenda/edit.html:19
+#: agenda/templates/agenda/overview.html:61
 msgid "New item"
 msgstr "Neuer Eintrag"
 
-#: agenda/templates/agenda/base_agenda.html:16
+#: agenda/templates/agenda/base_agenda.html:19
 msgid "Agenda as PDF"
 msgstr "Tagesordnung als PDF"
 
-#: agenda/templates/agenda/base_agenda.html:19
-#: projector/templates/projector/base_projector.html:20
-#: templates/front_page.html:25
-msgid "Projector view"
-msgstr "Projektor-Ansicht"
-
-#: agenda/templates/agenda/base_agenda.html:31
+#: agenda/templates/agenda/base_agenda.html:29
 msgid "View item"
 msgstr "Eintrag anzeigen"
 
-#: agenda/templates/agenda/base_agenda.html:36
-#: agenda/templates/agenda/edit.html:8 agenda/templates/agenda/edit.html:16
+#: agenda/templates/agenda/base_agenda.html:34
+#: agenda/templates/agenda/edit.html:8 agenda/templates/agenda/edit.html:17
 #: agenda/templates/agenda/item_row.html:40
 msgid "Edit item"
 msgstr "Eintrag bearbeiten"
 
-#: agenda/templates/agenda/base_agenda.html:38
+#: agenda/templates/agenda/base_agenda.html:36
 #: agenda/templates/agenda/item_row.html:41
 msgid "Delete item"
 msgstr "Eintrag löschen"
 
-#: agenda/templates/agenda/base_agenda.html:43
+#: agenda/templates/agenda/base_agenda.html:41
 msgid "Show item"
 msgstr "Eintrag projizieren"
 
@@ -147,10 +142,10 @@ msgstr "Eintrag projizieren"
 msgid "Agenda settings"
 msgstr "Tagesordnungs-Einstellungen"
 
-#: agenda/templates/agenda/config.html:13 agenda/templates/agenda/edit.html:24
+#: agenda/templates/agenda/config.html:13 agenda/templates/agenda/edit.html:40
 #: application/templates/application/config.html:13
-#: application/templates/application/edit.html:26
-#: application/templates/application/poll_view.html:52
+#: application/templates/application/edit.html:41
+#: application/templates/application/poll_view.html:75
 #: assignment/templates/assignment/config.html:13
 #: assignment/templates/assignment/edit.html:26
 #: assignment/templates/assignment/poll_view.html:66
@@ -161,14 +156,15 @@ msgstr "Tagesordnungs-Einstellungen"
 #: participant/templates/participant/password_change.html:22
 #: participant/templates/participant/settings.html:22
 #: projector/templates/projector/new.html:13
+#: projector/templates/projector/select_widgets.html:22
 msgid "Save"
 msgstr "Speichern"
 
-#: agenda/templates/agenda/config.html:17 agenda/templates/agenda/edit.html:31
+#: agenda/templates/agenda/config.html:17 agenda/templates/agenda/edit.html:47
 #: application/templates/application/config.html:17
-#: application/templates/application/edit.html:33
-#: application/templates/application/import.html:27
-#: application/templates/application/poll_view.html:59
+#: application/templates/application/edit.html:48
+#: application/templates/application/import.html:41
+#: application/templates/application/poll_view.html:81
 #: assignment/templates/assignment/config.html:17
 #: assignment/templates/assignment/edit.html:33
 #: assignment/templates/assignment/poll_view.html:73
@@ -183,22 +179,29 @@ msgstr "Speichern"
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: agenda/templates/agenda/edit.html:27
-#: application/templates/application/edit.html:29
-#: application/templates/application/poll_view.html:55
+#: agenda/templates/agenda/edit.html:22
+#: application/templates/application/edit.html:22
+#: application/templates/application/import.html:10
+#: application/templates/application/view.html:29
+msgid "Back to overview"
+msgstr "Zurück zur Übersicht"
+
+#: agenda/templates/agenda/edit.html:43
+#: application/templates/application/edit.html:44
+#: application/templates/application/poll_view.html:78
 #: assignment/templates/assignment/edit.html:29
 #: assignment/templates/assignment/poll_view.html:69
 #: assignment/templates/assignment/view.html:83
 #: participant/templates/participant/edit.html:34
 #: participant/templates/participant/group_edit.html:28
-#: projector/templates/projector/control_overlay_message.html:7
+#: projector/templates/projector/control_overlay_message.html:8
 #: projector/templates/projector/new.html:16
 msgid "Apply"
 msgstr "Übernehmen"
 
-#: agenda/templates/agenda/edit.html:35
-#: application/templates/application/edit.html:37
-#: application/templates/application/import.html:31
+#: agenda/templates/agenda/edit.html:51
+#: application/templates/application/edit.html:52
+#: application/templates/application/import.html:44
 #: assignment/templates/assignment/edit.html:37
 #: participant/templates/participant/edit.html:42
 #: participant/templates/participant/group_edit.html:36
@@ -215,7 +218,7 @@ msgid "Item closed"
 msgstr "Eintrag erledigt"
 
 #: agenda/templates/agenda/item_row.html:35
-#: agenda/templates/agenda/overview.html:86
+#: agenda/templates/agenda/overview.html:100
 msgid "Activate item"
 msgstr "Eintrag projizieren"
 
@@ -224,13 +227,13 @@ msgstr "Eintrag projizieren"
 msgid "Activate summary for this item"
 msgstr "Zusammenfassung für diesen Eintrag projizieren"
 
-#: agenda/templates/agenda/overview.html:45
+#: agenda/templates/agenda/overview.html:50
 msgid "Do you want to save the changed order of agenda items?"
 msgstr "Möchten Sie die geänderte Reihenfolge der Einträge speichern?"
 
-#: agenda/templates/agenda/overview.html:46 application/models.py:574
+#: agenda/templates/agenda/overview.html:52 application/models.py:574
 #: application/views.py:486 application/views.py:798 application/views.py:849
-#: application/templates/application/view.html:82
+#: application/templates/application/view.html:215
 #: application/templates/projector/Application.html:37
 #: assignment/models.py:260 assignment/views.py:561
 #: assignment/templates/assignment/view.html:156
@@ -241,9 +244,9 @@ msgstr "Möchten Sie die geänderte Reihenfolge der Einträge speichern?"
 msgid "Yes"
 msgstr "Ja"
 
-#: agenda/templates/agenda/overview.html:47 application/models.py:574
+#: agenda/templates/agenda/overview.html:53 application/models.py:574
 #: application/views.py:486 application/views.py:798 application/views.py:850
-#: application/templates/application/view.html:83
+#: application/templates/application/view.html:216
 #: application/templates/projector/Application.html:38
 #: assignment/models.py:260 assignment/views.py:562
 #: assignment/templates/assignment/view.html:157
@@ -252,42 +255,40 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nein"
 
-#: agenda/templates/agenda/overview.html:55
-#: application/templates/application/overview.html:12
-#: assignment/templates/assignment/overview.html:12
-#: participant/templates/participant/overview.html:22
-msgid "Filter"
-msgstr "Filter"
+#: agenda/templates/agenda/overview.html:61
+#: application/templates/application/overview.html:13
+msgid "New"
+msgstr ""
 
-#: agenda/templates/agenda/overview.html:56
+#: agenda/templates/agenda/overview.html:63
+msgid "Print agenda as PDF"
+msgstr "Tagesordnung als PDF drucken"
+
+#: agenda/templates/agenda/overview.html:68
 msgid "Hide closed items"
-msgstr "Verstecke abgeschlossene Einträge"
+msgstr "Abgeschlossene Einträge verbergen"
 
-#: agenda/templates/agenda/overview.html:59
+#: agenda/templates/agenda/overview.html:72
 msgid "item"
 msgid_plural "items"
 msgstr[0] "Eintrag"
 msgstr[1] "Einträge"
 
-#: agenda/templates/agenda/overview.html:62
-msgid "Done"
-msgstr "Erledigt"
-
-#: agenda/templates/agenda/overview.html:63
+#: agenda/templates/agenda/overview.html:77
 msgid "Item"
 msgstr "Eintrag"
 
-#: agenda/templates/agenda/overview.html:68
-#: application/templates/application/overview.html:43
+#: agenda/templates/agenda/overview.html:82
+#: application/templates/application/overview.html:58
 #: assignment/templates/assignment/overview.html:28
 #: participant/templates/participant/group_overview.html:13
 #: participant/templates/participant/overview.html:74
 msgid "Actions"
 msgstr "Aktionen"
 
-#: agenda/templates/agenda/overview.html:102
+#: agenda/templates/agenda/overview.html:116
 #: agenda/templates/agenda/widget.html:46
-#: projector/templates/projector/widget.html:36
+#: projector/templates/projector/custom_slide_widget.html:36
 msgid "No items available."
 msgstr "Keine Einträge vorhanden."
 
@@ -295,8 +296,8 @@ msgstr "Keine Einträge vorhanden."
 #: agenda/templates/agenda/widget.html:29
 #: application/templates/application/widget.html:17
 #: assignment/templates/assignment/widget.html:17
-#: projector/templates/projector/widget.html:11
-#: projector/templates/projector/widget.html:30
+#: projector/templates/projector/custom_slide_widget.html:11
+#: projector/templates/projector/custom_slide_widget.html:30
 msgid "Preview"
 msgstr "Vorschau"
 
@@ -304,7 +305,7 @@ msgstr "Vorschau"
 #: application/templates/application/widget.html:11
 #: assignment/templates/assignment/view.html:120
 #: assignment/templates/assignment/widget.html:11
-#: projector/templates/projector/widget.html:24
+#: projector/templates/projector/custom_slide_widget.html:24
 msgid "Delete"
 msgstr "Löschen"
 
@@ -312,13 +313,13 @@ msgstr "Löschen"
 #: application/templates/application/widget.html:14
 #: assignment/templates/assignment/view.html:119
 #: assignment/templates/assignment/widget.html:14
-#: projector/templates/projector/widget.html:27
+#: projector/templates/projector/custom_slide_widget.html:27
 msgid "Edit"
 msgstr "Bearbeiten"
 
 #: application/forms.py:25 application/models.py:542 application/views.py:817
-#: application/templates/application/view.html:232
-#: application/templates/application/view.html:252
+#: application/templates/application/view.html:85
+#: application/templates/application/view.html:102
 #: application/templates/projector/Application.html:77
 msgid "Reason"
 msgstr "Begründung"
@@ -332,11 +333,11 @@ msgid "Trivial changes don't create a new version."
 msgstr "Triviale Änderungen erzeugen keine neue Version."
 
 #: application/forms.py:44 application/views.py:748
-#: application/templates/application/view.html:25
+#: application/templates/application/view.html:167
 msgid "Supporters"
 msgstr "Unterstützer/innen"
 
-#: application/forms.py:50 participant/forms.py:116
+#: application/forms.py:50 participant/forms.py:102
 msgid "CSV File"
 msgstr "CSV-Datei"
 
@@ -405,13 +406,13 @@ msgstr "Veröffentlicht"
 msgid "Permitted"
 msgstr "Zugelassen"
 
-#: application/models.py:47 application/templates/application/overview.html:24
-#: application/templates/application/view.html:170
+#: application/models.py:47 application/templates/application/overview.html:38
+#: application/templates/application/view.html:302
 msgid "Accepted"
 msgstr "Angenommen"
 
-#: application/models.py:48 application/templates/application/overview.html:25
-#: application/templates/application/view.html:175
+#: application/models.py:48 application/templates/application/overview.html:39
+#: application/templates/application/view.html:307
 msgid "Rejected"
 msgstr "Abgelehnt"
 
@@ -419,17 +420,17 @@ msgstr "Abgelehnt"
 msgid "Withdrawed"
 msgstr "Zurückgezogen"
 
-#: application/models.py:50 application/templates/application/view.html:183
+#: application/models.py:50 application/templates/application/view.html:322
 msgid "Adjourned"
 msgstr "Vertagt"
 
 # please check!
-#: application/models.py:51 application/templates/application/view.html:186
+#: application/models.py:51 application/templates/application/view.html:325
 msgid "Not Concerned"
 msgstr "Nicht befasst"
 
 # please check!
-#: application/models.py:52 application/templates/application/view.html:189
+#: application/models.py:52 application/templates/application/view.html:328
 msgid "Commited a bill"
 msgstr "Verwiesen (in Ausschuss)"
 
@@ -437,13 +438,13 @@ msgstr "Verwiesen (in Ausschuss)"
 msgid "Rejected (not authorized)"
 msgstr "Verworfen (nicht zulässig)"
 
-#: application/models.py:54 application/templates/application/overview.html:27
+#: application/models.py:54 application/templates/application/overview.html:41
 msgid "Needs Review"
 msgstr "Benötigt Review"
 
 #: application/models.py:66 application/views.py:732
-#: application/templates/application/overview.html:41
-#: application/templates/application/view.html:18
+#: application/templates/application/overview.html:56
+#: application/templates/application/view.html:160
 #: application/templates/projector/Application.html:55
 msgid "Submitter"
 msgstr "Antragsteller/in"
@@ -453,12 +454,6 @@ msgstr "Antragsteller/in"
 msgid "Version %d authorized"
 msgstr "Version %d zugelassen"
 
-#: application/models.py:110
-#, python-format
-msgctxt "Rejected means not authorized"
-msgid "Version %d rejected"
-msgstr "Version %d verworfen"
-
 #: application/models.py:139
 msgid "Searching for supporters."
 msgstr "Auf Unterstützersuche."
@@ -545,14 +540,15 @@ msgstr "Status geändert"
 msgid "by"
 msgstr "von"
 
-#: application/models.py:455 application/templates/application/view.html:213
+#: application/models.py:455 application/templates/application/view.html:12
+#: application/templates/application/view.html:23
 #: application/templates/application/widget.html:27
 #: application/templates/projector/Application.html:65
 msgid "no number"
 msgstr "ohne Nummer"
 
 #: application/models.py:456
-#: application/templates/application/overview.html:32
+#: application/templates/application/overview.html:46
 #: application/templates/application/widget.html:23
 msgid "motion"
 msgstr "antrag"
@@ -585,9 +581,7 @@ msgstr "Enthaltung"
 msgid "The Assembly may decide,"
 msgstr "Die Versammlung möge beschließen,"
 
-#: application/models.py:604
-#: application/templates/application/base_application.html:9
-#: application/templates/application/overview.html:7
+#: application/models.py:604 application/templates/application/overview.html:7
 #: application/templates/application/overview.html:10
 msgid "Motions"
 msgstr "Anträge"
@@ -612,7 +606,7 @@ msgid "Motion was successfully modified."
 msgstr "Antrag wurde erfolgreich geändert."
 
 #: application/views.py:257 application/views.py:656 assignment/views.py:133
-#: participant/views.py:458 participant/views.py:481 utils/views.py:210
+#: participant/views.py:459 participant/views.py:482 utils/views.py:210
 #: utils/views.py:228 utils/views.py:252
 msgid "Please check the form for errors."
 msgstr "Bitte kontrollieren Sie das Formular nach Fehlern."
@@ -794,7 +788,7 @@ msgstr "Anträge"
 msgid "Application"
 msgstr "Antrag"
 
-#: application/views.py:706 application/templates/application/overview.html:84
+#: application/views.py:706 application/templates/application/overview.html:99
 msgid "No motions available."
 msgstr "Keine Anträge vorhanden."
 
@@ -804,9 +798,9 @@ msgstr "Keine Anträge vorhanden."
 msgid "Motion No."
 msgstr "Antrag Nr."
 
-#: application/views.py:762 application/templates/application/overview.html:20
-#: application/templates/application/overview.html:40
-#: application/templates/application/view.html:37
+#: application/views.py:762 application/templates/application/overview.html:33
+#: application/templates/application/overview.html:55
+#: application/templates/application/view.html:179
 #: application/templates/projector/Application.html:11
 #: assignment/templates/assignment/overview.html:14
 #: assignment/templates/assignment/overview.html:27
@@ -816,38 +810,36 @@ msgstr "Antrag Nr."
 msgid "Status"
 msgstr "Status"
 
-#: application/views.py:781 application/templates/application/view.html:217
-#: application/templates/application/view.html:247 config/models.py:131
+#: application/views.py:781 application/templates/application/view.html:25
+#: application/templates/application/view.html:98 config/models.py:131
 #: config/templates/config/version.html:5
 #: config/templates/config/version.html:8
 #: config/templates/config/version.html:11
 msgid "Version"
 msgstr "Version"
 
-#: application/views.py:791 application/templates/application/view.html:47
+#: application/views.py:791 application/templates/application/view.html:189
 #: assignment/views.py:395
 msgid "Vote results"
 msgstr "Abstimmungsergebnis"
 
-#: application/views.py:797
-#: application/templates/application/base_application.html:55
-#: application/templates/application/poll_view.html:8
-#: application/templates/application/poll_view.html:13
-#: application/templates/application/view.html:69
-#: application/templates/application/view.html:77
+#: application/views.py:797 application/templates/application/poll_view.html:7
+#: application/templates/application/poll_view.html:14
+#: application/templates/application/view.html:54
+#: application/templates/application/view.html:207
 #: application/templates/projector/Application.html:33
 msgid "Vote"
 msgstr "Abstimmung"
 
 #: application/views.py:798 application/views.py:851
-#: application/templates/application/view.html:84
+#: application/templates/application/view.html:217
 #: application/templates/projector/Application.html:39 assignment/views.py:562
 #: assignment/templates/assignment/view.html:158
 #: assignment/templates/projector/Assignment.html:80
 msgid "Abstention"
 msgstr "Enthaltung"
 
-#: application/views.py:798 application/templates/application/view.html:85
+#: application/views.py:798 application/templates/application/view.html:218
 #: application/templates/projector/Application.html:40
 #: assignment/templates/assignment/view.html:180
 #: assignment/templates/projector/Assignment.html:101
@@ -855,8 +847,8 @@ msgid "Invalid"
 msgstr "Ungültig"
 
 #: application/views.py:798
-#: application/templates/application/poll_view.html:35
-#: application/templates/application/view.html:87
+#: application/templates/application/poll_view.html:61
+#: application/templates/application/view.html:220
 #: application/templates/projector/Application.html:42 assignment/views.py:446
 #: assignment/templates/assignment/poll_view.html:45
 #: assignment/templates/assignment/view.html:192
@@ -884,70 +876,35 @@ msgstr "%d. Abstimmung"
 msgid "Motion settings successfully saved."
 msgstr "Antrags-Einstellungen wurden erfolgreich gespeichert."
 
-#: application/templates/application/base_application.html:11
-msgid "All motions"
-msgstr "Alle Anträge"
-
-#: application/templates/application/base_application.html:13
-#: application/templates/application/edit.html:10
-#: application/templates/application/edit.html:18
-msgid "New motion"
-msgstr "Neuer Antrag"
-
-#: application/templates/application/base_application.html:16
-#: application/templates/application/import.html:5
-#: application/templates/application/import.html:8
-msgid "Import motions"
-msgstr "Anträge importieren"
-
-#: application/templates/application/base_application.html:18
-msgid "All motions as PDF"
-msgstr "Alle Anträge als PDF"
-
-#: application/templates/application/base_application.html:24
-msgid "Application No."
-msgstr "Antrag Nr."
-
-#: application/templates/application/base_application.html:34
-msgid "View motion"
-msgstr "Antrag anzeigen"
-
-#: application/templates/application/base_application.html:38
-#: application/templates/application/edit.html:8
-#: application/templates/application/edit.html:16
-#: application/templates/application/overview.html:72
-msgid "Edit motion"
-msgstr "Antrag bearbeiten"
-
-#: application/templates/application/base_application.html:42
-#: application/templates/application/overview.html:74
-msgid "Delete motion"
-msgstr "Antrag löschen"
-
-#: application/templates/application/base_application.html:45
-#: application/templates/application/overview.html:77
-msgid "Motion as PDF"
-msgstr "Antrag als PDF"
-
-#: application/templates/application/base_application.html:49
-msgid "Show Application"
-msgstr "Antrag projizieren"
-
-#: application/templates/application/base_application.html:61
-#: assignment/templates/assignment/base_assignment.html:63
-msgid "New agenda item"
-msgstr "Neuer Tagesordnungseintrag"
-
 #: application/templates/application/config.html:5
 #: application/templates/application/config.html:8
 msgid "Application settings"
 msgstr "Antrags-Einstellungen"
 
-#: application/templates/application/import.html:9
+#: application/templates/application/edit.html:8
+#: application/templates/application/edit.html:17
+#: application/templates/application/overview.html:87
+#: application/templates/application/view.html:39
+msgid "Edit motion"
+msgstr "Antrag bearbeiten"
+
+#: application/templates/application/edit.html:10
+#: application/templates/application/edit.html:19
+#: application/templates/application/overview.html:13
+msgid "New motion"
+msgstr "Neuer Antrag"
+
+#: application/templates/application/import.html:5
+#: application/templates/application/import.html:8
+#: application/templates/application/overview.html:14
+msgid "Import motions"
+msgstr "Anträge importieren"
+
+#: application/templates/application/import.html:14
 msgid "Select a CSV file to import motions!"
 msgstr "Wählen Sie eine CSV-Datei zum Importieren von Anträgen aus!"
 
-#: application/templates/application/import.html:11
+#: application/templates/application/import.html:15
 msgid ""
 "Required comma separated values: <code>{number, title, text, reason, "
 "first_name, last_name}</code> (<code>number</code> and <code>reason</code> "
@@ -957,236 +914,274 @@ msgstr ""
 "Vorname, Nachname}</code> (<code>Nummer</code> und <code>Begründung</code> "
 "sind optional und können auch leer sein)"
 
-#: application/templates/application/import.html:13
+#: application/templates/application/import.html:17
 #: participant/templates/participant/import.html:13
 msgid "Required CSV file encoding: UTF-8 (Unicode)."
 msgstr "Erforderliches CSV-Datei-Encoding: UTF-8 (Unicode)."
 
-#: application/templates/application/import.html:16
+#: application/templates/application/import.html:20
 #: participant/templates/participant/import.html:16
 msgid "A CSV example file is available in OpenSlides Wiki."
 msgstr "Eine CSV-Beispiel-Datei gibt es im OpenSlides Wiki."
 
-#: application/templates/application/import.html:23
+#: application/templates/application/import.html:38
+#: application/templates/application/overview.html:14
 #: participant/templates/participant/import.html:23
 msgid "Import"
 msgstr "Importieren"
 
-#: application/templates/application/overview.html:15
+#: application/templates/application/overview.html:16
+msgid "Print all motions as PDF"
+msgstr "Alle Anträge als PDF drucken"
+
+#: application/templates/application/overview.html:24
 msgid "Need supporters"
 msgstr "Benötigt Unterstützer/innen"
 
-#: application/templates/application/overview.html:18
+#: application/templates/application/overview.html:29
 msgid "Without number"
 msgstr "Ohne Nummer"
 
-#: application/templates/application/overview.html:22
+#: application/templates/application/overview.html:36
 msgid "Not yet authorized"
 msgstr "Noch nicht zugelassen"
 
-#: application/templates/application/overview.html:23
+#: application/templates/application/overview.html:37
 msgid "Authorized"
 msgstr "Zugelassen"
 
-#: application/templates/application/overview.html:26
+#: application/templates/application/overview.html:40
 msgid "Withdrawen (by submitter)"
 msgstr "Zurückgezogen (durch Antragsteller/in)"
 
-#: application/templates/application/overview.html:35
+#: application/templates/application/overview.html:50
 msgid "Number"
 msgstr "Nummer"
 
-#: application/templates/application/overview.html:36
+#: application/templates/application/overview.html:51
 msgid "Motion title"
 msgstr "Antragstitel"
 
-#: application/templates/application/overview.html:38
+#: application/templates/application/overview.html:53
 msgid "Number of supporters"
 msgstr "Anzahl der Unterstützer/innen"
 
-#: application/templates/application/overview.html:42
-#: application/templates/application/view.html:112
+#: application/templates/application/overview.html:57
+#: application/templates/application/view.html:243
 msgid "Creation Time"
 msgstr "Erstellungszeit"
 
-#: application/templates/application/overview.html:67
+#: application/templates/application/overview.html:82
 msgid "Activate motion"
 msgstr "Antrag projizieren"
 
+#: application/templates/application/overview.html:89
+#: application/templates/application/view.html:43
+msgid "Delete motion"
+msgstr "Antrag löschen"
+
+#: application/templates/application/overview.html:92
+msgid "Motion as PDF"
+msgstr "Antrag als PDF"
+
 #: application/templates/application/poll_view.html:7
-#: application/templates/application/poll_view.html:12
-#: application/templates/application/view.html:7
-#: application/templates/application/view.html:209
-#: application/templates/application/view.html:228
+#: application/templates/application/poll_view.html:14
+#: application/templates/application/view.html:8
+#: application/templates/application/view.html:21
 #: application/templates/projector/Application.html:7
 #: application/templates/projector/Application.html:65
 msgid "Motion"
 msgstr "Antrag"
 
-#: application/templates/application/poll_view.html:14
+#: application/templates/application/poll_view.html:18
+msgid "Back to motion"
+msgstr "Zurück zum Antrag"
+
+#: application/templates/application/poll_view.html:21
+#: application/templates/application/view.html:33
+#: application/templates/application/view.html:317
+msgid "More actions"
+msgstr "Mehr Aktionen"
+
+#: application/templates/application/poll_view.html:27
+#: application/templates/application/view.html:210
+msgid "Delete Vote"
+msgstr "Abstimmung löschen"
+
+#: application/templates/application/poll_view.html:32
+#: application/templates/application/view.html:48
+msgid "Show Application"
+msgstr "Antrag projizieren"
+
+#: application/templates/application/poll_view.html:41
 #: assignment/templates/assignment/poll_view.html:12
 msgid "Special values"
 msgstr "Spezielle Werte"
 
-#: application/templates/application/poll_view.html:14
+#: application/templates/application/poll_view.html:41
 #: assignment/templates/assignment/poll_view.html:12 poll/models.py:235
 msgid "majority"
 msgstr "Mehrheit"
 
-#: application/templates/application/poll_view.html:14
+#: application/templates/application/poll_view.html:41
 #: assignment/templates/assignment/poll_view.html:12 poll/models.py:237
 msgid "undocumented"
 msgstr "nicht erfasst"
 
-#: application/templates/application/poll_view.html:21
+#: application/templates/application/poll_view.html:47
 msgid "Option"
 msgstr "Wahlmöglichkeit"
 
-#: application/templates/application/poll_view.html:22
+#: application/templates/application/poll_view.html:48
 #: assignment/models.py:263
 msgid "Votes"
 msgstr "Stimmen"
 
-#: application/templates/application/poll_view.html:31 assignment/views.py:439
+#: application/templates/application/poll_view.html:57 assignment/views.py:439
 #: assignment/templates/assignment/poll_view.html:35
 #: assignment/templates/assignment/view.html:175
 #: assignment/templates/projector/Assignment.html:97
 msgid "Invalid votes"
 msgstr "Ungültige Stimmen"
 
-#: application/templates/application/poll_view.html:45
+#: application/templates/application/poll_view.html:69
 #: assignment/templates/assignment/poll_view.html:59
 msgid "Ballot paper as PDF"
 msgstr "Stimmzettel als PDF"
 
-#: application/templates/application/view.html:21
-msgid "You!"
-msgstr "Sie!"
+#: application/templates/application/view.html:30
+msgid "Print this motion as PDF"
+msgstr "Alle Anträge als PDF drucken"
 
-#: application/templates/application/view.html:54
-#: application/templates/application/view.html:94
-msgid "New vote"
-msgstr "Neue Abstimmung"
+#: application/templates/application/view.html:60
+#: assignment/templates/assignment/base_assignment.html:63
+msgid "New agenda item"
+msgstr "Neuer Tagesordnungseintrag"
 
-#: application/templates/application/view.html:70
-msgid "Edit Vote"
-msgstr "Abstimmung bearbeiten"
-
-#: application/templates/application/view.html:73
-msgid "Delete Vote"
-msgstr "Abstimmung löschen"
-
-#: application/templates/application/view.html:102
-msgid "Enter result"
-msgstr "Ergebnis eingeben"
-
-#: application/templates/application/view.html:119
-msgid "Withdraw"
-msgstr "Zurückziehen"
-
-#: application/templates/application/view.html:127
-msgid "Unsupport"
-msgstr "Nicht unterstützen"
-
-#: application/templates/application/view.html:133
-msgid "Support"
-msgstr "Unterstützen"
-
-#: application/templates/application/view.html:139
-msgid "minimum required supporters"
-msgstr "minimal erforderliche Unterstützer/innen"
-
-#: application/templates/application/view.html:146
-msgid "Manage motion"
-msgstr "Antrag Verwalten"
-
-#: application/templates/application/view.html:149
-msgid "Formal validation"
-msgstr "Formale Gültigkeitsprüfung"
-
-#: application/templates/application/view.html:151
-msgid "Publish"
-msgstr "Veröffentlichen"
-
-#: application/templates/application/view.html:154
-msgid "Permit"
-msgstr "Zulassen"
-
-#: application/templates/application/view.html:157
-msgid "Not permit (reject)"
-msgstr "Nicht zulassen (verwerfen)"
-
-#: application/templates/application/view.html:160
-msgid "Set Number"
-msgstr "Setze Nummer"
-
-#: application/templates/application/view.html:167
-msgid "Result after vote"
-msgstr "Ergebnis nach der Abstimmung"
-
-#: application/templates/application/view.html:181
-msgid "Result after debate"
-msgstr "Ergebnis nach der Debatte"
-
-#: application/templates/application/view.html:192
-msgid "Withdrawed by Submitter"
-msgstr "Zurückgezogen durch Antragsteller/in"
-
-#: application/templates/application/view.html:197
-msgid "For Administration only:"
-msgstr "Nur zur Administration:"
-
-#: application/templates/application/view.html:199
-msgid "Reset"
-msgstr "Zurücksetzen"
-
-#: application/templates/application/view.html:222
+#: application/templates/application/view.html:74
 msgid "This is not the newest version."
 msgstr "Dies ist nicht die neuste Version."
 
-#: application/templates/application/view.html:222
-#: application/templates/application/view.html:224
+#: application/templates/application/view.html:74
+#: application/templates/application/view.html:76
 msgid "Go to version"
 msgstr "Gehe zu Version"
 
-#: application/templates/application/view.html:224
+#: application/templates/application/view.html:76
 msgid "This is not the authorized version."
 msgstr "Dies ist nicht die zugelassene Version."
 
-#: application/templates/application/view.html:242
+#: application/templates/application/view.html:81
+msgid "Motion text"
+msgstr "Antragstext"
+
+#: application/templates/application/view.html:94
 msgid "Version History"
 msgstr "Versionshistorie"
 
-#: application/templates/application/view.html:248
+#: application/templates/application/view.html:99
 msgid "Time"
 msgstr "Zeit"
 
-#: application/templates/application/view.html:259
+#: application/templates/application/view.html:109
 msgid "Version authorized"
 msgstr "Version %d zugelassen"
 
-#: application/templates/application/view.html:262
+#: application/templates/application/view.html:112
 msgid "Permit Version"
 msgstr "Version zulassen"
 
-#: application/templates/application/view.html:265
+#: application/templates/application/view.html:115
 msgid "Reject Version"
 msgstr "Version verwerfen"
 
-#: application/templates/application/view.html:269
+#: application/templates/application/view.html:119
 msgid "Version rejected"
 msgstr "Version verworfen"
 
-#: application/templates/application/view.html:279
-#: application/templates/application/view.html:286
-#: application/templates/application/view.html:293
+#: application/templates/application/view.html:129
+#: application/templates/application/view.html:136
+#: application/templates/application/view.html:143
 msgid "unchanged"
 msgstr "unverändert"
 
-#: application/templates/application/view.html:302
+#: application/templates/application/view.html:152
 msgid "Log"
 msgstr "Log"
 
+#: application/templates/application/view.html:163
+msgid "Me"
+msgstr "Ich"
+
+#: application/templates/application/view.html:195
+#: application/templates/application/view.html:227
+msgid "New vote"
+msgstr "Neue Abstimmung"
+
+#: application/templates/application/view.html:209
+msgid "Edit Vote"
+msgstr "Abstimmung bearbeiten"
+
+#: application/templates/application/view.html:234
+msgid "No results"
+msgstr "Keine Ergebnisse"
+
+#: application/templates/application/view.html:249
+msgid "Withdraw motion"
+msgstr "Antrag zurückziehen"
+
+#: application/templates/application/view.html:257
+msgid "Unsupport motion"
+msgstr "Antrag nicht unterstützen"
+
+#: application/templates/application/view.html:263
+msgid "Support"
+msgstr "Unterstützen"
+
+#: application/templates/application/view.html:270
+msgid "minimum required supporters"
+msgstr "minimal erforderliche Unterstützer/innen"
+
+#: application/templates/application/view.html:277
+msgid "Manage motion"
+msgstr "Antrag verwalten"
+
+#: application/templates/application/view.html:280
+msgid "Formal validation"
+msgstr "Formale Gültigkeitsprüfung"
+
+#: application/templates/application/view.html:283
+msgid "Publish"
+msgstr "Veröffentlichen"
+
+#: application/templates/application/view.html:286
+msgid "Permit"
+msgstr "Zulassen"
+
+#: application/templates/application/view.html:289
+msgid "Not permit"
+msgstr "Nicht zulassen"
+
+#: application/templates/application/view.html:292
+msgid "Set number"
+msgstr "Nummer vergeben"
+
+#: application/templates/application/view.html:298
+msgid "Result after vote"
+msgstr "Ergebnis nach der Abstimmung"
+
+#: application/templates/application/view.html:331
+msgid "Withdrawed by Submitter"
+msgstr "Zurückgezogen durch Antragsteller/in"
+
+#: application/templates/application/view.html:338
+msgid "For Administration only:"
+msgstr "Nur zur Administration:"
+
+#: application/templates/application/view.html:340
+msgid "Reset"
+msgstr "Zurücksetzen"
+
 #: application/templates/application/widget.html:31
 msgid "No motion available."
 msgstr "Keine Antrag vorhanden."
@@ -1460,7 +1455,7 @@ msgstr "%d verfügbare Posten"
 msgid "Election settings successfully saved."
 msgstr "Wahl-Einstellungen wurden erfolgreich gespeichert."
 
-#: assignment/views.py:660
+#: assignment/views.py:662
 msgid "Assignments"
 msgstr "Wahlen"
 
@@ -1508,6 +1503,11 @@ msgstr "Wahl projizieren"
 msgid "Election settings"
 msgstr "Wahl-Einstellungen"
 
+#: assignment/templates/assignment/overview.html:12
+#: participant/templates/participant/overview.html:22
+msgid "Filter"
+msgstr "Filter"
+
 #: assignment/templates/assignment/overview.html:22
 msgid "election"
 msgid_plural "elections"
@@ -1600,7 +1600,7 @@ msgstr "Veranstalter"
 msgid "Allow access for anonymous guest users"
 msgstr "Erlaube Zugriff für anonyme Gast-Nutzer"
 
-#: config/forms.py:67 participant/forms.py:128
+#: config/forms.py:67 participant/forms.py:114
 msgid "Welcome text"
 msgstr "Willkommenstext"
 
@@ -1612,7 +1612,7 @@ msgstr "Darf die Konfiguration verwalten"
 msgid "Presentation system for agenda, motions and elections"
 msgstr "Präsentationssystem für Tagesordnung, Anträge und Wahlen"
 
-#: config/models.py:89 templates/base.html:30
+#: config/models.py:89
 msgid "Welcome"
 msgstr "Willkommen"
 
@@ -1666,50 +1666,34 @@ msgstr "System"
 msgid "Participant"
 msgstr "Teilnehmer"
 
-#: participant/forms.py:26 participant/forms.py:40
+#: participant/forms.py:26
 #: participant/templates/participant/group_overview.html:6
 #: participant/templates/participant/group_overview.html:9
 msgid "User groups"
 msgstr "Benutzerrollen"
 
-#: participant/forms.py:27 participant/forms.py:41
-#: participant/templates/participant/overview.html:53 projector/models.py:65
-msgid "Active"
-msgstr "Aktiv"
-
-#: participant/forms.py:37
-msgid "First name"
-msgstr "Vorname"
-
-#: participant/forms.py:38
-msgid "Last name"
-msgstr "Nachname"
-
-#: participant/forms.py:59
+#: participant/forms.py:44
 msgid "Persmissions"
 msgstr "Rechte"
 
-#: participant/forms.py:62
-#, fuzzy
+#: participant/forms.py:47
 msgid "Users"
-msgstr "Nutzername: %s"
+msgstr "Nutzer"
 
-#: participant/forms.py:98
-#, fuzzy
+#: participant/forms.py:83
 msgid "You can not edit the name for the anonymous user"
-msgstr ""
-"Sie dürfen diesen Antrag nicht bearbeiten. Sie sind nicht der Antragsteller"
+msgstr "Sie dürfen den Namen von dem anonymen Nutzer nicht bearbeiten."
 
-#: participant/forms.py:102
+#: participant/forms.py:87
 #, python-format
 msgid "Group name \"%s\" is reserved for internal use."
 msgstr "Der Gruppenname \"%s\" ist für interne Verwendung reserviert."
 
-#: participant/forms.py:123
+#: participant/forms.py:109
 msgid "System URL"
 msgstr "System URL"
 
-#: participant/forms.py:124 participant/forms.py:129
+#: participant/forms.py:110 participant/forms.py:115
 msgid "Printed in PDF of first time passwords only."
 msgstr "Erscheint nur im PDF der Erst-Passwörter"
 
@@ -1743,9 +1727,8 @@ msgid "Category"
 msgstr ""
 
 #: participant/models.py:41
-#, fuzzy
 msgid "Will be shown behind the name."
-msgstr "Hinter dem Namen angezeigt."
+msgstr "Wird nach dem Namen angezeigt."
 
 #: participant/models.py:44 participant/templates/participant/overview.html:24
 msgid "Gender"
@@ -1759,7 +1742,7 @@ msgstr "Nur zum Filtern der Benutzerliste."
 msgid "Typ"
 msgstr "Typ"
 
-#: participant/models.py:49 participant/views.py:215
+#: participant/models.py:49 participant/views.py:216
 #: participant/templates/participant/overview.html:45
 #: participant/templates/participant/overview.html:70
 msgid "Committee"
@@ -1770,7 +1753,6 @@ msgid "Only for notes."
 msgstr "Nur für Notizen."
 
 #: participant/models.py:56
-#, fuzzy
 msgid "Default password"
 msgstr "Erst-Passwort"
 
@@ -1782,100 +1764,99 @@ msgstr "Darf die Teilnehmer/inen sehen"
 msgid "Can manage participant"
 msgstr "Darf die Teilnehmer/inen verwalten"
 
-#: participant/views.py:210
+#: participant/views.py:211
 msgid "Participant-list"
 msgstr "Teilnehmerliste"
 
-#: participant/views.py:211
+#: participant/views.py:212
 msgid "List of Participants"
 msgstr "Teilnehmerliste"
 
-#: participant/views.py:214 participant/templates/participant/overview.html:67
+#: participant/views.py:215 participant/templates/participant/overview.html:67
 msgid "Last Name"
 msgstr "Nachname"
 
-#: participant/views.py:214 participant/templates/participant/overview.html:66
+#: participant/views.py:215 participant/templates/participant/overview.html:66
 msgid "First Name"
 msgstr "Vorname"
 
-#: participant/views.py:214
+#: participant/views.py:215
 msgid "Group"
 msgstr "Gruppe"
 
-#: participant/views.py:214 participant/templates/participant/overview.html:37
+#: participant/views.py:215 participant/templates/participant/overview.html:37
 #: participant/templates/participant/overview.html:69
 msgid "Type"
 msgstr "Typ"
 
-#: participant/views.py:243
+#: participant/views.py:244
 msgid "Participant-passwords"
 msgstr "Teilnehmer-Passwoerter"
 
-#: participant/views.py:261
+#: participant/views.py:262
 msgid "Account for OpenSlides"
 msgstr "Zugang für OpenSlides"
 
-#: participant/views.py:263
+#: participant/views.py:264
 #, python-format
 msgid "for %s"
 msgstr "für %s"
 
-#: participant/views.py:266
+#: participant/views.py:267
 #, python-format
 msgid "User: %s"
 msgstr "Nutzername: %s"
 
-#: participant/views.py:270
+#: participant/views.py:271
 #, python-format
 msgid "Password: %s"
 msgstr "Passwort: %s"
 
-#: participant/views.py:275
+#: participant/views.py:276
 #, python-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: participant/views.py:317
+#: participant/views.py:318
 #, python-format
 msgid "%d new participants were successfully imported."
 msgstr "%d neue Teilnehmer/innen wurden erfolgreich importiert."
 
-#: participant/views.py:328
-#, fuzzy
+#: participant/views.py:329
 msgid "Do you really want to reset the password?"
-msgstr "Soll das Passwort für <b>%s</b> wirklich zurückgesetzt werden?"
+msgstr "Soll das Passwort wirklich zurückgesetzt werden?"
 
-#: participant/views.py:344
-#, fuzzy, python-format
+#: participant/views.py:345
+#, python-format
 msgid "The Password for %s was successfully reset."
-msgstr "Das Passwort für <b>%s</b> wurde erfolgreich zurückgesetzt."
+msgstr "Das Passwort für %s wurde erfolgreich zurückgesetzt."
 
-#: participant/views.py:423
+#: participant/views.py:424
 msgid "Participants settings successfully saved."
 msgstr "Teilnehmer/innen-Einstellungen wurden erfolgreich gespeichert."
 
-#: participant/views.py:433
-#, fuzzy, python-format
+#: participant/views.py:434
+#, python-format
 msgid ""
 "Installation was successfully! Use %(user)s (password: %(password)s) for "
 "first login.<br><strong>Important:</strong> Please change the password after "
 "first login! Otherwise this message still appears for everyone  and could be "
 "a security risk."
 msgstr ""
-"Die Installation war erfolgreich! Verwende %(user)s (passwort: %(password)s) "
-"für die erste Anmeldung.<br><strong>Wichtig:</strong> Ändere das Passwort "
-"nach der ersten Anmeldung! Anderenfalls erscheint diese Meldung weiterhin "
-"für jeden und ist ein Sicherheitsrisiko."
+"Die Installation war erfolgreich! Verwenden Sie %(user)s (Passwort: "
+"%(password)s) für die erste Anmeldung.<br><strong>Wichtig:</strong> Ändern "
+"Sie das Passwort nach der ersten Anmeldung! Anderenfalls erscheint diese "
+"Meldung weiterhin für jeden und ist ein Sicherheitsrisiko."
 
-#: participant/views.py:456
+#: participant/views.py:457
 msgid "User settings successfully saved."
 msgstr "Nutzereinstellungen wurden erfolgreich gespeichert."
 
-#: participant/views.py:478
+#: participant/views.py:479
 msgid "Password successfully changed."
 msgstr "Password wurde erfolgreich geändert."
 
-#: participant/views.py:496
+#: participant/views.py:497
 #: participant/templates/participant/base_participant.html:12
 #: participant/templates/participant/overview.html:7
 #: participant/templates/participant/overview.html:18
@@ -1967,23 +1948,17 @@ msgstr ""
 
 #: participant/templates/participant/login.html:8
 #: participant/templates/participant/login.html:16
-#: participant/templates/participant/login.html:58 templates/base.html:32
+#: participant/templates/participant/login.html:47 templates/base.html:45
 msgid "Login"
 msgstr "Anmelden"
 
-#: participant/templates/participant/login.html:21
-#: participant/templates/participant/login.html:34 templates/base.html:57
-#: templates/base.html.py:64
-msgid "Close this notification"
-msgstr "Meldung ausblenden"
-
-#: participant/templates/participant/login.html:27
+#: participant/templates/participant/login.html:24
 msgid "Your username and password were not accepted. Please try again."
 msgstr ""
 "Benutzername und Passwort wurden nicht akzeptiert. Bitte versuchen Sie es "
 "erneut."
 
-#: participant/templates/participant/login.html:62
+#: participant/templates/participant/login.html:51
 msgid "Continue as guest"
 msgstr "Weiter als Gast"
 
@@ -1992,6 +1967,10 @@ msgstr "Weiter als Gast"
 msgid "Not specified"
 msgstr "Nicht angegeben"
 
+#: participant/templates/participant/overview.html:53 projector/models.py:66
+msgid "Active"
+msgstr "Aktiv"
+
 #: participant/templates/participant/overview.html:54
 msgid "Inactive"
 msgstr "Inaktiv"
@@ -2015,14 +1994,12 @@ msgid "Delete participant"
 msgstr "Teilnehmer/in löschen"
 
 #: participant/templates/participant/overview.html:99
-#, fuzzy
 msgid "Change status to inactive"
-msgstr "Status ändern (aktiv/inaktiv)"
+msgstr "Status ändern zu inaktiv"
 
 #: participant/templates/participant/overview.html:102
-#, fuzzy
 msgid "Change status to active"
-msgstr "Status ändern (aktiv/inaktiv)"
+msgstr "Status ändern zu aktiv"
 
 #: participant/templates/participant/overview.html:111
 msgid "No participants available."
@@ -2036,7 +2013,7 @@ msgid "Password Settings"
 msgstr "Passwort Einstellungen"
 
 #: participant/templates/participant/password_change.html:8
-#: participant/templates/participant/settings.html:8 templates/base.html:29
+#: participant/templates/participant/settings.html:8
 msgid "User Settings"
 msgstr "Benutzereinstellungen"
 
@@ -2060,12 +2037,35 @@ msgid "Can manage the projector"
 msgstr "Darf den Projektor steuern"
 
 #: projector/models.py:53
-msgid "Can see projector"
+msgid "Can see the projector"
 msgstr "Darf den Projektor sehen"
 
-#: projector/views.py:342 projector/templates/projector/base_projector.html:7
-#: projector/templates/projector/base_projector.html:11
-#: projector/templates/projector/control.html:17
+#: projector/models.py:54
+msgid "Can see the dashboard"
+msgstr "Darf das Dashboard sehen"
+
+#: projector/views.py:184
+msgid "Errors in the form"
+msgstr "Fehler im Formular"
+
+#: projector/views.py:360 projector/templates/projector/dashboard.html:17
+msgid "Dashboard"
+msgstr "Dashboard"
+
+#: projector/views.py:378
+msgid "Projector live view"
+msgstr "Projektor-Live-Ansicht"
+
+#: projector/views.py:404
+msgid "Manage Overlays"
+msgstr "Einblendungen verwalten"
+
+#: projector/views.py:417
+msgid "Custom Slide"
+msgstr "Benutzerdefinierte Folie"
+
+#: projector/templates/projector/base_projector.html:7
+#: projector/templates/projector/base_projector.html:12
 msgid "Projector"
 msgstr "Projektor"
 
@@ -2073,48 +2073,18 @@ msgstr "Projektor"
 msgid "Overview"
 msgstr "Übersicht"
 
-#: projector/templates/projector/control.html:20
-msgid "Adjust projector view"
-msgstr "Projektor-Ansicht anpassen"
+#: projector/templates/projector/base_projector.html:18
+#: projector/templates/projector/select_widgets.html:5
+#: projector/templates/projector/select_widgets.html:8
+msgid "Select widgets"
+msgstr "Widgets auswählen"
 
-#: projector/templates/projector/control.html:21
-msgid "Zoom in"
-msgstr "Vergrößern"
-
-#: projector/templates/projector/control.html:23
-msgid "Zoom out"
-msgstr "Verkleinern"
-
-#: projector/templates/projector/control.html:25
-msgid "Scroll text up"
-msgstr "Text nach oben scrollen"
-
-#: projector/templates/projector/control.html:27
-msgid "Scroll text down"
-msgstr "Text nach unten scrollen"
-
-#: projector/templates/projector/control.html:29
-msgid "Reset projector view"
-msgstr "Projektor-Ansicht zurücksetzen"
-
-#: projector/templates/projector/control.html:50
-msgid "Projector Live View"
-msgstr "Projektor-Live-Ansicht"
-
-#: projector/templates/projector/control.html:53
-msgid "Open Projector view"
-msgstr "Projektor-Ansicht öffnen"
-
-#: projector/templates/projector/control.html:64
-msgid "Overlays"
-msgstr "Einblendungen"
-
-#: projector/templates/projector/control.html:94
-msgid "Custom slides"
-msgstr "Benutzerdefinierte Folien"
+#: projector/templates/projector/base_projector.html:22
+#: templates/front_page.html:25
+msgid "Projector view"
+msgstr "Projektor-Ansicht"
 
 #: projector/templates/projector/control_countdown.html:6
-msgctxt "seconds"
 msgid "s"
 msgstr "s"
 
@@ -2135,22 +2105,50 @@ msgstr "Countdown starten"
 msgid "Stop countdown"
 msgstr "Countdown stoppen"
 
-#: projector/templates/projector/control_overlay_message.html:10
+#: projector/templates/projector/control_overlay_message.html:11
 msgid "Clean message"
 msgstr "Message leeren"
 
+#: projector/templates/projector/custom_slide_widget.html:14
+msgid "Welcome Page"
+msgstr "Willkommensseite"
+
+#: projector/templates/projector/custom_slide_widget.html:41
+msgid "New slide"
+msgstr "Neue Folie"
+
+#: projector/templates/projector/dashboard.html:21
+msgid "Adjust projector view"
+msgstr "Projektor-Ansicht anpassen"
+
+#: projector/templates/projector/dashboard.html:22
+msgid "Zoom in"
+msgstr "Vergrößern"
+
+#: projector/templates/projector/dashboard.html:25
+msgid "Zoom out"
+msgstr "Verkleinern"
+
+#: projector/templates/projector/dashboard.html:28
+msgid "Scroll text up"
+msgstr "Text nach oben scrollen"
+
+#: projector/templates/projector/dashboard.html:31
+msgid "Scroll text down"
+msgstr "Text nach unten scrollen"
+
+#: projector/templates/projector/dashboard.html:34
+msgid "Reset projector view"
+msgstr "Projektor-Ansicht zurücksetzen"
+
 #: projector/templates/projector/new.html:6
 #: projector/templates/projector/new.html:9
 msgid "Custom slide"
 msgstr "Benutzerdefinierte Folie"
 
-#: projector/templates/projector/widget.html:14
-msgid "Welcome Page"
-msgstr "Willkommensseite"
-
-#: projector/templates/projector/widget.html:41
-msgid "New slide"
-msgstr "Neue Folie"
+#: projector/templates/projector/select_widgets.html:17
+msgid "No widgets available"
+msgstr "Keine Widgets vorhanden."
 
 #: templates/404.html:7
 msgid "Page not found."
@@ -2160,12 +2158,20 @@ msgstr "Seite nicht gefunden."
 msgid "Server Error"
 msgstr "Serverfehler"
 
-#: templates/base.html:21 templates/front_page.html:6
+#: templates/base.html:29 templates/front_page.html:6
 #: templates/front_page.html.py:22
 msgid "Home"
 msgstr "Startseite"
 
-#: templates/base.html:27
+#: templates/base.html:39
+msgid "Profile"
+msgstr "Profil"
+
+#: templates/base.html:40
+msgid "Change password"
+msgstr "Passwort ändern"
+
+#: templates/base.html:42
 msgid "Logout"
 msgstr "Abmelden"
 
@@ -2227,99 +2233,17 @@ msgstr "undefinierter-dateiname"
 msgid "Enter valid JSON"
 msgstr "Gebe valides JSON ein"
 
-#~ msgid ""
-#~ "The import function is available for the admin (without user profile) "
-#~ "only."
-#~ msgstr ""
-#~ "Die Importfunktion ist nur für den superuser (ohne Nutzerprofil) "
-#~ "verfügbar."
+#~ msgid "All motions"
+#~ msgstr "Alle Anträge"
 
-#~ msgid "You can't candidate. Your user account is only for administration."
-#~ msgstr ""
-#~ "Sie können nicht kandidieren. Ihr Nutzerkonto ist nur zur Administration."
+#~ msgid "Application No."
+#~ msgstr "Antrag Nr."
 
-#~ msgid "Keep motions, try to reassign submitter"
-#~ msgstr "Anträge beibehalten, versuchen Antragssteller erneut zuzuweisen"
+#~ msgid "View motion"
+#~ msgstr "Antrag anzeigen"
 
-#~ msgid "Keep motions, set status to \"needs review\""
-#~ msgstr "Anträge beibehalten, Status auf \"Benötigt Review\" setzen"
+#~ msgid "Enter result"
+#~ msgstr "Ergebnis eingeben"
 
-#~ msgid "Discard motions"
-#~ msgstr "Alle Anträge löschen"
-
-#~ msgid "For existing motions"
-#~ msgstr "Bei existierenden Anträgen"
-
-#~ msgid "New participant was successfully created."
-#~ msgstr "Neue/r Teilnehmer/in wurde erfolgreich angelegt."
-
-#~ msgid "Participant was successfully modified."
-#~ msgstr "Teilnehmer/in wurde erfolgreich geändert."
-
-#~ msgid "Participant <b>%s</b> was successfully deleted."
-#~ msgstr "Teilnehmer/in <b>%s</b> wurde erfolgreich gelöscht."
-
-#~ msgid "Participant ID %d does not exist."
-#~ msgstr "Teilnehmer/in ID %d existiert nicht."
-
-#~ msgid "<b>%s</b> is now <b>present</b>."
-#~ msgstr "<b>%s</b> is jetzt <b>anwesend</b>."
-
-#~ msgid "<b>%s</b> is now <b>absent</b>."
-#~ msgstr "<b>%s</b> ist jetzt <b>abwesend</b>."
-
-#~ msgid "New group was successfully created."
-#~ msgstr "Neue Gruppe wurde erfolgreich angelegt."
-
-#~ msgid "Group was successfully modified."
-#~ msgstr "Gruppe wurde erfolgreich geändert."
-
-#~ msgid "Group <b>%s</b> was successfully deleted."
-#~ msgstr "Gruppe <b>%s</b>  wurde erfolgreich gelöscht."
-
-#~ msgid "Supporters removed after user import."
-#~ msgstr "Unterstützer/innen nach Benutzerimport zurückgesetzt."
-
-#~ msgid "Reassigned to \"%s\" after (re)importing users."
-#~ msgstr "Nach Benutzerimport erneut \"%s\" zugeordnet."
-
-#~ msgid "Could not reassing motion %d - object not found!"
-#~ msgstr ""
-#~ "Antrag %d konnte nicht neu zugewiesen werden - Das Objekt wurde nicht "
-#~ "gefunden!"
-
-#~ msgid "%d motion could not be reassigned and needs a review!"
-#~ msgid_plural "%d motions 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!"
-
-#~ msgid "%d motion was successfully reassigned."
-#~ msgid_plural "%d motions were successfully reassigned."
-#~ msgstr[0] "%d Antrag wurde erfolgreich neu zugewiesen."
-#~ msgstr[1] "%d Anträge wurden erfolgreich neu zugewiesen."
-
-#~ msgid "%d motion was discarded."
-#~ msgid_plural "%d motions were discarded."
-#~ msgstr[0] "%d Antrag wurde verworfen."
-#~ msgstr[1] "%d Anträge wurden verworfen."
-
-#~ msgid ""
-#~ "Attention: All existing participants will be removed if you import new "
-#~ "participants."
-#~ msgstr ""
-#~ "Achtung: Alle existierenden Teilnehmer/innen werden gelöscht, wenn Sie "
-#~ "neue Teilnehmer/innen importieren."
-
-#~ msgid "Attention: Supporters from all existing motions will be removed."
-#~ msgstr ""
-#~ "Achtung: Alle Unterstützer/innen werden von existiernden Anträgen "
-#~ "gelöscht."
-
-#~ msgid ""
-#~ "Attention: Motions 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\"."
+#~ msgid "Result after debate"
+#~ msgstr "Ergebnis nach der Debatte"
diff --git a/openslides/participant/templates/participant/login.html b/openslides/participant/templates/participant/login.html
index 1f182ade2..b873f8859 100644
--- a/openslides/participant/templates/participant/login.html
+++ b/openslides/participant/templates/participant/login.html
@@ -16,10 +16,7 @@
     <h1>{% trans "Login" %}</h1>
 
     {% if form.errors %}
-        <div class="notification error">
-            <a class="close" href="#">
-            <img alt="close" title="{% trans 'Close this notification' %}" src="{% static 'images/icons/cross.png' %}">
-            </a>
+        <div class="alert alert-error">
             {% for msg in form.non_field_errors %}
                 <em>{{ msg }}</em>
                 {% if not forloop.last %}<br />{% endif %}
@@ -29,18 +26,10 @@
         </div>
     {% endif %}
     {% if first_time_message %}
-        <div class="notification info">
-            <a class="close" href="#">
-            <img alt="close" title="{% trans 'Close this notification' %}" src="{% static 'images/icons/cross.png' %}">
-            </a>
+        <div class="alert alert-info">
             <em>{{ first_time_message|safe }}</em>
         </div>
     {% endif %}
-    <script>
-        $("div.notification").click(function () {
-            $(this).hide("fast");
-        });
-    </script>
     <form method="post" action="{% url user_login %}{% if next %}?next={{ next }}{% endif %}">
         {% csrf_token %}
         <table>
diff --git a/openslides/participant/templates/participant/overview.html b/openslides/participant/templates/participant/overview.html
index 3e2762a37..06437a9dd 100644
--- a/openslides/participant/templates/participant/overview.html
+++ b/openslides/participant/templates/participant/overview.html
@@ -61,7 +61,7 @@
     {% else %}
         {{ users.count }} {% trans "of" %} {{ allusers }} {% trans "Participants" %} (= {{ percent }} %)
     {% endif %}
-    <table>
+    <table class="table table-striped table-bordered">
         <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>
             <th><a href="?sort=last_name&reverse={% if 'last_name' in sortfilter.sort and 'reverse' not in sortfilter %}1{% else %}---{%endif%}">{% trans "Last Name" %}</a></th>
diff --git a/openslides/participant/views.py b/openslides/participant/views.py
index a2575d138..a498e5285 100644
--- a/openslides/participant/views.py
+++ b/openslides/participant/views.py
@@ -495,6 +495,7 @@ def register_tab(request):
     selected = request.path.startswith('/participant/')
     return Tab(
         title=_('Participants'),
+        app='participant',
         url=reverse('user_overview'),
         permission=request.user.has_perm('participant.can_see_participant') or
             request.user.has_perm('participant.can_manage_participant'),
diff --git a/openslides/projector/views.py b/openslides/projector/views.py
index 96af29ed6..cd906207c 100644
--- a/openslides/projector/views.py
+++ b/openslides/projector/views.py
@@ -358,6 +358,7 @@ def register_tab(request):
     selected = True if request.path.startswith('/projector/') else False
     return Tab(
         title=_('Dashboard'),
+        app='dashboard',
         url=reverse('dashboard'),
         permission=request.user.has_perm('projector.can_manage_projector') or
             request.user.has_perm('projector.can_see_dashboard'),
diff --git a/openslides/static/img/favicon.png b/openslides/static/img/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..a10d3081088e5196d989da6add813a16899d07e9
GIT binary patch
literal 1060
zcmV+<1l#+GP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004b3#c}2nYxW
zd<bNS00009a7bBm0003@0003@0cnQ4IRF3v8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11EEPoK~zYIwN%efBUK##zBkh;6N}KHxZS0DAYcg*Xh;Ym#2AyF
zwlQ$zZanB8pa)IF3&w*dFGkmcr#%|h%N~f05X@pAro`QpwP{Q(&>yiaF!as5pI&yF
zX`uzz_)R{Ud2hb?eBS5#{k}n|R0_NpA0K~DN_i)r&wmEKV2sT#E-v2B<#G?}_4+69
zFGBY(W@ctSG7RIEU!Yhlj;yV%ZBI;07@16FGM!G}qm<sOR;#6(2w?xhw(XZ1jYgYj
zEEaohYHG^hoWt1In7*>IGHaUV?~{|0AKXL$c_m6D5^u-j@t^ATI#5dgv@ENMF-Db2
zrGI&OIp#PH5JJFl9B>>5wzjq$A;fR#bo#AmG|H}Z5DJAVp-@OfA`v(~J}&O>@8|aR
z_71bz>|dO7V2lCh9K840+1WnJvR*$rI(oI2gH}0qc6Oc+LXLD@AIjx&Z~AiHsaC5G
z9mfIJbz2Tx*9Frw@!;U#2mn02)&T&3rfC!aq<^neDm_|VUA?`#yZfxazh4au49IXe
zEDD9fv-S1$+nT2R+{*#-k7**2_yYiLWipwUI}>ZQnnfucX*QdZ5F(|NrRnMEdM|Q-
zjxlA7fl^9cm1tR34FGD_5%v_IltLH&7miMWZU$aB+M3K511V*<-2X1XIsgAkluRb)
z3Wb7+F~)OqbMGRAKq-Z!lz<RIoO8uFSCmr87?X@KDTGjt<48)WVvGq&sUn0(+qT8V
z#>Pe}l~OH%;o;#2OG`^J#ux}8?t3@adkP_L{8UQ8>FMbk0Pwgau(`SU%fZ3HxDWz_
z5UqZAzXy+?8>yEogaATFJ{pZaZYxov(Wo1S(MHtkq`kfoLjI0MqwP&TIXU?TW85@N
z6Z{AUgAfb`!7vOk3<CmzKnuFAgQjVKF$Rn=AcO!R1cZ=pFHKP-5_wuGmA+?;fgfHU
zZVKDB_sZq+cbBFJ0O0WO@C!o7N?%`}<yrRQs)l>;%65K!{$(naYF#ER9*?&K!r}0#
zZQEjKXegy=nyzV@jxp9T#yUdi5}qGWS4!zhDcyD5ALi%hKlLBF?V<qyY;SLWRW6r*
zd_LQk%GIr8gpj;#+aGuGwK)I)h{xk95C}ZTX0wl^l#($v3IL{mvV0=);^N|oZQCD~
z%jNfz$z-KdK=0h}3GL?d`8$C?;FYtpv#$-qxC;PxrIZoQd65v3XN*-wM@K)eR;#}*
eEG)QJ@%#e_1>2n&lMRyq0000<MNUMnLSTZG#NM0$

literal 0
HcmV?d00001

diff --git a/openslides/static/img/glyphicons-halflings-white.png b/openslides/static/img/glyphicons-halflings-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..3bf6484a29d8da269f9bc874b25493a45fae3bae
GIT binary patch
literal 8777
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
B7G?kd

literal 0
HcmV?d00001

diff --git a/openslides/static/img/glyphicons-halflings.png b/openslides/static/img/glyphicons-halflings.png
new file mode 100644
index 0000000000000000000000000000000000000000..a9969993201f9cee63cf9f49217646347297b643
GIT binary patch
literal 12799
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

literal 0
HcmV?d00001

diff --git a/openslides/static/img/logo.png b/openslides/static/img/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b81eb76239edf7965896dc41c14527f4f1ee98d
GIT binary patch
literal 7273
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

literal 0
HcmV?d00001

diff --git a/openslides/static/javascript/bootstrap.min.js b/openslides/static/javascript/bootstrap.min.js
new file mode 100644
index 000000000..66e887bb3
--- /dev/null
+++ b/openslides/static/javascript/bootstrap.min.js
@@ -0,0 +1,6 @@
+/*!
+* Bootstrap.js by @fat & @mdo
+* Copyright 2012 Twitter, Inc.
+* http://www.apache.org/licenses/LICENSE-2.0.txt
+*/
+!function(e){e(function(){"use strict";e.support.transition=function(){var e=function(){var e=document.createElement("bootstrap"),t={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"},n;for(n in t)if(e.style[n]!==undefined)return t[n]}();return e&&{end:e}}()})}(window.jQuery),!function(e){"use strict";var t='[data-dismiss="alert"]',n=function(n){e(n).on("click",t,this.close)};n.prototype.close=function(t){function s(){i.trigger("closed").remove()}var n=e(this),r=n.attr("data-target"),i;r||(r=n.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,"")),i=e(r),t&&t.preventDefault(),i.length||(i=n.hasClass("alert")?n:n.parent()),i.trigger(t=e.Event("close"));if(t.isDefaultPrevented())return;i.removeClass("in"),e.support.transition&&i.hasClass("fade")?i.on(e.support.transition.end,s):s()},e.fn.alert=function(t){return this.each(function(){var r=e(this),i=r.data("alert");i||r.data("alert",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.alert.Constructor=n,e(function(){e("body").on("click.alert.data-api",t,n.prototype.close)})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.button.defaults,n)};t.prototype.setState=function(e){var t="disabled",n=this.$element,r=n.data(),i=n.is("input")?"val":"html";e+="Text",r.resetText||n.data("resetText",n[i]()),n[i](r[e]||this.options[e]),setTimeout(function(){e=="loadingText"?n.addClass(t).attr(t,t):n.removeClass(t).removeAttr(t)},0)},t.prototype.toggle=function(){var e=this.$element.parent('[data-toggle="buttons-radio"]');e&&e.find(".active").removeClass("active"),this.$element.toggleClass("active")},e.fn.button=function(n){return this.each(function(){var r=e(this),i=r.data("button"),s=typeof n=="object"&&n;i||r.data("button",i=new t(this,s)),n=="toggle"?i.toggle():n&&i.setState(n)})},e.fn.button.defaults={loadingText:"loading..."},e.fn.button.Constructor=t,e(function(){e("body").on("click.button.data-api","[data-toggle^=button]",function(t){var n=e(t.target);n.hasClass("btn")||(n=n.closest(".btn")),n.button("toggle")})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=n,this.options.slide&&this.slide(this.options.slide),this.options.pause=="hover"&&this.$element.on("mouseenter",e.proxy(this.pause,this)).on("mouseleave",e.proxy(this.cycle,this))};t.prototype={cycle:function(t){return t||(this.paused=!1),this.options.interval&&!this.paused&&(this.interval=setInterval(e.proxy(this.next,this),this.options.interval)),this},to:function(t){var n=this.$element.find(".item.active"),r=n.parent().children(),i=r.index(n),s=this;if(t>r.length-1||t<0)return;return this.sliding?this.$element.one("slid",function(){s.to(t)}):i==t?this.pause().cycle():this.slide(t>i?"next":"prev",e(r[t]))},pause:function(t){return t||(this.paused=!0),this.$element.find(".next, .prev").length&&e.support.transition.end&&(this.$element.trigger(e.support.transition.end),this.cycle()),clearInterval(this.interval),this.interval=null,this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(t,n){var r=this.$element.find(".item.active"),i=n||r[t](),s=this.interval,o=t=="next"?"left":"right",u=t=="next"?"first":"last",a=this,f=e.Event("slide",{relatedTarget:i[0]});this.sliding=!0,s&&this.pause(),i=i.length?i:this.$element.find(".item")[u]();if(i.hasClass("active"))return;if(e.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(f);if(f.isDefaultPrevented())return;i.addClass(t),i[0].offsetWidth,r.addClass(o),i.addClass(o),this.$element.one(e.support.transition.end,function(){i.removeClass([t,o].join(" ")).addClass("active"),r.removeClass(["active",o].join(" ")),a.sliding=!1,setTimeout(function(){a.$element.trigger("slid")},0)})}else{this.$element.trigger(f);if(f.isDefaultPrevented())return;r.removeClass("active"),i.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return s&&this.cycle(),this}},e.fn.carousel=function(n){return this.each(function(){var r=e(this),i=r.data("carousel"),s=e.extend({},e.fn.carousel.defaults,typeof n=="object"&&n),o=typeof n=="string"?n:s.slide;i||r.data("carousel",i=new t(this,s)),typeof n=="number"?i.to(n):o?i[o]():s.interval&&i.cycle()})},e.fn.carousel.defaults={interval:5e3,pause:"hover"},e.fn.carousel.Constructor=t,e(function(){e("body").on("click.carousel.data-api","[data-slide]",function(t){var n=e(this),r,i=e(n.attr("data-target")||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,"")),s=!i.data("modal")&&e.extend({},i.data(),n.data());i.carousel(s),t.preventDefault()})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.collapse.defaults,n),this.options.parent&&(this.$parent=e(this.options.parent)),this.options.toggle&&this.toggle()};t.prototype={constructor:t,dimension:function(){var e=this.$element.hasClass("width");return e?"width":"height"},show:function(){var t,n,r,i;if(this.transitioning)return;t=this.dimension(),n=e.camelCase(["scroll",t].join("-")),r=this.$parent&&this.$parent.find("> .accordion-group > .in");if(r&&r.length){i=r.data("collapse");if(i&&i.transitioning)return;r.collapse("hide"),i||r.data("collapse",null)}this.$element[t](0),this.transition("addClass",e.Event("show"),"shown"),e.support.transition&&this.$element[t](this.$element[0][n])},hide:function(){var t;if(this.transitioning)return;t=this.dimension(),this.reset(this.$element[t]()),this.transition("removeClass",e.Event("hide"),"hidden"),this.$element[t](0)},reset:function(e){var t=this.dimension();return this.$element.removeClass("collapse")[t](e||"auto")[0].offsetWidth,this.$element[e!==null?"addClass":"removeClass"]("collapse"),this},transition:function(t,n,r){var i=this,s=function(){n.type=="show"&&i.reset(),i.transitioning=0,i.$element.trigger(r)};this.$element.trigger(n);if(n.isDefaultPrevented())return;this.transitioning=1,this.$element[t]("in"),e.support.transition&&this.$element.hasClass("collapse")?this.$element.one(e.support.transition.end,s):s()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}},e.fn.collapse=function(n){return this.each(function(){var r=e(this),i=r.data("collapse"),s=typeof n=="object"&&n;i||r.data("collapse",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.collapse.defaults={toggle:!0},e.fn.collapse.Constructor=t,e(function(){e("body").on("click.collapse.data-api","[data-toggle=collapse]",function(t){var n=e(this),r,i=n.attr("data-target")||t.preventDefault()||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,""),s=e(i).data("collapse")?"toggle":n.data();n[e(i).hasClass("in")?"addClass":"removeClass"]("collapsed"),e(i).collapse(s)})})}(window.jQuery),!function(e){"use strict";function r(){i(e(t)).removeClass("open")}function i(t){var n=t.attr("data-target"),r;return n||(n=t.attr("href"),n=n&&n.replace(/.*(?=#[^\s]*$)/,"")),r=e(n),r.length||(r=t.parent()),r}var t="[data-toggle=dropdown]",n=function(t){var n=e(t).on("click.dropdown.data-api",this.toggle);e("html").on("click.dropdown.data-api",function(){n.parent().removeClass("open")})};n.prototype={constructor:n,toggle:function(t){var n=e(this),s,o;if(n.is(".disabled, :disabled"))return;return s=i(n),o=s.hasClass("open"),r(),o||(s.toggleClass("open"),n.focus()),!1},keydown:function(t){var n,r,s,o,u,a;if(!/(38|40|27)/.test(t.keyCode))return;n=e(this),t.preventDefault(),t.stopPropagation();if(n.is(".disabled, :disabled"))return;o=i(n),u=o.hasClass("open");if(!u||u&&t.keyCode==27)return n.click();r=e("[role=menu] li:not(.divider) a",o);if(!r.length)return;a=r.index(r.filter(":focus")),t.keyCode==38&&a>0&&a--,t.keyCode==40&&a<r.length-1&&a++,~a||(a=0),r.eq(a).focus()}},e.fn.dropdown=function(t){return this.each(function(){var r=e(this),i=r.data("dropdown");i||r.data("dropdown",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.dropdown.Constructor=n,e(function(){e("html").on("click.dropdown.data-api touchstart.dropdown.data-api",r),e("body").on("click.dropdown touchstart.dropdown.data-api",".dropdown",function(e){e.stopPropagation()}).on("click.dropdown.data-api touchstart.dropdown.data-api",t,n.prototype.toggle).on("keydown.dropdown.data-api touchstart.dropdown.data-api",t+", [role=menu]",n.prototype.keydown)})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.options=n,this.$element=e(t).delegate('[data-dismiss="modal"]',"click.dismiss.modal",e.proxy(this.hide,this)),this.options.remote&&this.$element.find(".modal-body").load(this.options.remote)};t.prototype={constructor:t,toggle:function(){return this[this.isShown?"hide":"show"]()},show:function(){var t=this,n=e.Event("show");this.$element.trigger(n);if(this.isShown||n.isDefaultPrevented())return;e("body").addClass("modal-open"),this.isShown=!0,this.escape(),this.backdrop(function(){var n=e.support.transition&&t.$element.hasClass("fade");t.$element.parent().length||t.$element.appendTo(document.body),t.$element.show(),n&&t.$element[0].offsetWidth,t.$element.addClass("in").attr("aria-hidden",!1).focus(),t.enforceFocus(),n?t.$element.one(e.support.transition.end,function(){t.$element.trigger("shown")}):t.$element.trigger("shown")})},hide:function(t){t&&t.preventDefault();var n=this;t=e.Event("hide"),this.$element.trigger(t);if(!this.isShown||t.isDefaultPrevented())return;this.isShown=!1,e("body").removeClass("modal-open"),this.escape(),e(document).off("focusin.modal"),this.$element.removeClass("in").attr("aria-hidden",!0),e.support.transition&&this.$element.hasClass("fade")?this.hideWithTransition():this.hideModal()},enforceFocus:function(){var t=this;e(document).on("focusin.modal",function(e){t.$element[0]!==e.target&&!t.$element.has(e.target).length&&t.$element.focus()})},escape:function(){var e=this;this.isShown&&this.options.keyboard?this.$element.on("keyup.dismiss.modal",function(t){t.which==27&&e.hide()}):this.isShown||this.$element.off("keyup.dismiss.modal")},hideWithTransition:function(){var t=this,n=setTimeout(function(){t.$element.off(e.support.transition.end),t.hideModal()},500);this.$element.one(e.support.transition.end,function(){clearTimeout(n),t.hideModal()})},hideModal:function(e){this.$element.hide().trigger("hidden"),this.backdrop()},removeBackdrop:function(){this.$backdrop.remove(),this.$backdrop=null},backdrop:function(t){var n=this,r=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var i=e.support.transition&&r;this.$backdrop=e('<div class="modal-backdrop '+r+'" />').appendTo(document.body),this.options.backdrop!="static"&&this.$backdrop.click(e.proxy(this.hide,this)),i&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),i?this.$backdrop.one(e.support.transition.end,t):t()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),e.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(e.support.transition.end,e.proxy(this.removeBackdrop,this)):this.removeBackdrop()):t&&t()}},e.fn.modal=function(n){return this.each(function(){var r=e(this),i=r.data("modal"),s=e.extend({},e.fn.modal.defaults,r.data(),typeof n=="object"&&n);i||r.data("modal",i=new t(this,s)),typeof n=="string"?i[n]():s.show&&i.show()})},e.fn.modal.defaults={backdrop:!0,keyboard:!0,show:!0},e.fn.modal.Constructor=t,e(function(){e("body").on("click.modal.data-api",'[data-toggle="modal"]',function(t){var n=e(this),r=n.attr("href"),i=e(n.attr("data-target")||r&&r.replace(/.*(?=#[^\s]+$)/,"")),s=i.data("modal")?"toggle":e.extend({remote:!/#/.test(r)&&r},i.data(),n.data());t.preventDefault(),i.modal(s).one("hide",function(){n.focus()})})})}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("tooltip",e,t)};t.prototype={constructor:t,init:function(t,n,r){var i,s;this.type=t,this.$element=e(n),this.options=this.getOptions(r),this.enabled=!0,this.options.trigger=="click"?this.$element.on("click."+this.type,this.options.selector,e.proxy(this.toggle,this)):this.options.trigger!="manual"&&(i=this.options.trigger=="hover"?"mouseenter":"focus",s=this.options.trigger=="hover"?"mouseleave":"blur",this.$element.on(i+"."+this.type,this.options.selector,e.proxy(this.enter,this)),this.$element.on(s+"."+this.type,this.options.selector,e.proxy(this.leave,this))),this.options.selector?this._options=e.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(t){return t=e.extend({},e.fn[this.type].defaults,t,this.$element.data()),t.delay&&typeof t.delay=="number"&&(t.delay={show:t.delay,hide:t.delay}),t},enter:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);if(!n.options.delay||!n.options.delay.show)return n.show();clearTimeout(this.timeout),n.hoverState="in",this.timeout=setTimeout(function(){n.hoverState=="in"&&n.show()},n.options.delay.show)},leave:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);this.timeout&&clearTimeout(this.timeout);if(!n.options.delay||!n.options.delay.hide)return n.hide();n.hoverState="out",this.timeout=setTimeout(function(){n.hoverState=="out"&&n.hide()},n.options.delay.hide)},show:function(){var e,t,n,r,i,s,o;if(this.hasContent()&&this.enabled){e=this.tip(),this.setContent(),this.options.animation&&e.addClass("fade"),s=typeof this.options.placement=="function"?this.options.placement.call(this,e[0],this.$element[0]):this.options.placement,t=/in/.test(s),e.remove().css({top:0,left:0,display:"block"}).appendTo(t?this.$element:document.body),n=this.getPosition(t),r=e[0].offsetWidth,i=e[0].offsetHeight;switch(t?s.split(" ")[1]:s){case"bottom":o={top:n.top+n.height,left:n.left+n.width/2-r/2};break;case"top":o={top:n.top-i,left:n.left+n.width/2-r/2};break;case"left":o={top:n.top+n.height/2-i/2,left:n.left-r};break;case"right":o={top:n.top+n.height/2-i/2,left:n.left+n.width}}e.css(o).addClass(s).addClass("in")}},setContent:function(){var e=this.tip(),t=this.getTitle();e.find(".tooltip-inner")[this.options.html?"html":"text"](t),e.removeClass("fade in top bottom left right")},hide:function(){function r(){var t=setTimeout(function(){n.off(e.support.transition.end).remove()},500);n.one(e.support.transition.end,function(){clearTimeout(t),n.remove()})}var t=this,n=this.tip();return n.removeClass("in"),e.support.transition&&this.$tip.hasClass("fade")?r():n.remove(),this},fixTitle:function(){var e=this.$element;(e.attr("title")||typeof e.attr("data-original-title")!="string")&&e.attr("data-original-title",e.attr("title")||"").removeAttr("title")},hasContent:function(){return this.getTitle()},getPosition:function(t){return e.extend({},t?{top:0,left:0}:this.$element.offset(),{width:this.$element[0].offsetWidth,height:this.$element[0].offsetHeight})},getTitle:function(){var e,t=this.$element,n=this.options;return e=t.attr("data-original-title")||(typeof n.title=="function"?n.title.call(t[0]):n.title),e},tip:function(){return this.$tip=this.$tip||e(this.options.template)},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(){this[this.tip().hasClass("in")?"hide":"show"]()},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}},e.fn.tooltip=function(n){return this.each(function(){var r=e(this),i=r.data("tooltip"),s=typeof n=="object"&&n;i||r.data("tooltip",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.tooltip.Constructor=t,e.fn.tooltip.defaults={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover",title:"",delay:0,html:!0}}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("popover",e,t)};t.prototype=e.extend({},e.fn.tooltip.Constructor.prototype,{constructor:t,setContent:function(){var e=this.tip(),t=this.getTitle(),n=this.getContent();e.find(".popover-title")[this.options.html?"html":"text"](t),e.find(".popover-content > *")[this.options.html?"html":"text"](n),e.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var e,t=this.$element,n=this.options;return e=t.attr("data-content")||(typeof n.content=="function"?n.content.call(t[0]):n.content),e},tip:function(){return this.$tip||(this.$tip=e(this.options.template)),this.$tip},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}}),e.fn.popover=function(n){return this.each(function(){var r=e(this),i=r.data("popover"),s=typeof n=="object"&&n;i||r.data("popover",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.popover.Constructor=t,e.fn.popover.defaults=e.extend({},e.fn.tooltip.defaults,{placement:"right",trigger:"click",content:"",template:'<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>'})}(window.jQuery),!function(e){"use strict";function t(t,n){var r=e.proxy(this.process,this),i=e(t).is("body")?e(window):e(t),s;this.options=e.extend({},e.fn.scrollspy.defaults,n),this.$scrollElement=i.on("scroll.scroll-spy.data-api",r),this.selector=(this.options.target||(s=e(t).attr("href"))&&s.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=e("body"),this.refresh(),this.process()}t.prototype={constructor:t,refresh:function(){var t=this,n;this.offsets=e([]),this.targets=e([]),n=this.$body.find(this.selector).map(function(){var t=e(this),n=t.data("target")||t.attr("href"),r=/^#\w/.test(n)&&e(n);return r&&r.length&&[[r.position().top,n]]||null}).sort(function(e,t){return e[0]-t[0]}).each(function(){t.offsets.push(this[0]),t.targets.push(this[1])})},process:function(){var e=this.$scrollElement.scrollTop()+this.options.offset,t=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,n=t-this.$scrollElement.height(),r=this.offsets,i=this.targets,s=this.activeTarget,o;if(e>=n)return s!=(o=i.last()[0])&&this.activate(o);for(o=r.length;o--;)s!=i[o]&&e>=r[o]&&(!r[o+1]||e<=r[o+1])&&this.activate(i[o])},activate:function(t){var n,r;this.activeTarget=t,e(this.selector).parent(".active").removeClass("active"),r=this.selector+'[data-target="'+t+'"],'+this.selector+'[href="'+t+'"]',n=e(r).parent("li").addClass("active"),n.parent(".dropdown-menu").length&&(n=n.closest("li.dropdown").addClass("active")),n.trigger("activate")}},e.fn.scrollspy=function(n){return this.each(function(){var r=e(this),i=r.data("scrollspy"),s=typeof n=="object"&&n;i||r.data("scrollspy",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.scrollspy.Constructor=t,e.fn.scrollspy.defaults={offset:10},e(window).on("load",function(){e('[data-spy="scroll"]').each(function(){var t=e(this);t.scrollspy(t.data())})})}(window.jQuery),!function(e){"use strict";var t=function(t){this.element=e(t)};t.prototype={constructor:t,show:function(){var t=this.element,n=t.closest("ul:not(.dropdown-menu)"),r=t.attr("data-target"),i,s,o;r||(r=t.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,""));if(t.parent("li").hasClass("active"))return;i=n.find(".active a").last()[0],o=e.Event("show",{relatedTarget:i}),t.trigger(o);if(o.isDefaultPrevented())return;s=e(r),this.activate(t.parent("li"),n),this.activate(s,s.parent(),function(){t.trigger({type:"shown",relatedTarget:i})})},activate:function(t,n,r){function o(){i.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),t.addClass("active"),s?(t[0].offsetWidth,t.addClass("in")):t.removeClass("fade"),t.parent(".dropdown-menu")&&t.closest("li.dropdown").addClass("active"),r&&r()}var i=n.find("> .active"),s=r&&e.support.transition&&i.hasClass("fade");s?i.one(e.support.transition.end,o):o(),i.removeClass("in")}},e.fn.tab=function(n){return this.each(function(){var r=e(this),i=r.data("tab");i||r.data("tab",i=new t(this)),typeof n=="string"&&i[n]()})},e.fn.tab.Constructor=t,e(function(){e("body").on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(t){t.preventDefault(),e(this).tab("show")})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.typeahead.defaults,n),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.updater=this.options.updater||this.updater,this.$menu=e(this.options.menu).appendTo("body"),this.source=this.options.source,this.shown=!1,this.listen()};t.prototype={constructor:t,select:function(){var e=this.$menu.find(".active").attr("data-value");return this.$element.val(this.updater(e)).change(),this.hide()},updater:function(e){return e},show:function(){var t=e.extend({},this.$element.offset(),{height:this.$element[0].offsetHeight});return this.$menu.css({top:t.top+t.height,left:t.left}),this.$menu.show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(t){var n;return this.query=this.$element.val(),!this.query||this.query.length<this.options.minLength?this.shown?this.hide():this:(n=e.isFunction(this.source)?this.source(this.query,e.proxy(this.process,this)):this.source,n?this.process(n):this)},process:function(t){var n=this;return t=e.grep(t,function(e){return n.matcher(e)}),t=this.sorter(t),t.length?this.render(t.slice(0,this.options.items)).show():this.shown?this.hide():this},matcher:function(e){return~e.toLowerCase().indexOf(this.query.toLowerCase())},sorter:function(e){var t=[],n=[],r=[],i;while(i=e.shift())i.toLowerCase().indexOf(this.query.toLowerCase())?~i.indexOf(this.query)?n.push(i):r.push(i):t.push(i);return t.concat(n,r)},highlighter:function(e){var t=this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&");return e.replace(new RegExp("("+t+")","ig"),function(e,t){return"<strong>"+t+"</strong>"})},render:function(t){var n=this;return t=e(t).map(function(t,r){return t=e(n.options.item).attr("data-value",r),t.find("a").html(n.highlighter(r)),t[0]}),t.first().addClass("active"),this.$menu.html(t),this},next:function(t){var n=this.$menu.find(".active").removeClass("active"),r=n.next();r.length||(r=e(this.$menu.find("li")[0])),r.addClass("active")},prev:function(e){var t=this.$menu.find(".active").removeClass("active"),n=t.prev();n.length||(n=this.$menu.find("li").last()),n.addClass("active")},listen:function(){this.$element.on("blur",e.proxy(this.blur,this)).on("keypress",e.proxy(this.keypress,this)).on("keyup",e.proxy(this.keyup,this)),(e.browser.webkit||e.browser.msie)&&this.$element.on("keydown",e.proxy(this.keydown,this)),this.$menu.on("click",e.proxy(this.click,this)).on("mouseenter","li",e.proxy(this.mouseenter,this))},move:function(e){if(!this.shown)return;switch(e.keyCode){case 9:case 13:case 27:e.preventDefault();break;case 38:e.preventDefault(),this.prev();break;case 40:e.preventDefault(),this.next()}e.stopPropagation()},keydown:function(t){this.suppressKeyPressRepeat=!~e.inArray(t.keyCode,[40,38,9,13,27]),this.move(t)},keypress:function(e){if(this.suppressKeyPressRepeat)return;this.move(e)},keyup:function(e){switch(e.keyCode){case 40:case 38:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}e.stopPropagation(),e.preventDefault()},blur:function(e){var t=this;setTimeout(function(){t.hide()},150)},click:function(e){e.stopPropagation(),e.preventDefault(),this.select()},mouseenter:function(t){this.$menu.find(".active").removeClass("active"),e(t.currentTarget).addClass("active")}},e.fn.typeahead=function(n){return this.each(function(){var r=e(this),i=r.data("typeahead"),s=typeof n=="object"&&n;i||r.data("typeahead",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.typeahead.defaults={source:[],items:8,menu:'<ul class="typeahead dropdown-menu"></ul>',item:'<li><a href="#"></a></li>',minLength:1},e.fn.typeahead.Constructor=t,e(function(){e("body").on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(t){var n=e(this);if(n.data("typeahead"))return;t.preventDefault(),n.typeahead(n.data())})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.options=e.extend({},e.fn.affix.defaults,n),this.$window=e(window).on("scroll.affix.data-api",e.proxy(this.checkPosition,this)),this.$element=e(t),this.checkPosition()};t.prototype.checkPosition=function(){if(!this.$element.is(":visible"))return;var t=e(document).height(),n=this.$window.scrollTop(),r=this.$element.offset(),i=this.options.offset,s=i.bottom,o=i.top,u="affix affix-top affix-bottom",a;typeof i!="object"&&(s=o=i),typeof o=="function"&&(o=i.top()),typeof s=="function"&&(s=i.bottom()),a=this.unpin!=null&&n+this.unpin<=r.top?!1:s!=null&&r.top+this.$element.height()>=t-s?"bottom":o!=null&&n<=o?"top":!1;if(this.affixed===a)return;this.affixed=a,this.unpin=a=="bottom"?r.top-n:null,this.$element.removeClass(u).addClass("affix"+(a?"-"+a:""))},e.fn.affix=function(n){return this.each(function(){var r=e(this),i=r.data("affix"),s=typeof n=="object"&&n;i||r.data("affix",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.affix.Constructor=t,e.fn.affix.defaults={offset:0},e(window).on("load",function(){e('[data-spy="affix"]').each(function(){var t=e(this),n=t.data();n.offset=n.offset||{},n.offsetBottom&&(n.offset.bottom=n.offsetBottom),n.offsetTop&&(n.offset.top=n.offsetTop),t.affix(n)})})}(window.jQuery);
\ No newline at end of file
diff --git a/openslides/static/javascript/utils.js b/openslides/static/javascript/utils.js
index b5bcb2a5a..273cbb744 100644
--- a/openslides/static/javascript/utils.js
+++ b/openslides/static/javascript/utils.js
@@ -43,3 +43,115 @@ function new_message(text, type) {
     $('#notifications').append(message);
     message.slideDown('fast');
 }
+
+
+// Functios for sidebar navigation
+$(document).ready(function(){
+    // Resize navigation
+    $(window).resize(function(){
+        if($(this).width() < 1124) {
+            iconmenu();
+            if($(window).width() < 570) {
+                $('.table').each(function(){
+                    if($(this).find('.table-wrapper').size() == 0) {
+                        $(this).wrap('<div class="table-wrapper"></div>');
+                    }
+                });
+            }
+        } else {
+            fullmenu();
+        }
+    });
+    if($(window).width() < 1124) {
+        iconmenu();
+        if($(window).width() < 570) {
+            $('.table').each(function(){
+                if($(this).find('.table-wrapper').size() == 0) {
+                    $(this).wrap('<div class="table-wrapper"></div>');
+                }
+            });
+        }
+    } else {
+        fullmenu();
+    }
+    // Sticky navigation
+    $(window).scroll(function(){
+        var el = $('.leftmenu > ul'); 
+        if($(window).width() > 479) {
+            if ( ($(this).scrollTop() > 80) && ($(this).scrollLeft() < 10)) {
+                el.css({'position':'fixed','top':'10px','width':'14.15%'});
+            } else {
+                el.css({'position': 'relative', 'top': '0','width':'auto'});
+            }
+        } else {
+            if (($(this).scrollTop() > 130) && ($(this).scrollLeft() < 10)){
+                el.css({'position':'fixed','top':'10px','width':'14.15%'});
+            } else {
+                el.css({'position': 'relative', 'top': '0','width':'auto'});
+            }
+        }
+    });
+    // Submenu with drop down
+    $('.leftmenu a').click(function(e){
+        if($(this).siblings('ul').size() == 1){
+            e.preventDefault();
+            var submenu = $(this).siblings('ul');
+            if($(this).hasClass('open')) {
+                if($(this).parents('.leftmenu').hasClass('lefticon')) {
+                    submenu.fadeOut();
+                } else {
+                    submenu.slideUp('fast');
+                }
+                $(this).removeClass('open');
+            } else {
+                if($(this).parents('.leftmenu').hasClass('lefticon')) {
+                    submenu.fadeIn();
+                } else {
+                    submenu.slideDown('fast');
+                }
+                $(this).addClass('open');
+            }
+        }
+    });
+    // Tooltips
+    $('.leftmenu').tooltip({
+      selector: "a[rel=tooltip]",
+      placement: 'right'
+    });
+    $('h1').tooltip({
+      selector: "a[rel=tooltip]",
+      placement: 'bottom'
+    });
+    $('body').tooltip({
+       selector: '.tooltip' 
+    });
+    $('.tooltip-left').tooltip({
+       placement: 'left'
+    });
+    $('.tooltip-right').tooltip({
+       placement: 'right'
+    });
+    $('.tooltip-top').tooltip({
+       placement: 'top'
+    });
+    $('.tooltip-bottom').tooltip({
+        placement: 'bottom'
+    });
+    // Resize menu and content container
+    function iconmenu(){
+        $('.leftmenu').removeClass('span2').addClass('lefticon').addClass('span1');
+        $('.leftmenu > ul > li > a').each(function(){
+            atitle = $(this).text();
+            $(this).attr({'rel':'tooltip','title':atitle});
+        });
+        $('#content').removeClass('span10').addClass('span11');
+    }
+    
+    function fullmenu(){
+        $('.leftmenu').removeClass('span1').removeClass('lefticon').addClass('span2');
+        $('.leftmenu > ul > li > a').each(function(){
+            $(this).attr({'rel':'','title':''});
+        });
+        $('#content').removeClass('span11').addClass('span10'); 
+    }
+});
\ No newline at end of file
diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css
index 088171aae..341c8a73b 100644
--- a/openslides/static/styles/base.css
+++ b/openslides/static/styles/base.css
@@ -1,615 +1,196 @@
-/**
- * OpenSlides default template style
- *
- * :copyright: 2011, 2012 by OpenSlides team, see AUTHORS.
- * :license: GNU GPL, see LICENSE for more details.
- */
-
-body {
-    padding: 0 0 0px;
-    margin:0;
-    background:url("../images/bg-submenu.gif") repeat-y scroll 0 0 #FFFFFF;
-    color:#1B110F;
-    font-family:'Lucida Grande',"Trebuchet MS",Verdana,sans-serif;
-    font-size:12px;
-    position:relative;
-}
-
-/* HEADER */
+/* Header */
 #header {
-    position:relative;
-    background:url("../images/bg-header.gif") repeat-x scroll center top #3D3020;
-    height:150px;
+    background-color: #333333;
+    background-image: -moz-linear-gradient(top, #444444, #222222);
+    background-image: -ms-linear-gradient(top, #444444, #222222);
+    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222));
+    background-image: -webkit-linear-gradient(top, #444444, #222222);
+    background-image: -o-linear-gradient(top, #444444, #222222);
+    background-image: linear-gradient(top, #444444, #222222);
+    box-shadow: 0 0 7px rgba(0,0,0,0.6);
+    height: 35px;
+    margin-bottom: 20px;
+    padding: 7px 20px 0;
+    position: relative;
 }
-#logo {
-    position:absolute;
-    top: 25px;
-    left: 75px;
+#header .logo img {
+    height: 30px;
+    padding-left: 3px;
 }
-#header_title {
-    position:absolute;
-    height:40px;
-    left:230px;
-    top:25px;
-    font-size:34px;
-    font-weight: bold;
-    color:#FFFFFF;
-}
-#header_subtitle {
-    position:absolute;
-    color:#B9A894;
-    left:230px;
-    top:70px;
-    font-size:14px;
-}
-#header_userprofile, #header_userprofile a  {
-    color:#B9A894;
-}
-#header_userprofile {
-    position:absolute;
-    font-size:10px;
-    top:10px;
-    right:20px;
-}
-#header_userprofile li {
-    float:right;
-    margin:0 10px 0 0;
-}
-#header_userprofile li#last {
-    clear:both;
-    color:#6A5644;
-    padding:8px 0 0;
-}
-#header_userprofile li strong {
-    color:#ECE0D2;
-    font-weight:normal;
-}
-#header_userprofile li a {
-    color:#B9A894;
-    padding:1px 0 1px 10px;
-    text-decoration:none;
-}
-#header_userprofile li a:hover {
-    color:#ECE0D2;
+#header .title {
+    font-size: 20px;
+    color: #999999;
 }
 
-/* Main Menu */
-#mainmenu {
-    position:absolute;
-    bottom:0;
-    left:197px;
-    z-index:1000;}
-#mainmenu li {
-    float:left;
-    font-size:12px;
+h1 {
+    border-bottom: 1px solid #EEEEEE;
+    margin: 0px 0 30px;
+    padding-bottom: 9px;
 }
-#mainmenu li a {
-    border-radius:6px 6px 0px 0px;
-    background:none repeat scroll 0 0 #4F4743;
-    color:#A59A92;
-    display:block;
-    margin:0 3px;
-    padding:10px 12px;
-    text-decoration:none;
+h5 {
+    margin-bottom: 0px;
 }
-#mainmenu li a:hover {
-    color:#ECE0D2;
-}
-#mainmenu li.selected a {
-    background:none repeat scroll 0 0 #FFFFFF;
-    color:#333333;
+/*h1 small a {
+    background: none repeat scroll 0 0 #F1F1F1;
+    border: 0 none;
+    font-family: sans-serif;
+    font-size: 14px;
+    margin-left: 4px;
+    padding: 3px 8px;
+    position: relative;
+    text-decoration: none;
+    top: -7px;
+}*/
+
+
+a:hover {
+    text-decoration: none;
 }
 
 
-/* Wrapper */
-#wrapper {
-    float:left;
-    line-height:140%;
+
+
+
+/* Left Menu */
+.leftmenu ul {
+    margin: 0;
+    list-style: none; 
+}
+.leftmenu ul ul {
+    display: none;
+    margin-left: 35px;
+    margin-top: -1px;
+    box-shadow: 0 1px 2px rgba(0,0,0,0.1);  
+}
+.leftmenu ul li {
+    display: block;
     width: 100%;
 }
-
-/* Sub Menu */
-#submenu {
-    float: left;
-    width: 200px;
-    margin-left: -100%;
+.leftmenu ul li a {
+    border-style: none solid solid;
+    border-width: 0 1px 1px;
+    border-color: #dddddd;
+    color: #666666;
+    display: block;
+    font-weight: bold;
+    background-color: #ffffff;
+    padding: 0;    
 }
-#submenu .section {
-    border-top:1px solid #2C2523;
-}
-#submenu .sectiontitle {
-    /*background-color: #2E2520*/
-}
-#submenu .section h4 {
-    border-top:1px solid #443C3A;
-    border-bottom:1px solid #B9A894;
-    color:#B9A894;
-    padding:15px 20px 10px 5px;
-    margin:0px;
-    margin-bottom:0px;
-    font-size: 16px;
-    text-align:right;
-}
-#submenu .section h3 {
-    border-bottom:1px dashed #B9A894;
-    color:#B9A894;
-    padding:15px 20px 10px 5px;
-    margin:0px;
-    margin-bottom:0px;
-    font-size: 16px;
-    text-align:right;
-    overflow:hidden;
-}
-#submenu li a {
-    color:#B9A894;
-    display:block;
-    font-size:11px;
-    padding:6px 20px 6px 2px;
-    text-align:right;
-    text-decoration:none;
-}
-.section li a:hover {
-    background:none repeat scroll 0 0 #443C3A;
-}
-#submenu li.selected a, .section li.selected a:hover {
-    background:none repeat scroll 0 0 #FFFFFF;
-    color:#333333;
+.leftmenu ul li:first-child a {
+    border-top: 1px solid #DDDDDD;
 }
 
-
-/* Content */
-#content {
-    margin-left: 200px;
-    padding: 3px 20px;
-}
-#content h1 {
-    font-size: 28px;
-    font-weight: normal;
-    line-height: 100%;
-}
-#content h2 {
-    margin-top: 40px;
-}
-#content h3 {
-    font-size: 20px;
-    font-weight: normal;
-}
-
-
-/* Table */
-table {
-    border-collapse:collapse;
-    border-color:#CCCCCC;
-    border-style:solid;
-    border-width:1px;
-    font-size:11px;
-    margin:0;
-    width:100%;
-    border-spacing:0px;
-}
-table th {
-    border-right:1px solid #CCCCCC;
-    color:#333333;
-    font-weight:bold;
-    padding:10px 10px 10px 10px;
-    text-align:left;
-    text-transform:uppercase;
-}
-table tr.odd td {
-    background:none repeat scroll 0 0 #F1F1F1;
-}
-table td {
-    background:none repeat scroll 0 0 #F7F7F7;
-    border-right:1px solid #CCCCCC;
-    line-height:120%;
-    padding: 10px 10px;
-    vertical-align:middle;
-}
-table tr:hover td, tr.odd:hover td {
-    background:none repeat scroll 0 0 #E8E4DE;
-}
-table a.table_delete {
-    background:url("../img/icons/cross.png") no-repeat scroll 0 0 transparent;
-    display:block;
-    float:left;
-    height:16px;
-    margin:0 10px 0 0;
-    padding:0;
-    text-indent:-9999px;
-    width:16px;
-}
-table a.table_edit {
-    background:url("../img/icons/pencil.png") no-repeat scroll 0 0 transparent;
-    display:block;
-    float:left;
-    height:16px;
-    margin:0 10px 0 0;
-    padding:0;
-    text-indent:-9999px;
-    width:16px;
-}
-.valigntop td {
-    vertical-align:top;
-}
-.agendatable td.dragcell {
-    padding: 0px 0 0px 10px;
-}
-.agendatable td img.center {
-    margin-left: 10px;
-}
-
-.agendatable tr.activesummarychildline td {
-    background-color: #f5cfa2;
-}
-.cleantable, .cleantable td, .cleantable td:hover {
-    border:none;
-    background:none;
-    line-height:120%;
-    padding: 5px 0;
-    font-size:11px;
-    margin:0;
-    width: 0;
-}
-tr.total td {
-    border-top: 1px solid #333333;
-    background-color: #e3e3e3;
-}
-tr.topline td {
-    border-bottom: 1px solid #333333;
-    background-color: #e3e3e3;
-}
-table tr.emptyline, table tr.emptyline td, table tr.emptyline td:hover {
-    border-right: 0px;
-    border-top: 1px solid #CCCCCC;
-    border-bottom: 1px solid #CCCCCC;
-    background: none !important;
-}
-
-/* Links and Images */
-a {
-    color:#41829F;
-    text-decoration: none;
+.leftmenu ul li a span.ico {
     display: inline-block;
+    background: #f9f9f9;
+    padding: 8px 10px 6px;
+    margin: 0 5px 0 0;
+    border-right: 1px solid #dddddd;
 }
-a:hover {
-    text-decoration: underline;
+.leftmenu ul li a, .leftmenu ul li a span.ico {
+    -webkit-transition: background 0.2s ease-in-out;
+       -moz-transition: background 0.2s ease-in-out;
+        -ms-transition: background 0.2s ease-in-out;
+         -o-transition: background 0.2s ease-in-out;
+            transition: background 0.2s ease-in-out;
 }
-img {
-    border:none;
+.leftmenu ul li a:hover {
+    background-color: #f5f5f5;
+    color: #000000;
+}
+.leftmenu ul li a:hover span.ico {
+    background-color: #efefef;
+}
+.leftmenu ul li.active a {
+    background-color: #333333;
+    color: #ffffff;
+}
+.leftmenu ul li.active a span.ico {
+    background-color: #111111;
+    border-right: 1px solid #444444;
+}
+.leftmenu ul li.active a span.ico i {
+    background-image: url("../img/glyphicons-halflings-white.png");
+}
+.leftmenu ul li.hider a {
+    margin-top: 5px;
+    height: 20px;
 }
 
-
-/*Forms*/
-form {
-    margin:0;
-    padding:0
+.leftmenu.lefticon > ul {
+    width: 37px !important;
 }
-label {
-    /*clear:both;*/
-    display:block;
-    padding:5px 0;
+.leftmenu.lefticon ul ul {
+    position: absolute;
+    z-index: 20;
+    margin-top: -34px;
 }
-input[type="text"], input[type="email"], input[type="password"], input[type="number"], textarea, select {
-    background:none repeat scroll 0 0 #F7F7F7;
-    border:1px solid #CCCCCC;
-    outline:medium none;
-    padding:5px;
-    font-size:13px;
-    width: 400px;
-    size:800px;
+.leftmenu.lefticon > ul > li > a > span.text {
+    display: none;
 }
-input[type="text"], input[type="email"], input[type="password"], input[type="number"] {
-    height:17px;
+.leftmenu.lefticon ul ul > li > a {
+    min-width: 200px !important;
 }
-textarea {
-    height: 150px;
-}
-select {
-    padding:0px;
-}
-input[type="submit"], input[type="button"]  {
-    background:url("../images/button.gif") repeat-x scroll left top #459300 !important;
-    border:1px solid #459300 !important;
-    color:#FFFFFF !important;
-    cursor:pointer;
-    display:inline-block;
-    padding:4px 10px !important;
-    margin: 2px 0 2px 0;
-}
-#id_permissions {
-    height: 310px;
-}
-.button {
-    border: 1px solid #D3D3D3;
-    border-radius: 4px 4px 4px 4px;
-    display: inline-block;
-    font-weight: normal;
-    padding: 4px 10px;
-    margin: 2px 0 2px 0;
-    text-align: center;
-    text-decoration: none;
-    background:#f9f9f9;
-    background:#f9f9f9 -webkit-gradient( linear,0% 0%,0% 100%,from(rgba(255,255,255,.2)),to(rgba(0,0,0,0)));
-    background:#f9f9f9 -moz-linear-gradient( top,rgba(255,255,255,.4),rgba(0,0,0,0));
-    color: #555555;
-    cursor: pointer;
-}
-.button:hover {
-    border: 1px solid #999999;
-    background:#f9f9f9 -webkit-gradient(linear,0% 0%,0% 100%,from(rgba(255,255,255,.55)),to(rgba(0,0,0,0)));
-    background:#f9f9f9 -moz-linear-gradient( top,rgba(255,255,255,.55),rgba(0,0,0,0));
-}
-.button:active {
-    -webkit-box-shadow:inset 0 100% 0 0 rgba(0,0,0,0.2);
-    background:#f9f9f9 -webkit-gradient(linear,0% 0%,0% 100%,from(rgba(0,0,0,.3)),to(rgba(0,0,0,0)));
-    background:#f9f9f9 -moz-linear-gradient( top,rgba(0,0,0,.1),rgba(0,0,0,0));
-}
-.button .icon {
-    height: 16px;
-    text-indent:20px;
-    padding-top: 1px;
-    display:block;
-    text-transform:none;
-    white-space:nowrap;
-}
-.button .cancel{
-    background:url(../images/icons/dialog-cancel.png) no-repeat 0px 0px;
-}
-.button .ok{
-    background:url(../images/icons/dialog-ok-apply.png) no-repeat 0px 0px;
-}
-.button .ok-blue, .button .apply{
-    background:url(../images/icons/dialog-ok.png) no-repeat 0px 0px;
-}
-.button .edit{
-    background:url(../images/icons/edit.png) no-repeat 0px 0px;
-}
-.button .revert{
-    background:url(../images/icons/revert.png) no-repeat 0px 0px;
-}
-.button .undo{
-    background:url(../images/icons/undo.png) no-repeat 0px 0px;
-}
-.button .item{
-    background:url(../images/icons/view-list-details.png) no-repeat 0px 0px;
-}
-.button .projector{
-    background:url(../images/icons/projector.png) no-repeat 0px 0px;
-}
-.button .done{
-    background:url(../images/icons/done.png) no-repeat 0px 0px;
-}
-.button .close{
-    background:url(../images/icons/close.png) no-repeat 0px 0px;
-}
-.button .reject{
-    background:url(../images/icons/reject.png) no-repeat 0px 0px;
-}
-.statistics{
-    background:url(../images/icons/statistics.png) no-repeat 0px 0px;
-}
-.button .pdf{
-    background:url(../images/icons/pdf.png) no-repeat 0px 0px;
-}
-.button .adduser{
-    background:url(../images/icons/add-user.png) no-repeat 0px 0px;
-}
-.button .removeuser{
-    background:url(../images/icons/remove-user.png) no-repeat 0px 0px;
-}
-.button .export{
-    background:url(../images/icons/export.png) no-repeat 0px 0px;
-}
-.button .import{
-    background:url(../images/icons/import.png) no-repeat 0px 0px;
-}
-.add{
-    background:url(../images/icons/add.png) no-repeat 0px 0px;
-}
-.button .number{
-    background:url(../images/icons/number.png) no-repeat 0px 0px;
-}
-.button .guest{
-    background:url(../images/icons/guest.png) no-repeat 0px 0px;
-}
-.button .clear{
-    background:url(../images/icons/clear.png) no-repeat 0px 0px;
-    text-indent:12px;
+.leftmenu.lefticon span.text {
+    padding-right: 15px;
 }
 
-.small-input {
-    width: 40px !important;
+/** Navigation icons (mapping to glyphicons-halflings) **/
+.icon-dashboard {
+    background-position: 0 -24px;
+}
+.icon-agenda {
+    background-position: -264px 0;
+}
+.icon-application {
+    background-position: -24px -24px;
+}
+.icon-assignment {
+    background-position: -408px 0;
+}
+.icon-participant {
+    background-position: -168px 0;
+}
+.icon-config {
+    background-position: -360px -144px;
 }
 
-.small-form input {
-    width: 40px !important;
+/** Utils **/
+.nopadding {
+    padding: 0;
+}
+.alert form {
+    margin-bottom: 0;
 }
 
-.medium-input {
-    width: 200px !important;
+/** Forms **/
+.errorlist{
+    margin: 0;
 }
-.default-input {
-    width: auto !important;
-}
-
-.errorlist {
-    color:#DA3939;
-    font-size:9px;
-    font-style:italic;
-    height:13px;
-    padding:0;
+.errorlist li {
+    list-style: none outside none;
 }
 form .required label:after {
     content: " *";
 }
-form .error {
-    font-weight: bold;
-    color:#DA3939;
-}
-form p.error {
-    margin-top:0;
-}
-form .error input, form .error textarea {
-    border:1px solid #DA3939;
-}
-form input:after {
-    font-weight: bold;
-}
 .helptext {
     font-size:9px;
     display: block;
     color: #556652;
 }
-/* Fieldsets */
-fieldset {
-    width: 0px;
-    padding: 0 60px 0 20px;
+textarea {
+    height: 100px;
 }
 
-/* Lists */
-ul {
-    list-style:none outside none;
-    -moz-padding-start:0px;
-    margin:0;
-    padding:0;
-}
-ol {
-    -moz-padding-start:20px;
-    margin:0;
-    padding-left:20px;
-}
-ul.results {
-    list-style:square outside none;
-    -moz-padding-start:0px;
-    margin-left: 20px;
-    padding:0;
-}
-
-/* Main container */
-#main ul{
-    list-style: disc inside;
-}
-#main table {
-    width: auto;
-}
-
-/* Misc */
-#sidebar {
-    width: 250px;
-    float: right;
-    margin:50px 0 20px 10px;
-}
-.box {
-    border:1px solid #808080;
-    padding: 0px 10px 10px 10px;
-}
-.box h4 {
-    margin-bottom: 0;
-    color: #333333;
-    font-weight: normal;
-    text-transform: uppercase;
-}
-
-.note {
-    color: red;
-}
-
-/* Footer */
-#footer {
-    border-top:1px solid #CCCCCC;
-    font-size:12px;
-    margin:20px 0 0;
-    padding:5px 0;
-    clear: both;
-}
-
-/* Notification */
-.notification {
-    border-radius: 6px 6px 6px 6px;
-    background-position: 10px 11px !important;
-    background-repeat: no-repeat !important;
-    border: 1px solid;
-    font-size: 13px;
-    margin: 10px 0 15px 0;
-    padding: 0;
-    position: relative;
-    line-height: 100%;
-    width: 96%;
-    cursor: pointer;
-}
-.notification .close {
-    color: #990000;
-    font-size: 9px;
-    position: absolute;
-    right: 5px;
-    top: 5px;
-}
-.notification em {
-    display: block;
-    font-style: normal;
-    line-height: 1.5em;
-    padding: 10px 20px 10px 36px;
-}
-.notification.success {
-    background: url("../images/icons/done.png") repeat scroll 0 0 #D5FFCE;
-    border-color: #9ADF8F;
-    color: #556652;
-}
-.notification.error {
-    background: url("../images/icons/error.png") repeat scroll 0 0 #FFCECE;
-    border-color: #DF8F8F;
-    color: #665252;
-}
-.notification.warning {
-    background: url("../images/icons/warning.png") repeat scroll 0 0 #FFFBCC;
-    border-color: #E6DB55;
-    color: #666452;
-}
-.notification.info {
-    background: url("../images/icons/information.png") repeat scroll 0 0 #DBE3FF;
-    border-color: #A2B4EE;
-    color: #585B66;
-}
-
-/* Icons */
-.icon {
-    font-size: 14px;
-}
-
-.icon span {
-    background-repeat: no-repeat;
-    background-position: center;
-    width: 16px;
-    height: 16px;
-    display: inline-block;
-}
-.right {
-    float: right
-}
-.preview {
-    background:url("../images/icons/preview.png") no-repeat 0px 0px;
-}
-.edit {
-    background:url("../images/icons/edit.png") no-repeat 0px 0px;
-}
-.delete {
-    background:url("../images/icons/delete.png") no-repeat 0px 0px;
-}
-
-
-
-/* inactive/active */
-a.activate_link span {
-    background-image: url(../images/icons/accept-grey.png);
-    background-repeat: no-repeat;
-    background-position: center;
-    width: 16px;
-    height: 16px;
-    display: inline-block;
-}
-a.activate_link.active span {
-    background-image: url(../images/icons/accept.png);
-}
-tr.activeline td, li.activeline {
-    background-color: #bed4de !important;
-}
+/** Responsive **/
+@media (max-width: 767px) {
+    body {
+        padding: 0;
+    }
+    .row-fluid .leftmenu {
+        float: left;
+    }
+    #content {
+        margin: 0 5px 0 45px;
+    }
+}
\ No newline at end of file
diff --git a/openslides/static/styles/bootstrap-responsive.css b/openslides/static/styles/bootstrap-responsive.css
new file mode 100644
index 000000000..daafa9180
--- /dev/null
+++ b/openslides/static/styles/bootstrap-responsive.css
@@ -0,0 +1,1040 @@
+/*!
+ * Bootstrap Responsive v2.1.0
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */
+
+.clearfix {
+  *zoom: 1;
+}
+
+.clearfix:before,
+.clearfix:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.clearfix:after {
+  clear: both;
+}
+
+.hide-text {
+  font: 0/0 a;
+  color: transparent;
+  text-shadow: none;
+  background-color: transparent;
+  border: 0;
+}
+
+.input-block-level {
+  display: block;
+  width: 100%;
+  min-height: 30px;
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
+.hidden {
+  display: none;
+  visibility: hidden;
+}
+
+.visible-phone {
+  display: none !important;
+}
+
+.visible-tablet {
+  display: none !important;
+}
+
+.hidden-desktop {
+  display: none !important;
+}
+
+.visible-desktop {
+  display: inherit !important;
+}
+
+@media (min-width: 768px) and (max-width: 979px) {
+  .hidden-desktop {
+    display: inherit !important;
+  }
+  .visible-desktop {
+    display: none !important ;
+  }
+  .visible-tablet {
+    display: inherit !important;
+  }
+  .hidden-tablet {
+    display: none !important;
+  }
+}
+
+@media (max-width: 767px) {
+  .hidden-desktop {
+    display: inherit !important;
+  }
+  .visible-desktop {
+    display: none !important;
+  }
+  .visible-phone {
+    display: inherit !important;
+  }
+  .hidden-phone {
+    display: none !important;
+  }
+}
+
+@media (min-width: 1200px) {
+  .row {
+    margin-left: -30px;
+    *zoom: 1;
+  }
+  .row:before,
+  .row:after {
+    display: table;
+    line-height: 0;
+    content: "";
+  }
+  .row:after {
+    clear: both;
+  }
+  [class*="span"] {
+    float: left;
+    margin-left: 30px;
+  }
+  .container,
+  .navbar-static-top .container,
+  .navbar-fixed-top .container,
+  .navbar-fixed-bottom .container {
+    width: 1170px;
+  }
+  .span12 {
+    width: 1170px;
+  }
+  .span11 {
+    width: 1070px;
+  }
+  .span10 {
+    width: 970px;
+  }
+  .span9 {
+    width: 870px;
+  }
+  .span8 {
+    width: 770px;
+  }
+  .span7 {
+    width: 670px;
+  }
+  .span6 {
+    width: 570px;
+  }
+  .span5 {
+    width: 470px;
+  }
+  .span4 {
+    width: 370px;
+  }
+  .span3 {
+    width: 270px;
+  }
+  .span2 {
+    width: 170px;
+  }
+  .span1 {
+    width: 70px;
+  }
+  .offset12 {
+    margin-left: 1230px;
+  }
+  .offset11 {
+    margin-left: 1130px;
+  }
+  .offset10 {
+    margin-left: 1030px;
+  }
+  .offset9 {
+    margin-left: 930px;
+  }
+  .offset8 {
+    margin-left: 830px;
+  }
+  .offset7 {
+    margin-left: 730px;
+  }
+  .offset6 {
+    margin-left: 630px;
+  }
+  .offset5 {
+    margin-left: 530px;
+  }
+  .offset4 {
+    margin-left: 430px;
+  }
+  .offset3 {
+    margin-left: 330px;
+  }
+  .offset2 {
+    margin-left: 230px;
+  }
+  .offset1 {
+    margin-left: 130px;
+  }
+  .row-fluid {
+    width: 100%;
+    *zoom: 1;
+  }
+  .row-fluid:before,
+  .row-fluid:after {
+    display: table;
+    line-height: 0;
+    content: "";
+  }
+  .row-fluid:after {
+    clear: both;
+  }
+  .row-fluid [class*="span"] {
+    display: block;
+    float: left;
+    width: 100%;
+    min-height: 30px;
+    margin-left: 2.564102564102564%;
+    *margin-left: 2.5109110747408616%;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  .row-fluid [class*="span"]:first-child {
+    margin-left: 0;
+  }
+  .row-fluid .span12 {
+    width: 100%;
+    *width: 99.94680851063829%;
+  }
+  .row-fluid .span11 {
+    width: 91.45299145299145%;
+    *width: 91.39979996362975%;
+  }
+  .row-fluid .span10 {
+    width: 82.90598290598291%;
+    *width: 82.8527914166212%;
+  }
+  .row-fluid .span9 {
+    width: 74.35897435897436%;
+    *width: 74.30578286961266%;
+  }
+  .row-fluid .span8 {
+    width: 65.81196581196582%;
+    *width: 65.75877432260411%;
+  }
+  .row-fluid .span7 {
+    width: 57.26495726495726%;
+    *width: 57.21176577559556%;
+  }
+  .row-fluid .span6 {
+    width: 48.717948717948715%;
+    *width: 48.664757228587014%;
+  }
+  .row-fluid .span5 {
+    width: 40.17094017094017%;
+    *width: 40.11774868157847%;
+  }
+  .row-fluid .span4 {
+    width: 31.623931623931625%;
+    *width: 31.570740134569924%;
+  }
+  .row-fluid .span3 {
+    width: 23.076923076923077%;
+    *width: 23.023731587561375%;
+  }
+  .row-fluid .span2 {
+    width: 14.52991452991453%;
+    *width: 14.476723040552828%;
+  }
+  .row-fluid .span1 {
+    width: 5.982905982905983%;
+    *width: 5.929714493544281%;
+  }
+  .row-fluid .offset12 {
+    margin-left: 105.12820512820512%;
+    *margin-left: 105.02182214948171%;
+  }
+  .row-fluid .offset12:first-child {
+    margin-left: 102.56410256410257%;
+    *margin-left: 102.45771958537915%;
+  }
+  .row-fluid .offset11 {
+    margin-left: 96.58119658119658%;
+    *margin-left: 96.47481360247316%;
+  }
+  .row-fluid .offset11:first-child {
+    margin-left: 94.01709401709402%;
+    *margin-left: 93.91071103837061%;
+  }
+  .row-fluid .offset10 {
+    margin-left: 88.03418803418803%;
+    *margin-left: 87.92780505546462%;
+  }
+  .row-fluid .offset10:first-child {
+    margin-left: 85.47008547008548%;
+    *margin-left: 85.36370249136206%;
+  }
+  .row-fluid .offset9 {
+    margin-left: 79.48717948717949%;
+    *margin-left: 79.38079650845607%;
+  }
+  .row-fluid .offset9:first-child {
+    margin-left: 76.92307692307693%;
+    *margin-left: 76.81669394435352%;
+  }
+  .row-fluid .offset8 {
+    margin-left: 70.94017094017094%;
+    *margin-left: 70.83378796144753%;
+  }
+  .row-fluid .offset8:first-child {
+    margin-left: 68.37606837606839%;
+    *margin-left: 68.26968539734497%;
+  }
+  .row-fluid .offset7 {
+    margin-left: 62.393162393162385%;
+    *margin-left: 62.28677941443899%;
+  }
+  .row-fluid .offset7:first-child {
+    margin-left: 59.82905982905982%;
+    *margin-left: 59.72267685033642%;
+  }
+  .row-fluid .offset6 {
+    margin-left: 53.84615384615384%;
+    *margin-left: 53.739770867430444%;
+  }
+  .row-fluid .offset6:first-child {
+    margin-left: 51.28205128205128%;
+    *margin-left: 51.175668303327875%;
+  }
+  .row-fluid .offset5 {
+    margin-left: 45.299145299145295%;
+    *margin-left: 45.1927623204219%;
+  }
+  .row-fluid .offset5:first-child {
+    margin-left: 42.73504273504273%;
+    *margin-left: 42.62865975631933%;
+  }
+  .row-fluid .offset4 {
+    margin-left: 36.75213675213675%;
+    *margin-left: 36.645753773413354%;
+  }
+  .row-fluid .offset4:first-child {
+    margin-left: 34.18803418803419%;
+    *margin-left: 34.081651209310785%;
+  }
+  .row-fluid .offset3 {
+    margin-left: 28.205128205128204%;
+    *margin-left: 28.0987452264048%;
+  }
+  .row-fluid .offset3:first-child {
+    margin-left: 25.641025641025642%;
+    *margin-left: 25.53464266230224%;
+  }
+  .row-fluid .offset2 {
+    margin-left: 19.65811965811966%;
+    *margin-left: 19.551736679396257%;
+  }
+  .row-fluid .offset2:first-child {
+    margin-left: 17.094017094017094%;
+    *margin-left: 16.98763411529369%;
+  }
+  .row-fluid .offset1 {
+    margin-left: 11.11111111111111%;
+    *margin-left: 11.004728132387708%;
+  }
+  .row-fluid .offset1:first-child {
+    margin-left: 8.547008547008547%;
+    *margin-left: 8.440625568285142%;
+  }
+  input,
+  textarea,
+  .uneditable-input {
+    margin-left: 0;
+  }
+  .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 30px;
+  }
+  input.span12,
+  textarea.span12,
+  .uneditable-input.span12 {
+    width: 1156px;
+  }
+  input.span11,
+  textarea.span11,
+  .uneditable-input.span11 {
+    width: 1056px;
+  }
+  input.span10,
+  textarea.span10,
+  .uneditable-input.span10 {
+    width: 956px;
+  }
+  input.span9,
+  textarea.span9,
+  .uneditable-input.span9 {
+    width: 856px;
+  }
+  input.span8,
+  textarea.span8,
+  .uneditable-input.span8 {
+    width: 756px;
+  }
+  input.span7,
+  textarea.span7,
+  .uneditable-input.span7 {
+    width: 656px;
+  }
+  input.span6,
+  textarea.span6,
+  .uneditable-input.span6 {
+    width: 556px;
+  }
+  input.span5,
+  textarea.span5,
+  .uneditable-input.span5 {
+    width: 456px;
+  }
+  input.span4,
+  textarea.span4,
+  .uneditable-input.span4 {
+    width: 356px;
+  }
+  input.span3,
+  textarea.span3,
+  .uneditable-input.span3 {
+    width: 256px;
+  }
+  input.span2,
+  textarea.span2,
+  .uneditable-input.span2 {
+    width: 156px;
+  }
+  input.span1,
+  textarea.span1,
+  .uneditable-input.span1 {
+    width: 56px;
+  }
+  .thumbnails {
+    margin-left: -30px;
+  }
+  .thumbnails > li {
+    margin-left: 30px;
+  }
+  .row-fluid .thumbnails {
+    margin-left: 0;
+  }
+}
+
+@media (min-width: 768px) and (max-width: 979px) {
+  .row {
+    margin-left: -20px;
+    *zoom: 1;
+  }
+  .row:before,
+  .row:after {
+    display: table;
+    line-height: 0;
+    content: "";
+  }
+  .row:after {
+    clear: both;
+  }
+  [class*="span"] {
+    float: left;
+    margin-left: 20px;
+  }
+  .container,
+  .navbar-static-top .container,
+  .navbar-fixed-top .container,
+  .navbar-fixed-bottom .container {
+    width: 724px;
+  }
+  .span12 {
+    width: 724px;
+  }
+  .span11 {
+    width: 662px;
+  }
+  .span10 {
+    width: 600px;
+  }
+  .span9 {
+    width: 538px;
+  }
+  .span8 {
+    width: 476px;
+  }
+  .span7 {
+    width: 414px;
+  }
+  .span6 {
+    width: 352px;
+  }
+  .span5 {
+    width: 290px;
+  }
+  .span4 {
+    width: 228px;
+  }
+  .span3 {
+    width: 166px;
+  }
+  .span2 {
+    width: 104px;
+  }
+  .span1 {
+    width: 42px;
+  }
+  .offset12 {
+    margin-left: 764px;
+  }
+  .offset11 {
+    margin-left: 702px;
+  }
+  .offset10 {
+    margin-left: 640px;
+  }
+  .offset9 {
+    margin-left: 578px;
+  }
+  .offset8 {
+    margin-left: 516px;
+  }
+  .offset7 {
+    margin-left: 454px;
+  }
+  .offset6 {
+    margin-left: 392px;
+  }
+  .offset5 {
+    margin-left: 330px;
+  }
+  .offset4 {
+    margin-left: 268px;
+  }
+  .offset3 {
+    margin-left: 206px;
+  }
+  .offset2 {
+    margin-left: 144px;
+  }
+  .offset1 {
+    margin-left: 82px;
+  }
+  .row-fluid {
+    width: 100%;
+    *zoom: 1;
+  }
+  .row-fluid:before,
+  .row-fluid:after {
+    display: table;
+    line-height: 0;
+    content: "";
+  }
+  .row-fluid:after {
+    clear: both;
+  }
+  .row-fluid [class*="span"] {
+    display: block;
+    float: left;
+    width: 100%;
+    min-height: 30px;
+    margin-left: 2.7624309392265194%;
+    *margin-left: 2.709239449864817%;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  .row-fluid [class*="span"]:first-child {
+    margin-left: 0;
+  }
+  .row-fluid .span12 {
+    width: 100%;
+    *width: 99.94680851063829%;
+  }
+  .row-fluid .span11 {
+    width: 91.43646408839778%;
+    *width: 91.38327259903608%;
+  }
+  .row-fluid .span10 {
+    width: 82.87292817679558%;
+    *width: 82.81973668743387%;
+  }
+  .row-fluid .span9 {
+    width: 74.30939226519337%;
+    *width: 74.25620077583166%;
+  }
+  .row-fluid .span8 {
+    width: 65.74585635359117%;
+    *width: 65.69266486422946%;
+  }
+  .row-fluid .span7 {
+    width: 57.18232044198895%;
+    *width: 57.12912895262725%;
+  }
+  .row-fluid .span6 {
+    width: 48.61878453038674%;
+    *width: 48.56559304102504%;
+  }
+  .row-fluid .span5 {
+    width: 40.05524861878453%;
+    *width: 40.00205712942283%;
+  }
+  .row-fluid .span4 {
+    width: 31.491712707182323%;
+    *width: 31.43852121782062%;
+  }
+  .row-fluid .span3 {
+    width: 22.92817679558011%;
+    *width: 22.87498530621841%;
+  }
+  .row-fluid .span2 {
+    width: 14.3646408839779%;
+    *width: 14.311449394616199%;
+  }
+  .row-fluid .span1 {
+    width: 5.801104972375691%;
+    *width: 5.747913483013988%;
+  }
+  .row-fluid .offset12 {
+    margin-left: 105.52486187845304%;
+    *margin-left: 105.41847889972962%;
+  }
+  .row-fluid .offset12:first-child {
+    margin-left: 102.76243093922652%;
+    *margin-left: 102.6560479605031%;
+  }
+  .row-fluid .offset11 {
+    margin-left: 96.96132596685082%;
+    *margin-left: 96.8549429881274%;
+  }
+  .row-fluid .offset11:first-child {
+    margin-left: 94.1988950276243%;
+    *margin-left: 94.09251204890089%;
+  }
+  .row-fluid .offset10 {
+    margin-left: 88.39779005524862%;
+    *margin-left: 88.2914070765252%;
+  }
+  .row-fluid .offset10:first-child {
+    margin-left: 85.6353591160221%;
+    *margin-left: 85.52897613729868%;
+  }
+  .row-fluid .offset9 {
+    margin-left: 79.8342541436464%;
+    *margin-left: 79.72787116492299%;
+  }
+  .row-fluid .offset9:first-child {
+    margin-left: 77.07182320441989%;
+    *margin-left: 76.96544022569647%;
+  }
+  .row-fluid .offset8 {
+    margin-left: 71.2707182320442%;
+    *margin-left: 71.16433525332079%;
+  }
+  .row-fluid .offset8:first-child {
+    margin-left: 68.50828729281768%;
+    *margin-left: 68.40190431409427%;
+  }
+  .row-fluid .offset7 {
+    margin-left: 62.70718232044199%;
+    *margin-left: 62.600799341718584%;
+  }
+  .row-fluid .offset7:first-child {
+    margin-left: 59.94475138121547%;
+    *margin-left: 59.838368402492065%;
+  }
+  .row-fluid .offset6 {
+    margin-left: 54.14364640883978%;
+    *margin-left: 54.037263430116376%;
+  }
+  .row-fluid .offset6:first-child {
+    margin-left: 51.38121546961326%;
+    *margin-left: 51.27483249088986%;
+  }
+  .row-fluid .offset5 {
+    margin-left: 45.58011049723757%;
+    *margin-left: 45.47372751851417%;
+  }
+  .row-fluid .offset5:first-child {
+    margin-left: 42.81767955801105%;
+    *margin-left: 42.71129657928765%;
+  }
+  .row-fluid .offset4 {
+    margin-left: 37.01657458563536%;
+    *margin-left: 36.91019160691196%;
+  }
+  .row-fluid .offset4:first-child {
+    margin-left: 34.25414364640884%;
+    *margin-left: 34.14776066768544%;
+  }
+  .row-fluid .offset3 {
+    margin-left: 28.45303867403315%;
+    *margin-left: 28.346655695309746%;
+  }
+  .row-fluid .offset3:first-child {
+    margin-left: 25.69060773480663%;
+    *margin-left: 25.584224756083227%;
+  }
+  .row-fluid .offset2 {
+    margin-left: 19.88950276243094%;
+    *margin-left: 19.783119783707537%;
+  }
+  .row-fluid .offset2:first-child {
+    margin-left: 17.12707182320442%;
+    *margin-left: 17.02068884448102%;
+  }
+  .row-fluid .offset1 {
+    margin-left: 11.32596685082873%;
+    *margin-left: 11.219583872105325%;
+  }
+  .row-fluid .offset1:first-child {
+    margin-left: 8.56353591160221%;
+    *margin-left: 8.457152932878806%;
+  }
+  input,
+  textarea,
+  .uneditable-input {
+    margin-left: 0;
+  }
+  .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 20px;
+  }
+  input.span12,
+  textarea.span12,
+  .uneditable-input.span12 {
+    width: 710px;
+  }
+  input.span11,
+  textarea.span11,
+  .uneditable-input.span11 {
+    width: 648px;
+  }
+  input.span10,
+  textarea.span10,
+  .uneditable-input.span10 {
+    width: 586px;
+  }
+  input.span9,
+  textarea.span9,
+  .uneditable-input.span9 {
+    width: 524px;
+  }
+  input.span8,
+  textarea.span8,
+  .uneditable-input.span8 {
+    width: 462px;
+  }
+  input.span7,
+  textarea.span7,
+  .uneditable-input.span7 {
+    width: 400px;
+  }
+  input.span6,
+  textarea.span6,
+  .uneditable-input.span6 {
+    width: 338px;
+  }
+  input.span5,
+  textarea.span5,
+  .uneditable-input.span5 {
+    width: 276px;
+  }
+  input.span4,
+  textarea.span4,
+  .uneditable-input.span4 {
+    width: 214px;
+  }
+  input.span3,
+  textarea.span3,
+  .uneditable-input.span3 {
+    width: 152px;
+  }
+  input.span2,
+  textarea.span2,
+  .uneditable-input.span2 {
+    width: 90px;
+  }
+  input.span1,
+  textarea.span1,
+  .uneditable-input.span1 {
+    width: 28px;
+  }
+}
+
+@media (max-width: 767px) {
+  body {
+    padding-right: 20px;
+    padding-left: 20px;
+  }
+  .navbar-fixed-top,
+  .navbar-fixed-bottom {
+    margin-right: -20px;
+    margin-left: -20px;
+  }
+  .container-fluid {
+    padding: 0;
+  }
+  .dl-horizontal dt {
+    float: none;
+    width: auto;
+    clear: none;
+    text-align: left;
+  }
+  .dl-horizontal dd {
+    margin-left: 0;
+  }
+  .container {
+    width: auto;
+  }
+  .row-fluid {
+    width: 100%;
+  }
+  .row,
+  .thumbnails {
+    margin-left: 0;
+  }
+  .thumbnails > li {
+    float: none;
+    margin-left: 0;
+  }
+  [class*="span"],
+  .row-fluid [class*="span"] {
+    display: block;
+    float: none;
+    width: auto;
+    margin-left: 0;
+  }
+  .span12,
+  .row-fluid .span12 {
+    width: 100%;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  .input-large,
+  .input-xlarge,
+  .input-xxlarge,
+  input[class*="span"],
+  select[class*="span"],
+  textarea[class*="span"],
+  .uneditable-input {
+    display: block;
+    width: 100%;
+    min-height: 30px;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  .input-prepend input,
+  .input-append input,
+  .input-prepend input[class*="span"],
+  .input-append input[class*="span"] {
+    display: inline-block;
+    width: auto;
+  }
+  .modal {
+    position: fixed;
+    top: 20px;
+    right: 20px;
+    left: 20px;
+    width: auto;
+    margin: 0;
+  }
+  .modal.fade.in {
+    top: auto;
+  }
+}
+
+@media (max-width: 480px) {
+  .nav-collapse {
+    -webkit-transform: translate3d(0, 0, 0);
+  }
+  .page-header h1 small {
+    display: block;
+    line-height: 20px;
+  }
+  input[type="checkbox"],
+  input[type="radio"] {
+    border: 1px solid #ccc;
+  }
+  .form-horizontal .control-group > label {
+    float: none;
+    width: auto;
+    padding-top: 0;
+    text-align: left;
+  }
+  .form-horizontal .controls {
+    margin-left: 0;
+  }
+  .form-horizontal .control-list {
+    padding-top: 0;
+  }
+  .form-horizontal .form-actions {
+    padding-right: 10px;
+    padding-left: 10px;
+  }
+  .modal {
+    top: 10px;
+    right: 10px;
+    left: 10px;
+  }
+  .modal-header .close {
+    padding: 10px;
+    margin: -10px;
+  }
+  .carousel-caption {
+    position: static;
+  }
+}
+
+@media (max-width: 979px) {
+  body {
+    padding-top: 0;
+  }
+  .navbar-fixed-top,
+  .navbar-fixed-bottom {
+    position: static;
+  }
+  .navbar-fixed-top {
+    margin-bottom: 20px;
+  }
+  .navbar-fixed-bottom {
+    margin-top: 20px;
+  }
+  .navbar-fixed-top .navbar-inner,
+  .navbar-fixed-bottom .navbar-inner {
+    padding: 5px;
+  }
+  .navbar .container {
+    width: auto;
+    padding: 0;
+  }
+  .navbar .brand {
+    padding-right: 10px;
+    padding-left: 10px;
+    margin: 0 0 0 -5px;
+  }
+  .nav-collapse {
+    clear: both;
+  }
+  .nav-collapse .nav {
+    float: none;
+    margin: 0 0 10px;
+  }
+  .nav-collapse .nav > li {
+    float: none;
+  }
+  .nav-collapse .nav > li > a {
+    margin-bottom: 2px;
+  }
+  .nav-collapse .nav > .divider-vertical {
+    display: none;
+  }
+  .nav-collapse .nav .nav-header {
+    color: #555555;
+    text-shadow: none;
+  }
+  .nav-collapse .nav > li > a,
+  .nav-collapse .dropdown-menu a {
+    padding: 9px 15px;
+    font-weight: bold;
+    color: #555555;
+    -webkit-border-radius: 3px;
+       -moz-border-radius: 3px;
+            border-radius: 3px;
+  }
+  .nav-collapse .btn {
+    padding: 4px 10px 4px;
+    font-weight: normal;
+    -webkit-border-radius: 4px;
+       -moz-border-radius: 4px;
+            border-radius: 4px;
+  }
+  .nav-collapse .dropdown-menu li + li a {
+    margin-bottom: 2px;
+  }
+  .nav-collapse .nav > li > a:hover,
+  .nav-collapse .dropdown-menu a:hover {
+    background-color: #f2f2f2;
+  }
+  .navbar-inverse .nav-collapse .nav > li > a:hover,
+  .navbar-inverse .nav-collapse .dropdown-menu a:hover {
+    background-color: #111111;
+  }
+  .nav-collapse.in .btn-group {
+    padding: 0;
+    margin-top: 5px;
+  }
+  .nav-collapse .dropdown-menu {
+    position: static;
+    top: auto;
+    left: auto;
+    display: block;
+    float: none;
+    max-width: none;
+    padding: 0;
+    margin: 0 15px;
+    background-color: transparent;
+    border: none;
+    -webkit-border-radius: 0;
+       -moz-border-radius: 0;
+            border-radius: 0;
+    -webkit-box-shadow: none;
+       -moz-box-shadow: none;
+            box-shadow: none;
+  }
+  .nav-collapse .dropdown-menu:before,
+  .nav-collapse .dropdown-menu:after {
+    display: none;
+  }
+  .nav-collapse .dropdown-menu .divider {
+    display: none;
+  }
+  .nav-collapse .navbar-form,
+  .nav-collapse .navbar-search {
+    float: none;
+    padding: 10px 15px;
+    margin: 10px 0;
+    border-top: 1px solid #f2f2f2;
+    border-bottom: 1px solid #f2f2f2;
+    -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+       -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+            box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+  }
+  .navbar .nav-collapse .nav.pull-right {
+    float: none;
+    margin-left: 0;
+  }
+  .nav-collapse,
+  .nav-collapse.collapse {
+    height: 0;
+    overflow: hidden;
+  }
+  .navbar .btn-navbar {
+    display: block;
+  }
+  .navbar-static .navbar-inner {
+    padding-right: 10px;
+    padding-left: 10px;
+  }
+}
+
+@media (min-width: 980px) {
+  .nav-collapse.collapse {
+    height: auto !important;
+    overflow: visible !important;
+  }
+}
diff --git a/openslides/static/styles/bootstrap.css b/openslides/static/styles/bootstrap.css
new file mode 100644
index 000000000..0664207ae
--- /dev/null
+++ b/openslides/static/styles/bootstrap.css
@@ -0,0 +1,5624 @@
+/*!
+ * Bootstrap v2.1.0
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */
+
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+nav,
+section {
+  display: block;
+}
+
+audio,
+canvas,
+video {
+  display: inline-block;
+  *display: inline;
+  *zoom: 1;
+}
+
+audio:not([controls]) {
+  display: none;
+}
+
+html {
+  font-size: 100%;
+  -webkit-text-size-adjust: 100%;
+      -ms-text-size-adjust: 100%;
+}
+
+a:focus {
+  outline: thin dotted #333;
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+
+a:hover,
+a:active {
+  outline: 0;
+}
+
+sub,
+sup {
+  position: relative;
+  font-size: 75%;
+  line-height: 0;
+  vertical-align: baseline;
+}
+
+sup {
+  top: -0.5em;
+}
+
+sub {
+  bottom: -0.25em;
+}
+
+img {
+  height: auto;
+  max-width: 100%;
+  vertical-align: middle;
+  border: 0;
+  -ms-interpolation-mode: bicubic;
+}
+
+#map_canvas img {
+  max-width: none;
+}
+
+button,
+input,
+select,
+textarea {
+  margin: 0;
+  font-size: 100%;
+  vertical-align: middle;
+}
+
+button,
+input {
+  *overflow: visible;
+  line-height: normal;
+}
+
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+  padding: 0;
+  border: 0;
+}
+
+button,
+input[type="button"],
+input[type="reset"],
+input[type="submit"] {
+  cursor: pointer;
+  -webkit-appearance: button;
+}
+
+input[type="search"] {
+  -webkit-box-sizing: content-box;
+     -moz-box-sizing: content-box;
+          box-sizing: content-box;
+  -webkit-appearance: textfield;
+}
+
+input[type="search"]::-webkit-search-decoration,
+input[type="search"]::-webkit-search-cancel-button {
+  -webkit-appearance: none;
+}
+
+textarea {
+  overflow: auto;
+  vertical-align: top;
+}
+
+.clearfix {
+  *zoom: 1;
+}
+
+.clearfix:before,
+.clearfix:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.clearfix:after {
+  clear: both;
+}
+
+.hide-text {
+  font: 0/0 a;
+  color: transparent;
+  text-shadow: none;
+  background-color: transparent;
+  border: 0;
+}
+
+.input-block-level {
+  display: block;
+  width: 100%;
+  min-height: 30px;
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
+body {
+  margin: 0;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 14px;
+  line-height: 20px;
+  color: #333333;
+  background-color: #ffffff;
+}
+
+a {
+  color: #0088cc;
+  text-decoration: none;
+}
+
+a:hover {
+  color: #005580;
+  text-decoration: underline;
+}
+
+.img-rounded {
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+}
+
+.img-polaroid {
+  padding: 4px;
+  background-color: #fff;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+     -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+          box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+}
+
+.img-circle {
+  -webkit-border-radius: 500px;
+     -moz-border-radius: 500px;
+          border-radius: 500px;
+}
+
+.row {
+  margin-left: -20px;
+  *zoom: 1;
+}
+
+.row:before,
+.row:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.row:after {
+  clear: both;
+}
+
+[class*="span"] {
+  float: left;
+  margin-left: 20px;
+}
+
+.container,
+.navbar-static-top .container,
+.navbar-fixed-top .container,
+.navbar-fixed-bottom .container {
+  width: 940px;
+}
+
+.span12 {
+  width: 940px;
+}
+
+.span11 {
+  width: 860px;
+}
+
+.span10 {
+  width: 780px;
+}
+
+.span9 {
+  width: 700px;
+}
+
+.span8 {
+  width: 620px;
+}
+
+.span7 {
+  width: 540px;
+}
+
+.span6 {
+  width: 460px;
+}
+
+.span5 {
+  width: 380px;
+}
+
+.span4 {
+  width: 300px;
+}
+
+.span3 {
+  width: 220px;
+}
+
+.span2 {
+  width: 140px;
+}
+
+.span1 {
+  width: 60px;
+}
+
+.offset12 {
+  margin-left: 980px;
+}
+
+.offset11 {
+  margin-left: 900px;
+}
+
+.offset10 {
+  margin-left: 820px;
+}
+
+.offset9 {
+  margin-left: 740px;
+}
+
+.offset8 {
+  margin-left: 660px;
+}
+
+.offset7 {
+  margin-left: 580px;
+}
+
+.offset6 {
+  margin-left: 500px;
+}
+
+.offset5 {
+  margin-left: 420px;
+}
+
+.offset4 {
+  margin-left: 340px;
+}
+
+.offset3 {
+  margin-left: 260px;
+}
+
+.offset2 {
+  margin-left: 180px;
+}
+
+.offset1 {
+  margin-left: 100px;
+}
+
+.row-fluid {
+  width: 100%;
+  *zoom: 1;
+}
+
+.row-fluid:before,
+.row-fluid:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.row-fluid:after {
+  clear: both;
+}
+
+.row-fluid [class*="span"] {
+  display: block;
+  float: left;
+  width: 100%;
+  min-height: 30px;
+  margin-left: 2.127659574468085%;
+  *margin-left: 2.074468085106383%;
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
+.row-fluid [class*="span"]:first-child {
+  margin-left: 0;
+}
+
+.row-fluid .span12 {
+  width: 100%;
+  *width: 99.94680851063829%;
+}
+
+.row-fluid .span11 {
+  width: 91.48936170212765%;
+  *width: 91.43617021276594%;
+}
+
+.row-fluid .span10 {
+  width: 82.97872340425532%;
+  *width: 82.92553191489361%;
+}
+
+.row-fluid .span9 {
+  width: 74.46808510638297%;
+  *width: 74.41489361702126%;
+}
+
+.row-fluid .span8 {
+  width: 65.95744680851064%;
+  *width: 65.90425531914893%;
+}
+
+.row-fluid .span7 {
+  width: 57.44680851063829%;
+  *width: 57.39361702127659%;
+}
+
+.row-fluid .span6 {
+  width: 48.93617021276595%;
+  *width: 48.88297872340425%;
+}
+
+.row-fluid .span5 {
+  width: 40.42553191489362%;
+  *width: 40.37234042553192%;
+}
+
+.row-fluid .span4 {
+  width: 31.914893617021278%;
+  *width: 31.861702127659576%;
+}
+
+.row-fluid .span3 {
+  width: 23.404255319148934%;
+  *width: 23.351063829787233%;
+}
+
+.row-fluid .span2 {
+  width: 14.893617021276595%;
+  *width: 14.840425531914894%;
+}
+
+.row-fluid .span1 {
+  width: 6.382978723404255%;
+  *width: 6.329787234042553%;
+}
+
+.row-fluid .offset12 {
+  margin-left: 104.25531914893617%;
+  *margin-left: 104.14893617021275%;
+}
+
+.row-fluid .offset12:first-child {
+  margin-left: 102.12765957446808%;
+  *margin-left: 102.02127659574467%;
+}
+
+.row-fluid .offset11 {
+  margin-left: 95.74468085106382%;
+  *margin-left: 95.6382978723404%;
+}
+
+.row-fluid .offset11:first-child {
+  margin-left: 93.61702127659574%;
+  *margin-left: 93.51063829787232%;
+}
+
+.row-fluid .offset10 {
+  margin-left: 87.23404255319149%;
+  *margin-left: 87.12765957446807%;
+}
+
+.row-fluid .offset10:first-child {
+  margin-left: 85.1063829787234%;
+  *margin-left: 84.99999999999999%;
+}
+
+.row-fluid .offset9 {
+  margin-left: 78.72340425531914%;
+  *margin-left: 78.61702127659572%;
+}
+
+.row-fluid .offset9:first-child {
+  margin-left: 76.59574468085106%;
+  *margin-left: 76.48936170212764%;
+}
+
+.row-fluid .offset8 {
+  margin-left: 70.2127659574468%;
+  *margin-left: 70.10638297872339%;
+}
+
+.row-fluid .offset8:first-child {
+  margin-left: 68.08510638297872%;
+  *margin-left: 67.9787234042553%;
+}
+
+.row-fluid .offset7 {
+  margin-left: 61.70212765957446%;
+  *margin-left: 61.59574468085106%;
+}
+
+.row-fluid .offset7:first-child {
+  margin-left: 59.574468085106375%;
+  *margin-left: 59.46808510638297%;
+}
+
+.row-fluid .offset6 {
+  margin-left: 53.191489361702125%;
+  *margin-left: 53.085106382978715%;
+}
+
+.row-fluid .offset6:first-child {
+  margin-left: 51.063829787234035%;
+  *margin-left: 50.95744680851063%;
+}
+
+.row-fluid .offset5 {
+  margin-left: 44.68085106382979%;
+  *margin-left: 44.57446808510638%;
+}
+
+.row-fluid .offset5:first-child {
+  margin-left: 42.5531914893617%;
+  *margin-left: 42.4468085106383%;
+}
+
+.row-fluid .offset4 {
+  margin-left: 36.170212765957444%;
+  *margin-left: 36.06382978723405%;
+}
+
+.row-fluid .offset4:first-child {
+  margin-left: 34.04255319148936%;
+  *margin-left: 33.93617021276596%;
+}
+
+.row-fluid .offset3 {
+  margin-left: 27.659574468085104%;
+  *margin-left: 27.5531914893617%;
+}
+
+.row-fluid .offset3:first-child {
+  margin-left: 25.53191489361702%;
+  *margin-left: 25.425531914893618%;
+}
+
+.row-fluid .offset2 {
+  margin-left: 19.148936170212764%;
+  *margin-left: 19.04255319148936%;
+}
+
+.row-fluid .offset2:first-child {
+  margin-left: 17.02127659574468%;
+  *margin-left: 16.914893617021278%;
+}
+
+.row-fluid .offset1 {
+  margin-left: 10.638297872340425%;
+  *margin-left: 10.53191489361702%;
+}
+
+.row-fluid .offset1:first-child {
+  margin-left: 8.51063829787234%;
+  *margin-left: 8.404255319148938%;
+}
+
+[class*="span"].hide,
+.row-fluid [class*="span"].hide {
+  display: none;
+}
+
+[class*="span"].pull-right,
+.row-fluid [class*="span"].pull-right {
+  float: right;
+}
+
+.container {
+  margin-right: auto;
+  margin-left: auto;
+  *zoom: 1;
+}
+
+.container:before,
+.container:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.container:after {
+  clear: both;
+}
+
+.container-fluid {
+  padding-right: 20px;
+  padding-left: 20px;
+  *zoom: 1;
+}
+
+.container-fluid:before,
+.container-fluid:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.container-fluid:after {
+  clear: both;
+}
+
+p {
+  margin: 0 0 10px;
+}
+
+.lead {
+  margin-bottom: 20px;
+  font-size: 20px;
+  font-weight: 200;
+  line-height: 30px;
+}
+
+small {
+  font-size: 85%;
+}
+
+strong {
+  font-weight: bold;
+}
+
+em {
+  font-style: italic;
+}
+
+cite {
+  font-style: normal;
+}
+
+.muted {
+  color: #999999;
+}
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  margin: 10px 0;
+  font-family: inherit;
+  font-weight: bold;
+  line-height: 1;
+  color: inherit;
+  text-rendering: optimizelegibility;
+}
+
+h1 small,
+h2 small,
+h3 small,
+h4 small,
+h5 small,
+h6 small {
+  font-weight: normal;
+  line-height: 1;
+  color: #999999;
+}
+
+h1 {
+  font-size: 36px;
+  line-height: 40px;
+}
+
+h2 {
+  font-size: 30px;
+  line-height: 40px;
+}
+
+h3 {
+  font-size: 24px;
+  line-height: 40px;
+}
+
+h4 {
+  font-size: 18px;
+  line-height: 20px;
+}
+
+h5 {
+  font-size: 14px;
+  line-height: 20px;
+}
+
+h6 {
+  font-size: 12px;
+  line-height: 20px;
+}
+
+h1 small {
+  font-size: 24px;
+}
+
+h2 small {
+  font-size: 18px;
+}
+
+h3 small {
+  font-size: 14px;
+}
+
+h4 small {
+  font-size: 14px;
+}
+
+.page-header {
+  padding-bottom: 9px;
+  margin: 20px 0 30px;
+  border-bottom: 1px solid #eeeeee;
+}
+
+ul,
+ol {
+  padding: 0;
+  margin: 0 0 10px 25px;
+}
+
+ul ul,
+ul ol,
+ol ol,
+ol ul {
+  margin-bottom: 0;
+}
+
+li {
+  line-height: 20px;
+}
+
+ul.unstyled,
+ol.unstyled {
+  margin-left: 0;
+  list-style: none;
+}
+
+dl {
+  margin-bottom: 20px;
+}
+
+dt,
+dd {
+  line-height: 20px;
+}
+
+dt {
+  font-weight: bold;
+}
+
+dd {
+  margin-left: 10px;
+}
+
+.dl-horizontal dt {
+  float: left;
+  width: 120px;
+  overflow: hidden;
+  clear: left;
+  text-align: right;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.dl-horizontal dd {
+  margin-left: 130px;
+}
+
+hr {
+  margin: 20px 0;
+  border: 0;
+  border-top: 1px solid #eeeeee;
+  border-bottom: 1px solid #ffffff;
+}
+
+abbr[title] {
+  cursor: help;
+  border-bottom: 1px dotted #999999;
+}
+
+abbr.initialism {
+  font-size: 90%;
+  text-transform: uppercase;
+}
+
+blockquote {
+  padding: 0 0 0 15px;
+  margin: 0 0 20px;
+  border-left: 5px solid #eeeeee;
+}
+
+blockquote p {
+  margin-bottom: 0;
+  font-size: 16px;
+  font-weight: 300;
+  line-height: 25px;
+}
+
+blockquote small {
+  display: block;
+  line-height: 20px;
+  color: #999999;
+}
+
+blockquote small:before {
+  content: '\2014 \00A0';
+}
+
+blockquote.pull-right {
+  float: right;
+  padding-right: 15px;
+  padding-left: 0;
+  border-right: 5px solid #eeeeee;
+  border-left: 0;
+}
+
+blockquote.pull-right p,
+blockquote.pull-right small {
+  text-align: right;
+}
+
+blockquote.pull-right small:before {
+  content: '';
+}
+
+blockquote.pull-right small:after {
+  content: '\00A0 \2014';
+}
+
+q:before,
+q:after,
+blockquote:before,
+blockquote:after {
+  content: "";
+}
+
+address {
+  display: block;
+  margin-bottom: 20px;
+  font-style: normal;
+  line-height: 20px;
+}
+
+code,
+pre {
+  padding: 0 3px 2px;
+  font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
+  font-size: 12px;
+  color: #333333;
+  -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+          border-radius: 3px;
+}
+
+code {
+  padding: 2px 4px;
+  color: #d14;
+  background-color: #f7f7f9;
+  border: 1px solid #e1e1e8;
+}
+
+pre {
+  display: block;
+  padding: 9.5px;
+  margin: 0 0 10px;
+  font-size: 13px;
+  line-height: 20px;
+  word-break: break-all;
+  word-wrap: break-word;
+  white-space: pre;
+  white-space: pre-wrap;
+  background-color: #f5f5f5;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+pre.prettyprint {
+  margin-bottom: 20px;
+}
+
+pre code {
+  padding: 0;
+  color: inherit;
+  background-color: transparent;
+  border: 0;
+}
+
+.pre-scrollable {
+  max-height: 340px;
+  overflow-y: scroll;
+}
+
+form {
+  margin: 0 0 20px;
+}
+
+fieldset {
+  padding: 0;
+  margin: 0;
+  border: 0;
+}
+
+legend {
+  display: block;
+  width: 100%;
+  padding: 0;
+  margin-bottom: 20px;
+  font-size: 21px;
+  line-height: 40px;
+  color: #333333;
+  border: 0;
+  border-bottom: 1px solid #e5e5e5;
+}
+
+legend small {
+  font-size: 15px;
+  color: #999999;
+}
+
+label,
+input,
+button,
+select,
+textarea {
+  font-size: 14px;
+  font-weight: normal;
+  line-height: 20px;
+}
+
+input,
+button,
+select,
+textarea {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+
+label {
+  display: block;
+  margin-bottom: 5px;
+}
+
+select,
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"],
+.uneditable-input {
+  display: inline-block;
+  height: 20px;
+  padding: 4px 6px;
+  margin-bottom: 9px;
+  font-size: 14px;
+  line-height: 20px;
+  color: #555555;
+  -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+          border-radius: 3px;
+}
+
+input,
+textarea {
+  width: 210px;
+}
+
+textarea {
+  height: auto;
+}
+
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"],
+.uneditable-input {
+  background-color: #ffffff;
+  border: 1px solid #cccccc;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
+     -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
+       -o-transition: border linear 0.2s, box-shadow linear 0.2s;
+          transition: border linear 0.2s, box-shadow linear 0.2s;
+}
+
+textarea:focus,
+input[type="text"]:focus,
+input[type="password"]:focus,
+input[type="datetime"]:focus,
+input[type="datetime-local"]:focus,
+input[type="date"]:focus,
+input[type="month"]:focus,
+input[type="time"]:focus,
+input[type="week"]:focus,
+input[type="number"]:focus,
+input[type="email"]:focus,
+input[type="url"]:focus,
+input[type="search"]:focus,
+input[type="tel"]:focus,
+input[type="color"]:focus,
+.uneditable-input:focus {
+  border-color: rgba(82, 168, 236, 0.8);
+  outline: 0;
+  outline: thin dotted \9;
+  /* IE6-9 */
+
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+}
+
+input[type="radio"],
+input[type="checkbox"] {
+  margin: 4px 0 0;
+  margin-top: 1px \9;
+  *margin-top: 0;
+  line-height: normal;
+  cursor: pointer;
+}
+
+input[type="file"],
+input[type="image"],
+input[type="submit"],
+input[type="reset"],
+input[type="button"],
+input[type="radio"],
+input[type="checkbox"] {
+  width: auto;
+}
+
+select,
+input[type="file"] {
+  height: 30px;
+  /* In IE7, the height of the select element cannot be changed by height, only font-size */
+
+  *margin-top: 4px;
+  /* For IE7, add top margin to align select with labels */
+
+  line-height: 30px;
+}
+
+select {
+  width: 220px;
+  background-color: #ffffff;
+  border: 1px solid #bbb;
+}
+
+select[multiple],
+select[size] {
+  height: auto;
+}
+
+select:focus,
+input[type="file"]:focus,
+input[type="radio"]:focus,
+input[type="checkbox"]:focus {
+  outline: thin dotted #333;
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+
+.uneditable-input,
+.uneditable-textarea {
+  color: #999999;
+  cursor: not-allowed;
+  background-color: #fcfcfc;
+  border-color: #cccccc;
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+     -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+          box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+}
+
+.uneditable-input {
+  overflow: hidden;
+  white-space: nowrap;
+}
+
+.uneditable-textarea {
+  width: auto;
+  height: auto;
+}
+
+input:-moz-placeholder,
+textarea:-moz-placeholder {
+  color: #999999;
+}
+
+input:-ms-input-placeholder,
+textarea:-ms-input-placeholder {
+  color: #999999;
+}
+
+input::-webkit-input-placeholder,
+textarea::-webkit-input-placeholder {
+  color: #999999;
+}
+
+.radio,
+.checkbox {
+  min-height: 18px;
+  padding-left: 18px;
+}
+
+.radio input[type="radio"],
+.checkbox input[type="checkbox"] {
+  float: left;
+  margin-left: -18px;
+}
+
+.controls > .radio:first-child,
+.controls > .checkbox:first-child {
+  padding-top: 5px;
+}
+
+.radio.inline,
+.checkbox.inline {
+  display: inline-block;
+  padding-top: 5px;
+  margin-bottom: 0;
+  vertical-align: middle;
+}
+
+.radio.inline + .radio.inline,
+.checkbox.inline + .checkbox.inline {
+  margin-left: 10px;
+}
+
+.input-mini {
+  width: 60px;
+}
+
+.input-small {
+  width: 90px;
+}
+
+.input-medium {
+  width: 150px;
+}
+
+.input-large {
+  width: 210px;
+}
+
+.input-xlarge {
+  width: 270px;
+}
+
+.input-xxlarge {
+  width: 530px;
+}
+
+input[class*="span"],
+select[class*="span"],
+textarea[class*="span"],
+.uneditable-input[class*="span"],
+.row-fluid input[class*="span"],
+.row-fluid select[class*="span"],
+.row-fluid textarea[class*="span"],
+.row-fluid .uneditable-input[class*="span"] {
+  float: none;
+  margin-left: 0;
+}
+
+.input-append input[class*="span"],
+.input-append .uneditable-input[class*="span"],
+.input-prepend input[class*="span"],
+.input-prepend .uneditable-input[class*="span"],
+.row-fluid input[class*="span"],
+.row-fluid select[class*="span"],
+.row-fluid textarea[class*="span"],
+.row-fluid .uneditable-input[class*="span"],
+.row-fluid .input-prepend [class*="span"],
+.row-fluid .input-append [class*="span"] {
+  display: inline-block;
+}
+
+input,
+textarea,
+.uneditable-input {
+  margin-left: 0;
+}
+
+.controls-row [class*="span"] + [class*="span"] {
+  margin-left: 20px;
+}
+
+input.span12,
+textarea.span12,
+.uneditable-input.span12 {
+  width: 926px;
+}
+
+input.span11,
+textarea.span11,
+.uneditable-input.span11 {
+  width: 846px;
+}
+
+input.span10,
+textarea.span10,
+.uneditable-input.span10 {
+  width: 766px;
+}
+
+input.span9,
+textarea.span9,
+.uneditable-input.span9 {
+  width: 686px;
+}
+
+input.span8,
+textarea.span8,
+.uneditable-input.span8 {
+  width: 606px;
+}
+
+input.span7,
+textarea.span7,
+.uneditable-input.span7 {
+  width: 526px;
+}
+
+input.span6,
+textarea.span6,
+.uneditable-input.span6 {
+  width: 446px;
+}
+
+input.span5,
+textarea.span5,
+.uneditable-input.span5 {
+  width: 366px;
+}
+
+input.span4,
+textarea.span4,
+.uneditable-input.span4 {
+  width: 286px;
+}
+
+input.span3,
+textarea.span3,
+.uneditable-input.span3 {
+  width: 206px;
+}
+
+input.span2,
+textarea.span2,
+.uneditable-input.span2 {
+  width: 126px;
+}
+
+input.span1,
+textarea.span1,
+.uneditable-input.span1 {
+  width: 46px;
+}
+
+.controls-row {
+  *zoom: 1;
+}
+
+.controls-row:before,
+.controls-row:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.controls-row:after {
+  clear: both;
+}
+
+.controls-row [class*="span"] {
+  float: left;
+}
+
+input[disabled],
+select[disabled],
+textarea[disabled],
+input[readonly],
+select[readonly],
+textarea[readonly] {
+  cursor: not-allowed;
+  background-color: #eeeeee;
+}
+
+input[type="radio"][disabled],
+input[type="checkbox"][disabled],
+input[type="radio"][readonly],
+input[type="checkbox"][readonly] {
+  background-color: transparent;
+}
+
+.control-group.warning > label,
+.control-group.warning .help-block,
+.control-group.warning .help-inline {
+  color: #c09853;
+}
+
+.control-group.warning .checkbox,
+.control-group.warning .radio,
+.control-group.warning input,
+.control-group.warning select,
+.control-group.warning textarea {
+  color: #c09853;
+  border-color: #c09853;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+
+.control-group.warning .checkbox:focus,
+.control-group.warning .radio:focus,
+.control-group.warning input:focus,
+.control-group.warning select:focus,
+.control-group.warning textarea:focus {
+  border-color: #a47e3c;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
+}
+
+.control-group.warning .input-prepend .add-on,
+.control-group.warning .input-append .add-on {
+  color: #c09853;
+  background-color: #fcf8e3;
+  border-color: #c09853;
+}
+
+.control-group.error > label,
+.control-group.error .help-block,
+.control-group.error .help-inline {
+  color: #b94a48;
+}
+
+.control-group.error .checkbox,
+.control-group.error .radio,
+.control-group.error input,
+.control-group.error select,
+.control-group.error textarea {
+  color: #b94a48;
+  border-color: #b94a48;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+
+.control-group.error .checkbox:focus,
+.control-group.error .radio:focus,
+.control-group.error input:focus,
+.control-group.error select:focus,
+.control-group.error textarea:focus {
+  border-color: #953b39;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
+}
+
+.control-group.error .input-prepend .add-on,
+.control-group.error .input-append .add-on {
+  color: #b94a48;
+  background-color: #f2dede;
+  border-color: #b94a48;
+}
+
+.control-group.success > label,
+.control-group.success .help-block,
+.control-group.success .help-inline {
+  color: #468847;
+}
+
+.control-group.success .checkbox,
+.control-group.success .radio,
+.control-group.success input,
+.control-group.success select,
+.control-group.success textarea {
+  color: #468847;
+  border-color: #468847;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+
+.control-group.success .checkbox:focus,
+.control-group.success .radio:focus,
+.control-group.success input:focus,
+.control-group.success select:focus,
+.control-group.success textarea:focus {
+  border-color: #356635;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+}
+
+.control-group.success .input-prepend .add-on,
+.control-group.success .input-append .add-on {
+  color: #468847;
+  background-color: #dff0d8;
+  border-color: #468847;
+}
+
+input:focus:required:invalid,
+textarea:focus:required:invalid,
+select:focus:required:invalid {
+  color: #b94a48;
+  border-color: #ee5f5b;
+}
+
+input:focus:required:invalid:focus,
+textarea:focus:required:invalid:focus,
+select:focus:required:invalid:focus {
+  border-color: #e9322d;
+  -webkit-box-shadow: 0 0 6px #f8b9b7;
+     -moz-box-shadow: 0 0 6px #f8b9b7;
+          box-shadow: 0 0 6px #f8b9b7;
+}
+
+.form-actions {
+  padding: 19px 20px 20px;
+  margin-top: 20px;
+  margin-bottom: 20px;
+  background-color: #f5f5f5;
+  border-top: 1px solid #e5e5e5;
+  *zoom: 1;
+}
+
+.form-actions:before,
+.form-actions:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.form-actions:after {
+  clear: both;
+}
+
+.help-block,
+.help-inline {
+  color: #595959;
+}
+
+.help-block {
+  display: block;
+  margin-bottom: 10px;
+}
+
+.help-inline {
+  display: inline-block;
+  *display: inline;
+  padding-left: 5px;
+  vertical-align: middle;
+  *zoom: 1;
+}
+
+.input-append,
+.input-prepend {
+  margin-bottom: 5px;
+  font-size: 0;
+  white-space: nowrap;
+}
+
+.input-append input,
+.input-prepend input,
+.input-append select,
+.input-prepend select,
+.input-append .uneditable-input,
+.input-prepend .uneditable-input {
+  position: relative;
+  margin-bottom: 0;
+  *margin-left: 0;
+  font-size: 14px;
+  vertical-align: top;
+  -webkit-border-radius: 0 3px 3px 0;
+     -moz-border-radius: 0 3px 3px 0;
+          border-radius: 0 3px 3px 0;
+}
+
+.input-append input:focus,
+.input-prepend input:focus,
+.input-append select:focus,
+.input-prepend select:focus,
+.input-append .uneditable-input:focus,
+.input-prepend .uneditable-input:focus {
+  z-index: 2;
+}
+
+.input-append .add-on,
+.input-prepend .add-on {
+  display: inline-block;
+  width: auto;
+  height: 20px;
+  min-width: 16px;
+  padding: 4px 5px;
+  font-size: 14px;
+  font-weight: normal;
+  line-height: 20px;
+  text-align: center;
+  text-shadow: 0 1px 0 #ffffff;
+  background-color: #eeeeee;
+  border: 1px solid #ccc;
+}
+
+.input-append .add-on,
+.input-prepend .add-on,
+.input-append .btn,
+.input-prepend .btn {
+  margin-left: -1px;
+  vertical-align: top;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.input-append .active,
+.input-prepend .active {
+  background-color: #a9dba9;
+  border-color: #46a546;
+}
+
+.input-prepend .add-on,
+.input-prepend .btn {
+  margin-right: -1px;
+}
+
+.input-prepend .add-on:first-child,
+.input-prepend .btn:first-child {
+  -webkit-border-radius: 3px 0 0 3px;
+     -moz-border-radius: 3px 0 0 3px;
+          border-radius: 3px 0 0 3px;
+}
+
+.input-append input,
+.input-append select,
+.input-append .uneditable-input {
+  -webkit-border-radius: 3px 0 0 3px;
+     -moz-border-radius: 3px 0 0 3px;
+          border-radius: 3px 0 0 3px;
+}
+
+.input-append .add-on:last-child,
+.input-append .btn:last-child {
+  -webkit-border-radius: 0 3px 3px 0;
+     -moz-border-radius: 0 3px 3px 0;
+          border-radius: 0 3px 3px 0;
+}
+
+.input-prepend.input-append input,
+.input-prepend.input-append select,
+.input-prepend.input-append .uneditable-input {
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.input-prepend.input-append .add-on:first-child,
+.input-prepend.input-append .btn:first-child {
+  margin-right: -1px;
+  -webkit-border-radius: 3px 0 0 3px;
+     -moz-border-radius: 3px 0 0 3px;
+          border-radius: 3px 0 0 3px;
+}
+
+.input-prepend.input-append .add-on:last-child,
+.input-prepend.input-append .btn:last-child {
+  margin-left: -1px;
+  -webkit-border-radius: 0 3px 3px 0;
+     -moz-border-radius: 0 3px 3px 0;
+          border-radius: 0 3px 3px 0;
+}
+
+input.search-query {
+  padding-right: 14px;
+  padding-right: 4px \9;
+  padding-left: 14px;
+  padding-left: 4px \9;
+  /* IE7-8 doesn't have border-radius, so don't indent the padding */
+
+  margin-bottom: 0;
+  -webkit-border-radius: 15px;
+     -moz-border-radius: 15px;
+          border-radius: 15px;
+}
+
+/* Allow for input prepend/append in search forms */
+
+.form-search .input-append .search-query,
+.form-search .input-prepend .search-query {
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.form-search .input-append .search-query {
+  -webkit-border-radius: 14px 0 0 14px;
+     -moz-border-radius: 14px 0 0 14px;
+          border-radius: 14px 0 0 14px;
+}
+
+.form-search .input-append .btn {
+  -webkit-border-radius: 0 14px 14px 0;
+     -moz-border-radius: 0 14px 14px 0;
+          border-radius: 0 14px 14px 0;
+}
+
+.form-search .input-prepend .search-query {
+  -webkit-border-radius: 0 14px 14px 0;
+     -moz-border-radius: 0 14px 14px 0;
+          border-radius: 0 14px 14px 0;
+}
+
+.form-search .input-prepend .btn {
+  -webkit-border-radius: 14px 0 0 14px;
+     -moz-border-radius: 14px 0 0 14px;
+          border-radius: 14px 0 0 14px;
+}
+
+.form-search input,
+.form-inline input,
+.form-horizontal input,
+.form-search textarea,
+.form-inline textarea,
+.form-horizontal textarea,
+.form-search select,
+.form-inline select,
+.form-horizontal select,
+.form-search .help-inline,
+.form-inline .help-inline,
+.form-horizontal .help-inline,
+.form-search .uneditable-input,
+.form-inline .uneditable-input,
+.form-horizontal .uneditable-input,
+.form-search .input-prepend,
+.form-inline .input-prepend,
+.form-horizontal .input-prepend,
+.form-search .input-append,
+.form-inline .input-append,
+.form-horizontal .input-append {
+  display: inline-block;
+  *display: inline;
+  margin-bottom: 0;
+  vertical-align: middle;
+  *zoom: 1;
+}
+
+.form-search .hide,
+.form-inline .hide,
+.form-horizontal .hide {
+  display: none;
+}
+
+.form-search label,
+.form-inline label,
+.form-search .btn-group,
+.form-inline .btn-group {
+  display: inline-block;
+}
+
+.form-search .input-append,
+.form-inline .input-append,
+.form-search .input-prepend,
+.form-inline .input-prepend {
+  margin-bottom: 0;
+}
+
+.form-search .radio,
+.form-search .checkbox,
+.form-inline .radio,
+.form-inline .checkbox {
+  padding-left: 0;
+  margin-bottom: 0;
+  vertical-align: middle;
+}
+
+.form-search .radio input[type="radio"],
+.form-search .checkbox input[type="checkbox"],
+.form-inline .radio input[type="radio"],
+.form-inline .checkbox input[type="checkbox"] {
+  float: left;
+  margin-right: 3px;
+  margin-left: 0;
+}
+
+.control-group {
+  margin-bottom: 10px;
+}
+
+legend + .control-group {
+  margin-top: 20px;
+  -webkit-margin-top-collapse: separate;
+}
+
+.form-horizontal .control-group {
+  margin-bottom: 20px;
+  *zoom: 1;
+}
+
+.form-horizontal .control-group:before,
+.form-horizontal .control-group:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.form-horizontal .control-group:after {
+  clear: both;
+}
+
+.form-horizontal .control-label {
+  float: left;
+  width: 140px;
+  padding-top: 5px;
+  text-align: right;
+}
+
+.form-horizontal .controls {
+  *display: inline-block;
+  *padding-left: 20px;
+  margin-left: 160px;
+  *margin-left: 0;
+}
+
+.form-horizontal .controls:first-child {
+  *padding-left: 160px;
+}
+
+.form-horizontal .help-block {
+  margin-top: 10px;
+  margin-bottom: 0;
+}
+
+.form-horizontal .form-actions {
+  padding-left: 160px;
+}
+
+table {
+  max-width: 100%;
+  background-color: transparent;
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+.table {
+  width: 100%;
+  margin-bottom: 20px;
+}
+
+.table th,
+.table td {
+  padding: 8px;
+  line-height: 20px;
+  text-align: left;
+  vertical-align: top;
+  border-top: 1px solid #dddddd;
+}
+
+.table th {
+  font-weight: bold;
+}
+
+.table thead th {
+  vertical-align: bottom;
+}
+
+.table caption + thead tr:first-child th,
+.table caption + thead tr:first-child td,
+.table colgroup + thead tr:first-child th,
+.table colgroup + thead tr:first-child td,
+.table thead:first-child tr:first-child th,
+.table thead:first-child tr:first-child td {
+  border-top: 0;
+}
+
+.table tbody + tbody {
+  border-top: 2px solid #dddddd;
+}
+
+.table-condensed th,
+.table-condensed td {
+  padding: 4px 5px;
+}
+
+.table-bordered {
+  border: 1px solid #dddddd;
+  border-collapse: separate;
+  *border-collapse: collapse;
+  border-left: 0;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+.table-bordered th,
+.table-bordered td {
+  border-left: 1px solid #dddddd;
+}
+
+.table-bordered caption + thead tr:first-child th,
+.table-bordered caption + tbody tr:first-child th,
+.table-bordered caption + tbody tr:first-child td,
+.table-bordered colgroup + thead tr:first-child th,
+.table-bordered colgroup + tbody tr:first-child th,
+.table-bordered colgroup + tbody tr:first-child td,
+.table-bordered thead:first-child tr:first-child th,
+.table-bordered tbody:first-child tr:first-child th,
+.table-bordered tbody:first-child tr:first-child td {
+  border-top: 0;
+}
+
+.table-bordered thead:first-child tr:first-child th:first-child,
+.table-bordered tbody:first-child tr:first-child td:first-child {
+  -webkit-border-top-left-radius: 4px;
+          border-top-left-radius: 4px;
+  -moz-border-radius-topleft: 4px;
+}
+
+.table-bordered thead:first-child tr:first-child th:last-child,
+.table-bordered tbody:first-child tr:first-child td:last-child {
+  -webkit-border-top-right-radius: 4px;
+          border-top-right-radius: 4px;
+  -moz-border-radius-topright: 4px;
+}
+
+.table-bordered thead:last-child tr:last-child th:first-child,
+.table-bordered tbody:last-child tr:last-child td:first-child,
+.table-bordered tfoot:last-child tr:last-child td:first-child {
+  -webkit-border-radius: 0 0 0 4px;
+     -moz-border-radius: 0 0 0 4px;
+          border-radius: 0 0 0 4px;
+  -webkit-border-bottom-left-radius: 4px;
+          border-bottom-left-radius: 4px;
+  -moz-border-radius-bottomleft: 4px;
+}
+
+.table-bordered thead:last-child tr:last-child th:last-child,
+.table-bordered tbody:last-child tr:last-child td:last-child,
+.table-bordered tfoot:last-child tr:last-child td:last-child {
+  -webkit-border-bottom-right-radius: 4px;
+          border-bottom-right-radius: 4px;
+  -moz-border-radius-bottomright: 4px;
+}
+
+.table-bordered caption + thead tr:first-child th:first-child,
+.table-bordered caption + tbody tr:first-child td:first-child,
+.table-bordered colgroup + thead tr:first-child th:first-child,
+.table-bordered colgroup + tbody tr:first-child td:first-child {
+  -webkit-border-top-left-radius: 4px;
+          border-top-left-radius: 4px;
+  -moz-border-radius-topleft: 4px;
+}
+
+.table-bordered caption + thead tr:first-child th:last-child,
+.table-bordered caption + tbody tr:first-child td:last-child,
+.table-bordered colgroup + thead tr:first-child th:last-child,
+.table-bordered colgroup + tbody tr:first-child td:last-child {
+  -webkit-border-top-right-radius: 4px;
+          border-top-right-radius: 4px;
+  -moz-border-right-topleft: 4px;
+}
+
+.table-striped tbody tr:nth-child(odd) td,
+.table-striped tbody tr:nth-child(odd) th {
+  background-color: #f9f9f9;
+}
+
+.table-hover tbody tr:hover td,
+.table-hover tbody tr:hover th {
+  background-color: #f5f5f5;
+}
+
+table [class*=span],
+.row-fluid table [class*=span] {
+  display: table-cell;
+  float: none;
+  margin-left: 0;
+}
+
+table .span1 {
+  float: none;
+  width: 44px;
+  margin-left: 0;
+}
+
+table .span2 {
+  float: none;
+  width: 124px;
+  margin-left: 0;
+}
+
+table .span3 {
+  float: none;
+  width: 204px;
+  margin-left: 0;
+}
+
+table .span4 {
+  float: none;
+  width: 284px;
+  margin-left: 0;
+}
+
+table .span5 {
+  float: none;
+  width: 364px;
+  margin-left: 0;
+}
+
+table .span6 {
+  float: none;
+  width: 444px;
+  margin-left: 0;
+}
+
+table .span7 {
+  float: none;
+  width: 524px;
+  margin-left: 0;
+}
+
+table .span8 {
+  float: none;
+  width: 604px;
+  margin-left: 0;
+}
+
+table .span9 {
+  float: none;
+  width: 684px;
+  margin-left: 0;
+}
+
+table .span10 {
+  float: none;
+  width: 764px;
+  margin-left: 0;
+}
+
+table .span11 {
+  float: none;
+  width: 844px;
+  margin-left: 0;
+}
+
+table .span12 {
+  float: none;
+  width: 924px;
+  margin-left: 0;
+}
+
+table .span13 {
+  float: none;
+  width: 1004px;
+  margin-left: 0;
+}
+
+table .span14 {
+  float: none;
+  width: 1084px;
+  margin-left: 0;
+}
+
+table .span15 {
+  float: none;
+  width: 1164px;
+  margin-left: 0;
+}
+
+table .span16 {
+  float: none;
+  width: 1244px;
+  margin-left: 0;
+}
+
+table .span17 {
+  float: none;
+  width: 1324px;
+  margin-left: 0;
+}
+
+table .span18 {
+  float: none;
+  width: 1404px;
+  margin-left: 0;
+}
+
+table .span19 {
+  float: none;
+  width: 1484px;
+  margin-left: 0;
+}
+
+table .span20 {
+  float: none;
+  width: 1564px;
+  margin-left: 0;
+}
+
+table .span21 {
+  float: none;
+  width: 1644px;
+  margin-left: 0;
+}
+
+table .span22 {
+  float: none;
+  width: 1724px;
+  margin-left: 0;
+}
+
+table .span23 {
+  float: none;
+  width: 1804px;
+  margin-left: 0;
+}
+
+table .span24 {
+  float: none;
+  width: 1884px;
+  margin-left: 0;
+}
+
+.table tbody tr.success td {
+  background-color: #dff0d8;
+}
+
+.table tbody tr.error td {
+  background-color: #f2dede;
+}
+
+.table tbody tr.info td {
+  background-color: #d9edf7;
+}
+
+[class^="icon-"],
+[class*=" icon-"] {
+  display: inline-block;
+  width: 14px;
+  height: 14px;
+  margin-top: 1px;
+  *margin-right: .3em;
+  line-height: 14px;
+  vertical-align: text-top;
+  background-image: url("../img/glyphicons-halflings.png");
+  background-position: 14px 14px;
+  background-repeat: no-repeat;
+}
+
+/* White icons with optional class, or on hover/active states of certain elements */
+
+.icon-white,
+.nav > .active > a > [class^="icon-"],
+.nav > .active > a > [class*=" icon-"],
+.dropdown-menu > li > a:hover > [class^="icon-"],
+.dropdown-menu > li > a:hover > [class*=" icon-"],
+.dropdown-menu > .active > a > [class^="icon-"],
+.dropdown-menu > .active > a > [class*=" icon-"] {
+  background-image: url("../img/glyphicons-halflings-white.png");
+}
+
+.icon-glass {
+  background-position: 0      0;
+}
+
+.icon-music {
+  background-position: -24px 0;
+}
+
+.icon-search {
+  background-position: -48px 0;
+}
+
+.icon-envelope {
+  background-position: -72px 0;
+}
+
+.icon-heart {
+  background-position: -96px 0;
+}
+
+.icon-star {
+  background-position: -120px 0;
+}
+
+.icon-star-empty {
+  background-position: -144px 0;
+}
+
+.icon-user {
+  background-position: -168px 0;
+}
+
+.icon-film {
+  background-position: -192px 0;
+}
+
+.icon-th-large {
+  background-position: -216px 0;
+}
+
+.icon-th {
+  background-position: -240px 0;
+}
+
+.icon-th-list {
+  background-position: -264px 0;
+}
+
+.icon-ok {
+  background-position: -288px 0;
+}
+
+.icon-remove {
+  background-position: -312px 0;
+}
+
+.icon-zoom-in {
+  background-position: -336px 0;
+}
+
+.icon-zoom-out {
+  background-position: -360px 0;
+}
+
+.icon-off {
+  background-position: -384px 0;
+}
+
+.icon-signal {
+  background-position: -408px 0;
+}
+
+.icon-cog {
+  background-position: -432px 0;
+}
+
+.icon-trash {
+  background-position: -456px 0;
+}
+
+.icon-home {
+  background-position: 0 -24px;
+}
+
+.icon-file {
+  background-position: -24px -24px;
+}
+
+.icon-time {
+  background-position: -48px -24px;
+}
+
+.icon-road {
+  background-position: -72px -24px;
+}
+
+.icon-download-alt {
+  background-position: -96px -24px;
+}
+
+.icon-download {
+  background-position: -120px -24px;
+}
+
+.icon-upload {
+  background-position: -144px -24px;
+}
+
+.icon-inbox {
+  background-position: -168px -24px;
+}
+
+.icon-play-circle {
+  background-position: -192px -24px;
+}
+
+.icon-repeat {
+  background-position: -216px -24px;
+}
+
+.icon-refresh {
+  background-position: -240px -24px;
+}
+
+.icon-list-alt {
+  background-position: -264px -24px;
+}
+
+.icon-lock {
+  background-position: -287px -24px;
+}
+
+.icon-flag {
+  background-position: -312px -24px;
+}
+
+.icon-headphones {
+  background-position: -336px -24px;
+}
+
+.icon-volume-off {
+  background-position: -360px -24px;
+}
+
+.icon-volume-down {
+  background-position: -384px -24px;
+}
+
+.icon-volume-up {
+  background-position: -408px -24px;
+}
+
+.icon-qrcode {
+  background-position: -432px -24px;
+}
+
+.icon-barcode {
+  background-position: -456px -24px;
+}
+
+.icon-tag {
+  background-position: 0 -48px;
+}
+
+.icon-tags {
+  background-position: -25px -48px;
+}
+
+.icon-book {
+  background-position: -48px -48px;
+}
+
+.icon-bookmark {
+  background-position: -72px -48px;
+}
+
+.icon-print {
+  background-position: -96px -48px;
+}
+
+.icon-camera {
+  background-position: -120px -48px;
+}
+
+.icon-font {
+  background-position: -144px -48px;
+}
+
+.icon-bold {
+  background-position: -167px -48px;
+}
+
+.icon-italic {
+  background-position: -192px -48px;
+}
+
+.icon-text-height {
+  background-position: -216px -48px;
+}
+
+.icon-text-width {
+  background-position: -240px -48px;
+}
+
+.icon-align-left {
+  background-position: -264px -48px;
+}
+
+.icon-align-center {
+  background-position: -288px -48px;
+}
+
+.icon-align-right {
+  background-position: -312px -48px;
+}
+
+.icon-align-justify {
+  background-position: -336px -48px;
+}
+
+.icon-list {
+  background-position: -360px -48px;
+}
+
+.icon-indent-left {
+  background-position: -384px -48px;
+}
+
+.icon-indent-right {
+  background-position: -408px -48px;
+}
+
+.icon-facetime-video {
+  background-position: -432px -48px;
+}
+
+.icon-picture {
+  background-position: -456px -48px;
+}
+
+.icon-pencil {
+  background-position: 0 -72px;
+}
+
+.icon-map-marker {
+  background-position: -24px -72px;
+}
+
+.icon-adjust {
+  background-position: -48px -72px;
+}
+
+.icon-tint {
+  background-position: -72px -72px;
+}
+
+.icon-edit {
+  background-position: -96px -72px;
+}
+
+.icon-share {
+  background-position: -120px -72px;
+}
+
+.icon-check {
+  background-position: -144px -72px;
+}
+
+.icon-move {
+  background-position: -168px -72px;
+}
+
+.icon-step-backward {
+  background-position: -192px -72px;
+}
+
+.icon-fast-backward {
+  background-position: -216px -72px;
+}
+
+.icon-backward {
+  background-position: -240px -72px;
+}
+
+.icon-play {
+  background-position: -264px -72px;
+}
+
+.icon-pause {
+  background-position: -288px -72px;
+}
+
+.icon-stop {
+  background-position: -312px -72px;
+}
+
+.icon-forward {
+  background-position: -336px -72px;
+}
+
+.icon-fast-forward {
+  background-position: -360px -72px;
+}
+
+.icon-step-forward {
+  background-position: -384px -72px;
+}
+
+.icon-eject {
+  background-position: -408px -72px;
+}
+
+.icon-chevron-left {
+  background-position: -432px -72px;
+}
+
+.icon-chevron-right {
+  background-position: -456px -72px;
+}
+
+.icon-plus-sign {
+  background-position: 0 -96px;
+}
+
+.icon-minus-sign {
+  background-position: -24px -96px;
+}
+
+.icon-remove-sign {
+  background-position: -48px -96px;
+}
+
+.icon-ok-sign {
+  background-position: -72px -96px;
+}
+
+.icon-question-sign {
+  background-position: -96px -96px;
+}
+
+.icon-info-sign {
+  background-position: -120px -96px;
+}
+
+.icon-screenshot {
+  background-position: -144px -96px;
+}
+
+.icon-remove-circle {
+  background-position: -168px -96px;
+}
+
+.icon-ok-circle {
+  background-position: -192px -96px;
+}
+
+.icon-ban-circle {
+  background-position: -216px -96px;
+}
+
+.icon-arrow-left {
+  background-position: -240px -96px;
+}
+
+.icon-arrow-right {
+  background-position: -264px -96px;
+}
+
+.icon-arrow-up {
+  background-position: -289px -96px;
+}
+
+.icon-arrow-down {
+  background-position: -312px -96px;
+}
+
+.icon-share-alt {
+  background-position: -336px -96px;
+}
+
+.icon-resize-full {
+  background-position: -360px -96px;
+}
+
+.icon-resize-small {
+  background-position: -384px -96px;
+}
+
+.icon-plus {
+  background-position: -408px -96px;
+}
+
+.icon-minus {
+  background-position: -433px -96px;
+}
+
+.icon-asterisk {
+  background-position: -456px -96px;
+}
+
+.icon-exclamation-sign {
+  background-position: 0 -120px;
+}
+
+.icon-gift {
+  background-position: -24px -120px;
+}
+
+.icon-leaf {
+  background-position: -48px -120px;
+}
+
+.icon-fire {
+  background-position: -72px -120px;
+}
+
+.icon-eye-open {
+  background-position: -96px -120px;
+}
+
+.icon-eye-close {
+  background-position: -120px -120px;
+}
+
+.icon-warning-sign {
+  background-position: -144px -120px;
+}
+
+.icon-plane {
+  background-position: -168px -120px;
+}
+
+.icon-calendar {
+  background-position: -192px -120px;
+}
+
+.icon-random {
+  width: 16px;
+  background-position: -216px -120px;
+}
+
+.icon-comment {
+  background-position: -240px -120px;
+}
+
+.icon-magnet {
+  background-position: -264px -120px;
+}
+
+.icon-chevron-up {
+  background-position: -288px -120px;
+}
+
+.icon-chevron-down {
+  background-position: -313px -119px;
+}
+
+.icon-retweet {
+  background-position: -336px -120px;
+}
+
+.icon-shopping-cart {
+  background-position: -360px -120px;
+}
+
+.icon-folder-close {
+  background-position: -384px -120px;
+}
+
+.icon-folder-open {
+  width: 16px;
+  background-position: -408px -120px;
+}
+
+.icon-resize-vertical {
+  background-position: -432px -119px;
+}
+
+.icon-resize-horizontal {
+  background-position: -456px -118px;
+}
+
+.icon-hdd {
+  background-position: 0 -144px;
+}
+
+.icon-bullhorn {
+  background-position: -24px -144px;
+}
+
+.icon-bell {
+  background-position: -48px -144px;
+}
+
+.icon-certificate {
+  background-position: -72px -144px;
+}
+
+.icon-thumbs-up {
+  background-position: -96px -144px;
+}
+
+.icon-thumbs-down {
+  background-position: -120px -144px;
+}
+
+.icon-hand-right {
+  background-position: -144px -144px;
+}
+
+.icon-hand-left {
+  background-position: -168px -144px;
+}
+
+.icon-hand-up {
+  background-position: -192px -144px;
+}
+
+.icon-hand-down {
+  background-position: -216px -144px;
+}
+
+.icon-circle-arrow-right {
+  background-position: -240px -144px;
+}
+
+.icon-circle-arrow-left {
+  background-position: -264px -144px;
+}
+
+.icon-circle-arrow-up {
+  background-position: -288px -144px;
+}
+
+.icon-circle-arrow-down {
+  background-position: -312px -144px;
+}
+
+.icon-globe {
+  background-position: -336px -144px;
+}
+
+.icon-wrench {
+  background-position: -360px -144px;
+}
+
+.icon-tasks {
+  background-position: -384px -144px;
+}
+
+.icon-filter {
+  background-position: -408px -144px;
+}
+
+.icon-briefcase {
+  background-position: -432px -144px;
+}
+
+.icon-fullscreen {
+  background-position: -456px -144px;
+}
+
+.dropup,
+.dropdown {
+  position: relative;
+}
+
+.dropdown-toggle {
+  *margin-bottom: -3px;
+}
+
+.dropdown-toggle:active,
+.open .dropdown-toggle {
+  outline: 0;
+}
+
+.caret {
+  display: inline-block;
+  width: 0;
+  height: 0;
+  vertical-align: top;
+  border-top: 4px solid #000000;
+  border-right: 4px solid transparent;
+  border-left: 4px solid transparent;
+  content: "";
+}
+
+.dropdown .caret {
+  margin-top: 8px;
+  margin-left: 2px;
+}
+
+.dropdown-menu {
+  position: absolute;
+  top: 100%;
+  left: 0;
+  z-index: 1000;
+  display: none;
+  float: left;
+  min-width: 160px;
+  padding: 5px 0;
+  margin: 2px 0 0;
+  list-style: none;
+  background-color: #ffffff;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  *border-right-width: 2px;
+  *border-bottom-width: 2px;
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+     -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+          box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  -webkit-background-clip: padding-box;
+     -moz-background-clip: padding;
+          background-clip: padding-box;
+}
+
+.dropdown-menu.pull-right {
+  right: 0;
+  left: auto;
+}
+
+.dropdown-menu .divider {
+  *width: 100%;
+  height: 1px;
+  margin: 9px 1px;
+  *margin: -5px 0 5px;
+  overflow: hidden;
+  background-color: #e5e5e5;
+  border-bottom: 1px solid #ffffff;
+}
+
+.dropdown-menu a {
+  display: block;
+  padding: 3px 20px;
+  clear: both;
+  font-weight: normal;
+  line-height: 20px;
+  color: #333333;
+  white-space: nowrap;
+}
+
+.dropdown-menu li > a:hover,
+.dropdown-menu li > a:focus,
+.dropdown-submenu:hover > a {
+  color: #ffffff;
+  text-decoration: none;
+  background-color: #0088cc;
+  background-color: #0081c2;
+  background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));
+  background-image: -webkit-linear-gradient(top, #0088cc, #0077b3);
+  background-image: -o-linear-gradient(top, #0088cc, #0077b3);
+  background-image: linear-gradient(to bottom, #0088cc, #0077b3);
+  background-repeat: repeat-x;
+  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);
+}
+
+.dropdown-menu .active > a,
+.dropdown-menu .active > a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  background-color: #0088cc;
+  background-color: #0081c2;
+  background-image: linear-gradient(to bottom, #0088cc, #0077b3);
+  background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));
+  background-image: -webkit-linear-gradient(top, #0088cc, #0077b3);
+  background-image: -o-linear-gradient(top, #0088cc, #0077b3);
+  background-repeat: repeat-x;
+  outline: 0;
+  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);
+}
+
+.dropdown-menu .disabled > a,
+.dropdown-menu .disabled > a:hover {
+  color: #999999;
+}
+
+.dropdown-menu .disabled > a:hover {
+  text-decoration: none;
+  cursor: default;
+  background-color: transparent;
+}
+
+.open {
+  *z-index: 1000;
+}
+
+.open > .dropdown-menu {
+  display: block;
+}
+
+.pull-right > .dropdown-menu {
+  right: 0;
+  left: auto;
+}
+
+.dropup .caret,
+.navbar-fixed-bottom .dropdown .caret {
+  border-top: 0;
+  border-bottom: 4px solid #000000;
+  content: "\2191";
+}
+
+.dropup .dropdown-menu,
+.navbar-fixed-bottom .dropdown .dropdown-menu {
+  top: auto;
+  bottom: 100%;
+  margin-bottom: 1px;
+}
+
+.dropdown-submenu {
+  position: relative;
+}
+
+.dropdown-submenu > .dropdown-menu {
+  top: 0;
+  left: 100%;
+  margin-top: -6px;
+  margin-left: -1px;
+  -webkit-border-radius: 0 6px 6px 6px;
+     -moz-border-radius: 0 6px 6px 6px;
+          border-radius: 0 6px 6px 6px;
+}
+
+.dropdown-submenu:hover .dropdown-menu {
+  display: block;
+}
+
+.dropdown-submenu > a:after {
+  display: block;
+  float: right;
+  width: 0;
+  height: 0;
+  margin-top: 5px;
+  margin-right: -10px;
+  border-color: transparent;
+  border-left-color: #cccccc;
+  border-style: solid;
+  border-width: 5px 0 5px 5px;
+  content: " ";
+}
+
+.dropdown-submenu:hover > a:after {
+  border-left-color: #ffffff;
+}
+
+.dropdown .dropdown-menu .nav-header {
+  padding-right: 20px;
+  padding-left: 20px;
+}
+
+.typeahead {
+  margin-top: 2px;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+.well {
+  min-height: 20px;
+  padding: 19px;
+  margin-bottom: 20px;
+  background-color: #f5f5f5;
+  border: 1px solid #e3e3e3;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+}
+
+.well blockquote {
+  border-color: #ddd;
+  border-color: rgba(0, 0, 0, 0.15);
+}
+
+.well-large {
+  padding: 24px;
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+}
+
+.well-small {
+  padding: 9px;
+  -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+          border-radius: 3px;
+}
+
+.fade {
+  opacity: 0;
+  -webkit-transition: opacity 0.15s linear;
+     -moz-transition: opacity 0.15s linear;
+       -o-transition: opacity 0.15s linear;
+          transition: opacity 0.15s linear;
+}
+
+.fade.in {
+  opacity: 1;
+}
+
+.collapse {
+  position: relative;
+  height: 0;
+  overflow: hidden;
+  overflow: visible \9;
+  -webkit-transition: height 0.35s ease;
+     -moz-transition: height 0.35s ease;
+       -o-transition: height 0.35s ease;
+          transition: height 0.35s ease;
+}
+
+.collapse.in {
+  height: auto;
+}
+
+.close {
+  float: right;
+  font-size: 20px;
+  font-weight: bold;
+  line-height: 20px;
+  color: #000000;
+  text-shadow: 0 1px 0 #ffffff;
+  opacity: 0.2;
+  filter: alpha(opacity=20);
+}
+
+.close:hover {
+  color: #000000;
+  text-decoration: none;
+  cursor: pointer;
+  opacity: 0.4;
+  filter: alpha(opacity=40);
+}
+
+button.close {
+  padding: 0;
+  cursor: pointer;
+  background: transparent;
+  border: 0;
+  -webkit-appearance: none;
+}
+
+.btn {
+  display: inline-block;
+  *display: inline;
+  padding: 4px 14px;
+  margin-bottom: 0;
+  *margin-left: .3em;
+  font-size: 14px;
+  line-height: 20px;
+  *line-height: 20px;
+  color: #333333;
+  text-align: center;
+  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+  vertical-align: middle;
+  cursor: pointer;
+  background-color: #f5f5f5;
+  *background-color: #e6e6e6;
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
+  background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
+  background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
+  background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
+  background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
+  background-repeat: repeat-x;
+  border: 1px solid #bbbbbb;
+  *border: 0;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  border-color: #e6e6e6 #e6e6e6 #bfbfbf;
+  border-bottom-color: #a2a2a2;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);
+  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+  *zoom: 1;
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+     -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.btn:hover,
+.btn:active,
+.btn.active,
+.btn.disabled,
+.btn[disabled] {
+  color: #333333;
+  background-color: #e6e6e6;
+  *background-color: #d9d9d9;
+}
+
+.btn:active,
+.btn.active {
+  background-color: #cccccc \9;
+}
+
+.btn:first-child {
+  *margin-left: 0;
+}
+
+.btn:hover {
+  color: #333333;
+  text-decoration: none;
+  background-color: #e6e6e6;
+  *background-color: #d9d9d9;
+  /* Buttons in IE7 don't get borders, so darken on hover */
+
+  background-position: 0 -15px;
+  -webkit-transition: background-position 0.1s linear;
+     -moz-transition: background-position 0.1s linear;
+       -o-transition: background-position 0.1s linear;
+          transition: background-position 0.1s linear;
+}
+
+.btn:focus {
+  outline: thin dotted #333;
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+
+.btn.active,
+.btn:active {
+  background-color: #e6e6e6;
+  background-color: #d9d9d9 \9;
+  background-image: none;
+  outline: 0;
+  -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+     -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.btn.disabled,
+.btn[disabled] {
+  cursor: default;
+  background-color: #e6e6e6;
+  background-image: none;
+  opacity: 0.65;
+  filter: alpha(opacity=65);
+  -webkit-box-shadow: none;
+     -moz-box-shadow: none;
+          box-shadow: none;
+}
+
+.btn-large {
+  padding: 9px 14px;
+  font-size: 16px;
+  line-height: normal;
+  -webkit-border-radius: 5px;
+     -moz-border-radius: 5px;
+          border-radius: 5px;
+}
+
+.btn-large [class^="icon-"] {
+  margin-top: 2px;
+}
+
+.btn-small {
+  padding: 3px 9px;
+  font-size: 12px;
+  line-height: 18px;
+}
+
+.btn-small [class^="icon-"] {
+  margin-top: 0;
+}
+
+.btn-mini {
+  padding: 2px 6px;
+  font-size: 11px;
+  line-height: 16px;
+}
+
+.btn-block {
+  display: block;
+  width: 100%;
+  padding-right: 0;
+  padding-left: 0;
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
+.btn-block + .btn-block {
+  margin-top: 5px;
+}
+
+.btn-primary.active,
+.btn-warning.active,
+.btn-danger.active,
+.btn-success.active,
+.btn-info.active,
+.btn-inverse.active {
+  color: rgba(255, 255, 255, 0.75);
+}
+
+.btn {
+  border-color: #c5c5c5;
+  border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);
+}
+
+.btn-primary {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #006dcc;
+  *background-color: #0044cc;
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
+  background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
+  background-image: -o-linear-gradient(top, #0088cc, #0044cc);
+  background-image: linear-gradient(to bottom, #0088cc, #0044cc);
+  background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
+  background-repeat: repeat-x;
+  border-color: #0044cc #0044cc #002a80;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0);
+  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+}
+
+.btn-primary:hover,
+.btn-primary:active,
+.btn-primary.active,
+.btn-primary.disabled,
+.btn-primary[disabled] {
+  color: #ffffff;
+  background-color: #0044cc;
+  *background-color: #003bb3;
+}
+
+.btn-primary:active,
+.btn-primary.active {
+  background-color: #003399 \9;
+}
+
+.btn-warning {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #faa732;
+  *background-color: #f89406;
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));
+  background-image: -webkit-linear-gradient(top, #fbb450, #f89406);
+  background-image: -o-linear-gradient(top, #fbb450, #f89406);
+  background-image: linear-gradient(to bottom, #fbb450, #f89406);
+  background-image: -moz-linear-gradient(top, #fbb450, #f89406);
+  background-repeat: repeat-x;
+  border-color: #f89406 #f89406 #ad6704;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);
+  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+}
+
+.btn-warning:hover,
+.btn-warning:active,
+.btn-warning.active,
+.btn-warning.disabled,
+.btn-warning[disabled] {
+  color: #ffffff;
+  background-color: #f89406;
+  *background-color: #df8505;
+}
+
+.btn-warning:active,
+.btn-warning.active {
+  background-color: #c67605 \9;
+}
+
+.btn-danger {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #da4f49;
+  *background-color: #bd362f;
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));
+  background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f);
+  background-image: -o-linear-gradient(top, #ee5f5b, #bd362f);
+  background-image: linear-gradient(to bottom, #ee5f5b, #bd362f);
+  background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f);
+  background-repeat: repeat-x;
+  border-color: #bd362f #bd362f #802420;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0);
+  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+}
+
+.btn-danger:hover,
+.btn-danger:active,
+.btn-danger.active,
+.btn-danger.disabled,
+.btn-danger[disabled] {
+  color: #ffffff;
+  background-color: #bd362f;
+  *background-color: #a9302a;
+}
+
+.btn-danger:active,
+.btn-danger.active {
+  background-color: #942a25 \9;
+}
+
+.btn-success {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #5bb75b;
+  *background-color: #51a351;
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));
+  background-image: -webkit-linear-gradient(top, #62c462, #51a351);
+  background-image: -o-linear-gradient(top, #62c462, #51a351);
+  background-image: linear-gradient(to bottom, #62c462, #51a351);
+  background-image: -moz-linear-gradient(top, #62c462, #51a351);
+  background-repeat: repeat-x;
+  border-color: #51a351 #51a351 #387038;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0);
+  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+}
+
+.btn-success:hover,
+.btn-success:active,
+.btn-success.active,
+.btn-success.disabled,
+.btn-success[disabled] {
+  color: #ffffff;
+  background-color: #51a351;
+  *background-color: #499249;
+}
+
+.btn-success:active,
+.btn-success.active {
+  background-color: #408140 \9;
+}
+
+.btn-info {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #49afcd;
+  *background-color: #2f96b4;
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));
+  background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4);
+  background-image: -o-linear-gradient(top, #5bc0de, #2f96b4);
+  background-image: linear-gradient(to bottom, #5bc0de, #2f96b4);
+  background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4);
+  background-repeat: repeat-x;
+  border-color: #2f96b4 #2f96b4 #1f6377;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0);
+  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+}
+
+.btn-info:hover,
+.btn-info:active,
+.btn-info.active,
+.btn-info.disabled,
+.btn-info[disabled] {
+  color: #ffffff;
+  background-color: #2f96b4;
+  *background-color: #2a85a0;
+}
+
+.btn-info:active,
+.btn-info.active {
+  background-color: #24748c \9;
+}
+
+.btn-inverse {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #363636;
+  *background-color: #222222;
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222));
+  background-image: -webkit-linear-gradient(top, #444444, #222222);
+  background-image: -o-linear-gradient(top, #444444, #222222);
+  background-image: linear-gradient(to bottom, #444444, #222222);
+  background-image: -moz-linear-gradient(top, #444444, #222222);
+  background-repeat: repeat-x;
+  border-color: #222222 #222222 #000000;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0);
+  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+}
+
+.btn-inverse:hover,
+.btn-inverse:active,
+.btn-inverse.active,
+.btn-inverse.disabled,
+.btn-inverse[disabled] {
+  color: #ffffff;
+  background-color: #222222;
+  *background-color: #151515;
+}
+
+.btn-inverse:active,
+.btn-inverse.active {
+  background-color: #080808 \9;
+}
+
+button.btn,
+input[type="submit"].btn {
+  *padding-top: 3px;
+  *padding-bottom: 3px;
+}
+
+button.btn::-moz-focus-inner,
+input[type="submit"].btn::-moz-focus-inner {
+  padding: 0;
+  border: 0;
+}
+
+button.btn.btn-large,
+input[type="submit"].btn.btn-large {
+  *padding-top: 7px;
+  *padding-bottom: 7px;
+}
+
+button.btn.btn-small,
+input[type="submit"].btn.btn-small {
+  *padding-top: 3px;
+  *padding-bottom: 3px;
+}
+
+button.btn.btn-mini,
+input[type="submit"].btn.btn-mini {
+  *padding-top: 1px;
+  *padding-bottom: 1px;
+}
+
+.btn-link,
+.btn-link:active {
+  background-color: transparent;
+  background-image: none;
+  -webkit-box-shadow: none;
+     -moz-box-shadow: none;
+          box-shadow: none;
+}
+
+.btn-link {
+  color: #0088cc;
+  cursor: pointer;
+  border-color: transparent;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.btn-link:hover {
+  color: #005580;
+  text-decoration: underline;
+  background-color: transparent;
+}
+
+.btn-group {
+  position: relative;
+  *margin-left: .3em;
+  font-size: 0;
+  white-space: nowrap;
+}
+
+.btn-group:first-child {
+  *margin-left: 0;
+}
+
+.btn-group + .btn-group {
+  margin-left: 5px;
+}
+
+.btn-toolbar {
+  margin-top: 10px;
+  margin-bottom: 10px;
+  font-size: 0;
+}
+
+.btn-toolbar .btn-group {
+  display: inline-block;
+  *display: inline;
+  /* IE7 inline-block hack */
+
+  *zoom: 1;
+}
+
+.btn-toolbar .btn + .btn,
+.btn-toolbar .btn-group + .btn,
+.btn-toolbar .btn + .btn-group {
+  margin-left: 5px;
+}
+
+.btn-group > .btn {
+  position: relative;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.btn-group > .btn + .btn {
+  margin-left: -1px;
+}
+
+.btn-group > .btn,
+.btn-group > .dropdown-menu {
+  font-size: 14px;
+}
+
+.btn-group > .btn-mini {
+  font-size: 11px;
+}
+
+.btn-group > .btn-small {
+  font-size: 12px;
+}
+
+.btn-group > .btn-large {
+  font-size: 16px;
+}
+
+.btn-group > .btn:first-child {
+  margin-left: 0;
+  -webkit-border-bottom-left-radius: 4px;
+          border-bottom-left-radius: 4px;
+  -webkit-border-top-left-radius: 4px;
+          border-top-left-radius: 4px;
+  -moz-border-radius-bottomleft: 4px;
+  -moz-border-radius-topleft: 4px;
+}
+
+.btn-group > .btn:last-child,
+.btn-group > .dropdown-toggle {
+  -webkit-border-top-right-radius: 4px;
+          border-top-right-radius: 4px;
+  -webkit-border-bottom-right-radius: 4px;
+          border-bottom-right-radius: 4px;
+  -moz-border-radius-topright: 4px;
+  -moz-border-radius-bottomright: 4px;
+}
+
+.btn-group > .btn.large:first-child {
+  margin-left: 0;
+  -webkit-border-bottom-left-radius: 6px;
+          border-bottom-left-radius: 6px;
+  -webkit-border-top-left-radius: 6px;
+          border-top-left-radius: 6px;
+  -moz-border-radius-bottomleft: 6px;
+  -moz-border-radius-topleft: 6px;
+}
+
+.btn-group > .btn.large:last-child,
+.btn-group > .large.dropdown-toggle {
+  -webkit-border-top-right-radius: 6px;
+          border-top-right-radius: 6px;
+  -webkit-border-bottom-right-radius: 6px;
+          border-bottom-right-radius: 6px;
+  -moz-border-radius-topright: 6px;
+  -moz-border-radius-bottomright: 6px;
+}
+
+.btn-group > .btn:hover,
+.btn-group > .btn:focus,
+.btn-group > .btn:active,
+.btn-group > .btn.active {
+  z-index: 2;
+}
+
+.btn-group .dropdown-toggle:active,
+.btn-group.open .dropdown-toggle {
+  outline: 0;
+}
+
+.btn-group > .btn + .dropdown-toggle {
+  *padding-top: 5px;
+  padding-right: 8px;
+  *padding-bottom: 5px;
+  padding-left: 8px;
+  -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+     -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.btn-group > .btn-mini + .dropdown-toggle {
+  *padding-top: 2px;
+  padding-right: 5px;
+  *padding-bottom: 2px;
+  padding-left: 5px;
+}
+
+.btn-group > .btn-small + .dropdown-toggle {
+  *padding-top: 5px;
+  *padding-bottom: 4px;
+}
+
+.btn-group > .btn-large + .dropdown-toggle {
+  *padding-top: 7px;
+  padding-right: 12px;
+  *padding-bottom: 7px;
+  padding-left: 12px;
+}
+
+.btn-group.open .dropdown-toggle {
+  background-image: none;
+  -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+     -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.btn-group.open .btn.dropdown-toggle {
+  background-color: #e6e6e6;
+}
+
+.btn-group.open .btn-primary.dropdown-toggle {
+  background-color: #0044cc;
+}
+
+.btn-group.open .btn-warning.dropdown-toggle {
+  background-color: #f89406;
+}
+
+.btn-group.open .btn-danger.dropdown-toggle {
+  background-color: #bd362f;
+}
+
+.btn-group.open .btn-success.dropdown-toggle {
+  background-color: #51a351;
+}
+
+.btn-group.open .btn-info.dropdown-toggle {
+  background-color: #2f96b4;
+}
+
+.btn-group.open .btn-inverse.dropdown-toggle {
+  background-color: #222222;
+}
+
+.btn .caret {
+  margin-top: 8px;
+  margin-left: 0;
+}
+
+.btn-mini .caret,
+.btn-small .caret,
+.btn-large .caret {
+  margin-top: 6px;
+}
+
+.btn-large .caret {
+  border-top-width: 5px;
+  border-right-width: 5px;
+  border-left-width: 5px;
+}
+
+.dropup .btn-large .caret {
+  border-top: 0;
+  border-bottom: 5px solid #000000;
+}
+
+.btn-primary .caret,
+.btn-warning .caret,
+.btn-danger .caret,
+.btn-info .caret,
+.btn-success .caret,
+.btn-inverse .caret {
+  border-top-color: #ffffff;
+  border-bottom-color: #ffffff;
+}
+
+.btn-group-vertical {
+  display: inline-block;
+  *display: inline;
+  /* IE7 inline-block hack */
+
+  *zoom: 1;
+}
+
+.btn-group-vertical .btn {
+  display: block;
+  float: none;
+  width: 100%;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.btn-group-vertical .btn + .btn {
+  margin-top: -1px;
+  margin-left: 0;
+}
+
+.btn-group-vertical .btn:first-child {
+  -webkit-border-radius: 4px 4px 0 0;
+     -moz-border-radius: 4px 4px 0 0;
+          border-radius: 4px 4px 0 0;
+}
+
+.btn-group-vertical .btn:last-child {
+  -webkit-border-radius: 0 0 4px 4px;
+     -moz-border-radius: 0 0 4px 4px;
+          border-radius: 0 0 4px 4px;
+}
+
+.btn-group-vertical .btn-large:first-child {
+  -webkit-border-radius: 6px 6px 0 0;
+     -moz-border-radius: 6px 6px 0 0;
+          border-radius: 6px 6px 0 0;
+}
+
+.btn-group-vertical .btn-large:last-child {
+  -webkit-border-radius: 0 0 6px 6px;
+     -moz-border-radius: 0 0 6px 6px;
+          border-radius: 0 0 6px 6px;
+}
+
+.alert {
+  padding: 8px 35px 8px 14px;
+  margin-bottom: 20px;
+  color: #c09853;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+  background-color: #fcf8e3;
+  border: 1px solid #fbeed5;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+.alert h4 {
+  margin: 0;
+}
+
+.alert .close {
+  position: relative;
+  top: -2px;
+  right: -21px;
+  line-height: 20px;
+}
+
+.alert-success {
+  color: #468847;
+  background-color: #dff0d8;
+  border-color: #d6e9c6;
+}
+
+.alert-danger,
+.alert-error {
+  color: #b94a48;
+  background-color: #f2dede;
+  border-color: #eed3d7;
+}
+
+.alert-info {
+  color: #3a87ad;
+  background-color: #d9edf7;
+  border-color: #bce8f1;
+}
+
+.alert-block {
+  padding-top: 14px;
+  padding-bottom: 14px;
+}
+
+.alert-block > p,
+.alert-block > ul {
+  margin-bottom: 0;
+}
+
+.alert-block p + p {
+  margin-top: 5px;
+}
+
+.nav {
+  margin-bottom: 20px;
+  margin-left: 0;
+  list-style: none;
+}
+
+.nav > li > a {
+  display: block;
+}
+
+.nav > li > a:hover {
+  text-decoration: none;
+  background-color: #eeeeee;
+}
+
+.nav > .pull-right {
+  float: right;
+}
+
+.nav-header {
+  display: block;
+  padding: 3px 15px;
+  font-size: 11px;
+  font-weight: bold;
+  line-height: 20px;
+  color: #999999;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+  text-transform: uppercase;
+}
+
+.nav li + .nav-header {
+  margin-top: 9px;
+}
+
+.nav-list {
+  padding-right: 15px;
+  padding-left: 15px;
+  margin-bottom: 0;
+}
+
+.nav-list > li > a,
+.nav-list .nav-header {
+  margin-right: -15px;
+  margin-left: -15px;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+}
+
+.nav-list > li > a {
+  padding: 3px 15px;
+}
+
+.nav-list > .active > a,
+.nav-list > .active > a:hover {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
+  background-color: #0088cc;
+}
+
+.nav-list [class^="icon-"] {
+  margin-right: 2px;
+}
+
+.nav-list .divider {
+  *width: 100%;
+  height: 1px;
+  margin: 9px 1px;
+  *margin: -5px 0 5px;
+  overflow: hidden;
+  background-color: #e5e5e5;
+  border-bottom: 1px solid #ffffff;
+}
+
+.nav-tabs,
+.nav-pills {
+  *zoom: 1;
+}
+
+.nav-tabs:before,
+.nav-pills:before,
+.nav-tabs:after,
+.nav-pills:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.nav-tabs:after,
+.nav-pills:after {
+  clear: both;
+}
+
+.nav-tabs > li,
+.nav-pills > li {
+  float: left;
+}
+
+.nav-tabs > li > a,
+.nav-pills > li > a {
+  padding-right: 12px;
+  padding-left: 12px;
+  margin-right: 2px;
+  line-height: 14px;
+}
+
+.nav-tabs {
+  border-bottom: 1px solid #ddd;
+}
+
+.nav-tabs > li {
+  margin-bottom: -1px;
+}
+
+.nav-tabs > li > a {
+  padding-top: 8px;
+  padding-bottom: 8px;
+  line-height: 20px;
+  border: 1px solid transparent;
+  -webkit-border-radius: 4px 4px 0 0;
+     -moz-border-radius: 4px 4px 0 0;
+          border-radius: 4px 4px 0 0;
+}
+
+.nav-tabs > li > a:hover {
+  border-color: #eeeeee #eeeeee #dddddd;
+}
+
+.nav-tabs > .active > a,
+.nav-tabs > .active > a:hover {
+  color: #555555;
+  cursor: default;
+  background-color: #ffffff;
+  border: 1px solid #ddd;
+  border-bottom-color: transparent;
+}
+
+.nav-pills > li > a {
+  padding-top: 8px;
+  padding-bottom: 8px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+  -webkit-border-radius: 5px;
+     -moz-border-radius: 5px;
+          border-radius: 5px;
+}
+
+.nav-pills > .active > a,
+.nav-pills > .active > a:hover {
+  color: #ffffff;
+  background-color: #0088cc;
+}
+
+.nav-stacked > li {
+  float: none;
+}
+
+.nav-stacked > li > a {
+  margin-right: 0;
+}
+
+.nav-tabs.nav-stacked {
+  border-bottom: 0;
+}
+
+.nav-tabs.nav-stacked > li > a {
+  border: 1px solid #ddd;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.nav-tabs.nav-stacked > li:first-child > a {
+  -webkit-border-top-right-radius: 4px;
+          border-top-right-radius: 4px;
+  -webkit-border-top-left-radius: 4px;
+          border-top-left-radius: 4px;
+  -moz-border-radius-topright: 4px;
+  -moz-border-radius-topleft: 4px;
+}
+
+.nav-tabs.nav-stacked > li:last-child > a {
+  -webkit-border-bottom-right-radius: 4px;
+          border-bottom-right-radius: 4px;
+  -webkit-border-bottom-left-radius: 4px;
+          border-bottom-left-radius: 4px;
+  -moz-border-radius-bottomright: 4px;
+  -moz-border-radius-bottomleft: 4px;
+}
+
+.nav-tabs.nav-stacked > li > a:hover {
+  z-index: 2;
+  border-color: #ddd;
+}
+
+.nav-pills.nav-stacked > li > a {
+  margin-bottom: 3px;
+}
+
+.nav-pills.nav-stacked > li:last-child > a {
+  margin-bottom: 1px;
+}
+
+.nav-tabs .dropdown-menu {
+  -webkit-border-radius: 0 0 6px 6px;
+     -moz-border-radius: 0 0 6px 6px;
+          border-radius: 0 0 6px 6px;
+}
+
+.nav-pills .dropdown-menu {
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+}
+
+.nav .dropdown-toggle .caret {
+  margin-top: 6px;
+  border-top-color: #0088cc;
+  border-bottom-color: #0088cc;
+}
+
+.nav .dropdown-toggle:hover .caret {
+  border-top-color: #005580;
+  border-bottom-color: #005580;
+}
+
+/* move down carets for tabs */
+
+.nav-tabs .dropdown-toggle .caret {
+  margin-top: 8px;
+}
+
+.nav .active .dropdown-toggle .caret {
+  border-top-color: #fff;
+  border-bottom-color: #fff;
+}
+
+.nav-tabs .active .dropdown-toggle .caret {
+  border-top-color: #555555;
+  border-bottom-color: #555555;
+}
+
+.nav > .dropdown.active > a:hover {
+  cursor: pointer;
+}
+
+.nav-tabs .open .dropdown-toggle,
+.nav-pills .open .dropdown-toggle,
+.nav > li.dropdown.open.active > a:hover {
+  color: #ffffff;
+  background-color: #999999;
+  border-color: #999999;
+}
+
+.nav li.dropdown.open .caret,
+.nav li.dropdown.open.active .caret,
+.nav li.dropdown.open a:hover .caret {
+  border-top-color: #ffffff;
+  border-bottom-color: #ffffff;
+  opacity: 1;
+  filter: alpha(opacity=100);
+}
+
+.tabs-stacked .open > a:hover {
+  border-color: #999999;
+}
+
+.tabbable {
+  *zoom: 1;
+}
+
+.tabbable:before,
+.tabbable:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.tabbable:after {
+  clear: both;
+}
+
+.tab-content {
+  overflow: auto;
+}
+
+.tabs-below > .nav-tabs,
+.tabs-right > .nav-tabs,
+.tabs-left > .nav-tabs {
+  border-bottom: 0;
+}
+
+.tab-content > .tab-pane,
+.pill-content > .pill-pane {
+  display: none;
+}
+
+.tab-content > .active,
+.pill-content > .active {
+  display: block;
+}
+
+.tabs-below > .nav-tabs {
+  border-top: 1px solid #ddd;
+}
+
+.tabs-below > .nav-tabs > li {
+  margin-top: -1px;
+  margin-bottom: 0;
+}
+
+.tabs-below > .nav-tabs > li > a {
+  -webkit-border-radius: 0 0 4px 4px;
+     -moz-border-radius: 0 0 4px 4px;
+          border-radius: 0 0 4px 4px;
+}
+
+.tabs-below > .nav-tabs > li > a:hover {
+  border-top-color: #ddd;
+  border-bottom-color: transparent;
+}
+
+.tabs-below > .nav-tabs > .active > a,
+.tabs-below > .nav-tabs > .active > a:hover {
+  border-color: transparent #ddd #ddd #ddd;
+}
+
+.tabs-left > .nav-tabs > li,
+.tabs-right > .nav-tabs > li {
+  float: none;
+}
+
+.tabs-left > .nav-tabs > li > a,
+.tabs-right > .nav-tabs > li > a {
+  min-width: 74px;
+  margin-right: 0;
+  margin-bottom: 3px;
+}
+
+.tabs-left > .nav-tabs {
+  float: left;
+  margin-right: 19px;
+  border-right: 1px solid #ddd;
+}
+
+.tabs-left > .nav-tabs > li > a {
+  margin-right: -1px;
+  -webkit-border-radius: 4px 0 0 4px;
+     -moz-border-radius: 4px 0 0 4px;
+          border-radius: 4px 0 0 4px;
+}
+
+.tabs-left > .nav-tabs > li > a:hover {
+  border-color: #eeeeee #dddddd #eeeeee #eeeeee;
+}
+
+.tabs-left > .nav-tabs .active > a,
+.tabs-left > .nav-tabs .active > a:hover {
+  border-color: #ddd transparent #ddd #ddd;
+  *border-right-color: #ffffff;
+}
+
+.tabs-right > .nav-tabs {
+  float: right;
+  margin-left: 19px;
+  border-left: 1px solid #ddd;
+}
+
+.tabs-right > .nav-tabs > li > a {
+  margin-left: -1px;
+  -webkit-border-radius: 0 4px 4px 0;
+     -moz-border-radius: 0 4px 4px 0;
+          border-radius: 0 4px 4px 0;
+}
+
+.tabs-right > .nav-tabs > li > a:hover {
+  border-color: #eeeeee #eeeeee #eeeeee #dddddd;
+}
+
+.tabs-right > .nav-tabs .active > a,
+.tabs-right > .nav-tabs .active > a:hover {
+  border-color: #ddd #ddd #ddd transparent;
+  *border-left-color: #ffffff;
+}
+
+.nav > .disabled > a {
+  color: #999999;
+}
+
+.nav > .disabled > a:hover {
+  text-decoration: none;
+  cursor: default;
+  background-color: transparent;
+}
+
+.navbar {
+  *position: relative;
+  *z-index: 2;
+  margin-bottom: 20px;
+  overflow: visible;
+  color: #555555;
+}
+
+.navbar-inner {
+  min-height: 40px;
+  padding-right: 20px;
+  padding-left: 20px;
+  background-color: #fafafa;
+  background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2));
+  background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2);
+  background-image: -o-linear-gradient(top, #ffffff, #f2f2f2);
+  background-image: linear-gradient(to bottom, #ffffff, #f2f2f2);
+  background-repeat: repeat-x;
+  border: 1px solid #d4d4d4;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0);
+  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
+     -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
+          box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
+}
+
+.navbar .container {
+  width: auto;
+}
+
+.nav-collapse.collapse {
+  height: auto;
+}
+
+.navbar .brand {
+  display: block;
+  float: left;
+  padding: 10px 20px 10px;
+  margin-left: -20px;
+  font-size: 20px;
+  font-weight: 200;
+  color: #555555;
+  text-shadow: 0 1px 0 #ffffff;
+}
+
+.navbar .brand:hover {
+  text-decoration: none;
+}
+
+.navbar-text {
+  margin-bottom: 0;
+  line-height: 40px;
+}
+
+.navbar-link {
+  color: #555555;
+}
+
+.navbar-link:hover {
+  color: #333333;
+}
+
+.navbar .divider-vertical {
+  height: 40px;
+  margin: 0 9px;
+  border-right: 1px solid #ffffff;
+  border-left: 1px solid #f2f2f2;
+}
+
+.navbar .btn,
+.navbar .btn-group {
+  margin-top: 6px;
+}
+
+.navbar .btn-group .btn {
+  margin: 0;
+}
+
+.navbar-form {
+  margin-bottom: 0;
+  *zoom: 1;
+}
+
+.navbar-form:before,
+.navbar-form:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.navbar-form:after {
+  clear: both;
+}
+
+.navbar-form input,
+.navbar-form select,
+.navbar-form .radio,
+.navbar-form .checkbox {
+  margin-top: 5px;
+}
+
+.navbar-form input,
+.navbar-form select,
+.navbar-form .btn {
+  display: inline-block;
+  margin-bottom: 0;
+}
+
+.navbar-form input[type="image"],
+.navbar-form input[type="checkbox"],
+.navbar-form input[type="radio"] {
+  margin-top: 3px;
+}
+
+.navbar-form .input-append,
+.navbar-form .input-prepend {
+  margin-top: 6px;
+  white-space: nowrap;
+}
+
+.navbar-form .input-append input,
+.navbar-form .input-prepend input {
+  margin-top: 0;
+}
+
+.navbar-search {
+  position: relative;
+  float: left;
+  margin-top: 5px;
+  margin-bottom: 0;
+}
+
+.navbar-search .search-query {
+  padding: 4px 14px;
+  margin-bottom: 0;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  font-weight: normal;
+  line-height: 1;
+  -webkit-border-radius: 15px;
+     -moz-border-radius: 15px;
+          border-radius: 15px;
+}
+
+.navbar-static-top {
+  position: static;
+  width: 100%;
+  margin-bottom: 0;
+}
+
+.navbar-static-top .navbar-inner {
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.navbar-fixed-top,
+.navbar-fixed-bottom {
+  position: fixed;
+  right: 0;
+  left: 0;
+  z-index: 1030;
+  margin-bottom: 0;
+}
+
+.navbar-fixed-top .navbar-inner,
+.navbar-fixed-bottom .navbar-inner,
+.navbar-static-top .navbar-inner {
+  border: 0;
+}
+
+.navbar-fixed-top .navbar-inner,
+.navbar-fixed-bottom .navbar-inner {
+  padding-right: 0;
+  padding-left: 0;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.navbar-static-top .container,
+.navbar-fixed-top .container,
+.navbar-fixed-bottom .container {
+  width: 940px;
+}
+
+.navbar-fixed-top {
+  top: 0;
+}
+
+.navbar-fixed-top .navbar-inner,
+.navbar-static-top .navbar-inner {
+  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1);
+     -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1);
+          box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1);
+}
+
+.navbar-fixed-bottom {
+  bottom: 0;
+}
+
+.navbar-fixed-bottom .navbar-inner {
+  -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 10px rgba(0, 0, 0, 0.1);
+     -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 10px rgba(0, 0, 0, 0.1);
+          box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 10px rgba(0, 0, 0, 0.1);
+}
+
+.navbar .nav {
+  position: relative;
+  left: 0;
+  display: block;
+  float: left;
+  margin: 0 10px 0 0;
+}
+
+.navbar .nav.pull-right {
+  float: right;
+}
+
+.navbar .nav > li {
+  float: left;
+}
+
+.navbar .nav > li > a {
+  float: none;
+  padding: 10px 15px 10px;
+  color: #555555;
+  text-decoration: none;
+  text-shadow: 0 1px 0 #ffffff;
+}
+
+.navbar .nav .dropdown-toggle .caret {
+  margin-top: 8px;
+}
+
+.navbar .nav > li > a:focus,
+.navbar .nav > li > a:hover {
+  color: #333333;
+  text-decoration: none;
+  background-color: transparent;
+}
+
+.navbar .nav > .active > a,
+.navbar .nav > .active > a:hover,
+.navbar .nav > .active > a:focus {
+  color: #555555;
+  text-decoration: none;
+  background-color: #e5e5e5;
+  -webkit-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
+     -moz-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
+          box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
+}
+
+.navbar .btn-navbar {
+  display: none;
+  float: right;
+  padding: 7px 10px;
+  margin-right: 5px;
+  margin-left: 5px;
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #ededed;
+  *background-color: #e5e5e5;
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#e5e5e5));
+  background-image: -webkit-linear-gradient(top, #f2f2f2, #e5e5e5);
+  background-image: -o-linear-gradient(top, #f2f2f2, #e5e5e5);
+  background-image: linear-gradient(to bottom, #f2f2f2, #e5e5e5);
+  background-image: -moz-linear-gradient(top, #f2f2f2, #e5e5e5);
+  background-repeat: repeat-x;
+  border-color: #e5e5e5 #e5e5e5 #bfbfbf;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0);
+  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
+     -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
+          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
+}
+
+.navbar .btn-navbar:hover,
+.navbar .btn-navbar:active,
+.navbar .btn-navbar.active,
+.navbar .btn-navbar.disabled,
+.navbar .btn-navbar[disabled] {
+  color: #ffffff;
+  background-color: #e5e5e5;
+  *background-color: #d9d9d9;
+}
+
+.navbar .btn-navbar:active,
+.navbar .btn-navbar.active {
+  background-color: #cccccc \9;
+}
+
+.navbar .btn-navbar .icon-bar {
+  display: block;
+  width: 18px;
+  height: 2px;
+  background-color: #f5f5f5;
+  -webkit-border-radius: 1px;
+     -moz-border-radius: 1px;
+          border-radius: 1px;
+  -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
+     -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
+          box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
+}
+
+.btn-navbar .icon-bar + .icon-bar {
+  margin-top: 3px;
+}
+
+.navbar .nav > li > .dropdown-menu:before {
+  position: absolute;
+  top: -7px;
+  left: 9px;
+  display: inline-block;
+  border-right: 7px solid transparent;
+  border-bottom: 7px solid #ccc;
+  border-left: 7px solid transparent;
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+  content: '';
+}
+
+.navbar .nav > li > .dropdown-menu:after {
+  position: absolute;
+  top: -6px;
+  left: 10px;
+  display: inline-block;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid #ffffff;
+  border-left: 6px solid transparent;
+  content: '';
+}
+
+.navbar-fixed-bottom .nav > li > .dropdown-menu:before {
+  top: auto;
+  bottom: -7px;
+  border-top: 7px solid #ccc;
+  border-bottom: 0;
+  border-top-color: rgba(0, 0, 0, 0.2);
+}
+
+.navbar-fixed-bottom .nav > li > .dropdown-menu:after {
+  top: auto;
+  bottom: -6px;
+  border-top: 6px solid #ffffff;
+  border-bottom: 0;
+}
+
+.navbar .nav li.dropdown.open > .dropdown-toggle,
+.navbar .nav li.dropdown.active > .dropdown-toggle,
+.navbar .nav li.dropdown.open.active > .dropdown-toggle {
+  color: #555555;
+  background-color: #e5e5e5;
+}
+
+.navbar .nav li.dropdown > .dropdown-toggle .caret {
+  border-top-color: #555555;
+  border-bottom-color: #555555;
+}
+
+.navbar .nav li.dropdown.open > .dropdown-toggle .caret,
+.navbar .nav li.dropdown.active > .dropdown-toggle .caret,
+.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret {
+  border-top-color: #555555;
+  border-bottom-color: #555555;
+}
+
+.navbar .pull-right > li > .dropdown-menu,
+.navbar .nav > li > .dropdown-menu.pull-right {
+  right: 0;
+  left: auto;
+}
+
+.navbar .pull-right > li > .dropdown-menu:before,
+.navbar .nav > li > .dropdown-menu.pull-right:before {
+  right: 12px;
+  left: auto;
+}
+
+.navbar .pull-right > li > .dropdown-menu:after,
+.navbar .nav > li > .dropdown-menu.pull-right:after {
+  right: 13px;
+  left: auto;
+}
+
+.navbar .pull-right > li > .dropdown-menu .dropdown-menu,
+.navbar .nav > li > .dropdown-menu.pull-right .dropdown-menu {
+  right: 100%;
+  left: auto;
+  margin-right: -1px;
+  margin-left: 0;
+  -webkit-border-radius: 6px 0 6px 6px;
+     -moz-border-radius: 6px 0 6px 6px;
+          border-radius: 6px 0 6px 6px;
+}
+
+.navbar-inverse {
+  color: #999999;
+}
+
+.navbar-inverse .navbar-inner {
+  background-color: #1b1b1b;
+  background-image: -moz-linear-gradient(top, #222222, #111111);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111));
+  background-image: -webkit-linear-gradient(top, #222222, #111111);
+  background-image: -o-linear-gradient(top, #222222, #111111);
+  background-image: linear-gradient(to bottom, #222222, #111111);
+  background-repeat: repeat-x;
+  border-color: #252525;
+  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0);
+}
+
+.navbar-inverse .brand,
+.navbar-inverse .nav > li > a {
+  color: #999999;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+
+.navbar-inverse .brand:hover,
+.navbar-inverse .nav > li > a:hover {
+  color: #ffffff;
+}
+
+.navbar-inverse .nav > li > a:focus,
+.navbar-inverse .nav > li > a:hover {
+  color: #ffffff;
+  background-color: transparent;
+}
+
+.navbar-inverse .nav .active > a,
+.navbar-inverse .nav .active > a:hover,
+.navbar-inverse .nav .active > a:focus {
+  color: #ffffff;
+  background-color: #111111;
+}
+
+.navbar-inverse .navbar-link {
+  color: #999999;
+}
+
+.navbar-inverse .navbar-link:hover {
+  color: #ffffff;
+}
+
+.navbar-inverse .divider-vertical {
+  border-right-color: #222222;
+  border-left-color: #111111;
+}
+
+.navbar-inverse .nav li.dropdown.open > .dropdown-toggle,
+.navbar-inverse .nav li.dropdown.active > .dropdown-toggle,
+.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle {
+  color: #ffffff;
+  background-color: #111111;
+}
+
+.navbar-inverse .nav li.dropdown > .dropdown-toggle .caret {
+  border-top-color: #999999;
+  border-bottom-color: #999999;
+}
+
+.navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret,
+.navbar-inverse .nav li.dropdown.active > .dropdown-toggle .caret,
+.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle .caret {
+  border-top-color: #ffffff;
+  border-bottom-color: #ffffff;
+}
+
+.navbar-inverse .navbar-search .search-query {
+  color: #ffffff;
+  background-color: #515151;
+  border-color: #111111;
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
+     -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
+          box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
+  -webkit-transition: none;
+     -moz-transition: none;
+       -o-transition: none;
+          transition: none;
+}
+
+.navbar-inverse .navbar-search .search-query:-moz-placeholder {
+  color: #cccccc;
+}
+
+.navbar-inverse .navbar-search .search-query:-ms-input-placeholder {
+  color: #cccccc;
+}
+
+.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder {
+  color: #cccccc;
+}
+
+.navbar-inverse .navbar-search .search-query:focus,
+.navbar-inverse .navbar-search .search-query.focused {
+  padding: 5px 15px;
+  color: #333333;
+  text-shadow: 0 1px 0 #ffffff;
+  background-color: #ffffff;
+  border: 0;
+  outline: 0;
+  -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+     -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+          box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+}
+
+.navbar-inverse .btn-navbar {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #0e0e0e;
+  *background-color: #040404;
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404));
+  background-image: -webkit-linear-gradient(top, #151515, #040404);
+  background-image: -o-linear-gradient(top, #151515, #040404);
+  background-image: linear-gradient(to bottom, #151515, #040404);
+  background-image: -moz-linear-gradient(top, #151515, #040404);
+  background-repeat: repeat-x;
+  border-color: #040404 #040404 #000000;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0);
+  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+}
+
+.navbar-inverse .btn-navbar:hover,
+.navbar-inverse .btn-navbar:active,
+.navbar-inverse .btn-navbar.active,
+.navbar-inverse .btn-navbar.disabled,
+.navbar-inverse .btn-navbar[disabled] {
+  color: #ffffff;
+  background-color: #040404;
+  *background-color: #000000;
+}
+
+.navbar-inverse .btn-navbar:active,
+.navbar-inverse .btn-navbar.active {
+  background-color: #000000 \9;
+}
+
+.breadcrumb {
+  padding: 8px 15px;
+  margin: 0 0 20px;
+  list-style: none;
+  background-color: #f5f5f5;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+.breadcrumb li {
+  display: inline-block;
+  *display: inline;
+  text-shadow: 0 1px 0 #ffffff;
+  *zoom: 1;
+}
+
+.breadcrumb .divider {
+  padding: 0 5px;
+  color: #ccc;
+}
+
+.breadcrumb .active {
+  color: #999999;
+}
+
+.pagination {
+  height: 40px;
+  margin: 20px 0;
+}
+
+.pagination ul {
+  display: inline-block;
+  *display: inline;
+  margin-bottom: 0;
+  margin-left: 0;
+  -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+          border-radius: 3px;
+  *zoom: 1;
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+     -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.pagination li {
+  display: inline;
+}
+
+.pagination a,
+.pagination span {
+  float: left;
+  padding: 0 14px;
+  line-height: 38px;
+  text-decoration: none;
+  background-color: #ffffff;
+  border: 1px solid #dddddd;
+  border-left-width: 0;
+}
+
+.pagination a:hover,
+.pagination .active a,
+.pagination .active span {
+  background-color: #f5f5f5;
+}
+
+.pagination .active a,
+.pagination .active span {
+  color: #999999;
+  cursor: default;
+}
+
+.pagination .disabled span,
+.pagination .disabled a,
+.pagination .disabled a:hover {
+  color: #999999;
+  cursor: default;
+  background-color: transparent;
+}
+
+.pagination li:first-child a,
+.pagination li:first-child span {
+  border-left-width: 1px;
+  -webkit-border-radius: 3px 0 0 3px;
+     -moz-border-radius: 3px 0 0 3px;
+          border-radius: 3px 0 0 3px;
+}
+
+.pagination li:last-child a,
+.pagination li:last-child span {
+  -webkit-border-radius: 0 3px 3px 0;
+     -moz-border-radius: 0 3px 3px 0;
+          border-radius: 0 3px 3px 0;
+}
+
+.pagination-centered {
+  text-align: center;
+}
+
+.pagination-right {
+  text-align: right;
+}
+
+.pager {
+  margin: 20px 0;
+  text-align: center;
+  list-style: none;
+  *zoom: 1;
+}
+
+.pager:before,
+.pager:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.pager:after {
+  clear: both;
+}
+
+.pager li {
+  display: inline;
+}
+
+.pager a {
+  display: inline-block;
+  padding: 5px 14px;
+  background-color: #fff;
+  border: 1px solid #ddd;
+  -webkit-border-radius: 15px;
+     -moz-border-radius: 15px;
+          border-radius: 15px;
+}
+
+.pager a:hover {
+  text-decoration: none;
+  background-color: #f5f5f5;
+}
+
+.pager .next a {
+  float: right;
+}
+
+.pager .previous a {
+  float: left;
+}
+
+.pager .disabled a,
+.pager .disabled a:hover {
+  color: #999999;
+  cursor: default;
+  background-color: #fff;
+}
+
+.modal-open .dropdown-menu {
+  z-index: 2050;
+}
+
+.modal-open .dropdown.open {
+  *z-index: 2050;
+}
+
+.modal-open .popover {
+  z-index: 2060;
+}
+
+.modal-open .tooltip {
+  z-index: 2080;
+}
+
+.modal-backdrop {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1040;
+  background-color: #000000;
+}
+
+.modal-backdrop.fade {
+  opacity: 0;
+}
+
+.modal-backdrop,
+.modal-backdrop.fade.in {
+  opacity: 0.8;
+  filter: alpha(opacity=80);
+}
+
+.modal {
+  position: fixed;
+  top: 50%;
+  left: 50%;
+  z-index: 1050;
+  width: 560px;
+  margin: -250px 0 0 -280px;
+  overflow: auto;
+  background-color: #ffffff;
+  border: 1px solid #999;
+  border: 1px solid rgba(0, 0, 0, 0.3);
+  *border: 1px solid #999;
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+  -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+     -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+          box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+  -webkit-background-clip: padding-box;
+     -moz-background-clip: padding-box;
+          background-clip: padding-box;
+}
+
+.modal.fade {
+  top: -25%;
+  -webkit-transition: opacity 0.3s linear, top 0.3s ease-out;
+     -moz-transition: opacity 0.3s linear, top 0.3s ease-out;
+       -o-transition: opacity 0.3s linear, top 0.3s ease-out;
+          transition: opacity 0.3s linear, top 0.3s ease-out;
+}
+
+.modal.fade.in {
+  top: 50%;
+}
+
+.modal-header {
+  padding: 9px 15px;
+  border-bottom: 1px solid #eee;
+}
+
+.modal-header .close {
+  margin-top: 2px;
+}
+
+.modal-header h3 {
+  margin: 0;
+  line-height: 30px;
+}
+
+.modal-body {
+  max-height: 400px;
+  padding: 15px;
+  overflow-y: auto;
+}
+
+.modal-form {
+  margin-bottom: 0;
+}
+
+.modal-footer {
+  padding: 14px 15px 15px;
+  margin-bottom: 0;
+  text-align: right;
+  background-color: #f5f5f5;
+  border-top: 1px solid #ddd;
+  -webkit-border-radius: 0 0 6px 6px;
+     -moz-border-radius: 0 0 6px 6px;
+          border-radius: 0 0 6px 6px;
+  *zoom: 1;
+  -webkit-box-shadow: inset 0 1px 0 #ffffff;
+     -moz-box-shadow: inset 0 1px 0 #ffffff;
+          box-shadow: inset 0 1px 0 #ffffff;
+}
+
+.modal-footer:before,
+.modal-footer:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.modal-footer:after {
+  clear: both;
+}
+
+.modal-footer .btn + .btn {
+  margin-bottom: 0;
+  margin-left: 5px;
+}
+
+.modal-footer .btn-group .btn + .btn {
+  margin-left: -1px;
+}
+
+.tooltip {
+  position: absolute;
+  z-index: 1030;
+  display: block;
+  padding: 5px;
+  font-size: 11px;
+  opacity: 0;
+  filter: alpha(opacity=0);
+  visibility: visible;
+}
+
+.tooltip.in {
+  opacity: 0.8;
+  filter: alpha(opacity=80);
+}
+
+.tooltip.top {
+  margin-top: -3px;
+}
+
+.tooltip.right {
+  margin-left: 3px;
+}
+
+.tooltip.bottom {
+  margin-top: 3px;
+}
+
+.tooltip.left {
+  margin-left: -3px;
+}
+
+.tooltip-inner {
+  max-width: 200px;
+  padding: 3px 8px;
+  color: #ffffff;
+  text-align: center;
+  text-decoration: none;
+  background-color: #000000;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+.tooltip-arrow {
+  position: absolute;
+  width: 0;
+  height: 0;
+  border-color: transparent;
+  border-style: solid;
+}
+
+.tooltip.top .tooltip-arrow {
+  bottom: 0;
+  left: 50%;
+  margin-left: -5px;
+  border-top-color: #000000;
+  border-width: 5px 5px 0;
+}
+
+.tooltip.right .tooltip-arrow {
+  top: 50%;
+  left: 0;
+  margin-top: -5px;
+  border-right-color: #000000;
+  border-width: 5px 5px 5px 0;
+}
+
+.tooltip.left .tooltip-arrow {
+  top: 50%;
+  right: 0;
+  margin-top: -5px;
+  border-left-color: #000000;
+  border-width: 5px 0 5px 5px;
+}
+
+.tooltip.bottom .tooltip-arrow {
+  top: 0;
+  left: 50%;
+  margin-left: -5px;
+  border-bottom-color: #000000;
+  border-width: 0 5px 5px;
+}
+
+.popover {
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 1010;
+  display: none;
+  width: 236px;
+  padding: 1px;
+  background-color: #ffffff;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+     -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+          box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  -webkit-background-clip: padding-box;
+     -moz-background-clip: padding;
+          background-clip: padding-box;
+}
+
+.popover.top {
+  margin-bottom: 10px;
+}
+
+.popover.right {
+  margin-left: 10px;
+}
+
+.popover.bottom {
+  margin-top: 10px;
+}
+
+.popover.left {
+  margin-right: 10px;
+}
+
+.popover-title {
+  padding: 8px 14px;
+  margin: 0;
+  font-size: 14px;
+  font-weight: normal;
+  line-height: 18px;
+  background-color: #f7f7f7;
+  border-bottom: 1px solid #ebebeb;
+  -webkit-border-radius: 5px 5px 0 0;
+     -moz-border-radius: 5px 5px 0 0;
+          border-radius: 5px 5px 0 0;
+}
+
+.popover-content {
+  padding: 9px 14px;
+}
+
+.popover-content p,
+.popover-content ul,
+.popover-content ol {
+  margin-bottom: 0;
+}
+
+.popover .arrow,
+.popover .arrow:after {
+  position: absolute;
+  display: inline-block;
+  width: 0;
+  height: 0;
+  border-color: transparent;
+  border-style: solid;
+}
+
+.popover .arrow:after {
+  z-index: -1;
+  content: "";
+}
+
+.popover.top .arrow {
+  bottom: -10px;
+  left: 50%;
+  margin-left: -10px;
+  border-top-color: #ffffff;
+  border-width: 10px 10px 0;
+}
+
+.popover.top .arrow:after {
+  bottom: -1px;
+  left: -11px;
+  border-top-color: rgba(0, 0, 0, 0.25);
+  border-width: 11px 11px 0;
+}
+
+.popover.right .arrow {
+  top: 50%;
+  left: -10px;
+  margin-top: -10px;
+  border-right-color: #ffffff;
+  border-width: 10px 10px 10px 0;
+}
+
+.popover.right .arrow:after {
+  bottom: -11px;
+  left: -1px;
+  border-right-color: rgba(0, 0, 0, 0.25);
+  border-width: 11px 11px 11px 0;
+}
+
+.popover.bottom .arrow {
+  top: -10px;
+  left: 50%;
+  margin-left: -10px;
+  border-bottom-color: #ffffff;
+  border-width: 0 10px 10px;
+}
+
+.popover.bottom .arrow:after {
+  top: -1px;
+  left: -11px;
+  border-bottom-color: rgba(0, 0, 0, 0.25);
+  border-width: 0 11px 11px;
+}
+
+.popover.left .arrow {
+  top: 50%;
+  right: -10px;
+  margin-top: -10px;
+  border-left-color: #ffffff;
+  border-width: 10px 0 10px 10px;
+}
+
+.popover.left .arrow:after {
+  right: -1px;
+  bottom: -11px;
+  border-left-color: rgba(0, 0, 0, 0.25);
+  border-width: 11px 0 11px 11px;
+}
+
+.thumbnails {
+  margin-left: -20px;
+  list-style: none;
+  *zoom: 1;
+}
+
+.thumbnails:before,
+.thumbnails:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.thumbnails:after {
+  clear: both;
+}
+
+.row-fluid .thumbnails {
+  margin-left: 0;
+}
+
+.thumbnails > li {
+  float: left;
+  margin-bottom: 20px;
+  margin-left: 20px;
+}
+
+.thumbnail {
+  display: block;
+  padding: 4px;
+  line-height: 20px;
+  border: 1px solid #ddd;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055);
+     -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055);
+          box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055);
+  -webkit-transition: all 0.2s ease-in-out;
+     -moz-transition: all 0.2s ease-in-out;
+       -o-transition: all 0.2s ease-in-out;
+          transition: all 0.2s ease-in-out;
+}
+
+a.thumbnail:hover {
+  border-color: #0088cc;
+  -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
+     -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
+          box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
+}
+
+.thumbnail > img {
+  display: block;
+  max-width: 100%;
+  margin-right: auto;
+  margin-left: auto;
+}
+
+.thumbnail .caption {
+  padding: 9px;
+  color: #555555;
+}
+
+.label,
+.badge {
+  font-size: 11.844px;
+  font-weight: bold;
+  line-height: 14px;
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  white-space: nowrap;
+  vertical-align: baseline;
+  background-color: #999999;
+}
+
+.label {
+  padding: 1px 4px 2px;
+  -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+          border-radius: 3px;
+}
+
+.badge {
+  padding: 1px 9px 2px;
+  -webkit-border-radius: 9px;
+     -moz-border-radius: 9px;
+          border-radius: 9px;
+}
+
+a.label:hover,
+a.badge:hover {
+  color: #ffffff;
+  text-decoration: none;
+  cursor: pointer;
+}
+
+.label-important,
+.badge-important {
+  background-color: #b94a48;
+}
+
+.label-important[href],
+.badge-important[href] {
+  background-color: #953b39;
+}
+
+.label-warning,
+.badge-warning {
+  background-color: #f89406;
+}
+
+.label-warning[href],
+.badge-warning[href] {
+  background-color: #c67605;
+}
+
+.label-success,
+.badge-success {
+  background-color: #468847;
+}
+
+.label-success[href],
+.badge-success[href] {
+  background-color: #356635;
+}
+
+.label-info,
+.badge-info {
+  background-color: #3a87ad;
+}
+
+.label-info[href],
+.badge-info[href] {
+  background-color: #2d6987;
+}
+
+.label-inverse,
+.badge-inverse {
+  background-color: #333333;
+}
+
+.label-inverse[href],
+.badge-inverse[href] {
+  background-color: #1a1a1a;
+}
+
+.btn .label,
+.btn .badge {
+  position: relative;
+  top: -1px;
+}
+
+.btn-mini .label,
+.btn-mini .badge {
+  top: 0;
+}
+
+@-webkit-keyframes progress-bar-stripes {
+  from {
+    background-position: 40px 0;
+  }
+  to {
+    background-position: 0 0;
+  }
+}
+
+@-moz-keyframes progress-bar-stripes {
+  from {
+    background-position: 40px 0;
+  }
+  to {
+    background-position: 0 0;
+  }
+}
+
+@-ms-keyframes progress-bar-stripes {
+  from {
+    background-position: 40px 0;
+  }
+  to {
+    background-position: 0 0;
+  }
+}
+
+@-o-keyframes progress-bar-stripes {
+  from {
+    background-position: 0 0;
+  }
+  to {
+    background-position: 40px 0;
+  }
+}
+
+@keyframes progress-bar-stripes {
+  from {
+    background-position: 40px 0;
+  }
+  to {
+    background-position: 0 0;
+  }
+}
+
+.progress {
+  height: 20px;
+  margin-bottom: 20px;
+  overflow: hidden;
+  background-color: #f7f7f7;
+  background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));
+  background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-image: linear-gradient(to bottom, #f5f5f5, #f9f9f9);
+  background-repeat: repeat-x;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0);
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+     -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+          box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+}
+
+.progress .bar {
+  float: left;
+  width: 0;
+  height: 100%;
+  font-size: 12px;
+  color: #ffffff;
+  text-align: center;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #0e90d2;
+  background-image: -moz-linear-gradient(top, #149bdf, #0480be);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));
+  background-image: -webkit-linear-gradient(top, #149bdf, #0480be);
+  background-image: -o-linear-gradient(top, #149bdf, #0480be);
+  background-image: linear-gradient(to bottom, #149bdf, #0480be);
+  background-repeat: repeat-x;
+  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0);
+  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+     -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+          box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+  -webkit-transition: width 0.6s ease;
+     -moz-transition: width 0.6s ease;
+       -o-transition: width 0.6s ease;
+          transition: width 0.6s ease;
+}
+
+.progress .bar + .bar {
+  -webkit-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+     -moz-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+          box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+}
+
+.progress-striped .bar {
+  background-color: #149bdf;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  -webkit-background-size: 40px 40px;
+     -moz-background-size: 40px 40px;
+       -o-background-size: 40px 40px;
+          background-size: 40px 40px;
+}
+
+.progress.active .bar {
+  -webkit-animation: progress-bar-stripes 2s linear infinite;
+     -moz-animation: progress-bar-stripes 2s linear infinite;
+      -ms-animation: progress-bar-stripes 2s linear infinite;
+       -o-animation: progress-bar-stripes 2s linear infinite;
+          animation: progress-bar-stripes 2s linear infinite;
+}
+
+.progress-danger .bar,
+.progress .bar-danger {
+  background-color: #dd514c;
+  background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));
+  background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: linear-gradient(to bottom, #ee5f5b, #c43c35);
+  background-repeat: repeat-x;
+  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0);
+}
+
+.progress-danger.progress-striped .bar,
+.progress-striped .bar-danger {
+  background-color: #ee5f5b;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+
+.progress-success .bar,
+.progress .bar-success {
+  background-color: #5eb95e;
+  background-image: -moz-linear-gradient(top, #62c462, #57a957);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));
+  background-image: -webkit-linear-gradient(top, #62c462, #57a957);
+  background-image: -o-linear-gradient(top, #62c462, #57a957);
+  background-image: linear-gradient(to bottom, #62c462, #57a957);
+  background-repeat: repeat-x;
+  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0);
+}
+
+.progress-success.progress-striped .bar,
+.progress-striped .bar-success {
+  background-color: #62c462;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+
+.progress-info .bar,
+.progress .bar-info {
+  background-color: #4bb1cf;
+  background-image: -moz-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));
+  background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: -o-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: linear-gradient(to bottom, #5bc0de, #339bb9);
+  background-repeat: repeat-x;
+  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0);
+}
+
+.progress-info.progress-striped .bar,
+.progress-striped .bar-info {
+  background-color: #5bc0de;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+
+.progress-warning .bar,
+.progress .bar-warning {
+  background-color: #faa732;
+  background-image: -moz-linear-gradient(top, #fbb450, #f89406);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));
+  background-image: -webkit-linear-gradient(top, #fbb450, #f89406);
+  background-image: -o-linear-gradient(top, #fbb450, #f89406);
+  background-image: linear-gradient(to bottom, #fbb450, #f89406);
+  background-repeat: repeat-x;
+  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);
+}
+
+.progress-warning.progress-striped .bar,
+.progress-striped .bar-warning {
+  background-color: #fbb450;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+
+.accordion {
+  margin-bottom: 20px;
+}
+
+.accordion-group {
+  margin-bottom: 2px;
+  border: 1px solid #e5e5e5;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+.accordion-heading {
+  border-bottom: 0;
+}
+
+.accordion-heading .accordion-toggle {
+  display: block;
+  padding: 8px 15px;
+}
+
+.accordion-toggle {
+  cursor: pointer;
+}
+
+.accordion-inner {
+  padding: 9px 15px;
+  border-top: 1px solid #e5e5e5;
+}
+
+.carousel {
+  position: relative;
+  margin-bottom: 20px;
+  line-height: 1;
+}
+
+.carousel-inner {
+  position: relative;
+  width: 100%;
+  overflow: hidden;
+}
+
+.carousel .item {
+  position: relative;
+  display: none;
+  -webkit-transition: 0.6s ease-in-out left;
+     -moz-transition: 0.6s ease-in-out left;
+       -o-transition: 0.6s ease-in-out left;
+          transition: 0.6s ease-in-out left;
+}
+
+.carousel .item > img {
+  display: block;
+  line-height: 1;
+}
+
+.carousel .active,
+.carousel .next,
+.carousel .prev {
+  display: block;
+}
+
+.carousel .active {
+  left: 0;
+}
+
+.carousel .next,
+.carousel .prev {
+  position: absolute;
+  top: 0;
+  width: 100%;
+}
+
+.carousel .next {
+  left: 100%;
+}
+
+.carousel .prev {
+  left: -100%;
+}
+
+.carousel .next.left,
+.carousel .prev.right {
+  left: 0;
+}
+
+.carousel .active.left {
+  left: -100%;
+}
+
+.carousel .active.right {
+  left: 100%;
+}
+
+.carousel-control {
+  position: absolute;
+  top: 40%;
+  left: 15px;
+  width: 40px;
+  height: 40px;
+  margin-top: -20px;
+  font-size: 60px;
+  font-weight: 100;
+  line-height: 30px;
+  color: #ffffff;
+  text-align: center;
+  background: #222222;
+  border: 3px solid #ffffff;
+  -webkit-border-radius: 23px;
+     -moz-border-radius: 23px;
+          border-radius: 23px;
+  opacity: 0.5;
+  filter: alpha(opacity=50);
+}
+
+.carousel-control.right {
+  right: 15px;
+  left: auto;
+}
+
+.carousel-control:hover {
+  color: #ffffff;
+  text-decoration: none;
+  opacity: 0.9;
+  filter: alpha(opacity=90);
+}
+
+.carousel-caption {
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  padding: 15px;
+  background: #333333;
+  background: rgba(0, 0, 0, 0.75);
+}
+
+.carousel-caption h4,
+.carousel-caption p {
+  line-height: 20px;
+  color: #ffffff;
+}
+
+.carousel-caption h4 {
+  margin: 0 0 5px;
+}
+
+.carousel-caption p {
+  margin-bottom: 0;
+}
+
+.hero-unit {
+  padding: 60px;
+  margin-bottom: 30px;
+  background-color: #eeeeee;
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+}
+
+.hero-unit h1 {
+  margin-bottom: 0;
+  font-size: 60px;
+  line-height: 1;
+  letter-spacing: -1px;
+  color: inherit;
+}
+
+.hero-unit p {
+  font-size: 18px;
+  font-weight: 200;
+  line-height: 30px;
+  color: inherit;
+}
+
+.pull-right {
+  float: right;
+}
+
+.pull-left {
+  float: left;
+}
+
+.hide {
+  display: none;
+}
+
+.show {
+  display: block;
+}
+
+.invisible {
+  visibility: hidden;
+}
+
+.affix {
+  position: fixed;
+}
diff --git a/openslides/static/styles/tabledrag.css b/openslides/static/styles/tabledrag.css
index f1e0aced8..8585bcba0 100644
--- a/openslides/static/styles/tabledrag.css
+++ b/openslides/static/styles/tabledrag.css
@@ -9,8 +9,6 @@ body.drag {
 .draggable a.tabledrag-handle {
   cursor: move;
   float: left; /* LTR */
-  height: 1.7em;
-  margin: -0.4em 0 -0.4em -0.5em; /* LTR */
   padding-right: 0.5em ; /* LTR */
   text-decoration: none;
 }
diff --git a/openslides/templates/base.html b/openslides/templates/base.html
index f8050244f..e221dd200 100644
--- a/openslides/templates/base.html
+++ b/openslides/templates/base.html
@@ -7,86 +7,122 @@
     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>{% block title %}{% get_config 'event_name' %}{% endblock %}</title>
-    <link type="text/css" rel="stylesheet" media="all" href="{% static 'styles/base.css' %}" />
-    <link rel="shortcut icon" href="{% static 'images/favicon.png' %}" type="image/png" />
-    <script type="text/javascript" src="{% static 'javascript/jquery.js' %}"></script>
-    <script type="text/javascript" src="{% static 'javascript/utils.js' %}"></script>
-    <script type="text/javascript" src="{% url django.views.i18n.javascript_catalog %}"></script>
+
+    <!-- styles -->
+    <link href="{% static 'styles/bootstrap.css' %}" type="text/css" rel="stylesheet">
+    <link href="{% static 'styles/bootstrap-responsive.css' %}" type="text/css" rel="stylesheet">
+    <link href="{% static 'styles/base.css' %}" type="text/css" rel="stylesheet">
+
+    <link href="{% static 'img/favicon.png' %}" type="image/png" rel="shortcut icon" />
     {% block header %}
     {% endblock %}
 </head>
 <body>
-    <div id="header">
-        <a href="/" title="{% trans 'Home' %}"><div id="logo"><img src="{% static 'images/logo.png' %}"></div></a>
-        <div id="header_title">{% get_config 'event_name' %}</div>
-        <div id="header_subtitle">{% get_config 'event_description' %}</div>
-        <div id="header_userprofile">
-            <ul>
-            {% if user.is_authenticated %}
-                <li>|<a href="{% url user_logout %}">{% trans "Logout" %}</a></li>
-                {% url user_settings as url_usersettings %}
-                <li>|<a href="{% url user_settings %}">{% if request.path == url_usersettings %}<strong>{% endif %}{% trans "User Settings" %}{% if request.path == url_usersettings %}</strong>{% endif %}</a></li>
-                <li>{% trans "Welcome" %}, <strong>{{ user.username }}</strong></li>
-            {% else %}
-                <li><a href="{% url user_login %}">{% trans "Login" %}</a></li>
+    <!-- Navbar -->
+    <div class="container-fluid nopadding">
+        <div class="row-fluid">
+            <div class="span12">
+                <div id="header">
+                    <a href="/" class="logo" title="{% trans 'Home' %}"><img src="{% static 'img/logo.png' %}"></a>
+                    <!--<a class="title" href="#">{% get_config 'event_name' %}</a>-->
+                    <div class="btn-group pull-right">
+                        {% if user.is_authenticated %}
+                        <a href="#" data-toggle="dropdown" class="btn btn-small dropdown-toggle">
+                              <i class="icon-user"></i> {{ user.username }}
+                              <span class="caret"></span>
+                        </a>
+                        <ul class="dropdown-menu">
+                            {% url user_settings as url_usersettings %}
+                            <li><a href="{% url user_settings %}"><i class="icon-cog"></i> {% trans "Profile" %}</a></li>
+                            <li><a href="{% url password_change %}"><i class="icon-lock"></i> {% trans "Change password" %}</a></li>
+                            <li class="divider"></li>
+                            <li><a href="{% url user_logout %}"><i class="icon-off"></i> {% trans "Logout" %}</a></li>
+                        </ul>
+                        {% else %}
+                            <a href="{% url user_login %}">{% trans "Login" %}</a>
+                        {% endif %}
+                    </div>
+                </div> <!--/#header-->
+            </div> <!--/.span12-->
+        </div>
+    </div> <!--/.container-fluid-->
+
+
+<!--
+ {% block mainmenu %}
+ {% endblock %}
+ {% block submenu %}
+ {% endblock %}
+-->
+
+
+<!-- Container -->
+<div class="container-fluid" id="container">
+<div class="row-fluid">
+
+  <!-- Sidebar navigation-->
+  <div class="span2 leftmenu lefticon">
+      <ul>
+        {% for tab in tabs %}
+            {% if tab.permission %}
+            <li{% if tab.selected %} class="active"{% endif %}>
+                <a href="{{ tab.url }}">
+                <span class="ico"><i class="icon-{{tab.app}}"></i></span>
+                <span class="text">{{ tab.title }}</span>
+                </a>
+            </li>
             {% endif %}
-            </ul>
-        </div>
+        {% endfor %}
+      </ul>
+  </div>
 
-        <div id="mainmenu">
-           {% block mainmenu %}
-            <ul>
-                {% for tab in tabs %}
-                    {% if tab.permission %}
-                    <li{% if tab.selected%} class="selected"{% endif %}>
-                        <a href="{{ tab.url }}">{{ tab.title }}</a>
-                    </li>
-                    {% endif %}
-                {% endfor %}
-            </ul>
-            {% endblock %}
-        </div>
+  <!-- Content -->
+  <div id="content" class="span10">
+  <div class="row-fluid">
+    <div class="span12">
+      <div id="notifications">
+           <div id="dummy-notification" class="notification" style="display:none">
+               <button type="button" class="close" data-dismiss="alert">×</button>
+           </div>
+           {% for message in messages %}
+           <div class="alert {% if message.tags %}alert-{{ message.tags }}{% endif %}">
+               <button type="button" class="close" data-dismiss="alert">×</button>
+               {{ message|safe }}
+           </div>
+           {% endfor %}
+       </div>
+       
+      {% block content %}
+      {% endblock %}
     </div>
+  </div>
+  <hr>
+  <footer>
+      <small>
+      &copy; Copyright 2012 | Powered by <a href="http://openslides.org" target="_blank">OpenSlides</a>
+      </small>
+  </footer>
+  </div><!--/content-->
+  
+</div><!--/row-->
+</div><!--/container-fluid-->
 
-    <div id="wrapper">
-        <div id="content">
-            <div id="notifications">
-                <div id="dummy-notification" class="notification" style="display:none">
-                    <a class="close" href="#">
-                    <img alt="close" title="{% trans 'Close this notification' %}" src="{% static 'images/icons/cross.png' %}">
-                    </a>
-                    <em></em>
-                </div>
-                {% for message in messages %}
-                <div class="notification {% if message.tags %}{{ message.tags }}{% endif %}">
-                    <a class="close" href="#">
-                    <img alt="close" title="{% trans 'Close this notification' %}" src="{% static 'images/icons/cross.png' %}">
-                    </a>
-                    <em>{{ message|safe }}</em>
-                </div>
-                {% endfor %}
-                <script>
-                    $("div.notification").click(function () {
-                        $(this).slideUp("fast");
-                    });
-                </script>
-            </div>
-            {% block content %}
-            {% endblock %}
-            <div id="footer">
-                <small>
-                &copy; Copyright 2012 | Powered by <a href="http://openslides.org" target="_blank">OpenSlides</a>
-                </small>
-            </div>
-        </div>
-    </div> <!-- end wrapper -->
 
-    <div id="submenu">
-        <div class="section">
-            {% block submenu %}
-            {% endblock %}
-        </div>
-    </div>
+
+ 
+     
+
+         
+<!-- JavaScript (Placed at the end of the document so the pages load faster) -->
+    <script src="{% static 'javascript/jquery.js' %}" type="text/javascript"></script>
+    <script src="{% static 'javascript/utils.js' %}" type="text/javascript"></script>
+    <script src="{% static 'javascript/bootstrap.min.js' %}" type="text/javascript"></script>
+    <script type="text/javascript" src="{% url django.views.i18n.javascript_catalog %}"></script>
+    {% block javascript %}
+    {% endblock %}
+
 </body>
 </html>
diff --git a/openslides/utils/template.py b/openslides/utils/template.py
index c3b16b630..dc63f6103 100644
--- a/openslides/utils/template.py
+++ b/openslides/utils/template.py
@@ -16,9 +16,10 @@ from django.template.loader_tags import BlockNode, ExtendsNode
 
 
 class Tab(object):
-    def __init__(self, title='', url='', permission='', selected=False):
+    def __init__(self, title='', app='', url='', permission='', selected=False):
         self.selected = False
         self.title = title
+        self.app = app
         self.permission = permission
         self.selected = selected
         self.url = url
diff --git a/openslides/utils/utils.py b/openslides/utils/utils.py
index 6d14b35a6..58107254a 100644
--- a/openslides/utils/utils.py
+++ b/openslides/utils/utils.py
@@ -46,8 +46,8 @@ def gen_confirm_form(request, message, url):
     %s
     <form action="%s" method="post">
         <input type="hidden" value="%s" name="csrfmiddlewaretoken">
-        <input type="submit" value="%s">
-        <input type="button" value="%s">
+        <button type="submit" class="btn">%s</button>
+        <button class="btn">%s</button>
     </form>
     """
     % (message, url, csrf(request)['csrf_token'], _("Yes"), _("No")))
diff --git a/openslides/utils/views.py b/openslides/utils/views.py
index becdbfc8b..25fb0119f 100644
--- a/openslides/utils/views.py
+++ b/openslides/utils/views.py
@@ -127,7 +127,7 @@ class QuestionMixin(object):
 
     def confirm_form(self):
         option_fields = "\n".join([
-            '<input type="submit" name="%s" value="%s">' % (option[0], unicode(option[1]))
+            '<button type="submit" class="btn" name="%s">%s</button>' % (option[0], unicode(option[1]))
             for option in self.get_answer_options()])
         messages.warning(self.request,
             """

From 13cfdb36af6e4c53ed127f0e1609ed28c805a488 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Wed, 5 Sep 2012 00:43:19 +0200
Subject: [PATCH 02/88] Updated login form to new template style.

---
 .../templates/participant/login.html          | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/openslides/participant/templates/participant/login.html b/openslides/participant/templates/participant/login.html
index b873f8859..632065cd2 100644
--- a/openslides/participant/templates/participant/login.html
+++ b/openslides/participant/templates/participant/login.html
@@ -32,23 +32,22 @@
     {% endif %}
     <form method="post" action="{% url user_login %}{% if next %}?next={{ next }}{% endif %}">
         {% csrf_token %}
-        <table>
-        <tr>
-            <td>{{ form.username.label_tag }}</td>
-            <td>{{ form.username }}</td>
-        </tr>
-        <tr>
-            <td>{{ form.password.label_tag }}</td>
-            <td>{{ form.password }}</td>
-        </tr>
-        </table>
+        <div class="input-prepend">
+            <span class="add-on"><i class="icon-user"></i></span>
+            <input type="text" maxlength="30" name="username" id="id_username" placeholder="{% trans 'Username' %}">
+        </div>
+        <div class="input-prepend">
+            <span class="add-on"><i class="icon-lock"></i></span>
+            <input type="password" maxlength="30" name="password" id="id_password" placeholder="{% trans 'Password' %}">
+        </div>
+        
         <p>
-        <button class="button" type="submit">
-            <span class="icon ok">{% trans 'Login' %}</span>
+        <button type="submit" class="btn btn-primary">
+            {% trans 'Login' %}
         </button>
         {% if os_enable_anonymous_login %}
-        <button class="button" id="anonymous_login">
-            <span class="icon guest">{% trans 'Continue as guest' %}</span>
+        <button id="anonymous_login" class="btn">
+            {% trans 'Continue as guest' %}
         </button>
         {% endif %}
         <input type="hidden" name="next" value="{{ next }}" />

From 8da28310f7b1c043421418310fd53ae5b0666640 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Wed, 5 Sep 2012 07:54:01 +0200
Subject: [PATCH 03/88] Hide optional columns on mobile devices (with small
 window width).

---
 .../application/templates/application/overview.html       | 6 +++---
 openslides/static/styles/base.css                         | 8 ++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/openslides/application/templates/application/overview.html b/openslides/application/templates/application/overview.html
index de3c29eae..a26da98cb 100644
--- a/openslides/application/templates/application/overview.html
+++ b/openslides/application/templates/application/overview.html
@@ -47,14 +47,14 @@
     </i></small>
     <table class="table table-striped table-bordered">
         <tr>
-            <th><a href="?sort=number{% if 'number' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Number" %}</a></th>
+            <th><a href="?sort=number{% if 'number' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "#" %}</a></th>
             <th><a href="?sort=title{% if 'title' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Motion title" %}</a></th>
             {% if min_supporters > 0 %}
             <th><a href="?sort=supporter{% if 'supporter' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Number of supporters" %}</a></th>
             {% endif %}
             <th><a href="?sort=status{% if 'status' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Status" %}</a></th>
             <th><a href="?sort=submitter{% if 'submitter' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Submitter" %}</a></th>
-            <th><a href="?sort=time{% if 'time' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Creation Time" %}<a></th>
+            <th class="optional"><a href="?sort=time{% if 'time' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Creation Time" %}<a></th>
             <th style="width: 1px;">{% trans "Actions" %}</th>
         </tr>
     {% for app_info in applications %}
@@ -75,7 +75,7 @@
                 {% endfor %}
             </td>
             <td>{{ application.submitter }}</td>
-            <td>{{ application.creation_time }}</td>
+            <td class="optional">{{ application.creation_time }}</td>
             <td>
                 <span style="width: 1px; white-space: nowrap;">
                 {% if perms.projector.can_manage_projector %}
diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css
index 341c8a73b..1d4a65210 100644
--- a/openslides/static/styles/base.css
+++ b/openslides/static/styles/base.css
@@ -47,6 +47,10 @@ a:hover {
     text-decoration: none;
 }
 
+/* show optional column */
+.optional {
+    display: block;
+}
 
 
 
@@ -193,4 +197,8 @@ textarea {
     #content {
         margin: 0 5px 0 45px;
     }
+    /* hide optional column */ 
+    .optional {
+        display: none;
+    }
 }
\ No newline at end of file

From 7c90206b3fae3856cc56a35e88e6ef0c90ccc2c3 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Thu, 6 Sep 2012 22:41:24 +0200
Subject: [PATCH 04/88] Adjusted new template for participant app. Added new
 generic form.

---
 .../participant/base_participant.html         |  30 ----
 .../templates/participant/config.html         |  18 +--
 .../templates/participant/edit.html           |  35 ++---
 .../templates/participant/group_edit.html     |  26 ++--
 .../templates/participant/group_overview.html |  12 +-
 .../templates/participant/import.html         |  20 ++-
 .../templates/participant/login.html          |  11 +-
 .../templates/participant/overview.html       | 140 +++++++++++-------
 .../participant/password_change.html          |  21 +--
 .../templates/participant/settings.html       |  20 +--
 openslides/participant/views.py               |  10 +-
 openslides/static/styles/base.css             |   7 +-
 openslides/templates/base.html                |   2 +-
 openslides/templates/form.html                |  12 ++
 openslides/templates/formbuttons_save.html    |   5 +
 .../templates/formbuttons_saveapply.html      |   8 +
 16 files changed, 184 insertions(+), 193 deletions(-)
 delete mode 100644 openslides/participant/templates/participant/base_participant.html
 create mode 100644 openslides/templates/form.html
 create mode 100644 openslides/templates/formbuttons_save.html
 create mode 100644 openslides/templates/formbuttons_saveapply.html

diff --git a/openslides/participant/templates/participant/base_participant.html b/openslides/participant/templates/participant/base_participant.html
deleted file mode 100644
index bb726731d..000000000
--- a/openslides/participant/templates/participant/base_participant.html
+++ /dev/null
@@ -1,30 +0,0 @@
-{% extends "base.html" %}
-
-{% load tags %}
-{% load i18n %}
-{% load staticfiles %}
-
-{% block submenu %}
-    {% url user_overview as url_users %}
-    {% url user_new as url_usernew %}
-    {% url user_group_overview as url_usergroups %}
-    {% url user_import as url_userimport %}
-    <h4 class="sectiontitle">{% trans "Participants" %}</h4>
-    <ul>
-        {% if perms.participant.can_see_participant %}
-        <li class="{% if request.path == url_users %}selected{% endif %}"><a href="{% url user_overview %}">{% trans "All participants" %}</a></li>
-        {% endif %}
-        {% if perms.participant.can_manage_participant %}
-        <li class="{% active request url_usernew %}"><a href="{%  url user_new %}">{% trans "New participant" %}</a></li>
-        <li class="{% if request.path == url_usergroups %}selected{% endif %}"><a href="{%  url user_group_overview %}">{% trans "All user groups" %}</a></li>
-        <li class="{% active request '/participant/group/new' %}"><a href="{%  url user_group_new %}">{% trans "New user group" %}</a></li>
-        <li class="{% if request.path == url_userimport %}selected{% endif %}"><a href="{% url user_import %}"> {% trans 'Import participants' %}</a></li>
-        {% endif %}
-        {% if perms.participant.can_see_participant %}
-        <li><a href="{% url user_print %}"><img src="{% static 'images/icons/pdf.png' %}"> {% trans 'List of participants as PDF' %}</a></li>
-        {% endif %}
-        {% if perms.participant.can_manage_participant %}
-        <li><a href="{% url print_passwords %}"><img src="{% static 'images/icons/pdf.png' %}"> {% trans 'First time passwords as PDF' %}</a></li>
-        {% endif %}
-    </ul>
-{% endblock %}
diff --git a/openslides/participant/templates/participant/config.html b/openslides/participant/templates/participant/config.html
index 83a33eae2..49973462e 100644
--- a/openslides/participant/templates/participant/config.html
+++ b/openslides/participant/templates/participant/config.html
@@ -7,16 +7,12 @@
 {% block content %}
     <h1>{% trans "Participant settings" %}</h1>
     <form action="" method="post">{% csrf_token %}
-    {{ form.as_p }}
-    <p>
-    <button class="button" type="submit">
-        <span class="icon ok">{% trans 'Save' %}</span>
-    </button>
-    <a href='{% url config_application %}'>
-    <button class="button" type="button" onclick="window.location='{% url config_application %}'">
-        <span class="icon cancel">{% trans 'Cancel' %}</span>
-    </button>
-    </a>
-    </p>
+        {% include "form.html" %}
+        <p>
+        {% include "formbuttons_save.html" %}
+        <a href='{% url config_application %}' class="btn">
+            {% trans 'Cancel' %}
+        </a>
+        </p>
     </form>
 {% endblock %}
diff --git a/openslides/participant/templates/participant/edit.html b/openslides/participant/templates/participant/edit.html
index da910b19e..abfb03bae 100644
--- a/openslides/participant/templates/participant/edit.html
+++ b/openslides/participant/templates/participant/edit.html
@@ -1,4 +1,4 @@
-{% extends "participant/base_participant.html" %}
+{% extends "base.html" %}
 
 {% load i18n %}
 
@@ -11,33 +11,30 @@
     {% endif %}
 {% endblock %}
 
-
 {% block content %}
-    {% if edit_user %}
-        <h1>{% trans "Edit participant" %}</h1>
-    {% else %}
-        <h1>{% trans "New participant" %}</h1>
-    {% endif %}
+    <h1>
+        {% if edit_user %}
+            {% trans "Edit participant" %}
+        {% else %}
+            {% trans "New participant" %}
+        {% endif %}
+        <small class="pull-right">
+        <a href="{% url user_overview %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
+        </small>
+    </h1>
 
     <form action="" method="post">{% csrf_token %}
-        {{ form.as_p }}
+        {% include "form.html" %}
         {% if edit_user %}
             <p>
                 <a href="{% url user_reset_password edit_user.id %}">{% trans 'Reset to First Password' %}</a>
             </p>
         {% endif %}
         <p>
-            <button class="button" type="submit">
-                <span class="icon ok">{% trans 'Save' %}</span>
-            </button>
-            <button class="button" type="submit" name="apply">
-                <span class="icon apply">{% trans 'Apply' %}</span>
-            </button>
-            <a href='{% url user_overview %}'>
-                <button class="button" type="button" onclick="window.location='{% url user_overview %}'">
-                    <span class="icon cancel">{% trans 'Cancel' %}</span>
-                </button>
-            </a>
+        {% include "formbuttons_saveapply.html" %}
+        <a href='{% url user_overview %}' class="btn">
+            {% trans 'Cancel' %}
+        </a>
         </p>
         <small>* {% trans "required" %}</small>
     </form>
diff --git a/openslides/participant/templates/participant/group_edit.html b/openslides/participant/templates/participant/group_edit.html
index 8fafae7b2..788cc8ccd 100644
--- a/openslides/participant/templates/participant/group_edit.html
+++ b/openslides/participant/templates/participant/group_edit.html
@@ -1,4 +1,4 @@
-{% extends "participant/base_participant.html" %}
+{% extends "base.html" %}
 
 {% load i18n %}
 
@@ -12,25 +12,23 @@
 {% endblock %}
 
 {% block content %}
+    <h1>
     {% if group %}
-        <h1>{% trans "Edit user group" %}</h1>
+        {% trans "Edit user group" %}
     {% else %}
-        <h1>{% trans "New user group" %}</h1>
+        {% trans "New user group" %}
     {% endif %}
+        <small class="pull-right">
+        <a href="{% url user_group_overview %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
+        </small>
+    </h1>
 
     <form action="" method="post">{% csrf_token %}
-        {{ form.as_p }}
+        {% include "form.html" %}
         <p>
-        <button class="button" type="submit">
-            <span class="icon ok">{% trans 'Save' %}</span>
-        </button>
-        <button class="button" type="submit" name="apply">
-            <span class="icon apply">{% trans 'Apply' %}</span>
-        </button>
-        <a href='{% url user_group_overview %}'>
-        <button class="button" type="button" onclick="window.location='{% url user_group_overview %}'">
-            <span class="icon cancel">{% trans 'Cancel' %}</span>
-        </button>
+        {% include "formbuttons_saveapply.html" %}
+        <a href='{% url user_group_overview %}' class="btn">
+            {% trans 'Cancel' %}
         </a>
         </p>
         <small>* {% trans "required" %}</small>
diff --git a/openslides/participant/templates/participant/group_overview.html b/openslides/participant/templates/participant/group_overview.html
index 3745308fb..04dde9e2f 100644
--- a/openslides/participant/templates/participant/group_overview.html
+++ b/openslides/participant/templates/participant/group_overview.html
@@ -1,4 +1,4 @@
-{% extends "participant/base_participant.html" %}
+{% extends "base.html" %}
 
 {% load i18n %}
 {% load staticfiles %}
@@ -6,8 +6,14 @@
 {% block title %}{{ block.super }} – {% trans "User groups" %}{% endblock %}
 
 {% block content %}
-    <h1>{% trans "User groups" %}</h1>
-    <table>
+    <h1>{% trans "User groups" %}
+        <small class="pull-right">
+        <a href="{% url user_group_new %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'New user group' %}"><i class="icon-plus"></i> {% trans "New" %}</a>
+        <a href="{% url user_overview %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Participants" %}</a>
+        </small>
+    </h1>
+
+    <table class="table table-striped table-bordered">
         <tr>
             <th>{% trans "User Group" %}</th>
             <th>{% trans "Actions" %}</th>
diff --git a/openslides/participant/templates/participant/import.html b/openslides/participant/templates/participant/import.html
index d01a76e39..14b4ae516 100644
--- a/openslides/participant/templates/participant/import.html
+++ b/openslides/participant/templates/participant/import.html
@@ -1,11 +1,17 @@
-{% extends "participant/base_participant.html" %}
+{% extends "base.html" %}
 
 {% load i18n %}
 
 {% block title %}{{ block.super }} – {% trans "Import participants" %} {% endblock %}
 
 {% block content %}
-    <h1>{% trans 'Import participants' %}</h1>
+    <h1>
+        {% trans 'Import participants' %}
+        <small class="pull-right">
+        <a href="{% url user_overview %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
+        </small>
+    </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, comment}</code>' %}
@@ -17,15 +23,13 @@
     </p>
 
     <form enctype="multipart/form-data" action="" method="post">{% csrf_token %}
-        {{ form.as_p }}
+        {% include "form.html" %}
         <p>
-        <button class="button" type="submit">
+        <button class="btn btn-primary" type="submit">
             <span class="icon import">{% trans 'Import' %}</span>
         </button>
-        <a href="{% url user_overview%}">
-        <button class="button" type="button"  onclick="window.location='{% url user_overview %}'">
-            <span class="icon cancel">{% trans 'Cancel' %}</span>
-        </button>
+        <a href="{% url user_overview%}" class="btn">
+            {% trans 'Cancel' %}
         </a>
         </p>
         <small>* {% trans "required" %}</small>
diff --git a/openslides/participant/templates/participant/login.html b/openslides/participant/templates/participant/login.html
index 632065cd2..13b6fdeb6 100644
--- a/openslides/participant/templates/participant/login.html
+++ b/openslides/participant/templates/participant/login.html
@@ -1,17 +1,8 @@
-{% extends "participant/base_participant.html" %}
+{% extends "base.html" %}
 
 {% load i18n %}
 {% load staticfiles %}
 
-{% block mainmenu %}
-    <ul>
-        <li class="selected"><a href="{% url user_login %}" title="">{% trans "Login" %}</a></li>
-    </ul>
-{% endblock %}
-
-{% block submenu %}
-{% endblock %}
-
 {% block content %}
     <h1>{% trans "Login" %}</h1>
 
diff --git a/openslides/participant/templates/participant/overview.html b/openslides/participant/templates/participant/overview.html
index 06437a9dd..91796a651 100644
--- a/openslides/participant/templates/participant/overview.html
+++ b/openslides/participant/templates/participant/overview.html
@@ -1,4 +1,4 @@
-{% extends "participant/base_participant.html" %}
+{% extends "base.html" %}
 
 {% load i18n %}
 {% load staticfiles %}
@@ -7,7 +7,7 @@
 {% block title %}{{ block.super }} – {% trans "Participants" %}{% endblock %}
 
 {% block header %}
-    {% if perms.agenda.can_manage_agenda %}
+    {% if perms.participant.can_manage_participant %}
         <link type="text/css" rel="stylesheet" media="all" href="{% static 'styles/participant.css' %}" />
         <script type="text/javascript" src="{% static 'javascript/participant.js' %}"></script>
     {% endif %}
@@ -15,75 +15,111 @@
 
 
 {% block content %}
-    <h1>{% trans "Participants" %}</h1>
+    <h1>{% trans "Participants" %}
+        <small class="pull-right">
+        <div class="btn-toolbar">
+            {% if perms.participant.can_manage_participant %}
+                <a href="{% url user_new %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'New participant' %}"><i class="icon-plus"></i> {% trans "New" %}</a>
+                <a href="{% url user_group_overview %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'All user groups' %}"><i class="icon-user"></i> {% trans "User groups" %}</a>
+                <a href="{% url user_import %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Import participants' %}"><i class="icon-share-alt"></i> {% trans 'Import' %}</a>
+            {% endif %}
+            {% if perms.participant.can_see_participant and perms.participant.can_manage_participant %}
+                <div class="btn-group pull-right">
+                    {% if user.is_authenticated %}
+                    <a href="#" data-toggle="dropdown" class="btn btn-mini dropdown-toggle">
+                          <i class="icon-print"></i> Print as PDF
+                          <span class="caret"></span>
+                    </a>
+                    <ul class="dropdown-menu">
+                        {% url user_settings as url_usersettings %}
+                        <li><a href="{% url user_print %}"><i class="icon-list"></i> {% trans 'List of participants' %}</a></li>
+                        <li><a href="{% url print_passwords %}"><i class="icon-th-large"></i> {% trans 'First time passwords' %}</a></li>
+                    </ul>
+                    {% else %}
+                        <a href="{% url user_login %}" class="btn">{% trans "Login" %}</a>
+                    {% endif %}
+                </div>
+            {% else %}
+                {% if perms.participant.can_see_participant %}
+                    <a href="{% url user_print %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print list of participants as PDF' %}"><i class="icon-print"></i> PDF</a>
+                {% endif %}
+                {% if perms.participant.can_manage_participant %}
+                    <a href="{% url print_passwords %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print first time passwords as PDF' %}"><i class="icon-print"></i> PDF</a>
+                {% endif %}
+            {% endif %}
+        </div>
+        </small>
+    </h1>
 
-    <p>
-        <form action="" name="filter" method="get">
-            {% trans "Filter" %}:
-            <select class="default-input" name="gender" onchange="document.forms['filter'].submit()">
-                <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="category" onchange="document.forms['filter'].submit()">
-                <option value="---">-- {% trans "Category" %} --</option>
-                {% for category in categories %}
-                    <option value="{{ category }}"{% if category in sortfilter.category %} selected{% endif %}>
-                    {{ category }}</option>
-                {% endfor %}
-            </select>
-            <select class="default-input" name="type" onchange="document.forms['filter'].submit()">
-                <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>
-                <option value="guest"{% if 'guest' in sortfilter.type %} selected{% endif %}>{% trans "Guest" %}</option>
-                <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>
-                {% 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>
+    <form action="" name="filter" method="get">
+        {% trans "Filter" %}:
+        <div class="control-group">
+        <select class="span2" name="gender" onchange="document.forms['filter'].submit()">
+            <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="span2" name="category" onchange="document.forms['filter'].submit()">
+            <option value="---">-- {% trans "Category" %} --</option>
+            {% for category in categories %}
+                <option value="{{ category }}"{% if category in sortfilter.category %} selected{% endif %}>
+                {{ category }}</option>
+            {% endfor %}
+        </select>
+        <select class="span2" name="type" onchange="document.forms['filter'].submit()">
+            <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>
+            <option value="guest"{% if 'guest' in sortfilter.type %} selected{% endif %}>{% trans "Guest" %}</option>
+            <option value=""{% if '' in sortfilter.type %} selected{% endif %}>{% trans "Not specified" %}</option>
+        </select>
+        <select class="span2" name="committee" onchange="document.forms['filter'].submit()">
+            <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="span2" 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>
+        </div>
+    </form>
+    <small><i>
     {% if users.count == allusers %}
         {{ users.count }}
         {% blocktrans count counter=users.count %}participant{% plural %}participants{% endblocktrans %}
     {% else %}
         {{ users.count }} {% trans "of" %} {{ allusers }} {% trans "Participants" %} (= {{ percent }} %)
     {% endif %}
+    </i></small>
     <table class="table table-striped table-bordered">
         <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>
             <th><a href="?sort=last_name&reverse={% if 'last_name' in sortfilter.sort and 'reverse' not in sortfilter %}1{% else %}---{%endif%}">{% trans "Last Name" %}</a></th>
-            <th><a href="?sort=group&reverse={% if 'category' in sortfilter.sort and 'reverse' not in sortfilter %}1{% else %}---{%endif%}">{% trans "Category" %}</a></th>
-            <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>
+            <th class="optional"><a href="?sort=group&reverse={% if 'category' in sortfilter.sort and 'reverse' not in sortfilter %}1{% else %}---{%endif%}">{% trans "Category" %}</a></th>
+            <th class="optional"><a href="?sort=type&reverse={% if 'type' in sortfilter.sort and 'reverse' not in sortfilter %}1{% else %}---{%endif%}">{% trans "Type" %}</a></th>
+            <th class="optional"><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=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>
+                <th class="optional"><a href="?sort=comment&reverse={% if 'comment' in sortfilter.sort and 'reverse' not in sortfilter %}1{% else %}---{%endif%}">{% trans "Comment" %}</a></th>
+                <th class="optional"><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 style="width: 1px;">{% trans "Actions" %}</th>
             {% endif %}
         </tr>
         {% for user in users %}
             <tr class="{% cycle '' 'odd' %}">
                 <td>{{ user.first_name }}</td>
                 <td>{{ user.last_name }}</td>
-                <td>{{ user.category }}</td>
-                <td>{{ user.get_type_display }}</td>
-                <td>{{ user.committee }}</td>
+                <td class="optional">{{ user.category }}</td>
+                <td class="optional">{{ user.get_type_display }}</td>
+                <td class="optional">{{ user.committee }}</td>
                 {% if perms.participant.can_manage_participant %}
-                    <td>{{ user.comment|first_line }}</td>
-                    <td>
+                    <td class="optional">{{ user.comment|first_line }}</td>
+                    <td class="optional">
                         {% if user.last_login > user.date_joined %}
                             {{ user.last_login }}
                         {% endif %}
diff --git a/openslides/participant/templates/participant/password_change.html b/openslides/participant/templates/participant/password_change.html
index 491aa987a..3a845dae5 100644
--- a/openslides/participant/templates/participant/password_change.html
+++ b/openslides/participant/templates/participant/password_change.html
@@ -4,28 +4,11 @@
 
 {% block title %}{{ block.super }} – {% trans "Password Settings" %}{% endblock %}
 
-{% block submenu %}
-    <h4 class="sectiontitle">{% trans "User Settings" %}</h4>
-    <ul>
-        <li><a href="{% url user_settings %}">{% trans "Personal Settings" %}</a></li>
-        <li class="selected"><a href="{% url password_change %}">{% trans "Password Settings" %}</a></li>
-    </ul>
-{% endblock %}
-
 {% block content %}
     <h1>{% trans "Password Settings" %}</h1>
 
     <form action="" method="post">{% csrf_token %}
-        {{ form.as_p }}
-
-        <button class="button" type="submit">
-            <span class="icon ok">{% trans 'Save' %}</span>
-        </button>
-        <a href=''>
-        <button class="button" type="button">
-            <span class="icon cancel">{% trans 'Cancel' %}</span>
-        </button>
-        </a>
+        {% include "form.html" %}
+        {% include "formbuttons_save.html" %}
     </form>
-    <p></p>
 {% endblock %}
diff --git a/openslides/participant/templates/participant/settings.html b/openslides/participant/templates/participant/settings.html
index 8c59157eb..746722cf3 100644
--- a/openslides/participant/templates/participant/settings.html
+++ b/openslides/participant/templates/participant/settings.html
@@ -4,27 +4,11 @@
 
 {% block title %}{{ block.super }} – {% trans "Personal Settings" %}{% endblock %}
 
-{% block submenu %}
-    <h4 class="sectiontitle">{% trans "User Settings" %}</h4>
-    <ul>
-        <li class="selected"><a href="{% url user_settings %}">{% trans "Personal Settings" %}</a></li>
-        <li><a href="{% url password_change %}">{% trans "Password Settings" %}</a></li>
-    </ul>
-{% endblock %}
-
 {% block content %}
     <h1>{% trans "Personal Settings" %}</h1>
 
     <form action="" method="post">{% csrf_token %}
-        {{ form_user.as_p }}
-
-        <button class="button" type="submit">
-            <span class="icon ok">{% trans 'Save' %}</span>
-        </button>
-        <a href=''>
-        <button class="button" type="button">
-            <span class="icon cancel">{% trans 'Cancel' %}</span>
-        </button>
-        </a>
+        {% include "form.html" %}
+        {% include "formbuttons_save.html" %}
     </form>
 {% endblock %}
diff --git a/openslides/participant/views.py b/openslides/participant/views.py
index a498e5285..69e2db7fe 100644
--- a/openslides/participant/views.py
+++ b/openslides/participant/views.py
@@ -451,17 +451,17 @@ def user_settings(request):
     Edit own user account.
     """
     if request.method == 'POST':
-        form_user = UsersettingsForm(request.POST, instance=request.user)
-        if form_user.is_valid():
-            form_user.save()
+        form = UsersettingsForm(request.POST, instance=request.user)
+        if form.is_valid():
+            form.save()
             messages.success(request, _('User settings successfully saved.'))
         else:
             messages.error(request, _('Please check the form for errors.'))
     else:
-        form_user = UsersettingsForm(instance=request.user)
+        form = UsersettingsForm(instance=request.user)
 
     return {
-        'form_user': form_user,
+        'form': form,
         'edituser': request.user,
     }
 
diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css
index 1d4a65210..648b55204 100644
--- a/openslides/static/styles/base.css
+++ b/openslides/static/styles/base.css
@@ -49,10 +49,11 @@ a:hover {
 
 /* show optional column */
 .optional {
-    display: block;
+    display: auto;
+}
+.help-inline {
+    font-size: 11px;
 }
-
-
 
 
 /* Left Menu */
diff --git a/openslides/templates/base.html b/openslides/templates/base.html
index e221dd200..0fd26c505 100644
--- a/openslides/templates/base.html
+++ b/openslides/templates/base.html
@@ -42,7 +42,7 @@
                             <li><a href="{% url user_logout %}"><i class="icon-off"></i> {% trans "Logout" %}</a></li>
                         </ul>
                         {% else %}
-                            <a href="{% url user_login %}">{% trans "Login" %}</a>
+                            <a href="{% url user_login %}" class="btn">{% trans "Login" %}</a>
                         {% endif %}
                     </div>
                 </div> <!--/#header-->
diff --git a/openslides/templates/form.html b/openslides/templates/form.html
new file mode 100644
index 000000000..63b08a983
--- /dev/null
+++ b/openslides/templates/form.html
@@ -0,0 +1,12 @@
+{% for field in form %}
+    <div class="control-group{% if field.errors %} error{% endif%}">
+        <label for="id_{{ field.name }}">{{ field.label }}{% if field.field.required %}<span class="required">*</span>{% endif %}:</label>
+        {{ field }}
+        {% if field.errors %}
+            <span class="help-inline">{{ field.errors }}</span>
+        {% endif %}
+        {% if field.help_text %}
+            <span class="help-inline">{{ field.help_text }}</span>
+        {% endif %}
+    </div>
+{% endfor %}
diff --git a/openslides/templates/formbuttons_save.html b/openslides/templates/formbuttons_save.html
new file mode 100644
index 000000000..d3b5a6ba6
--- /dev/null
+++ b/openslides/templates/formbuttons_save.html
@@ -0,0 +1,5 @@
+{% load i18n %}
+
+<button class="btn btn-primary" type="submit">
+    {% trans 'Save' %}
+</button>
\ No newline at end of file
diff --git a/openslides/templates/formbuttons_saveapply.html b/openslides/templates/formbuttons_saveapply.html
new file mode 100644
index 000000000..48c4fb339
--- /dev/null
+++ b/openslides/templates/formbuttons_saveapply.html
@@ -0,0 +1,8 @@
+{% load i18n %}
+
+<button class="btn btn-primary" type="submit">
+    {% trans 'Save' %}
+</button>
+<button class="btn" type="submit" name="apply">
+    {% trans 'Apply' %}
+</button>
\ No newline at end of file

From ae51d9e7dabb6ab0bffc0154a30a0fe9c84d2366 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Thu, 6 Sep 2012 23:58:20 +0200
Subject: [PATCH 05/88] Adjusted template for assignment app.

---
 .../assignment/templates/assignment/edit.html |  33 +-
 .../templates/assignment/overview.html        |  33 +-
 .../assignment/templates/assignment/view.html | 335 +++++++++---------
 3 files changed, 209 insertions(+), 192 deletions(-)

diff --git a/openslides/assignment/templates/assignment/edit.html b/openslides/assignment/templates/assignment/edit.html
index e1cc2e606..4d14a7dad 100644
--- a/openslides/assignment/templates/assignment/edit.html
+++ b/openslides/assignment/templates/assignment/edit.html
@@ -1,4 +1,4 @@
-{% extends "assignment/base_assignment.html" %}
+{% extends "base.html" %}
 
 {% load i18n %}
 
@@ -11,27 +11,24 @@
     {% endif %}
 {% endblock %}
 
-
 {% block content %}
-    {% if assignment %}
-        <h1>{% trans "Edit election" %}</h1>
-    {% else %}
-        <h1>{% trans "New election" %}</h1>
-    {% endif %}
+    <h1>
+        {% if assignment %}
+            {% trans "Edit election" %}
+        {% else %}
+            {% trans "New election" %}
+        {% endif %}
+        <small class="pull-right">
+        <a href="{% url assignment_overview %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
+        </small>
+    </h1>
 
     <form action="" method="post">{% csrf_token %}
-        {{ form.as_p }}
+        {% include "form.html" %}
         <p>
-        <button class="button" type="submit">
-            <span class="icon ok">{% trans 'Save' %}</span>
-        </button>
-        <button class="button" type="submit" name="apply">
-            <span class="icon apply">{% trans 'Apply' %}</span>
-        </button>
-        <a href='{% url assignment_overview %}'>
-        <button class="button" type="button" onclick="window.location='{% url assignment_overview %}'">
-            <span class="icon cancel">{% trans 'Cancel' %}</span>
-        </button>
+        {% include "formbuttons_saveapply.html" %}
+        <a href='{% url assignment_overview %}' class="btn">
+            {% trans 'Cancel' %}
         </a>
         </p>
         <small>* {% trans "required" %}</small>
diff --git a/openslides/assignment/templates/assignment/overview.html b/openslides/assignment/templates/assignment/overview.html
index 6719b429c..03ce6fd96 100644
--- a/openslides/assignment/templates/assignment/overview.html
+++ b/openslides/assignment/templates/assignment/overview.html
@@ -1,30 +1,41 @@
-{% extends "assignment/base_assignment.html" %}
+{% extends "base.html" %}
 
 {% load i18n %}
 {% load staticfiles %}
 
 {% block title %}{{ block.super }} – {% trans "Elections" %}{% endblock %}
 
-{% block content %}
-    <h1>{% trans "Elections" %}</h1>
 
-    <p><form action="{{request.url}}" name="filter" method="get">
+{% block content %}
+    <h1>{% trans "Elections" %}
+        <small class="pull-right">
+        {% if perms.assignment.can_manage_assignment %}
+            <a href="{% url assignment_new %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'New election' %}"><i class="icon-plus"></i> {% trans "New" %}</a>
+        {% endif %}
+        {% if perms.assignment.can_see_assignment %}
+            <a href="{% url print_assignment %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print all elections as PDF' %}"><i class="icon-print"></i> PDF</a>
+        {% endif %}
+        </small>
+    </h1>
+
+    <form action="{{request.url}}" name="filter" method="get">
         {% trans "Filter" %}:
-        <select class="default-input" name="status" onchange="document.forms['filter'].submit()">
+        <select class="span3" name="status" onchange="document.forms['filter'].submit()">
             <option value="---">-- {% trans "Status" %}--</option>
             <option value="sea" {% if 'sea' in request.GET.status %}selected{% endif %}>{% trans "Searching for candidates" %}</option>
             <option value="vot" {% if 'vot' in request.GET.status %}selected{% endif %}>{% trans "Voting" %}</option>
             <option value="fin" {% if 'fin' in request.GET.status %}selected{% endif %}>{% trans "Finished" %}</option>
         </select>
-        </form>
-    </p>
-   {{ assignments|length }}
-   {% blocktrans count counter=assignments|length %}election{% plural %}elections{% endblocktrans %}
+    </form>
+
+    <small><i>{{ assignments|length }}
+    {% blocktrans count counter=assignments|length %}election{% plural %}elections{% endblocktrans %}
+    </i></small>
     <table class="table table-striped table-bordered">
         <tr>
             <th><a href="?sort=name{% if 'name' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Election" %}</a></th>
             <th>{% trans "Candidates" %}</th>
-            <th><a href="?sort=status{% if 'status' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Status" %}</a></th>
+            <th class="optional"><a href="?sort=status{% if 'status' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Status" %}</a></th>
             <th style="width: 1px;">{% trans "Actions" %}</th>
         </tr>
     {% for assignment in assignments %}
@@ -32,7 +43,7 @@
             {% if assignment.active %}activeline{% endif %}">
             <td><a href="{% url assignment_view assignment.id %}">{{ assignment }}</a></td>
             <td>{{ assignment.candidates|length }} / {{ assignment.posts }}</td>
-            <td>{{ assignment.get_status_display }}</td>
+            <td class="optional">{{ assignment.get_status_display }}</td>
             <td>
                 <span style="width: 1px; white-space: nowrap;">
                 {% if perms.projector.can_manage_projector %}
diff --git a/openslides/assignment/templates/assignment/view.html b/openslides/assignment/templates/assignment/view.html
index fc4feb615..60c92890d 100644
--- a/openslides/assignment/templates/assignment/view.html
+++ b/openslides/assignment/templates/assignment/view.html
@@ -1,225 +1,234 @@
-{% extends "assignment/base_assignment.html" %}
+{% extends "base.html" %}
 
 {% load i18n %}
 {% load staticfiles %}
 
 {% block title %}{{ block.super }} – {% trans "Election" %} "{{ assignment }}"{% endblock %}
 
+{% block header %}
+    <link type="text/css" rel="stylesheet" media="all" href="{% static 'styles/assignment.css' %}" />
+{% endblock %}
+
+{% block javascript %}
+    <script type="text/javascript" src="{% static 'javascript/assignment.js' %}"></script>
+{% endblock %}
+
 {% block content %}
-<div id="sidebar">
-    <div class="box">
-        <h4>{% trans "Status" %}:</h4>
-        {% trans assignment.get_status_display %}
-        <h4>{% trans "Number of available posts" %}:</h4>
-        {{ assignment.posts }}
-    </div>
+    <h1>{{ assignment }}
+        <small class="pull-right">
+        <a href="{% url assignment_overview %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
+        </small>
+    </h1>
 
-    <br><br>
 
-    {% if perms.assignment.can_manage_assignment %}
-        <div class="box">
-        <h4>{% trans "Change status" %}:</h4>
-        <input type="radio" name="status" onclick="window.location.href='{% url assignment_set_status assignment.id 'sea' %}';"
-            {% if 'sea' in assignment.status %}checked{% endif %}>{% trans 'Searching for candidates' %}<br>
-        <input type="radio" name="status" onclick="window.location.href='{% url assignment_set_status assignment.id 'vot' %}';"
-            {% if 'vot' in assignment.status %}checked{% endif %}>{% trans 'Voting' %}<br>
-        <input type="radio" name="status" onclick="window.location.href='{% url assignment_set_status assignment.id 'fin' %}';"
-            {% if 'fin' in assignment.status %}checked{% endif %}>{% trans 'Finished' %}
-        </div>
+<div class="row-fluid">
+<div class="span9">
+    <!-- Description -->
+    <h4>{% trans "Description" %}</h4>
+    {% if assignment.description  %}
+        {{ assignment.description|linebreaks }}
+    {% else %}
+        –
     {% endif %}
-</div>
-
-<div style="margin-right: 250px; min-width: 400px;">
-    <h1>{{ assignment }}</h1>
-    <p>{{ assignment.description }}</p>
-
-    <h3>{% trans "Candidates" %}</h3>
+    <br>
+    <!-- Candidates -->
+    <h4>{% trans "Candidates" %}</h4>
     <ol>
     {% for person in assignment.candidates %}
         <li>
             {{ person }}
             {% if perms.assignment.can_manage_assignment %}
                 {% if assignment.status == "sea" or assignment.status == "vot" %}
-                    <a href="{% url assignment_delother assignment.id person.person_id %}"><img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Remove candidate' %}"></a>
+                    <a href="{% url assignment_delother assignment.id person.person_id %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Remove candidate' %}"><i class="icon-remove"></i></a>
                 {% endif %}
             {% endif %}
         </li>
     {% empty %}
-        <li style="list-style: none outside none;"><i>{% trans "No candidates available." %}</i></li>
+        <li style="list-style: none outside none; margin-left: -25px;"><i>{% trans "No candidates available." %}</i></li>
     {% endfor %}
     </ol>
-
     {% if assignment.status == "sea" or perms.assignment.can_manage_assignment and assignment.status == "vot" %}
     {% if  perms.assignment.can_nominate_self or perms.assignment.can_nominate_other %}
     <form action="" method="post">{% csrf_token %}
         {% if perms.assignment.can_nominate_self %}
             <p>
             {% if user_is_candidate %}
-                <a href='{% url assignment_delrun assignment.id %}'>
-                    <span class="button">
-                        <span class="icon removeuser">{% trans 'Withdraw self candidature' %}</span>
-                    </span>
+                <a href='{% url assignment_delrun assignment.id %}' class="btn">
+                    <i class="icon-remove"></i> {% trans 'Withdraw self candidature' %}
                 </a>
             {% else %}
-                <a href='{% url assignment_run assignment.id %}'>
-                    <span class="button">
-                        <span class="icon adduser">{% trans 'Self candidature' %}</span>
-                    </span>
+                <a href='{% url assignment_run assignment.id %}' class="btn">
+                    <i class="icon-plus"></i> {% trans 'Self candidature' %}
                 </a>
             {% endif %}
             </p>
         {% endif %}
         {% if perms.assignment.can_nominate_other %}
             {% for field in form %}
-            <label>{{ field.label }}:</label>
-            <nobr>{{ field }}
-            {% if perms.participant.can_see_participant and perms.participant.can_manage_participant %}
-            <a href="{% url user_new %}" target="_blank"><img src="{% static 'images/icons/add-user.png' %}" title="{% trans 'Add new participant' %}"></a>
-            {% endif %}
-            </nobr>
+                <label>{{ field.label }}:</label>
+                <nobr>{{ field }}
+                {% if perms.participant.can_see_participant and perms.participant.can_manage_participant %}
+                    <a href="{% url user_new %}" target="_blank"><img src="{% static 'images/icons/add-user.png' %}" title="{% trans 'Add new participant' %}"></a>
+                {% endif %}
+                </nobr>
             {% endfor %}
             <p>
-            <button class="button" type="submit">
-                <span class="icon ok">{% trans 'Apply' %}</span>
+            <button class="btn" type="submit">
+                {% trans 'Apply' %}
             </button>
             </p>
         {% endif %}
     </form>
-
     {% endif %}
     {% endif %}
-
-    <p><br></p>
-    <h3>{% trans "Election results" %}</h3>
-
-{% if polls.exists %}
-    <table id="election_table" style="width: auto;">
-
-    <tr>
-        <th></th>
-        {% with ballotnumber=polls.count %}
-        <th colspan="{{ ballotnumber|add:'1' }}" style="text-align: center;">
-            {% trans "ballot" %}
-        </th>
-        {% endwith %}
-    </tr>
-
-    <tr>
-        <th>{% trans "Candidates" %}</th>
-        {% for poll in polls %}
-            <th style="vertical-align: top; white-space:nowrap;">
-                {{ poll.get_ballot }}. {% trans 'ballot' %}
-                {% if perms.assignment.can_manage_assignment %}
-                    <br>
-                    <a class="publish_link {% if poll.published %}published{% endif %}"
-                    href="{% url assignment_poll_publish_status poll.id %}"
-                    title="{% trans 'Publish/unpublish results' %}">
-                    <span></span>
-                    </a>
-                    <a href="{% url assignment_poll_view poll.id %}"><img src="{% static 'images/icons/edit.png' %}" title="{% trans 'Edit' %}"></a>
-                    <a href="{% url assignment_poll_delete poll.id %}"><img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Delete' %}"></a>
-                {% endif %}
+    <!-- Results -->
+    <h4>{% trans "Election results" %}</h4>
+    {% if polls.exists %}
+        <table class="table table-striped table-bordered">
+        <tr>
+            <th></th>
+            {% with ballotnumber=polls.count %}
+            <th colspan="{{ ballotnumber|add:'1' }}" style="text-align: center;">
+                {% trans "ballot" %}
             </th>
-        {% endfor %}
-        {% if assignment.candidates and perms.assignment.can_manage_assignment and assignment.status == "vot" %}
-            <th>
-                <a href='{% url assignment_gen_poll assignment.id %}'>
-                    <span class="button">
-                       <span class="icon statistics">{% trans 'New ballot' %}</span>
-                    </span>
-                </a>
-            </th>
-        {% endif %}
-    </tr>
-
-    {% for candidate, poll_list in vote_results.items %}
-    <tr class="{% cycle 'odd' '' %}">
-        <td class="candidate">
-            {% if candidate in assignment.elected %}
-                {% if perms.assignment.can_manage_assignment %}
-                    <a class="election_link elected" href='{% url assignment_user_not_elected assignment.id candidate.person_id %}'></a>
-                {% else %}
-                    <a class="elected">
-                        <img src="{% static 'images/icons/voting-yes.png' %}" title="{% trans 'Candidate is elected' %}">
+            {% endwith %}
+        </tr>
+        <tr>
+            <th>{% trans "Candidates" %}</th>
+            {% for poll in polls %}
+                <th style="white-space:nowrap;" class="span1">
+                    {{ poll.get_ballot }}. {% trans 'ballot' %}
+                    {% if perms.assignment.can_manage_assignment %}
+                        <br>
+                        <a class="publish_link {% if poll.published %}published{% endif %}"
+                        href="{% url assignment_poll_publish_status poll.id %}"
+                        title="{% trans 'Publish/unpublish results' %}">
+                        <span></span>
+                        </a>
+                        <a href="{% url assignment_poll_view poll.id %}" class="btn btn-mini" title="{% trans 'Edit' %}"><i class="icon-pencil"></i></a>
+                        <a href="{% url assignment_poll_delete poll.id %}" class="btn btn-mini" title="{% trans 'Delete' %}"><i class="icon-remove"></i></a>
+                    {% endif %}
+                </th>
+            {% endfor %}
+            {% if assignment.candidates and perms.assignment.can_manage_assignment and assignment.status == "vot" %}
+                <th class="span1 nobr">
+                    <a href='{% url assignment_gen_poll assignment.id %}' class="btn">
+                       <i class="icon-plus"></i> {% trans 'New ballot' %}
                     </a>
-                {% endif %}
-            {% else %}
-                {% if perms.assignment.can_manage_assignment %}
-                    <a class="election_link" href='{% url assignment_user_elected assignment.id candidate.person_id %}'></a>
-                {% endif %}
+                </th>
             {% endif %}
-            {{ candidate }}
-        </td>
-        {% for vote in poll_list %}
-            <td style="white-space:nowrap;">
-                {% if 'Yes' in vote and 'No' in vote and 'Abstain' in vote %}
-                    <img src="{% static 'images/icons/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ vote.Yes }}<br>
-                    <img src="{% static 'images/icons/voting-no.png' %}" title="{% trans 'No' %}"> {{ vote.No }}<br>
-                    <img src="{% static 'images/icons/voting-abstention.png' %}" title="{% trans 'Abstention' %}"> {{ vote.Abstain }}<br>
-                {% elif 'Votes' in vote %}
-                    <img src="{% static 'images/icons/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ vote.Votes }}
-                {% elif vote == None %}
-                    {% trans 'was not a <br> candidate'%}
+        </tr>
+        {% for candidate, poll_list in vote_results.items %}
+        <tr>
+            <td>
+                {% if candidate in assignment.elected %}
+                    {% if perms.assignment.can_manage_assignment %}
+                        <a class="election_link elected" href='{% url assignment_user_not_elected assignment.id candidate.person_id %}'></a>
+                    {% else %}
+                        <a class="elected">
+                            <img src="{% static 'images/icons/voting-yes.png' %}" title="{% trans 'Candidate is elected' %}">
+                        </a>
+                    {% endif %}
                 {% else %}
-                    &nbsp;
+                    {% if perms.assignment.can_manage_assignment %}
+                        <a class="election_link" href='{% url assignment_user_elected assignment.id candidate.person_id %}'></a>
+                    {% endif %}
                 {% endif %}
+                {{ candidate }}
             </td>
-        {% endfor %}
-        {% if assignment.candidates and perms.assignment.can_manage_assignment and assignment.status == "vot" %}
-            <td></td>
-        {% endif %}
-    </tr>
-    {% endfor %}
-
-    <tr>
-        <td>{% trans 'Invalid votes' %}</td>
-        {% for poll in polls %}
-            {% if poll.published or perms.assignment.can_manage_assignment %}
+            {% for vote in poll_list %}
                 <td style="white-space:nowrap;">
-                    {% if poll.has_votes %}
-                        <img src="{% static 'images/icons/voting-invalid.png' %}" title="{% trans 'Invalid' %}">
-                        {{ poll.print_votesinvalid }}
+                    {% if 'Yes' in vote and 'No' in vote and 'Abstain' in vote %}
+                        <img src="{% static 'images/icons/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ vote.Yes }}<br>
+                        <img src="{% static 'images/icons/voting-no.png' %}" title="{% trans 'No' %}"> {{ vote.No }}<br>
+                        <img src="{% static 'images/icons/voting-abstention.png' %}" title="{% trans 'Abstention' %}"> {{ vote.Abstain }}<br>
+                    {% elif 'Votes' in vote %}
+                        <img src="{% static 'images/icons/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ vote.Votes }}
+                    {% elif vote == None %}
+                        {% trans 'was not a <br> candidate'%}
+                    {% else %}
+                        &nbsp;
                     {% endif %}
                 </td>
+            {% endfor %}
+            {% if assignment.candidates and perms.assignment.can_manage_assignment and assignment.status == "vot" %}
+                <td></td>
             {% endif %}
+        </tr>
         {% endfor %}
-        {% if assignment.candidates and perms.assignment.can_manage_assignment and assignment.status == "vot" %}
-            <td></td>
-        {% endif %}
-    </tr>
-
-    <tr class="total">
-        <td><strong>{% trans 'Votes cast' %}</strong></td>
-        {% for poll in polls %}
-            {% if poll.published or perms.assignment.can_manage_assignment %}
-                <td style="white-space:nowrap;">
-                    {% if poll.has_votes %}
-                        <img src="{% static 'images/icons/voting-total.png' %}" title="{% trans 'Votes cast' %}">
-                        <strong>{{ poll.print_votescast }}</strong>
-                    {% endif %}
-                </td>
+        <tr>
+            <td>{% trans 'Invalid votes' %}</td>
+            {% for poll in polls %}
+                {% if poll.published or perms.assignment.can_manage_assignment %}
+                    <td style="white-space:nowrap;">
+                        {% if poll.has_votes %}
+                            <img src="{% static 'images/icons/voting-invalid.png' %}" title="{% trans 'Invalid' %}">
+                            {{ poll.print_votesinvalid }}
+                        {% endif %}
+                    </td>
+                {% endif %}
+            {% endfor %}
+            {% if assignment.candidates and perms.assignment.can_manage_assignment and assignment.status == "vot" %}
+                <td></td>
             {% endif %}
-        {% endfor %}
+        </tr>
+        
+        <tr class="info total">
+            <td><strong>{% trans 'Votes cast' %}</strong></td>
+            {% for poll in polls %}
+                {% if poll.published or perms.assignment.can_manage_assignment %}
+                    <td style="white-space:nowrap;">
+                        {% if poll.has_votes %}
+                            <img src="{% static 'images/icons/voting-total.png' %}" title="{% trans 'Votes cast' %}">
+                            <strong>{{ poll.print_votescast }}</strong>
+                        {% endif %}
+                    </td>
+                {% endif %}
+            {% endfor %}
+            {% if assignment.candidates and perms.assignment.can_manage_assignment and assignment.status == "vot" %}
+                <td></td>
+            {% endif %}
+        </tr>
+        </table>
+    {% else %}
+        <i>{% trans "No ballots available." %}</i>
         {% if assignment.candidates and perms.assignment.can_manage_assignment and assignment.status == "vot" %}
-            <td></td>
+            <p>
+            <a href='{% url assignment_gen_poll assignment.id %}' class="btn">
+               <i class="icon-plus"></i> {% trans 'New ballot' %}
+            </a>
+            </p>
         {% endif %}
-    </tr>
-    </table>
-
-{% else %}
-
-    <i>{% trans "No ballots available." %}</i>
-
-    {% if assignment.candidates and perms.assignment.can_manage_assignment and assignment.status == "vot" %}
-        <p><a href='{% url assignment_gen_poll assignment.id %}'>
-        <span class="button">
-           <span class="icon statistics">{% trans 'New ballot' %}</span>
-        </span>
-        </a></p>
     {% endif %}
+</div> <!--/span-->
 
-{% endif %}
-
-</div>
+<div class="span3">
+    <div class="well">
+        <!-- Text -->
+        <h5>{% trans "Status" %}:</h5>
+        {% trans assignment.get_status_display %}
+        <!-- Posts -->
+        <h5>{% trans "Number of available posts" %}:</h5>
+        {{ assignment.posts }}
+    </div> <!--/well-->
 
+    {% if perms.assignment.can_manage_assignment %}
+    <div class="well">
+        <h4>{% trans "Change status" %}:</h4>
+        <label class="radio">
+            <input type="radio" name="status" onclick="window.location.href='{% url assignment_set_status assignment.id 'sea' %}';"
+                {% if 'sea' in assignment.status %}checked{% endif %}>{% trans 'Searching for candidates' %}
+        </label>
+        <label class="radio">
+            <input type="radio" name="status" onclick="window.location.href='{% url assignment_set_status assignment.id 'vot' %}';"
+                {% if 'vot' in assignment.status %}checked{% endif %}>{% trans 'Voting' %}<br>
+        </label>
+        <label class="radio">
+            <input type="radio" name="status" onclick="window.location.href='{% url assignment_set_status assignment.id 'fin' %}';"
+                {% if 'fin' in assignment.status %}checked{% endif %}>{% trans 'Finished' %}
+        </label>
+    </div> <!--/well-->
+    {% endif %}
+</div> <!--/span-->
+</div> <!--/row-->
 {% endblock %}

From 6a3bead5f65137e8103d48685aae584da032c405 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Thu, 6 Sep 2012 23:59:03 +0200
Subject: [PATCH 06/88] Cleanup template code and style.

---
 openslides/agenda/templates/agenda/edit.html  | 16 +++++++--------
 .../agenda/templates/agenda/overview.html     | 12 +++++------
 .../templates/application/import.html         |  6 +++---
 .../templates/application/overview.html       |  5 +++--
 openslides/static/styles/base.css             | 20 +++++++------------
 openslides/templates/base.html                |  1 -
 6 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/openslides/agenda/templates/agenda/edit.html b/openslides/agenda/templates/agenda/edit.html
index 39b319c96..2291fbc2a 100644
--- a/openslides/agenda/templates/agenda/edit.html
+++ b/openslides/agenda/templates/agenda/edit.html
@@ -13,14 +13,14 @@
 
 {% block content %}
     <h1>
-    {% if item %}
-        {% trans "Edit item" %}
-    {% else %}
-        {% trans "New item" %}
-    {% endif %}
-    <small class="pull-right">
-    <a href="{% url item_overview %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
-    </small>
+        {% if item %}
+            {% trans "Edit item" %}
+        {% else %}
+            {% trans "New item" %}
+        {% endif %}
+        <small class="pull-right">
+        <a href="{% url item_overview %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
+        </small>
     </h1>
     <form action="" method="post">{% csrf_token %}
         {% for field in form %}
diff --git a/openslides/agenda/templates/agenda/overview.html b/openslides/agenda/templates/agenda/overview.html
index f529f693b..ed8f6f8e6 100644
--- a/openslides/agenda/templates/agenda/overview.html
+++ b/openslides/agenda/templates/agenda/overview.html
@@ -54,12 +54,12 @@
        {% endif %}
 
         <h1>{% trans "Agenda" %} 
-        <small class="pull-right">
-        {% if perms.agenda.can_manage_agenda %}
-        <a href="{% url item_new %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'New item' %}"><i class="icon-plus"></i> {% trans "New" %}</a>
-        {% endif %}
-        <a href="{% url print_agenda %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print agenda as PDF' %}"><i class="icon-print"></i> PDF</a>
-        </small>
+            <small class="pull-right">
+            {% if perms.agenda.can_manage_agenda %}
+            <a href="{% url item_new %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'New item' %}"><i class="icon-plus"></i> {% trans "New" %}</a>
+            {% endif %}
+            <a href="{% url print_agenda %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print agenda as PDF' %}"><i class="icon-print"></i> PDF</a>
+            </small>
         </h1>
 
         <label class="checkbox">
diff --git a/openslides/application/templates/application/import.html b/openslides/application/templates/application/import.html
index e87ca7436..e92dbad56 100644
--- a/openslides/application/templates/application/import.html
+++ b/openslides/application/templates/application/import.html
@@ -6,9 +6,9 @@
 
 {% block content %}
     <h1>{% trans "Import motions" %}
-    <small class="pull-right">
-    <a href="{% url application_overview %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
-    </small>
+        <small class="pull-right">
+        <a href="{% url application_overview %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
+        </small>
     </h1>
 
     <p>{% trans 'Select a CSV file to import motions!' %}</p>
diff --git a/openslides/application/templates/application/overview.html b/openslides/application/templates/application/overview.html
index a26da98cb..ef4b9a7ca 100644
--- a/openslides/application/templates/application/overview.html
+++ b/openslides/application/templates/application/overview.html
@@ -7,8 +7,9 @@
 {% block title %}{{ block.super }} – {% trans "Motions" %}{% endblock %}
 
 {% block content %}
-    <h1>{% trans "Motions" %}
-    <small class="pull-right">
+    <h1>
+        {% trans "Motions" %}
+        <small class="pull-right">
         {% if perms.application.can_manage_application %}
             <a href="{% url application_new %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'New motion' %}"><i class="icon-plus"></i> {% trans "New" %}</a>
             <a href="{% url application_import %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Import motions' %}"><i class="icon-share-alt"></i> {% trans 'Import' %}</a>
diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css
index 648b55204..9cc393605 100644
--- a/openslides/static/styles/base.css
+++ b/openslides/static/styles/base.css
@@ -30,18 +30,6 @@ h1 {
 h5 {
     margin-bottom: 0px;
 }
-/*h1 small a {
-    background: none repeat scroll 0 0 #F1F1F1;
-    border: 0 none;
-    font-family: sans-serif;
-    font-size: 14px;
-    margin-left: 4px;
-    padding: 3px 8px;
-    position: relative;
-    text-decoration: none;
-    top: -7px;
-}*/
-
 
 a:hover {
     text-decoration: none;
@@ -151,7 +139,7 @@ a:hover {
     background-position: -24px -24px;
 }
 .icon-assignment {
-    background-position: -408px 0;
+    background-position: -144px -72px;
 }
 .icon-participant {
     background-position: -168px 0;
@@ -167,6 +155,12 @@ a:hover {
 .alert form {
     margin-bottom: 0;
 }
+tr.total td {
+    border-top: 1px solid #333333;
+}
+.nobr {
+    white-space: nowrap;
+}
 
 /** Forms **/
 .errorlist{
diff --git a/openslides/templates/base.html b/openslides/templates/base.html
index 0fd26c505..0164770e3 100644
--- a/openslides/templates/base.html
+++ b/openslides/templates/base.html
@@ -15,7 +15,6 @@
     <link href="{% static 'styles/bootstrap.css' %}" type="text/css" rel="stylesheet">
     <link href="{% static 'styles/bootstrap-responsive.css' %}" type="text/css" rel="stylesheet">
     <link href="{% static 'styles/base.css' %}" type="text/css" rel="stylesheet">
-
     <link href="{% static 'img/favicon.png' %}" type="image/png" rel="shortcut icon" />
     {% block header %}
     {% endblock %}

From 94ffb3ab4517ac51a36fa625eb1953fbdc0bd20a Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Fri, 7 Sep 2012 21:25:18 +0200
Subject: [PATCH 07/88] Redesign login template.

---
 .../templates/participant/login.html          |   8 +++--
 openslides/static/img/logo-login.png          | Bin 0 -> 13251 bytes
 openslides/static/styles/base.css             |  33 +++++++++++++++++-
 openslides/templates/base.html                |   8 ++---
 4 files changed, 39 insertions(+), 10 deletions(-)
 create mode 100644 openslides/static/img/logo-login.png

diff --git a/openslides/participant/templates/participant/login.html b/openslides/participant/templates/participant/login.html
index 13b6fdeb6..f9ebaff2c 100644
--- a/openslides/participant/templates/participant/login.html
+++ b/openslides/participant/templates/participant/login.html
@@ -3,8 +3,9 @@
 {% load i18n %}
 {% load staticfiles %}
 
-{% block content %}
-    <h1>{% trans "Login" %}</h1>
+{% block body %}
+<div id="login-page" class="container">
+    <h2><img src="/static/img/logo-login.png" width="250px"></h2>
 
     {% if form.errors %}
         <div class="alert alert-error">
@@ -21,7 +22,7 @@
             <em>{{ first_time_message|safe }}</em>
         </div>
     {% endif %}
-    <form method="post" action="{% url user_login %}{% if next %}?next={{ next }}{% endif %}">
+    <form method="post" action="{% url user_login %}{% if next %}?next={{ next }}{% endif %}" class="well">
         {% csrf_token %}
         <div class="input-prepend">
             <span class="add-on"><i class="icon-user"></i></span>
@@ -52,4 +53,5 @@
             });
         </script>
     {% endif %}
+</div>
 {% endblock %}
diff --git a/openslides/static/img/logo-login.png b/openslides/static/img/logo-login.png
new file mode 100644
index 0000000000000000000000000000000000000000..edd092950bb1aabbb8f1cb3dbcb7801377c5fd62
GIT binary patch
literal 13251
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
D)C<u4

literal 0
HcmV?d00001

diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css
index 9cc393605..162f0396d 100644
--- a/openslides/static/styles/base.css
+++ b/openslides/static/styles/base.css
@@ -1,3 +1,7 @@
+body {
+   background-color: #FAFAFA;
+}
+
 /* Header */
 #header {
     background-color: #333333;
@@ -22,6 +26,7 @@
     color: #999999;
 }
 
+/* Headings and Links */
 h1 {
     border-bottom: 1px solid #EEEEEE;
     margin: 0px 0 30px;
@@ -30,11 +35,37 @@ h1 {
 h5 {
     margin-bottom: 0px;
 }
-
 a:hover {
     text-decoration: none;
 }
 
+/* Login page */
+#login-page.container {
+    width: 320px;
+    margin-top: 20px;
+}
+#login-page h2 {
+    margin-left: 30px;
+    margin-bottom: 20px;
+}
+#login-page .well {
+    background-color: white;
+    border: 1px solid rgba(0, 0, 0, 0.2);
+    border-radius: 6px 6px 6px 6px;
+    box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+    margin-top: 20px;
+    padding-bottom: 20px;
+    line-height: 45px;
+}
+#login-page input {
+    width: 240px;
+    height: 30px;
+    font-size: 20px;
+}
+#login-page span.add-on {
+    height: 26px;
+    padding: 8px 5px 4px 5px;
+}
 /* show optional column */
 .optional {
     display: auto;
diff --git a/openslides/templates/base.html b/openslides/templates/base.html
index 0164770e3..0760c075e 100644
--- a/openslides/templates/base.html
+++ b/openslides/templates/base.html
@@ -56,7 +56,7 @@
  {% block submenu %}
  {% endblock %}
 -->
-
+{% block body %}
 
 <!-- Container -->
 <div class="container-fluid" id="container">
@@ -110,11 +110,8 @@
 </div><!--/container-fluid-->
 
 
+{% endblock %}<!--/body-->
 
- 
-     
-
-         
 <!-- JavaScript (Placed at the end of the document so the pages load faster) -->
     <script src="{% static 'javascript/jquery.js' %}" type="text/javascript"></script>
     <script src="{% static 'javascript/utils.js' %}" type="text/javascript"></script>
@@ -122,6 +119,5 @@
     <script type="text/javascript" src="{% url django.views.i18n.javascript_catalog %}"></script>
     {% block javascript %}
     {% endblock %}
-
 </body>
 </html>

From 65840d426117c79687097b847696f6e2dfebb8cf Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Mon, 10 Sep 2012 17:15:43 +0200
Subject: [PATCH 08/88] Minor changes in assigment view template.

---
 .../assignment/templates/assignment/view.html | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/openslides/assignment/templates/assignment/view.html b/openslides/assignment/templates/assignment/view.html
index 60c92890d..05411eb20 100644
--- a/openslides/assignment/templates/assignment/view.html
+++ b/openslides/assignment/templates/assignment/view.html
@@ -17,6 +17,9 @@
     <h1>{{ assignment }}
         <small class="pull-right">
         <a href="{% url assignment_overview %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
+        {% if perms.projector.can_manage_projector %}
+            <a href="{% url projector_activate_slide assignment.sid  %}" class="btn btn-primary btn-mini" title="{% trans 'Show election' %}"><i class="icon-facetime-video icon-white"></i></a>
+        {% endif %}
         </small>
     </h1>
 
@@ -53,11 +56,11 @@
         {% if perms.assignment.can_nominate_self %}
             <p>
             {% if user_is_candidate %}
-                <a href='{% url assignment_delrun assignment.id %}' class="btn">
+                <a href='{% url assignment_delrun assignment.id %}' class="btn btn-mini">
                     <i class="icon-remove"></i> {% trans 'Withdraw self candidature' %}
                 </a>
             {% else %}
-                <a href='{% url assignment_run assignment.id %}' class="btn">
+                <a href='{% url assignment_run assignment.id %}' class="btn btn-mini">
                     <i class="icon-plus"></i> {% trans 'Self candidature' %}
                 </a>
             {% endif %}
@@ -66,16 +69,16 @@
         {% if perms.assignment.can_nominate_other %}
             {% for field in form %}
                 <label>{{ field.label }}:</label>
-                <nobr>{{ field }}
-                {% if perms.participant.can_see_participant and perms.participant.can_manage_participant %}
-                    <a href="{% url user_new %}" target="_blank"><img src="{% static 'images/icons/add-user.png' %}" title="{% trans 'Add new participant' %}"></a>
-                {% endif %}
-                </nobr>
+                <div class="input-append">
+                    {{ field }}
+                    <button class="btn btn-primary" type="submit">{% trans 'Apply' %}</button>
+                    {% if perms.participant.can_see_participant and perms.participant.can_manage_participant %}
+                        <a href="{% url user_new %}" target="_blank" class="btn"><img src="{% static 'images/icons/add-user.png' %}" title="{% trans 'Add new participant' %}"></a>
+                    {% endif %}
+                </div>
             {% endfor %}
             <p>
-            <button class="btn" type="submit">
-                {% trans 'Apply' %}
-            </button>
+  
             </p>
         {% endif %}
     </form>
@@ -112,7 +115,7 @@
             {% endfor %}
             {% if assignment.candidates and perms.assignment.can_manage_assignment and assignment.status == "vot" %}
                 <th class="span1 nobr">
-                    <a href='{% url assignment_gen_poll assignment.id %}' class="btn">
+                    <a href='{% url assignment_gen_poll assignment.id %}' class="btn btn-mini">
                        <i class="icon-plus"></i> {% trans 'New ballot' %}
                     </a>
                 </th>

From 74ffad6ced4599ee80eee2f6a00a16131d13e5db Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Mon, 10 Sep 2012 17:17:22 +0200
Subject: [PATCH 09/88] Minor changes for template style.

---
 openslides/participant/templates/participant/login.html | 2 +-
 openslides/static/styles/base.css                       | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/openslides/participant/templates/participant/login.html b/openslides/participant/templates/participant/login.html
index f9ebaff2c..cd969f77f 100644
--- a/openslides/participant/templates/participant/login.html
+++ b/openslides/participant/templates/participant/login.html
@@ -5,7 +5,7 @@
 
 {% block body %}
 <div id="login-page" class="container">
-    <h2><img src="/static/img/logo-login.png" width="250px"></h2>
+    <h2><img src="/static/img/logo-login.png"></h2>
 
     {% if form.errors %}
         <div class="alert alert-error">
diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css
index 162f0396d..794517ef7 100644
--- a/openslides/static/styles/base.css
+++ b/openslides/static/styles/base.css
@@ -1,5 +1,5 @@
 body {
-   background-color: #FAFAFA;
+   background-color: #FBFBFB;
 }
 
 /* Header */
@@ -48,6 +48,9 @@ a:hover {
     margin-left: 30px;
     margin-bottom: 20px;
 }
+#login-page h2 img {
+    width: 250px;
+}
 #login-page .well {
     background-color: white;
     border: 1px solid rgba(0, 0, 0, 0.2);
@@ -66,6 +69,7 @@ a:hover {
     height: 26px;
     padding: 8px 5px 4px 5px;
 }
+
 /* show optional column */
 .optional {
     display: auto;

From ce233fc87069673a3e7c3821301e320c2b78d12c Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Mon, 10 Sep 2012 17:40:41 +0200
Subject: [PATCH 10/88] Updated config template.

---
 openslides/agenda/templates/agenda/config.html |  4 +++-
 .../templates/application/config.html          |  4 +++-
 .../templates/assignment/config.html           |  4 +++-
 .../config/templates/config/base_config.html   | 18 ++++++++++--------
 .../config/templates/config/general.html       |  4 +++-
 .../config/templates/config/version.html       |  4 +++-
 .../templates/participant/config.html          |  4 +++-
 7 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/openslides/agenda/templates/agenda/config.html b/openslides/agenda/templates/agenda/config.html
index 0ef26b8d5..4c2a85804 100644
--- a/openslides/agenda/templates/agenda/config.html
+++ b/openslides/agenda/templates/agenda/config.html
@@ -5,7 +5,9 @@
 {% block title %}{{ block.super }} – {% trans "Agenda settings" %}{% endblock %}
 
 {% block content %}
-    <h1>{% trans "Agenda settings" %}</h1>
+    <h1>{% trans "Configuration" %}: {% trans "Agenda" %}
+        {% block config_submenu %}{{ block.super }}{% endblock %}
+    </h1>
     <form action="" method="post">{% csrf_token %}
     {{ form.as_p }}
     <p>
diff --git a/openslides/application/templates/application/config.html b/openslides/application/templates/application/config.html
index 8dd65eddf..9193f5525 100644
--- a/openslides/application/templates/application/config.html
+++ b/openslides/application/templates/application/config.html
@@ -5,7 +5,9 @@
 {% block title %}{{ block.super }} – {% trans "Application settings" %}{% endblock %}
 
 {% block content %}
-    <h1>{% trans "Application settings" %}</h1>
+    <h1>{% trans "Configuration" %}: {% trans "Applications" %}
+        {% block config_submenu %}{{ block.super }}{% endblock %}
+    </h1>
     <form action="" method="post">{% csrf_token %}
     {{ form.as_p }}
     <p>
diff --git a/openslides/assignment/templates/assignment/config.html b/openslides/assignment/templates/assignment/config.html
index 035de8384..b2feb2412 100644
--- a/openslides/assignment/templates/assignment/config.html
+++ b/openslides/assignment/templates/assignment/config.html
@@ -5,7 +5,9 @@
 {% block title %}{{ block.super }} – {% trans "Election settings" %}{% endblock %}
 
 {% block content %}
-    <h1>{% trans "Election settings" %}</h1>
+    <h1>{% trans "Configuration" %}: {% trans "Elections" %}
+        {% block config_submenu %}{{ block.super }}{% endblock %}
+    </h1>
     <form action="" method="post">{% csrf_token %}
     {{ form.as_p }}
     <p>
diff --git a/openslides/config/templates/config/base_config.html b/openslides/config/templates/config/base_config.html
index 78880323e..a1f99418e 100644
--- a/openslides/config/templates/config/base_config.html
+++ b/openslides/config/templates/config/base_config.html
@@ -1,13 +1,15 @@
 {% extends "base.html" %}
 
-{% load tags %}
 {% load i18n %}
 
-{% block submenu %}
-    <h4 class="sectiontitle">{% trans "Configuration" %}</h4>
-    <ul>
-        {% for menu_link in menu_links %}
-            <li{% if menu_link.2 %} class="selected"{% endif %}><a href="{{ menu_link.0 }}">{{ menu_link.1 }}</a></li>
-        {% endfor %}
-    </ul>
+{% block config_submenu %}
+    <small class="pull-right">
+        <div class="btn-toolbar">
+            <div class="btn-group">
+            {% for menu_link in menu_links %}
+                <a href="{{ menu_link.0 }}" class="btn btn-mini {% if menu_link.2 %}active{% endif %}">{{ menu_link.1 }}</a>
+            {% endfor %}
+            </div>
+        </div>
+    </small>
 {% endblock %}
diff --git a/openslides/config/templates/config/general.html b/openslides/config/templates/config/general.html
index 55fbae5b1..585adf31e 100644
--- a/openslides/config/templates/config/general.html
+++ b/openslides/config/templates/config/general.html
@@ -5,7 +5,9 @@
 {% block title %}{{ block.super }} – {% trans "General settings" %}{% endblock %}
 
 {% block content %}
-    <h1>{% trans "General settings" %}</h1>
+    <h1>{% trans "Configuration" %}: {% trans "General" %}
+        {% block config_submenu %}{{ block.super }}{% endblock %}
+    </h1>
     <form action="" method="post">{% csrf_token %}
     <fieldset>
         <legend>{% trans "Event" %}</legend>
diff --git a/openslides/config/templates/config/version.html b/openslides/config/templates/config/version.html
index 0df6c49f3..a846675ad 100644
--- a/openslides/config/templates/config/version.html
+++ b/openslides/config/templates/config/version.html
@@ -5,7 +5,9 @@
 {% block title %}{{ block.super }} – {% trans "Version" %}{% endblock %}
 
 {% block content %}
-    <h1>{% trans "Version" %}</h1>
+    <h1>{% trans "Version" %}
+        {% block config_submenu %}{{ block.super }}{% endblock %}
+    </h1>
 
     {% for version in versions %}
         <p>{{ version.0 }} {% trans "Version" %}: {{ version.1 }}</p>
diff --git a/openslides/participant/templates/participant/config.html b/openslides/participant/templates/participant/config.html
index 49973462e..ea661a65c 100644
--- a/openslides/participant/templates/participant/config.html
+++ b/openslides/participant/templates/participant/config.html
@@ -5,7 +5,9 @@
 {% block title %}{{ block.super }} – {% trans "Participant settings" %}{% endblock %}
 
 {% block content %}
-    <h1>{% trans "Participant settings" %}</h1>
+    <h1>{% trans "Configuration" %}: {% trans "Participants" %}
+        {% block config_submenu %}{{ block.super }}{% endblock %}
+    </h1>
     <form action="" method="post">{% csrf_token %}
         {% include "form.html" %}
         <p>

From e50abbbf0393b41d9fd3defb7743976240e36005 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Mon, 10 Sep 2012 18:03:33 +0200
Subject: [PATCH 11/88] Restructured base.css.

---
 openslides/static/styles/base.css | 81 +++++++++++++++++--------------
 1 file changed, 44 insertions(+), 37 deletions(-)

diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css
index 794517ef7..70f02084e 100644
--- a/openslides/static/styles/base.css
+++ b/openslides/static/styles/base.css
@@ -1,3 +1,10 @@
+/**
+ * OpenSlides default template style
+ *
+ * :copyright: 2011, 2012 by OpenSlides team, see AUTHORS.
+ * :license: GNU GPL, see LICENSE for more details.
+ */
+
 body {
    background-color: #FBFBFB;
 }
@@ -70,16 +77,48 @@ a:hover {
     padding: 8px 5px 4px 5px;
 }
 
+
+/** Utils **/
+.nopadding {
+    padding: 0;
+}
+.alert form {
+    margin-bottom: 0;
+}
+tr.total td {
+    border-top: 1px solid #333333;
+}
+.nobr {
+    white-space: nowrap;
+}
 /* show optional column */
 .optional {
     display: auto;
 }
+
+
+/** Forms **/
+input, textarea {
+    width: 320px;
+}
+textarea {
+    height: 100px;
+}
 .help-inline {
     font-size: 11px;
 }
+.errorlist{
+    margin: 0;
+}
+.errorlist li {
+    list-style: none outside none;
+}
+form .required label:after {
+    content: " *";
+}
 
 
-/* Left Menu */
+/** Left sitebar navigation **/
 .leftmenu ul {
     margin: 0;
     list-style: none; 
@@ -117,10 +156,10 @@ a:hover {
 }
 .leftmenu ul li a, .leftmenu ul li a span.ico {
     -webkit-transition: background 0.2s ease-in-out;
-       -moz-transition: background 0.2s ease-in-out;
-        -ms-transition: background 0.2s ease-in-out;
-         -o-transition: background 0.2s ease-in-out;
-            transition: background 0.2s ease-in-out;
+    -moz-transition: background 0.2s ease-in-out;
+    -ms-transition: background 0.2s ease-in-out;
+    -o-transition: background 0.2s ease-in-out;
+    transition: background 0.2s ease-in-out;
 }
 .leftmenu ul li a:hover {
     background-color: #f5f5f5;
@@ -183,38 +222,6 @@ a:hover {
     background-position: -360px -144px;
 }
 
-/** Utils **/
-.nopadding {
-    padding: 0;
-}
-.alert form {
-    margin-bottom: 0;
-}
-tr.total td {
-    border-top: 1px solid #333333;
-}
-.nobr {
-    white-space: nowrap;
-}
-
-/** Forms **/
-.errorlist{
-    margin: 0;
-}
-.errorlist li {
-    list-style: none outside none;
-}
-form .required label:after {
-    content: " *";
-}
-.helptext {
-    font-size:9px;
-    display: block;
-    color: #556652;
-}
-textarea {
-    height: 100px;
-}
 
 /** Responsive **/
 @media (max-width: 767px) {

From b705df8c5f23da576e89fc6b38e39ee851860ca6 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Mon, 10 Sep 2012 21:02:58 +0200
Subject: [PATCH 12/88] Changed redirect to dashboard after changing password.

---
 openslides/participant/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openslides/participant/views.py b/openslides/participant/views.py
index 69e2db7fe..ef020478d 100644
--- a/openslides/participant/views.py
+++ b/openslides/participant/views.py
@@ -477,7 +477,7 @@ def user_settings_password(request):
         if form.is_valid():
             form.save()
             messages.success(request, _('Password successfully changed.'))
-            return redirect(reverse('user_settings'))
+            return redirect(reverse('dashboard'))
         else:
             messages.error(request, _('Please check the form for errors.'))
     else:

From 889bd66e04b255d11c2f377978ecb6cd195d9cba Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Mon, 10 Sep 2012 23:28:19 +0200
Subject: [PATCH 13/88] Adjusted dashboard templates for twitter bootstrap.
 Reduced jquery-ui stuff to really neccessary files.

---
 .../projector/static/javascript/dashboard.js  |  45 +--
 .../javascript/jquery-ui-1.8.18.custom.min.js |  41 ---
 .../static/javascript/jquery-ui.min.js        |  20 ++
 .../projector/static/styles/dashboard.css     |  60 +++-
 .../images/ui-bg_flat_75_aaaaaa_40x100.png    | Bin 180 -> 0 bytes
 .../images/ui-bg_glass_100_f5f0e5_1x400.png   | Bin 157 -> 0 bytes
 .../images/ui-bg_glass_25_cb842e_1x400.png    | Bin 174 -> 0 bytes
 .../images/ui-bg_glass_70_ede4d4_1x400.png    | Bin 125 -> 0 bytes
 .../ui-bg_highlight-hard_100_f4f0ec_1x100.png | Bin 103 -> 0 bytes
 .../ui-bg_highlight-hard_65_fee4bd_1x100.png  | Bin 114 -> 0 bytes
 .../ui-bg_highlight-hard_75_f5f5b5_1x100.png  | Bin 147 -> 0 bytes
 .../ui-bg_inset-soft_100_f4f0ec_1x100.png     | Bin 113 -> 0 bytes
 .../images/ui-icons_c47a23_256x240.png        | Bin 4369 -> 0 bytes
 .../images/ui-icons_cb672b_256x240.png        | Bin 4369 -> 0 bytes
 .../images/ui-icons_f08000_256x240.png        | Bin 5355 -> 0 bytes
 .../images/ui-icons_f35f07_256x240.png        | Bin 5355 -> 0 bytes
 .../images/ui-icons_ff7519_256x240.png        | Bin 4369 -> 0 bytes
 .../images/ui-icons_ffffff_256x240.png        | Bin 4369 -> 0 bytes
 .../humanity/jquery-ui-1.8.18.custom.css      | 286 ------------------
 .../templates/projector/base_projector.html   |  26 --
 .../projector/control_countdown.html          |  31 +-
 .../projector/control_overlay_message.html    |  19 +-
 .../projector/custom_slide_widget.html        |  31 +-
 .../templates/projector/dashboard.html        |  30 +-
 .../templates/projector/default.html          |   2 +-
 .../templates/projector/live_view_widget.html |   1 -
 .../projector/templates/projector/new.html    |  25 +-
 .../templates/projector/select_widgets.html   |  18 +-
 openslides/static/javascript/utils.js         |   5 +
 29 files changed, 163 insertions(+), 477 deletions(-)
 delete mode 100755 openslides/projector/static/javascript/jquery-ui-1.8.18.custom.min.js
 create mode 100755 openslides/projector/static/javascript/jquery-ui.min.js
 delete mode 100644 openslides/projector/static/styles/humanity/images/ui-bg_flat_75_aaaaaa_40x100.png
 delete mode 100644 openslides/projector/static/styles/humanity/images/ui-bg_glass_100_f5f0e5_1x400.png
 delete mode 100644 openslides/projector/static/styles/humanity/images/ui-bg_glass_25_cb842e_1x400.png
 delete mode 100644 openslides/projector/static/styles/humanity/images/ui-bg_glass_70_ede4d4_1x400.png
 delete mode 100644 openslides/projector/static/styles/humanity/images/ui-bg_highlight-hard_100_f4f0ec_1x100.png
 delete mode 100644 openslides/projector/static/styles/humanity/images/ui-bg_highlight-hard_65_fee4bd_1x100.png
 delete mode 100644 openslides/projector/static/styles/humanity/images/ui-bg_highlight-hard_75_f5f5b5_1x100.png
 delete mode 100644 openslides/projector/static/styles/humanity/images/ui-bg_inset-soft_100_f4f0ec_1x100.png
 delete mode 100644 openslides/projector/static/styles/humanity/images/ui-icons_c47a23_256x240.png
 delete mode 100644 openslides/projector/static/styles/humanity/images/ui-icons_cb672b_256x240.png
 delete mode 100644 openslides/projector/static/styles/humanity/images/ui-icons_f08000_256x240.png
 delete mode 100644 openslides/projector/static/styles/humanity/images/ui-icons_f35f07_256x240.png
 delete mode 100644 openslides/projector/static/styles/humanity/images/ui-icons_ff7519_256x240.png
 delete mode 100644 openslides/projector/static/styles/humanity/images/ui-icons_ffffff_256x240.png
 delete mode 100644 openslides/projector/static/styles/humanity/jquery-ui-1.8.18.custom.css
 delete mode 100644 openslides/projector/templates/projector/base_projector.html

diff --git a/openslides/projector/static/javascript/dashboard.js b/openslides/projector/static/javascript/dashboard.js
index 95b758c0a..430709c72 100644
--- a/openslides/projector/static/javascript/dashboard.js
+++ b/openslides/projector/static/javascript/dashboard.js
@@ -5,26 +5,17 @@
  * :license: GNU GPL, see LICENSE for more details.
  */
 
-// function that writes the portlet list order to a cookie
+// function that writes the widget list order to a cookie
 function saveOrder() {
     $(".column").each(function(index, value){
         var colid = value.id;
         var cookieName = "cookie-" + colid;
         // Get the order for this column.
         var order = $('#' + colid).sortable("toArray");
-        // For each portlet in the column
-        for ( var i = 0, n = order.length; i < n; i++ ) {
-            // Determine if it is 'opened' or 'closed'
-            var v = $('#' + order[i] ).find('.portlet-content').is(':visible');
-            // Modify the array we're saving to indicate what's open and
-            //  what's not.
-            order[i] = order[i] + ":" + v;
-        }
         $.cookie(cookieName, order, { path: "/", expiry: new Date(2012, 1, 1)});
     });
 }
-
-// function that restores the portlet list order from a cookie
+// function that restores the widget list order from a cookie
 function restoreOrder() {
     $(".column").each(function(index, value) {
         var colid = value.id;
@@ -33,20 +24,10 @@ function restoreOrder() {
         if ( cookie == null ) { return; }
         var IDs = cookie.split(",");
         for (var i = 0, n = IDs.length; i < n; i++ ) {
-            var toks = IDs[i].split(":");
-            if ( toks.length != 2 ) {
-                continue;
-            }
-            var portletID = toks[0];
-            var visible = toks[1]
-            var portlet = $(".column")
-                .find('#' + portletID)
+            var widgetID = IDs[i];
+            var widget = $(".column")
+                .find('#' + widgetID)
                 .appendTo($('#' + colid));
-            if (visible === 'false') {
-                portlet.find(".ui-icon").toggleClass("ui-icon-minus");
-                portlet.find(".ui-icon").toggleClass("ui-icon-plus");
-                portlet.find(".portlet-content").hide();
-            }
         }
     });
 }
@@ -57,24 +38,8 @@ $(function() {
         stop: function() { saveOrder(); }
     });
 
-    $(".portlet")
-         .addClass("ui-widget ui-widget-content")
-         .addClass("ui-helper-clearfix ui-corner-all")
-         .find(".portlet-header")
-         .addClass("ui-widget-header ui-corner-all")
-         .prepend('<span class="ui-icon ui-icon-minus"></span>')
-         .end()
-         .find(".portlet-content");
-
     restoreOrder();
 
-    $(".portlet-header .ui-icon").click(function() {
-        $(this).toggleClass("ui-icon-minus");
-        $(this).toggleClass("ui-icon-plus");
-        $(this).parents(".portlet:first").find(".portlet-content").toggle();
-        saveOrder(); // This is important
-    });
-
     if ($.browser.msie) {
         if ($.browser.version >= 8.0 && $.browser.version < 9.0)
         {
diff --git a/openslides/projector/static/javascript/jquery-ui-1.8.18.custom.min.js b/openslides/projector/static/javascript/jquery-ui-1.8.18.custom.min.js
deleted file mode 100755
index b74654cd9..000000000
--- a/openslides/projector/static/javascript/jquery-ui-1.8.18.custom.min.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/*!
- * jQuery UI 1.8.18
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI
- */(function(a,b){function d(b){return!a(b).parents().andSelf().filter(function(){return a.curCSS(this,"visibility")==="hidden"||a.expr.filters.hidden(this)}).length}function c(b,c){var e=b.nodeName.toLowerCase();if("area"===e){var f=b.parentNode,g=f.name,h;if(!b.href||!g||f.nodeName.toLowerCase()!=="map")return!1;h=a("img[usemap=#"+g+"]")[0];return!!h&&d(h)}return(/input|select|textarea|button|object/.test(e)?!b.disabled:"a"==e?b.href||c:c)&&d(b)}a.ui=a.ui||{};a.ui.version||(a.extend(a.ui,{version:"1.8.18",keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMMAND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38,WINDOWS:91}}),a.fn.extend({propAttr:a.fn.prop||a.fn.attr,_focus:a.fn.focus,focus:function(b,c){return typeof b=="number"?this.each(function(){var d=this;setTimeout(function(){a(d).focus(),c&&c.call(d)},b)}):this._focus.apply(this,arguments)},scrollParent:function(){var b;a.browser.msie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?b=this.parents().filter(function(){return/(relative|absolute|fixed)/.test(a.curCSS(this,"position",1))&&/(auto|scroll)/.test(a.curCSS(this,"overflow",1)+a.curCSS(this,"overflow-y",1)+a.curCSS(this,"overflow-x",1))}).eq(0):b=this.parents().filter(function(){return/(auto|scroll)/.test(a.curCSS(this,"overflow",1)+a.curCSS(this,"overflow-y",1)+a.curCSS(this,"overflow-x",1))}).eq(0);return/fixed/.test(this.css("position"))||!b.length?a(document):b},zIndex:function(c){if(c!==b)return this.css("zIndex",c);if(this.length){var d=a(this[0]),e,f;while(d.length&&d[0]!==document){e=d.css("position");if(e==="absolute"||e==="relative"||e==="fixed"){f=parseInt(d.css("zIndex"),10);if(!isNaN(f)&&f!==0)return f}d=d.parent()}}return 0},disableSelection:function(){return this.bind((a.support.selectstart?"selectstart":"mousedown")+".ui-disableSelection",function(a){a.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}}),a.each(["Width","Height"],function(c,d){function h(b,c,d,f){a.each(e,function(){c-=parseFloat(a.curCSS(b,"padding"+this,!0))||0,d&&(c-=parseFloat(a.curCSS(b,"border"+this+"Width",!0))||0),f&&(c-=parseFloat(a.curCSS(b,"margin"+this,!0))||0)});return c}var e=d==="Width"?["Left","Right"]:["Top","Bottom"],f=d.toLowerCase(),g={innerWidth:a.fn.innerWidth,innerHeight:a.fn.innerHeight,outerWidth:a.fn.outerWidth,outerHeight:a.fn.outerHeight};a.fn["inner"+d]=function(c){if(c===b)return g["inner"+d].call(this);return this.each(function(){a(this).css(f,h(this,c)+"px")})},a.fn["outer"+d]=function(b,c){if(typeof b!="number")return g["outer"+d].call(this,b);return this.each(function(){a(this).css(f,h(this,b,!0,c)+"px")})}}),a.extend(a.expr[":"],{data:function(b,c,d){return!!a.data(b,d[3])},focusable:function(b){return c(b,!isNaN(a.attr(b,"tabindex")))},tabbable:function(b){var d=a.attr(b,"tabindex"),e=isNaN(d);return(e||d>=0)&&c(b,!e)}}),a(function(){var b=document.body,c=b.appendChild(c=document.createElement("div"));c.offsetHeight,a.extend(c.style,{minHeight:"100px",height:"auto",padding:0,borderWidth:0}),a.support.minHeight=c.offsetHeight===100,a.support.selectstart="onselectstart"in c,b.removeChild(c).style.display="none"}),a.extend(a.ui,{plugin:{add:function(b,c,d){var e=a.ui[b].prototype;for(var f in d)e.plugins[f]=e.plugins[f]||[],e.plugins[f].push([c,d[f]])},call:function(a,b,c){var d=a.plugins[b];if(!!d&&!!a.element[0].parentNode)for(var e=0;e<d.length;e++)a.options[d[e][0]]&&d[e][1].apply(a.element,c)}},contains:function(a,b){return document.compareDocumentPosition?a.compareDocumentPosition(b)&16:a!==b&&a.contains(b)},hasScroll:function(b,c){if(a(b).css("overflow")==="hidden")return!1;var d=c&&c==="left"?"scrollLeft":"scrollTop",e=!1;if(b[d]>0)return!0;b[d]=1,e=b[d]>0,b[d]=0;return e},isOverAxis:function(a,b,c){return a>b&&a<b+c},isOver:function(b,c,d,e,f,g){return a.ui.isOverAxis(b,d,f)&&a.ui.isOverAxis(c,e,g)}}))})(jQuery);/*!
- * jQuery UI Widget 1.8.18
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Widget
- */(function(a,b){if(a.cleanData){var c=a.cleanData;a.cleanData=function(b){for(var d=0,e;(e=b[d])!=null;d++)try{a(e).triggerHandler("remove")}catch(f){}c(b)}}else{var d=a.fn.remove;a.fn.remove=function(b,c){return this.each(function(){c||(!b||a.filter(b,[this]).length)&&a("*",this).add([this]).each(function(){try{a(this).triggerHandler("remove")}catch(b){}});return d.call(a(this),b,c)})}}a.widget=function(b,c,d){var e=b.split(".")[0],f;b=b.split(".")[1],f=e+"-"+b,d||(d=c,c=a.Widget),a.expr[":"][f]=function(c){return!!a.data(c,b)},a[e]=a[e]||{},a[e][b]=function(a,b){arguments.length&&this._createWidget(a,b)};var g=new c;g.options=a.extend(!0,{},g.options),a[e][b].prototype=a.extend(!0,g,{namespace:e,widgetName:b,widgetEventPrefix:a[e][b].prototype.widgetEventPrefix||b,widgetBaseClass:f},d),a.widget.bridge(b,a[e][b])},a.widget.bridge=function(c,d){a.fn[c]=function(e){var f=typeof e=="string",g=Array.prototype.slice.call(arguments,1),h=this;e=!f&&g.length?a.extend.apply(null,[!0,e].concat(g)):e;if(f&&e.charAt(0)==="_")return h;f?this.each(function(){var d=a.data(this,c),f=d&&a.isFunction(d[e])?d[e].apply(d,g):d;if(f!==d&&f!==b){h=f;return!1}}):this.each(function(){var b=a.data(this,c);b?b.option(e||{})._init():a.data(this,c,new d(e,this))});return h}},a.Widget=function(a,b){arguments.length&&this._createWidget(a,b)},a.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",options:{disabled:!1},_createWidget:function(b,c){a.data(c,this.widgetName,this),this.element=a(c),this.options=a.extend(!0,{},this.options,this._getCreateOptions(),b);var d=this;this.element.bind("remove."+this.widgetName,function(){d.destroy()}),this._create(),this._trigger("create"),this._init()},_getCreateOptions:function(){return a.metadata&&a.metadata.get(this.element[0])[this.widgetName]},_create:function(){},_init:function(){},destroy:function(){this.element.unbind("."+this.widgetName).removeData(this.widgetName),this.widget().unbind("."+this.widgetName).removeAttr("aria-disabled").removeClass(this.widgetBaseClass+"-disabled "+"ui-state-disabled")},widget:function(){return this.element},option:function(c,d){var e=c;if(arguments.length===0)return a.extend({},this.options);if(typeof c=="string"){if(d===b)return this.options[c];e={},e[c]=d}this._setOptions(e);return this},_setOptions:function(b){var c=this;a.each(b,function(a,b){c._setOption(a,b)});return this},_setOption:function(a,b){this.options[a]=b,a==="disabled"&&this.widget()[b?"addClass":"removeClass"](this.widgetBaseClass+"-disabled"+" "+"ui-state-disabled").attr("aria-disabled",b);return this},enable:function(){return this._setOption("disabled",!1)},disable:function(){return this._setOption("disabled",!0)},_trigger:function(b,c,d){var e,f,g=this.options[b];d=d||{},c=a.Event(c),c.type=(b===this.widgetEventPrefix?b:this.widgetEventPrefix+b).toLowerCase(),c.target=this.element[0],f=c.originalEvent;if(f)for(e in f)e in c||(c[e]=f[e]);this.element.trigger(c,d);return!(a.isFunction(g)&&g.call(this.element[0],c,d)===!1||c.isDefaultPrevented())}}})(jQuery);/*!
- * jQuery UI Mouse 1.8.18
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Mouse
- *
- * Depends:
- *	jquery.ui.widget.js
- */(function(a,b){var c=!1;a(document).mouseup(function(a){c=!1}),a.widget("ui.mouse",{options:{cancel:":input,option",distance:1,delay:0},_mouseInit:function(){var b=this;this.element.bind("mousedown."+this.widgetName,function(a){return b._mouseDown(a)}).bind("click."+this.widgetName,function(c){if(!0===a.data(c.target,b.widgetName+".preventClickEvent")){a.removeData(c.target,b.widgetName+".preventClickEvent"),c.stopImmediatePropagation();return!1}}),this.started=!1},_mouseDestroy:function(){this.element.unbind("."+this.widgetName)},_mouseDown:function(b){if(!c){this._mouseStarted&&this._mouseUp(b),this._mouseDownEvent=b;var d=this,e=b.which==1,f=typeof this.options.cancel=="string"&&b.target.nodeName?a(b.target).closest(this.options.cancel).length:!1;if(!e||f||!this._mouseCapture(b))return!0;this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){d.mouseDelayMet=!0},this.options.delay));if(this._mouseDistanceMet(b)&&this._mouseDelayMet(b)){this._mouseStarted=this._mouseStart(b)!==!1;if(!this._mouseStarted){b.preventDefault();return!0}}!0===a.data(b.target,this.widgetName+".preventClickEvent")&&a.removeData(b.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(a){return d._mouseMove(a)},this._mouseUpDelegate=function(a){return d._mouseUp(a)},a(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate),b.preventDefault(),c=!0;return!0}},_mouseMove:function(b){if(a.browser.msie&&!(document.documentMode>=9)&&!b.button)return this._mouseUp(b);if(this._mouseStarted){this._mouseDrag(b);return b.preventDefault()}this._mouseDistanceMet(b)&&this._mouseDelayMet(b)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,b)!==!1,this._mouseStarted?this._mouseDrag(b):this._mouseUp(b));return!this._mouseStarted},_mouseUp:function(b){a(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,b.target==this._mouseDownEvent.target&&a.data(b.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(b));return!1},_mouseDistanceMet:function(a){return Math.max(Math.abs(this._mouseDownEvent.pageX-a.pageX),Math.abs(this._mouseDownEvent.pageY-a.pageY))>=this.options.distance},_mouseDelayMet:function(a){return this.mouseDelayMet},_mouseStart:function(a){},_mouseDrag:function(a){},_mouseStop:function(a){},_mouseCapture:function(a){return!0}})})(jQuery);/*
- * jQuery UI Sortable 1.8.18
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Sortables
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.mouse.js
- *	jquery.ui.widget.js
- */(function(a,b){a.widget("ui.sortable",a.ui.mouse,{widgetEventPrefix:"sort",ready:!1,options:{appendTo:"parent",axis:!1,connectWith:!1,containment:!1,cursor:"auto",cursorAt:!1,dropOnEmpty:!0,forcePlaceholderSize:!1,forceHelperSize:!1,grid:!1,handle:!1,helper:"original",items:"> *",opacity:!1,placeholder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1e3},_create:function(){var a=this.options;this.containerCache={},this.element.addClass("ui-sortable"),this.refresh(),this.floating=this.items.length?a.axis==="x"||/left|right/.test(this.items[0].item.css("float"))||/inline|table-cell/.test(this.items[0].item.css("display")):!1,this.offset=this.element.offset(),this._mouseInit(),this.ready=!0},destroy:function(){a.Widget.prototype.destroy.call(this),this.element.removeClass("ui-sortable ui-sortable-disabled"),this._mouseDestroy();for(var b=this.items.length-1;b>=0;b--)this.items[b].item.removeData(this.widgetName+"-item");return this},_setOption:function(b,c){b==="disabled"?(this.options[b]=c,this.widget()[c?"addClass":"removeClass"]("ui-sortable-disabled")):a.Widget.prototype._setOption.apply(this,arguments)},_mouseCapture:function(b,c){var d=this;if(this.reverting)return!1;if(this.options.disabled||this.options.type=="static")return!1;this._refreshItems(b);var e=null,f=this,g=a(b.target).parents().each(function(){if(a.data(this,d.widgetName+"-item")==f){e=a(this);return!1}});a.data(b.target,d.widgetName+"-item")==f&&(e=a(b.target));if(!e)return!1;if(this.options.handle&&!c){var h=!1;a(this.options.handle,e).find("*").andSelf().each(function(){this==b.target&&(h=!0)});if(!h)return!1}this.currentItem=e,this._removeCurrentsFromItems();return!0},_mouseStart:function(b,c,d){var e=this.options,f=this;this.currentContainer=this,this.refreshPositions(),this.helper=this._createHelper(b),this._cacheHelperProportions(),this._cacheMargins(),this.scrollParent=this.helper.scrollParent(),this.offset=this.currentItem.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},this.helper.css("position","absolute"),this.cssPosition=this.helper.css("position"),a.extend(this.offset,{click:{left:b.pageX-this.offset.left,top:b.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.originalPosition=this._generatePosition(b),this.originalPageX=b.pageX,this.originalPageY=b.pageY,e.cursorAt&&this._adjustOffsetFromHelper(e.cursorAt),this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]},this.helper[0]!=this.currentItem[0]&&this.currentItem.hide(),this._createPlaceholder(),e.containment&&this._setContainment(),e.cursor&&(a("body").css("cursor")&&(this._storedCursor=a("body").css("cursor")),a("body").css("cursor",e.cursor)),e.opacity&&(this.helper.css("opacity")&&(this._storedOpacity=this.helper.css("opacity")),this.helper.css("opacity",e.opacity)),e.zIndex&&(this.helper.css("zIndex")&&(this._storedZIndex=this.helper.css("zIndex")),this.helper.css("zIndex",e.zIndex)),this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"&&(this.overflowOffset=this.scrollParent.offset()),this._trigger("start",b,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProportions();if(!d)for(var g=this.containers.length-1;g>=0;g--)this.containers[g]._trigger("activate",b,f._uiHash(this));a.ui.ddmanager&&(a.ui.ddmanager.current=this),a.ui.ddmanager&&!e.dropBehaviour&&a.ui.ddmanager.prepareOffsets(this,b),this.dragging=!0,this.helper.addClass("ui-sortable-helper"),this._mouseDrag(b);return!0},_mouseDrag:function(b){this.position=this._generatePosition(b),this.positionAbs=this._convertPositionTo("absolute"),this.lastPositionAbs||(this.lastPositionAbs=this.positionAbs);if(this.options.scroll){var c=this.options,d=!1;this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"?(this.overflowOffset.top+this.scrollParent[0].offsetHeight-b.pageY<c.scrollSensitivity?this.scrollParent[0].scrollTop=d=this.scrollParent[0].scrollTop+c.scrollSpeed:b.pageY-this.overflowOffset.top<c.scrollSensitivity&&(this.scrollParent[0].scrollTop=d=this.scrollParent[0].scrollTop-c.scrollSpeed),this.overflowOffset.left+this.scrollParent[0].offsetWidth-b.pageX<c.scrollSensitivity?this.scrollParent[0].scrollLeft=d=this.scrollParent[0].scrollLeft+c.scrollSpeed:b.pageX-this.overflowOffset.left<c.scrollSensitivity&&(this.scrollParent[0].scrollLeft=d=this.scrollParent[0].scrollLeft-c.scrollSpeed)):(b.pageY-a(document).scrollTop()<c.scrollSensitivity?d=a(document).scrollTop(a(document).scrollTop()-c.scrollSpeed):a(window).height()-(b.pageY-a(document).scrollTop())<c.scrollSensitivity&&(d=a(document).scrollTop(a(document).scrollTop()+c.scrollSpeed)),b.pageX-a(document).scrollLeft()<c.scrollSensitivity?d=a(document).scrollLeft(a(document).scrollLeft()-c.scrollSpeed):a(window).width()-(b.pageX-a(document).scrollLeft())<c.scrollSensitivity&&(d=a(document).scrollLeft(a(document).scrollLeft()+c.scrollSpeed))),d!==!1&&a.ui.ddmanager&&!c.dropBehaviour&&a.ui.ddmanager.prepareOffsets(this,b)}this.positionAbs=this._convertPositionTo("absolute");if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";for(var e=this.items.length-1;e>=0;e--){var f=this.items[e],g=f.item[0],h=this._intersectsWithPointer(f);if(!h)continue;if(g!=this.currentItem[0]&&this.placeholder[h==1?"next":"prev"]()[0]!=g&&!a.ui.contains(this.placeholder[0],g)&&(this.options.type=="semi-dynamic"?!a.ui.contains(this.element[0],g):!0)){this.direction=h==1?"down":"up";if(this.options.tolerance=="pointer"||this._intersectsWithSides(f))this._rearrange(b,f);else break;this._trigger("change",b,this._uiHash());break}}this._contactContainers(b),a.ui.ddmanager&&a.ui.ddmanager.drag(this,b),this._trigger("sort",b,this._uiHash()),this.lastPositionAbs=this.positionAbs;return!1},_mouseStop:function(b,c){if(!!b){a.ui.ddmanager&&!this.options.dropBehaviour&&a.ui.ddmanager.drop(this,b);if(this.options.revert){var d=this,e=d.placeholder.offset();d.reverting=!0,a(this.helper).animate({left:e.left-this.offset.parent.left-d.margins.left+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollLeft),top:e.top-this.offset.parent.top-d.margins.top+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollTop)},parseInt(this.options.revert,10)||500,function(){d._clear(b)})}else this._clear(b,c);return!1}},cancel:function(){var b=this;if(this.dragging){this._mouseUp({target:null}),this.options.helper=="original"?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"):this.currentItem.show();for(var c=this.containers.length-1;c>=0;c--)this.containers[c]._trigger("deactivate",null,b._uiHash(this)),this.containers[c].containerCache.over&&(this.containers[c]._trigger("out",null,b._uiHash(this)),this.containers[c].containerCache.over=0)}this.placeholder&&(this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.options.helper!="original"&&this.helper&&this.helper[0].parentNode&&this.helper.remove(),a.extend(this,{helper:null,dragging:!1,reverting:!1,_noFinalSort:null}),this.domPosition.prev?a(this.domPosition.prev).after(this.currentItem):a(this.domPosition.parent).prepend(this.currentItem));return this},serialize:function(b){var c=this._getItemsAsjQuery(b&&b.connected),d=[];b=b||{},a(c).each(function(){var c=(a(b.item||this).attr(b.attribute||"id")||"").match(b.expression||/(.+)[-=_](.+)/);c&&d.push((b.key||c[1]+"[]")+"="+(b.key&&b.expression?c[1]:c[2]))}),!d.length&&b.key&&d.push(b.key+"=");return d.join("&")},toArray:function(b){var c=this._getItemsAsjQuery(b&&b.connected),d=[];b=b||{},c.each(function(){d.push(a(b.item||this).attr(b.attribute||"id")||"")});return d},_intersectsWith:function(a){var b=this.positionAbs.left,c=b+this.helperProportions.width,d=this.positionAbs.top,e=d+this.helperProportions.height,f=a.left,g=f+a.width,h=a.top,i=h+a.height,j=this.offset.click.top,k=this.offset.click.left,l=d+j>h&&d+j<i&&b+k>f&&b+k<g;return this.options.tolerance=="pointer"||this.options.forcePointerForContainers||this.options.tolerance!="pointer"&&this.helperProportions[this.floating?"width":"height"]>a[this.floating?"width":"height"]?l:f<b+this.helperProportions.width/2&&c-this.helperProportions.width/2<g&&h<d+this.helperProportions.height/2&&e-this.helperProportions.height/2<i},_intersectsWithPointer:function(b){var c=a.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,b.top,b.height),d=a.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,b.left,b.width),e=c&&d,f=this._getDragVerticalDirection(),g=this._getDragHorizontalDirection();if(!e)return!1;return this.floating?g&&g=="right"||f=="down"?2:1:f&&(f=="down"?2:1)},_intersectsWithSides:function(b){var c=a.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,b.top+b.height/2,b.height),d=a.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,b.left+b.width/2,b.width),e=this._getDragVerticalDirection(),f=this._getDragHorizontalDirection();return this.floating&&f?f=="right"&&d||f=="left"&&!d:e&&(e=="down"&&c||e=="up"&&!c)},_getDragVerticalDirection:function(){var a=this.positionAbs.top-this.lastPositionAbs.top;return a!=0&&(a>0?"down":"up")},_getDragHorizontalDirection:function(){var a=this.positionAbs.left-this.lastPositionAbs.left;return a!=0&&(a>0?"right":"left")},refresh:function(a){this._refreshItems(a),this.refreshPositions();return this},_connectWith:function(){var a=this.options;return a.connectWith.constructor==String?[a.connectWith]:a.connectWith},_getItemsAsjQuery:function(b){var c=this,d=[],e=[],f=this._connectWith();if(f&&b)for(var g=f.length-1;g>=0;g--){var h=a(f[g]);for(var i=h.length-1;i>=0;i--){var j=a.data(h[i],this.widgetName);j&&j!=this&&!j.options.disabled&&e.push([a.isFunction(j.options.items)?j.options.items.call(j.element):a(j.options.items,j.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),j])}}e.push([a.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):a(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]);for(var g=e.length-1;g>=0;g--)e[g][0].each(function(){d.push(this)});return a(d)},_removeCurrentsFromItems:function(){var a=this.currentItem.find(":data("+this.widgetName+"-item)");for(var b=0;b<this.items.length;b++)for(var c=0;c<a.length;c++)a[c]==this.items[b].item[0]&&this.items.splice(b,1)},_refreshItems:function(b){this.items=[],this.containers=[this];var c=this.items,d=this,e=[[a.isFunction(this.options.items)?this.options.items.call(this.element[0],b,{item:this.currentItem}):a(this.options.items,this.element),this]],f=this._connectWith();if(f&&this.ready)for(var g=f.length-1;g>=0;g--){var h=a(f[g]);for(var i=h.length-1;i>=0;i--){var j=a.data(h[i],this.widgetName);j&&j!=this&&!j.options.disabled&&(e.push([a.isFunction(j.options.items)?j.options.items.call(j.element[0],b,{item:this.currentItem}):a(j.options.items,j.element),j]),this.containers.push(j))}}for(var g=e.length-1;g>=0;g--){var k=e[g][1],l=e[g][0];for(var i=0,m=l.length;i<m;i++){var n=a(l[i]);n.data(this.widgetName+"-item",k),c.push({item:n,instance:k,width:0,height:0,left:0,top:0})}}},refreshPositions:function(b){this.offsetParent&&this.helper&&(this.offset.parent=this._getParentOffset());for(var c=this.items.length-1;c>=0;c--){var d=this.items[c];if(d.instance!=this.currentContainer&&this.currentContainer&&d.item[0]!=this.currentItem[0])continue;var e=this.options.toleranceElement?a(this.options.toleranceElement,d.item):d.item;b||(d.width=e.outerWidth(),d.height=e.outerHeight());var f=e.offset();d.left=f.left,d.top=f.top}if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(var c=this.containers.length-1;c>=0;c--){var f=this.containers[c].element.offset();this.containers[c].containerCache.left=f.left,this.containers[c].containerCache.top=f.top,this.containers[c].containerCache.width=this.containers[c].element.outerWidth(),this.containers[c].containerCache.height=this.containers[c].element.outerHeight()}return this},_createPlaceholder:function(b){var c=b||this,d=c.options;if(!d.placeholder||d.placeholder.constructor==String){var e=d.placeholder;d.placeholder={element:function(){var b=a(document.createElement(c.currentItem[0].nodeName)).addClass(e||c.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper")[0];e||(b.style.visibility="hidden");return b},update:function(a,b){if(!e||!!d.forcePlaceholderSize)b.height()||b.height(c.currentItem.innerHeight()-parseInt(c.currentItem.css("paddingTop")||0,10)-parseInt(c.currentItem.css("paddingBottom")||0,10)),b.width()||b.width(c.currentItem.innerWidth()-parseInt(c.currentItem.css("paddingLeft")||0,10)-parseInt(c.currentItem.css("paddingRight")||0,10))}}}c.placeholder=a(d.placeholder.element.call(c.element,c.currentItem)),c.currentItem.after(c.placeholder),d.placeholder.update(c,c.placeholder)},_contactContainers:function(b){var c=null,d=null;for(var e=this.containers.length-1;e>=0;e--){if(a.ui.contains(this.currentItem[0],this.containers[e].element[0]))continue;if(this._intersectsWith(this.containers[e].containerCache)){if(c&&a.ui.contains(this.containers[e].element[0],c.element[0]))continue;c=this.containers[e],d=e}else this.containers[e].containerCache.over&&(this.containers[e]._trigger("out",b,this._uiHash(this)),this.containers[e].containerCache.over=0)}if(!!c)if(this.containers.length===1)this.containers[d]._trigger("over",b,this._uiHash(this)),this.containers[d].containerCache.over=1;else if(this.currentContainer!=this.containers[d]){var f=1e4,g=null,h=this.positionAbs[this.containers[d].floating?"left":"top"];for(var i=this.items.length-1;i>=0;i--){if(!a.ui.contains(this.containers[d].element[0],this.items[i].item[0]))continue;var j=this.items[i][this.containers[d].floating?"left":"top"];Math.abs(j-h)<f&&(f=Math.abs(j-h),g=this.items[i])}if(!g&&!this.options.dropOnEmpty)return;this.currentContainer=this.containers[d],g?this._rearrange(b,g,null,!0):this._rearrange(b,null,this.containers[d].element,!0),this._trigger("change",b,this._uiHash()),this.containers[d]._trigger("change",b,this._uiHash(this)),this.options.placeholder.update(this.currentContainer,this.placeholder),this.containers[d]._trigger("over",b,this._uiHash(this)),this.containers[d].containerCache.over=1}},_createHelper:function(b){var c=this.options,d=a.isFunction(c.helper)?a(c.helper.apply(this.element[0],[b,this.currentItem])):c.helper=="clone"?this.currentItem.clone():this.currentItem;d.parents("body").length||a(c.appendTo!="parent"?c.appendTo:this.currentItem[0].parentNode)[0].appendChild(d[0]),d[0]==this.currentItem[0]&&(this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}),(d[0].style.width==""||c.forceHelperSize)&&d.width(this.currentItem.width()),(d[0].style.height==""||c.forceHelperSize)&&d.height(this.currentItem.height());return d},_adjustOffsetFromHelper:function(b){typeof b=="string"&&(b=b.split(" ")),a.isArray(b)&&(b={left:+b[0],top:+b[1]||0}),"left"in b&&(this.offset.click.left=b.left+this.margins.left),"right"in b&&(this.offset.click.left=this.helperProportions.width-b.right+this.margins.left),"top"in b&&(this.offset.click.top=b.top+this.margins.top),"bottom"in b&&(this.offset.click.top=this.helperProportions.height-b.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var b=this.offsetParent.offset();this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0])&&(b.left+=this.scrollParent.scrollLeft(),b.top+=this.scrollParent.scrollTop());if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&a.browser.msie)b={top:0,left:0};return{top:b.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:b.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var a=this.currentItem.position();return{top:a.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:a.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var b=this.options;b.containment=="parent"&&(b.containment=this.helper[0].parentNode);if(b.containment=="document"||b.containment=="window")this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,a(b.containment=="document"?document:window).width()-this.helperProportions.width-this.margins.left,(a(b.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(b.containment)){var c=a(b.containment)[0],d=a(b.containment).offset(),e=a(c).css("overflow")!="hidden";this.containment=[d.left+(parseInt(a(c).css("borderLeftWidth"),10)||0)+(parseInt(a(c).css("paddingLeft"),10)||0)-this.margins.left,d.top+(parseInt(a(c).css("borderTopWidth"),10)||0)+(parseInt(a(c).css("paddingTop"),10)||0)-this.margins.top,d.left+(e?Math.max(c.scrollWidth,c.offsetWidth):c.offsetWidth)-(parseInt(a(c).css("borderLeftWidth"),10)||0)-(parseInt(a(c).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,d.top+(e?Math.max(c.scrollHeight,c.offsetHeight):c.offsetHeight)-(parseInt(a(c).css("borderTopWidth"),10)||0)-(parseInt(a(c).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top]}},_convertPositionTo:function(b,c){c||(c=this.position);var d=b=="absolute"?1:-1,e=this.options,f=this.cssPosition=="absolute"&&(this.scrollParent[0]==document||!a.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,g=/(html|body)/i.test(f[0].tagName);return{top:c.top+this.offset.relative.top*d+this.offset.parent.top*d-(a.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():g?0:f.scrollTop())*d),left:c.left+this.offset.relative.left*d+this.offset.parent.left*d-(a.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():g?0:f.scrollLeft())*d)}},_generatePosition:function(b){var c=this.options,d=this.cssPosition=="absolute"&&(this.scrollParent[0]==document||!a.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,e=/(html|body)/i.test(d[0].tagName);this.cssPosition=="relative"&&(this.scrollParent[0]==document||this.scrollParent[0]==this.offsetParent[0])&&(this.offset.relative=this._getRelativeOffset());var f=b.pageX,g=b.pageY;if(this.originalPosition){this.containment&&(b.pageX-this.offset.click.left<this.containment[0]&&(f=this.containment[0]+this.offset.click.left),b.pageY-this.offset.click.top<this.containment[1]&&(g=this.containment[1]+this.offset.click.top),b.pageX-this.offset.click.left>this.containment[2]&&(f=this.containment[2]+this.offset.click.left),b.pageY-this.offset.click.top>this.containment[3]&&(g=this.containment[3]+this.offset.click.top));if(c.grid){var h=this.originalPageY+Math.round((g-this.originalPageY)/c.grid[1])*c.grid[1];g=this.containment?h-this.offset.click.top<this.containment[1]||h-this.offset.click.top>this.containment[3]?h-this.offset.click.top<this.containment[1]?h+c.grid[1]:h-c.grid[1]:h:h;var i=this.originalPageX+Math.round((f-this.originalPageX)/c.grid[0])*c.grid[0];f=this.containment?i-this.offset.click.left<this.containment[0]||i-this.offset.click.left>this.containment[2]?i-this.offset.click.left<this.containment[0]?i+c.grid[0]:i-c.grid[0]:i:i}}return{top:g-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(a.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollTop():e?0:d.scrollTop()),left:f-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(a.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():e?0:d.scrollLeft())}},_rearrange:function(a,b,c,d){c?c[0].appendChild(this.placeholder[0]):b.item[0].parentNode.insertBefore(this.placeholder[0],this.direction=="down"?b.item[0]:b.item[0].nextSibling),this.counter=this.counter?++this.counter:1;var e=this,f=this.counter;window.setTimeout(function(){f==e.counter&&e.refreshPositions(!d)},0)},_clear:function(b,c){this.reverting=!1;var d=[],e=this;!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem),this._noFinalSort=null;if(this.helper[0]==this.currentItem[0]){for(var f in this._storedCSS)if(this._storedCSS[f]=="auto"||this._storedCSS[f]=="static")this._storedCSS[f]="";this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.currentItem.show();this.fromOutside&&!c&&d.push(function(a){this._trigger("receive",a,this._uiHash(this.fromOutside))}),(this.fromOutside||this.domPosition.prev!=this.currentItem.prev().not(".ui-sortable-helper")[0]||this.domPosition.parent!=this.currentItem.parent()[0])&&!c&&d.push(function(a){this._trigger("update",a,this._uiHash())});if(!a.ui.contains(this.element[0],this.currentItem[0])){c||d.push(function(a){this._trigger("remove",a,this._uiHash())});for(var f=this.containers.length-1;f>=0;f--)a.ui.contains(this.containers[f].element[0],this.currentItem[0])&&!c&&(d.push(function(a){return function(b){a._trigger("receive",b,this._uiHash(this))}}.call(this,this.containers[f])),d.push(function(a){return function(b){a._trigger("update",b,this._uiHash(this))}}.call(this,this.containers[f])))}for(var f=this.containers.length-1;f>=0;f--)c||d.push(function(a){return function(b){a._trigger("deactivate",b,this._uiHash(this))}}.call(this,this.containers[f])),this.containers[f].containerCache.over&&(d.push(function(a){return function(b){a._trigger("out",b,this._uiHash(this))}}.call(this,this.containers[f])),this.containers[f].containerCache.over=0);this._storedCursor&&a("body").css("cursor",this._storedCursor),this._storedOpacity&&this.helper.css("opacity",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex",this._storedZIndex=="auto"?"":this._storedZIndex),this.dragging=!1;if(this.cancelHelperRemoval){if(!c){this._trigger("beforeStop",b,this._uiHash());for(var f=0;f<d.length;f++)d[f].call(this,b);this._trigger("stop",b,this._uiHash())}return!1}c||this._trigger("beforeStop",b,this._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.helper[0]!=this.currentItem[0]&&this.helper.remove(),this.helper=null;if(!c){for(var f=0;f<d.length;f++)d[f].call(this,b);this._trigger("stop",b,this._uiHash())}this.fromOutside=!1;return!0},_trigger:function(){a.Widget.prototype._trigger.apply(this,arguments)===!1&&this.cancel()},_uiHash:function(b){var c=b||this;return{helper:c.helper,placeholder:c.placeholder||a([]),position:c.position,originalPosition:c.originalPosition,offset:c.positionAbs,item:c.currentItem,sender:b?b.element:null}}}),a.extend(a.ui.sortable,{version:"1.8.18"})})(jQuery);
\ No newline at end of file
diff --git a/openslides/projector/static/javascript/jquery-ui.min.js b/openslides/projector/static/javascript/jquery-ui.min.js
new file mode 100755
index 000000000..e2e311ec5
--- /dev/null
+++ b/openslides/projector/static/javascript/jquery-ui.min.js
@@ -0,0 +1,20 @@
+/*! jQuery UI - v1.8.23 - 2012-08-15
+* Custom jquery UI file for OpenSlides Dashboard widget code: 
+* UI Core+Widget+Mouse+Sortable
+*
+* https://github.com/jquery/jquery-ui
+* Includes: jquery.ui.core.js
+* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
+(function(a,b){function c(b,c){var e=b.nodeName.toLowerCase();if("area"===e){var f=b.parentNode,g=f.name,h;return!b.href||!g||f.nodeName.toLowerCase()!=="map"?!1:(h=a("img[usemap=#"+g+"]")[0],!!h&&d(h))}return(/input|select|textarea|button|object/.test(e)?!b.disabled:"a"==e?b.href||c:c)&&d(b)}function d(b){return!a(b).parents().andSelf().filter(function(){return a.curCSS(this,"visibility")==="hidden"||a.expr.filters.hidden(this)}).length}a.ui=a.ui||{};if(a.ui.version)return;a.extend(a.ui,{version:"1.8.23",keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMMAND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38,WINDOWS:91}}),a.fn.extend({propAttr:a.fn.prop||a.fn.attr,_focus:a.fn.focus,focus:function(b,c){return typeof b=="number"?this.each(function(){var d=this;setTimeout(function(){a(d).focus(),c&&c.call(d)},b)}):this._focus.apply(this,arguments)},scrollParent:function(){var b;return a.browser.msie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?b=this.parents().filter(function(){return/(relative|absolute|fixed)/.test(a.curCSS(this,"position",1))&&/(auto|scroll)/.test(a.curCSS(this,"overflow",1)+a.curCSS(this,"overflow-y",1)+a.curCSS(this,"overflow-x",1))}).eq(0):b=this.parents().filter(function(){return/(auto|scroll)/.test(a.curCSS(this,"overflow",1)+a.curCSS(this,"overflow-y",1)+a.curCSS(this,"overflow-x",1))}).eq(0),/fixed/.test(this.css("position"))||!b.length?a(document):b},zIndex:function(c){if(c!==b)return this.css("zIndex",c);if(this.length){var d=a(this[0]),e,f;while(d.length&&d[0]!==document){e=d.css("position");if(e==="absolute"||e==="relative"||e==="fixed"){f=parseInt(d.css("zIndex"),10);if(!isNaN(f)&&f!==0)return f}d=d.parent()}}return 0},disableSelection:function(){return this.bind((a.support.selectstart?"selectstart":"mousedown")+".ui-disableSelection",function(a){a.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}}),a("<a>").outerWidth(1).jquery||a.each(["Width","Height"],function(c,d){function h(b,c,d,f){return a.each(e,function(){c-=parseFloat(a.curCSS(b,"padding"+this,!0))||0,d&&(c-=parseFloat(a.curCSS(b,"border"+this+"Width",!0))||0),f&&(c-=parseFloat(a.curCSS(b,"margin"+this,!0))||0)}),c}var e=d==="Width"?["Left","Right"]:["Top","Bottom"],f=d.toLowerCase(),g={innerWidth:a.fn.innerWidth,innerHeight:a.fn.innerHeight,outerWidth:a.fn.outerWidth,outerHeight:a.fn.outerHeight};a.fn["inner"+d]=function(c){return c===b?g["inner"+d].call(this):this.each(function(){a(this).css(f,h(this,c)+"px")})},a.fn["outer"+d]=function(b,c){return typeof b!="number"?g["outer"+d].call(this,b):this.each(function(){a(this).css(f,h(this,b,!0,c)+"px")})}}),a.extend(a.expr[":"],{data:a.expr.createPseudo?a.expr.createPseudo(function(b){return function(c){return!!a.data(c,b)}}):function(b,c,d){return!!a.data(b,d[3])},focusable:function(b){return c(b,!isNaN(a.attr(b,"tabindex")))},tabbable:function(b){var d=a.attr(b,"tabindex"),e=isNaN(d);return(e||d>=0)&&c(b,!e)}}),a(function(){var b=document.body,c=b.appendChild(c=document.createElement("div"));c.offsetHeight,a.extend(c.style,{minHeight:"100px",height:"auto",padding:0,borderWidth:0}),a.support.minHeight=c.offsetHeight===100,a.support.selectstart="onselectstart"in c,b.removeChild(c).style.display="none"}),a.curCSS||(a.curCSS=a.css),a.extend(a.ui,{plugin:{add:function(b,c,d){var e=a.ui[b].prototype;for(var f in d)e.plugins[f]=e.plugins[f]||[],e.plugins[f].push([c,d[f]])},call:function(a,b,c){var d=a.plugins[b];if(!d||!a.element[0].parentNode)return;for(var e=0;e<d.length;e++)a.options[d[e][0]]&&d[e][1].apply(a.element,c)}},contains:function(a,b){return document.compareDocumentPosition?a.compareDocumentPosition(b)&16:a!==b&&a.contains(b)},hasScroll:function(b,c){if(a(b).css("overflow")==="hidden")return!1;var d=c&&c==="left"?"scrollLeft":"scrollTop",e=!1;return b[d]>0?!0:(b[d]=1,e=b[d]>0,b[d]=0,e)},isOverAxis:function(a,b,c){return a>b&&a<b+c},isOver:function(b,c,d,e,f,g){return a.ui.isOverAxis(b,d,f)&&a.ui.isOverAxis(c,e,g)}})})(jQuery);;/*! jQuery UI - v1.8.23 - 2012-08-15
+* https://github.com/jquery/jquery-ui
+* Includes: jquery.ui.widget.js
+* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
+(function(a,b){if(a.cleanData){var c=a.cleanData;a.cleanData=function(b){for(var d=0,e;(e=b[d])!=null;d++)try{a(e).triggerHandler("remove")}catch(f){}c(b)}}else{var d=a.fn.remove;a.fn.remove=function(b,c){return this.each(function(){return c||(!b||a.filter(b,[this]).length)&&a("*",this).add([this]).each(function(){try{a(this).triggerHandler("remove")}catch(b){}}),d.call(a(this),b,c)})}}a.widget=function(b,c,d){var e=b.split(".")[0],f;b=b.split(".")[1],f=e+"-"+b,d||(d=c,c=a.Widget),a.expr[":"][f]=function(c){return!!a.data(c,b)},a[e]=a[e]||{},a[e][b]=function(a,b){arguments.length&&this._createWidget(a,b)};var g=new c;g.options=a.extend(!0,{},g.options),a[e][b].prototype=a.extend(!0,g,{namespace:e,widgetName:b,widgetEventPrefix:a[e][b].prototype.widgetEventPrefix||b,widgetBaseClass:f},d),a.widget.bridge(b,a[e][b])},a.widget.bridge=function(c,d){a.fn[c]=function(e){var f=typeof e=="string",g=Array.prototype.slice.call(arguments,1),h=this;return e=!f&&g.length?a.extend.apply(null,[!0,e].concat(g)):e,f&&e.charAt(0)==="_"?h:(f?this.each(function(){var d=a.data(this,c),f=d&&a.isFunction(d[e])?d[e].apply(d,g):d;if(f!==d&&f!==b)return h=f,!1}):this.each(function(){var b=a.data(this,c);b?b.option(e||{})._init():a.data(this,c,new d(e,this))}),h)}},a.Widget=function(a,b){arguments.length&&this._createWidget(a,b)},a.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",options:{disabled:!1},_createWidget:function(b,c){a.data(c,this.widgetName,this),this.element=a(c),this.options=a.extend(!0,{},this.options,this._getCreateOptions(),b);var d=this;this.element.bind("remove."+this.widgetName,function(){d.destroy()}),this._create(),this._trigger("create"),this._init()},_getCreateOptions:function(){return a.metadata&&a.metadata.get(this.element[0])[this.widgetName]},_create:function(){},_init:function(){},destroy:function(){this.element.unbind("."+this.widgetName).removeData(this.widgetName),this.widget().unbind("."+this.widgetName).removeAttr("aria-disabled").removeClass(this.widgetBaseClass+"-disabled "+"ui-state-disabled")},widget:function(){return this.element},option:function(c,d){var e=c;if(arguments.length===0)return a.extend({},this.options);if(typeof c=="string"){if(d===b)return this.options[c];e={},e[c]=d}return this._setOptions(e),this},_setOptions:function(b){var c=this;return a.each(b,function(a,b){c._setOption(a,b)}),this},_setOption:function(a,b){return this.options[a]=b,a==="disabled"&&this.widget()[b?"addClass":"removeClass"](this.widgetBaseClass+"-disabled"+" "+"ui-state-disabled").attr("aria-disabled",b),this},enable:function(){return this._setOption("disabled",!1)},disable:function(){return this._setOption("disabled",!0)},_trigger:function(b,c,d){var e,f,g=this.options[b];d=d||{},c=a.Event(c),c.type=(b===this.widgetEventPrefix?b:this.widgetEventPrefix+b).toLowerCase(),c.target=this.element[0],f=c.originalEvent;if(f)for(e in f)e in c||(c[e]=f[e]);return this.element.trigger(c,d),!(a.isFunction(g)&&g.call(this.element[0],c,d)===!1||c.isDefaultPrevented())}}})(jQuery);;/*! jQuery UI - v1.8.23 - 2012-08-15
+* https://github.com/jquery/jquery-ui
+* Includes: jquery.ui.mouse.js
+* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
+(function(a,b){var c=!1;a(document).mouseup(function(a){c=!1}),a.widget("ui.mouse",{options:{cancel:":input,option",distance:1,delay:0},_mouseInit:function(){var b=this;this.element.bind("mousedown."+this.widgetName,function(a){return b._mouseDown(a)}).bind("click."+this.widgetName,function(c){if(!0===a.data(c.target,b.widgetName+".preventClickEvent"))return a.removeData(c.target,b.widgetName+".preventClickEvent"),c.stopImmediatePropagation(),!1}),this.started=!1},_mouseDestroy:function(){this.element.unbind("."+this.widgetName),this._mouseMoveDelegate&&a(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(b){if(c)return;this._mouseStarted&&this._mouseUp(b),this._mouseDownEvent=b;var d=this,e=b.which==1,f=typeof this.options.cancel=="string"&&b.target.nodeName?a(b.target).closest(this.options.cancel).length:!1;if(!e||f||!this._mouseCapture(b))return!0;this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){d.mouseDelayMet=!0},this.options.delay));if(this._mouseDistanceMet(b)&&this._mouseDelayMet(b)){this._mouseStarted=this._mouseStart(b)!==!1;if(!this._mouseStarted)return b.preventDefault(),!0}return!0===a.data(b.target,this.widgetName+".preventClickEvent")&&a.removeData(b.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(a){return d._mouseMove(a)},this._mouseUpDelegate=function(a){return d._mouseUp(a)},a(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate),b.preventDefault(),c=!0,!0},_mouseMove:function(b){return!a.browser.msie||document.documentMode>=9||!!b.button?this._mouseStarted?(this._mouseDrag(b),b.preventDefault()):(this._mouseDistanceMet(b)&&this._mouseDelayMet(b)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,b)!==!1,this._mouseStarted?this._mouseDrag(b):this._mouseUp(b)),!this._mouseStarted):this._mouseUp(b)},_mouseUp:function(b){return a(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,b.target==this._mouseDownEvent.target&&a.data(b.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(b)),!1},_mouseDistanceMet:function(a){return Math.max(Math.abs(this._mouseDownEvent.pageX-a.pageX),Math.abs(this._mouseDownEvent.pageY-a.pageY))>=this.options.distance},_mouseDelayMet:function(a){return this.mouseDelayMet},_mouseStart:function(a){},_mouseDrag:function(a){},_mouseStop:function(a){},_mouseCapture:function(a){return!0}})})(jQuery);;/*! jQuery UI - v1.8.23 - 2012-08-15
+* https://github.com/jquery/jquery-ui
+* Includes: jquery.ui.sortable.js
+* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
+(function(a,b){a.widget("ui.sortable",a.ui.mouse,{widgetEventPrefix:"sort",ready:!1,options:{appendTo:"parent",axis:!1,connectWith:!1,containment:!1,cursor:"auto",cursorAt:!1,dropOnEmpty:!0,forcePlaceholderSize:!1,forceHelperSize:!1,grid:!1,handle:!1,helper:"original",items:"> *",opacity:!1,placeholder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1e3},_create:function(){var a=this.options;this.containerCache={},this.element.addClass("ui-sortable"),this.refresh(),this.floating=this.items.length?a.axis==="x"||/left|right/.test(this.items[0].item.css("float"))||/inline|table-cell/.test(this.items[0].item.css("display")):!1,this.offset=this.element.offset(),this._mouseInit(),this.ready=!0},destroy:function(){a.Widget.prototype.destroy.call(this),this.element.removeClass("ui-sortable ui-sortable-disabled"),this._mouseDestroy();for(var b=this.items.length-1;b>=0;b--)this.items[b].item.removeData(this.widgetName+"-item");return this},_setOption:function(b,c){b==="disabled"?(this.options[b]=c,this.widget()[c?"addClass":"removeClass"]("ui-sortable-disabled")):a.Widget.prototype._setOption.apply(this,arguments)},_mouseCapture:function(b,c){var d=this;if(this.reverting)return!1;if(this.options.disabled||this.options.type=="static")return!1;this._refreshItems(b);var e=null,f=this,g=a(b.target).parents().each(function(){if(a.data(this,d.widgetName+"-item")==f)return e=a(this),!1});a.data(b.target,d.widgetName+"-item")==f&&(e=a(b.target));if(!e)return!1;if(this.options.handle&&!c){var h=!1;a(this.options.handle,e).find("*").andSelf().each(function(){this==b.target&&(h=!0)});if(!h)return!1}return this.currentItem=e,this._removeCurrentsFromItems(),!0},_mouseStart:function(b,c,d){var e=this.options,f=this;this.currentContainer=this,this.refreshPositions(),this.helper=this._createHelper(b),this._cacheHelperProportions(),this._cacheMargins(),this.scrollParent=this.helper.scrollParent(),this.offset=this.currentItem.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},a.extend(this.offset,{click:{left:b.pageX-this.offset.left,top:b.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.helper.css("position","absolute"),this.cssPosition=this.helper.css("position"),this.originalPosition=this._generatePosition(b),this.originalPageX=b.pageX,this.originalPageY=b.pageY,e.cursorAt&&this._adjustOffsetFromHelper(e.cursorAt),this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]},this.helper[0]!=this.currentItem[0]&&this.currentItem.hide(),this._createPlaceholder(),e.containment&&this._setContainment(),e.cursor&&(a("body").css("cursor")&&(this._storedCursor=a("body").css("cursor")),a("body").css("cursor",e.cursor)),e.opacity&&(this.helper.css("opacity")&&(this._storedOpacity=this.helper.css("opacity")),this.helper.css("opacity",e.opacity)),e.zIndex&&(this.helper.css("zIndex")&&(this._storedZIndex=this.helper.css("zIndex")),this.helper.css("zIndex",e.zIndex)),this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"&&(this.overflowOffset=this.scrollParent.offset()),this._trigger("start",b,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProportions();if(!d)for(var g=this.containers.length-1;g>=0;g--)this.containers[g]._trigger("activate",b,f._uiHash(this));return a.ui.ddmanager&&(a.ui.ddmanager.current=this),a.ui.ddmanager&&!e.dropBehaviour&&a.ui.ddmanager.prepareOffsets(this,b),this.dragging=!0,this.helper.addClass("ui-sortable-helper"),this._mouseDrag(b),!0},_mouseDrag:function(b){this.position=this._generatePosition(b),this.positionAbs=this._convertPositionTo("absolute"),this.lastPositionAbs||(this.lastPositionAbs=this.positionAbs);if(this.options.scroll){var c=this.options,d=!1;this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"?(this.overflowOffset.top+this.scrollParent[0].offsetHeight-b.pageY<c.scrollSensitivity?this.scrollParent[0].scrollTop=d=this.scrollParent[0].scrollTop+c.scrollSpeed:b.pageY-this.overflowOffset.top<c.scrollSensitivity&&(this.scrollParent[0].scrollTop=d=this.scrollParent[0].scrollTop-c.scrollSpeed),this.overflowOffset.left+this.scrollParent[0].offsetWidth-b.pageX<c.scrollSensitivity?this.scrollParent[0].scrollLeft=d=this.scrollParent[0].scrollLeft+c.scrollSpeed:b.pageX-this.overflowOffset.left<c.scrollSensitivity&&(this.scrollParent[0].scrollLeft=d=this.scrollParent[0].scrollLeft-c.scrollSpeed)):(b.pageY-a(document).scrollTop()<c.scrollSensitivity?d=a(document).scrollTop(a(document).scrollTop()-c.scrollSpeed):a(window).height()-(b.pageY-a(document).scrollTop())<c.scrollSensitivity&&(d=a(document).scrollTop(a(document).scrollTop()+c.scrollSpeed)),b.pageX-a(document).scrollLeft()<c.scrollSensitivity?d=a(document).scrollLeft(a(document).scrollLeft()-c.scrollSpeed):a(window).width()-(b.pageX-a(document).scrollLeft())<c.scrollSensitivity&&(d=a(document).scrollLeft(a(document).scrollLeft()+c.scrollSpeed))),d!==!1&&a.ui.ddmanager&&!c.dropBehaviour&&a.ui.ddmanager.prepareOffsets(this,b)}this.positionAbs=this._convertPositionTo("absolute");if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";for(var e=this.items.length-1;e>=0;e--){var f=this.items[e],g=f.item[0],h=this._intersectsWithPointer(f);if(!h)continue;if(g!=this.currentItem[0]&&this.placeholder[h==1?"next":"prev"]()[0]!=g&&!a.ui.contains(this.placeholder[0],g)&&(this.options.type=="semi-dynamic"?!a.ui.contains(this.element[0],g):!0)){this.direction=h==1?"down":"up";if(this.options.tolerance=="pointer"||this._intersectsWithSides(f))this._rearrange(b,f);else break;this._trigger("change",b,this._uiHash());break}}return this._contactContainers(b),a.ui.ddmanager&&a.ui.ddmanager.drag(this,b),this._trigger("sort",b,this._uiHash()),this.lastPositionAbs=this.positionAbs,!1},_mouseStop:function(b,c){if(!b)return;a.ui.ddmanager&&!this.options.dropBehaviour&&a.ui.ddmanager.drop(this,b);if(this.options.revert){var d=this,e=d.placeholder.offset();d.reverting=!0,a(this.helper).animate({left:e.left-this.offset.parent.left-d.margins.left+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollLeft),top:e.top-this.offset.parent.top-d.margins.top+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollTop)},parseInt(this.options.revert,10)||500,function(){d._clear(b)})}else this._clear(b,c);return!1},cancel:function(){var b=this;if(this.dragging){this._mouseUp({target:null}),this.options.helper=="original"?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"):this.currentItem.show();for(var c=this.containers.length-1;c>=0;c--)this.containers[c]._trigger("deactivate",null,b._uiHash(this)),this.containers[c].containerCache.over&&(this.containers[c]._trigger("out",null,b._uiHash(this)),this.containers[c].containerCache.over=0)}return this.placeholder&&(this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.options.helper!="original"&&this.helper&&this.helper[0].parentNode&&this.helper.remove(),a.extend(this,{helper:null,dragging:!1,reverting:!1,_noFinalSort:null}),this.domPosition.prev?a(this.domPosition.prev).after(this.currentItem):a(this.domPosition.parent).prepend(this.currentItem)),this},serialize:function(b){var c=this._getItemsAsjQuery(b&&b.connected),d=[];return b=b||{},a(c).each(function(){var c=(a(b.item||this).attr(b.attribute||"id")||"").match(b.expression||/(.+)[-=_](.+)/);c&&d.push((b.key||c[1]+"[]")+"="+(b.key&&b.expression?c[1]:c[2]))}),!d.length&&b.key&&d.push(b.key+"="),d.join("&")},toArray:function(b){var c=this._getItemsAsjQuery(b&&b.connected),d=[];return b=b||{},c.each(function(){d.push(a(b.item||this).attr(b.attribute||"id")||"")}),d},_intersectsWith:function(a){var b=this.positionAbs.left,c=b+this.helperProportions.width,d=this.positionAbs.top,e=d+this.helperProportions.height,f=a.left,g=f+a.width,h=a.top,i=h+a.height,j=this.offset.click.top,k=this.offset.click.left,l=d+j>h&&d+j<i&&b+k>f&&b+k<g;return this.options.tolerance=="pointer"||this.options.forcePointerForContainers||this.options.tolerance!="pointer"&&this.helperProportions[this.floating?"width":"height"]>a[this.floating?"width":"height"]?l:f<b+this.helperProportions.width/2&&c-this.helperProportions.width/2<g&&h<d+this.helperProportions.height/2&&e-this.helperProportions.height/2<i},_intersectsWithPointer:function(b){var c=this.options.axis==="x"||a.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,b.top,b.height),d=this.options.axis==="y"||a.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,b.left,b.width),e=c&&d,f=this._getDragVerticalDirection(),g=this._getDragHorizontalDirection();return e?this.floating?g&&g=="right"||f=="down"?2:1:f&&(f=="down"?2:1):!1},_intersectsWithSides:function(b){var c=a.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,b.top+b.height/2,b.height),d=a.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,b.left+b.width/2,b.width),e=this._getDragVerticalDirection(),f=this._getDragHorizontalDirection();return this.floating&&f?f=="right"&&d||f=="left"&&!d:e&&(e=="down"&&c||e=="up"&&!c)},_getDragVerticalDirection:function(){var a=this.positionAbs.top-this.lastPositionAbs.top;return a!=0&&(a>0?"down":"up")},_getDragHorizontalDirection:function(){var a=this.positionAbs.left-this.lastPositionAbs.left;return a!=0&&(a>0?"right":"left")},refresh:function(a){return this._refreshItems(a),this.refreshPositions(),this},_connectWith:function(){var a=this.options;return a.connectWith.constructor==String?[a.connectWith]:a.connectWith},_getItemsAsjQuery:function(b){var c=this,d=[],e=[],f=this._connectWith();if(f&&b)for(var g=f.length-1;g>=0;g--){var h=a(f[g]);for(var i=h.length-1;i>=0;i--){var j=a.data(h[i],this.widgetName);j&&j!=this&&!j.options.disabled&&e.push([a.isFunction(j.options.items)?j.options.items.call(j.element):a(j.options.items,j.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),j])}}e.push([a.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):a(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]);for(var g=e.length-1;g>=0;g--)e[g][0].each(function(){d.push(this)});return a(d)},_removeCurrentsFromItems:function(){var a=this.currentItem.find(":data("+this.widgetName+"-item)");for(var b=0;b<this.items.length;b++)for(var c=0;c<a.length;c++)a[c]==this.items[b].item[0]&&this.items.splice(b,1)},_refreshItems:function(b){this.items=[],this.containers=[this];var c=this.items,d=this,e=[[a.isFunction(this.options.items)?this.options.items.call(this.element[0],b,{item:this.currentItem}):a(this.options.items,this.element),this]],f=this._connectWith();if(f&&this.ready)for(var g=f.length-1;g>=0;g--){var h=a(f[g]);for(var i=h.length-1;i>=0;i--){var j=a.data(h[i],this.widgetName);j&&j!=this&&!j.options.disabled&&(e.push([a.isFunction(j.options.items)?j.options.items.call(j.element[0],b,{item:this.currentItem}):a(j.options.items,j.element),j]),this.containers.push(j))}}for(var g=e.length-1;g>=0;g--){var k=e[g][1],l=e[g][0];for(var i=0,m=l.length;i<m;i++){var n=a(l[i]);n.data(this.widgetName+"-item",k),c.push({item:n,instance:k,width:0,height:0,left:0,top:0})}}},refreshPositions:function(b){this.offsetParent&&this.helper&&(this.offset.parent=this._getParentOffset());for(var c=this.items.length-1;c>=0;c--){var d=this.items[c];if(d.instance!=this.currentContainer&&this.currentContainer&&d.item[0]!=this.currentItem[0])continue;var e=this.options.toleranceElement?a(this.options.toleranceElement,d.item):d.item;b||(d.width=e.outerWidth(),d.height=e.outerHeight());var f=e.offset();d.left=f.left,d.top=f.top}if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(var c=this.containers.length-1;c>=0;c--){var f=this.containers[c].element.offset();this.containers[c].containerCache.left=f.left,this.containers[c].containerCache.top=f.top,this.containers[c].containerCache.width=this.containers[c].element.outerWidth(),this.containers[c].containerCache.height=this.containers[c].element.outerHeight()}return this},_createPlaceholder:function(b){var c=b||this,d=c.options;if(!d.placeholder||d.placeholder.constructor==String){var e=d.placeholder;d.placeholder={element:function(){var b=a(document.createElement(c.currentItem[0].nodeName)).addClass(e||c.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper")[0];return e||(b.style.visibility="hidden"),b},update:function(a,b){if(e&&!d.forcePlaceholderSize)return;b.height()||b.height(c.currentItem.innerHeight()-parseInt(c.currentItem.css("paddingTop")||0,10)-parseInt(c.currentItem.css("paddingBottom")||0,10)),b.width()||b.width(c.currentItem.innerWidth()-parseInt(c.currentItem.css("paddingLeft")||0,10)-parseInt(c.currentItem.css("paddingRight")||0,10))}}}c.placeholder=a(d.placeholder.element.call(c.element,c.currentItem)),c.currentItem.after(c.placeholder),d.placeholder.update(c,c.placeholder)},_contactContainers:function(b){var c=null,d=null;for(var e=this.containers.length-1;e>=0;e--){if(a.ui.contains(this.currentItem[0],this.containers[e].element[0]))continue;if(this._intersectsWith(this.containers[e].containerCache)){if(c&&a.ui.contains(this.containers[e].element[0],c.element[0]))continue;c=this.containers[e],d=e}else this.containers[e].containerCache.over&&(this.containers[e]._trigger("out",b,this._uiHash(this)),this.containers[e].containerCache.over=0)}if(!c)return;if(this.containers.length===1)this.containers[d]._trigger("over",b,this._uiHash(this)),this.containers[d].containerCache.over=1;else if(this.currentContainer!=this.containers[d]){var f=1e4,g=null,h=this.positionAbs[this.containers[d].floating?"left":"top"];for(var i=this.items.length-1;i>=0;i--){if(!a.ui.contains(this.containers[d].element[0],this.items[i].item[0]))continue;var j=this.containers[d].floating?this.items[i].item.offset().left:this.items[i].item.offset().top;Math.abs(j-h)<f&&(f=Math.abs(j-h),g=this.items[i],this.direction=j-h>0?"down":"up")}if(!g&&!this.options.dropOnEmpty)return;this.currentContainer=this.containers[d],g?this._rearrange(b,g,null,!0):this._rearrange(b,null,this.containers[d].element,!0),this._trigger("change",b,this._uiHash()),this.containers[d]._trigger("change",b,this._uiHash(this)),this.options.placeholder.update(this.currentContainer,this.placeholder),this.containers[d]._trigger("over",b,this._uiHash(this)),this.containers[d].containerCache.over=1}},_createHelper:function(b){var c=this.options,d=a.isFunction(c.helper)?a(c.helper.apply(this.element[0],[b,this.currentItem])):c.helper=="clone"?this.currentItem.clone():this.currentItem;return d.parents("body").length||a(c.appendTo!="parent"?c.appendTo:this.currentItem[0].parentNode)[0].appendChild(d[0]),d[0]==this.currentItem[0]&&(this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}),(d[0].style.width==""||c.forceHelperSize)&&d.width(this.currentItem.width()),(d[0].style.height==""||c.forceHelperSize)&&d.height(this.currentItem.height()),d},_adjustOffsetFromHelper:function(b){typeof b=="string"&&(b=b.split(" ")),a.isArray(b)&&(b={left:+b[0],top:+b[1]||0}),"left"in b&&(this.offset.click.left=b.left+this.margins.left),"right"in b&&(this.offset.click.left=this.helperProportions.width-b.right+this.margins.left),"top"in b&&(this.offset.click.top=b.top+this.margins.top),"bottom"in b&&(this.offset.click.top=this.helperProportions.height-b.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var b=this.offsetParent.offset();this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0])&&(b.left+=this.scrollParent.scrollLeft(),b.top+=this.scrollParent.scrollTop());if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&a.browser.msie)b={top:0,left:0};return{top:b.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:b.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var a=this.currentItem.position();return{top:a.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:a.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var b=this.options;b.containment=="parent"&&(b.containment=this.helper[0].parentNode);if(b.containment=="document"||b.containment=="window")this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,a(b.containment=="document"?document:window).width()-this.helperProportions.width-this.margins.left,(a(b.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(b.containment)){var c=a(b.containment)[0],d=a(b.containment).offset(),e=a(c).css("overflow")!="hidden";this.containment=[d.left+(parseInt(a(c).css("borderLeftWidth"),10)||0)+(parseInt(a(c).css("paddingLeft"),10)||0)-this.margins.left,d.top+(parseInt(a(c).css("borderTopWidth"),10)||0)+(parseInt(a(c).css("paddingTop"),10)||0)-this.margins.top,d.left+(e?Math.max(c.scrollWidth,c.offsetWidth):c.offsetWidth)-(parseInt(a(c).css("borderLeftWidth"),10)||0)-(parseInt(a(c).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,d.top+(e?Math.max(c.scrollHeight,c.offsetHeight):c.offsetHeight)-(parseInt(a(c).css("borderTopWidth"),10)||0)-(parseInt(a(c).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top]}},_convertPositionTo:function(b,c){c||(c=this.position);var d=b=="absolute"?1:-1,e=this.options,f=this.cssPosition=="absolute"&&(this.scrollParent[0]==document||!a.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,g=/(html|body)/i.test(f[0].tagName);return{top:c.top+this.offset.relative.top*d+this.offset.parent.top*d-(a.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():g?0:f.scrollTop())*d),left:c.left+this.offset.relative.left*d+this.offset.parent.left*d-(a.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():g?0:f.scrollLeft())*d)}},_generatePosition:function(b){var c=this.options,d=this.cssPosition=="absolute"&&(this.scrollParent[0]==document||!a.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,e=/(html|body)/i.test(d[0].tagName);this.cssPosition=="relative"&&(this.scrollParent[0]==document||this.scrollParent[0]==this.offsetParent[0])&&(this.offset.relative=this._getRelativeOffset());var f=b.pageX,g=b.pageY;if(this.originalPosition){this.containment&&(b.pageX-this.offset.click.left<this.containment[0]&&(f=this.containment[0]+this.offset.click.left),b.pageY-this.offset.click.top<this.containment[1]&&(g=this.containment[1]+this.offset.click.top),b.pageX-this.offset.click.left>this.containment[2]&&(f=this.containment[2]+this.offset.click.left),b.pageY-this.offset.click.top>this.containment[3]&&(g=this.containment[3]+this.offset.click.top));if(c.grid){var h=this.originalPageY+Math.round((g-this.originalPageY)/c.grid[1])*c.grid[1];g=this.containment?h-this.offset.click.top<this.containment[1]||h-this.offset.click.top>this.containment[3]?h-this.offset.click.top<this.containment[1]?h+c.grid[1]:h-c.grid[1]:h:h;var i=this.originalPageX+Math.round((f-this.originalPageX)/c.grid[0])*c.grid[0];f=this.containment?i-this.offset.click.left<this.containment[0]||i-this.offset.click.left>this.containment[2]?i-this.offset.click.left<this.containment[0]?i+c.grid[0]:i-c.grid[0]:i:i}}return{top:g-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(a.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollTop():e?0:d.scrollTop()),left:f-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(a.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():e?0:d.scrollLeft())}},_rearrange:function(a,b,c,d){c?c[0].appendChild(this.placeholder[0]):b.item[0].parentNode.insertBefore(this.placeholder[0],this.direction=="down"?b.item[0]:b.item[0].nextSibling),this.counter=this.counter?++this.counter:1;var e=this,f=this.counter;window.setTimeout(function(){f==e.counter&&e.refreshPositions(!d)},0)},_clear:function(b,c){this.reverting=!1;var d=[],e=this;!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem),this._noFinalSort=null;if(this.helper[0]==this.currentItem[0]){for(var f in this._storedCSS)if(this._storedCSS[f]=="auto"||this._storedCSS[f]=="static")this._storedCSS[f]="";this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.currentItem.show();this.fromOutside&&!c&&d.push(function(a){this._trigger("receive",a,this._uiHash(this.fromOutside))}),(this.fromOutside||this.domPosition.prev!=this.currentItem.prev().not(".ui-sortable-helper")[0]||this.domPosition.parent!=this.currentItem.parent()[0])&&!c&&d.push(function(a){this._trigger("update",a,this._uiHash())});if(!a.ui.contains(this.element[0],this.currentItem[0])){c||d.push(function(a){this._trigger("remove",a,this._uiHash())});for(var f=this.containers.length-1;f>=0;f--)a.ui.contains(this.containers[f].element[0],this.currentItem[0])&&!c&&(d.push(function(a){return function(b){a._trigger("receive",b,this._uiHash(this))}}.call(this,this.containers[f])),d.push(function(a){return function(b){a._trigger("update",b,this._uiHash(this))}}.call(this,this.containers[f])))}for(var f=this.containers.length-1;f>=0;f--)c||d.push(function(a){return function(b){a._trigger("deactivate",b,this._uiHash(this))}}.call(this,this.containers[f])),this.containers[f].containerCache.over&&(d.push(function(a){return function(b){a._trigger("out",b,this._uiHash(this))}}.call(this,this.containers[f])),this.containers[f].containerCache.over=0);this._storedCursor&&a("body").css("cursor",this._storedCursor),this._storedOpacity&&this.helper.css("opacity",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex",this._storedZIndex=="auto"?"":this._storedZIndex),this.dragging=!1;if(this.cancelHelperRemoval){if(!c){this._trigger("beforeStop",b,this._uiHash());for(var f=0;f<d.length;f++)d[f].call(this,b);this._trigger("stop",b,this._uiHash())}return this.fromOutside=!1,!1}c||this._trigger("beforeStop",b,this._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.helper[0]!=this.currentItem[0]&&this.helper.remove(),this.helper=null;if(!c){for(var f=0;f<d.length;f++)d[f].call(this,b);this._trigger("stop",b,this._uiHash())}return this.fromOutside=!1,!0},_trigger:function(){a.Widget.prototype._trigger.apply(this,arguments)===!1&&this.cancel()},_uiHash:function(b){var c=b||this;return{helper:c.helper,placeholder:c.placeholder||a([]),position:c.position,originalPosition:c.originalPosition,offset:c.positionAbs,item:c.currentItem,sender:b?b.element:null}}}),a.extend(a.ui.sortable,{version:"1.8.23"})})(jQuery);;
\ No newline at end of file
diff --git a/openslides/projector/static/styles/dashboard.css b/openslides/projector/static/styles/dashboard.css
index 1ff1b62ed..fa978c072 100644
--- a/openslides/projector/static/styles/dashboard.css
+++ b/openslides/projector/static/styles/dashboard.css
@@ -5,32 +5,65 @@
  * :license: GNU GPL, see LICENSE for more details.
  */
 
-/* Portlet */
+/** Widgets **/
 .column {
     width: 50%;
     float: left;
     padding-bottom: 100px;
 }
-.portlet {
+.widget {
     margin: 0 10px 10px 0;
 }
-.portlet-header {
-    margin: 0.3em;
-    padding-bottom: 4px;
-    padding-left: 0.2em;
+.widget-header {
+    height: 30px;
+    background: #E9E9E9;
+    background:-moz-linear-gradient(top, #FAFAFA 0%, #E9E9E9 100%); /* FF3.6+ */
+    background:-webkit-gradient(linear, left top, left bottom, color-stop(0%,#FAFAFA), color-stop(100%,#E9E9E9)); /* Chrome,Safari4+ */
+    background:-webkit-linear-gradient(top, #FAFAFA 0%,#E9E9E9 100%); /* Chrome10+,Safari5.1+ */
+    background:-o-linear-gradient(top, #FAFAFA 0%,#E9E9E9 100%); /* Opera11.10+ */
+    background:-ms-linear-gradient(top, #FAFAFA 0%,#E9E9E9 100%); /* IE10+ */
+    background:linear-gradient(top, #FAFAFA 0%,#E9E9E9 100%); /* W3C */
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FAFAFA', endColorstr='#E9E9E9');
+    -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#FAFAFA', endColorstr='#E9E9E9')";
+    border: 1px solid #D5D5D5;
+    border-radius: 5px 5px 0 0;
+    -moz-border-radius: 5px 5px 0 0;
+    -webkit-border-radius: 5px 5px 0 0;
+
 }
-.portlet-header .ui-icon {
-    float: right;
+.widget-header h3 {
+    padding-left: 7px;
+    margin: 7px 0;
+    display: inline-block;
+    font-size: 14px;
+    color: #555;
+    line-height: 18px;
 }
-.portlet-content {
-    padding: 0.4em;
-    overflow: hidden;
+
+.widget-header [class^="icon-"], .widget-header [class*=" icon-"] {
+    display: inline-block;
+    margin: -2px 0 0 13px;
+    color: #555;
+    vertical-align: middle;
 }
-.portlet-content li{
+.widget-content {
+    padding: 20px 15px 15px 13px;
+    background: #FFF;
+    border: 1px solid #D5D5D5;
+    border-radius: 0 0 5px 5px;
+    -moz-border-radius: 0 0 5px 5px;
+    -webkit-border-radius: 0 0 5px 5px;
+}
+.widget-content li{
     padding: 4px 0;
 }
+.widget-content ul {
+    list-style: none inside none;
+    margin: 0;
+}
+
 .ui-sortable-placeholder {
-    border: 1px dotted black;
+    border: 2px dashed #555555;
     visibility: visible !important;
     height: 50px !important;
 }
@@ -42,7 +75,6 @@
 
 #countdown_time {
     width: 40px;
-    height: 16px;
 }
 
 /* iframe */
diff --git a/openslides/projector/static/styles/humanity/images/ui-bg_flat_75_aaaaaa_40x100.png b/openslides/projector/static/styles/humanity/images/ui-bg_flat_75_aaaaaa_40x100.png
deleted file mode 100644
index 5b5dab2ab7b1c50dea9cfe73dc5a269a92d2d4b4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 180
zcmeAS@N?(olHy`uVBq!ia0vp^8bF-F!3HG1q!d*FscKIb$B>N1x91EQ4=4yQ7#`R^
z$vje}<irI&an_s0pV!D+$FtuP31JO&3=I&aE+u|=5A)Hv$*VMh&S3C#^>bP0l+XkK
DSH>_4

diff --git a/openslides/projector/static/styles/humanity/images/ui-bg_glass_100_f5f0e5_1x400.png b/openslides/projector/static/styles/humanity/images/ui-bg_glass_100_f5f0e5_1x400.png
deleted file mode 100644
index 688c2f3e8806f3afcc0b659d397d142ee4a0bb1c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 157
zcmeAS@N?(olHy`uVBq!ia0vp^j6gJjgAGVZ#9R3S1yVd+978O6-(EE2I&2`|a&dor
zn8LpQws$p8OzfO3V%e~f#q0BpwPkHfr@d8n;J+1T@Kk-4oVon+?9YosV?K4Y1e?D1
zs@@-9Jj<x<G{?%kgh%twd*9}E>qz`Hmt(*75f0D)F-JJVxa8Kd#rie_?PKtC^>bP0
Hl+XkK#L_u`

diff --git a/openslides/projector/static/styles/humanity/images/ui-bg_glass_25_cb842e_1x400.png b/openslides/projector/static/styles/humanity/images/ui-bg_glass_25_cb842e_1x400.png
deleted file mode 100644
index 1936896d8846c8badd874b3b9e95f83d3ed058e6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 174
zcmeAS@N?(olHy`uVBq!ia0vp^j6gJjgAGVZ#9R3S1xh_#978O6-(K<NYIYE4dHAYc
zPEcN2+;W2Ymki5}lTJJwT)Qqxv$)U5v3n63e(^%p*Sl>hOA}_YJzO33!@c-pk!tR~
zbBjB^221Fze&!juU*1uNb)%4;NV!KTqvU;?_-QX||A-em&gf>6KPRYvW{2}7d;27I
Yy+X;iHtwsJ10BHN>FVdQ&MBb@0J^9>X8-^I

diff --git a/openslides/projector/static/styles/humanity/images/ui-bg_glass_70_ede4d4_1x400.png b/openslides/projector/static/styles/humanity/images/ui-bg_glass_70_ede4d4_1x400.png
deleted file mode 100644
index 779ef0d0e24ce761cdbf952b5f1db4c80face3fe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 125
zcmeAS@N?(olHy`uVBq!ia0vp^j6gJjgAK^akKnouq+C2*978O6-=0_GI$$8u{Lp^q
zf7$AWm7QHq4}Ei%X4Un~=od&jRJp~-f#c!!GZza*BQ7zQe>!w*!){Z@V@~lu1f43L
ZGQIlG{q(*7ZyC@$22WQ%mvv4FO#pkXEp7k+

diff --git a/openslides/projector/static/styles/humanity/images/ui-bg_highlight-hard_100_f4f0ec_1x100.png b/openslides/projector/static/styles/humanity/images/ui-bg_highlight-hard_100_f4f0ec_1x100.png
deleted file mode 100644
index 8766f00183abc559eeaa61766dc0401ba19de22c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 103
zcmeAS@N?(olHy`uVBq!ia0vp^j6j^i!3HGVb)pi0l%A)HV~E7m<R4!j|E^bKV`FQ3
z==LW);n#opgTML@{p$DaX>5FH&+JoXP|@hd!f^Go?6iA_FS-MDGI+ZBxvX<aXaWGx
CoFd);

diff --git a/openslides/projector/static/styles/humanity/images/ui-bg_highlight-hard_65_fee4bd_1x100.png b/openslides/projector/static/styles/humanity/images/ui-bg_highlight-hard_65_fee4bd_1x100.png
deleted file mode 100644
index 52d3a341825ea6d2f42a6eca315447b90f7de390..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 114
zcmeAS@N?(olHy`uVBq!ia0vp^j6j^i!3HGVb)pi0l%=POV~E7myXQA@GAIZ*U(EkD
z|GeRy2YTTg;WxOGK69w}o-oyIxNmT%vp`+w;fqHK6TY9zuqk*b#9E#tlln9L({-RB
N44$rjF6*2UngH;tCDQ-^

diff --git a/openslides/projector/static/styles/humanity/images/ui-bg_highlight-hard_75_f5f5b5_1x100.png b/openslides/projector/static/styles/humanity/images/ui-bg_highlight-hard_75_f5f5b5_1x100.png
deleted file mode 100644
index af01f12087bb21e0be013397e4ebf7b59204eae2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 147
zcmeAS@N?(olHy`uVBq!ia0vp^j6j^i!3Ja)XlH!`a-uw49780gZk^!B)nFjN-2Uf(
zt)0^cr4?7Mtr35@Qe;)dOz#^h5ka$@7<_MNZ<=1l<*<Cgf}k{(%pcp@JD6Q_PTUiW
xX=aT-cK^k%pKK{9>MZJAC$8GnU0<<-ano)i%lSMBf<RjsJYD@<);T3K0RU+<H4Xp(

diff --git a/openslides/projector/static/styles/humanity/images/ui-bg_inset-soft_100_f4f0ec_1x100.png b/openslides/projector/static/styles/humanity/images/ui-bg_inset-soft_100_f4f0ec_1x100.png
deleted file mode 100644
index 894bf7510988f8ac5e9fc0d4aa07e648996060ae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 113
zcmeAS@N?(olHy`uVBq!ia0vp^j6j^i!3HGVb)pi0l!d2@V~E7myFD8@859JLOuAnm
z!p&W+d&K>&!)#@C#Vt`)41X-VEY`E=8F4CHiTyaqm^J*t3L9f)M-i6wGUwAa1I=LY
MboFyt=akR{0QGnuVE_OC

diff --git a/openslides/projector/static/styles/humanity/images/ui-icons_c47a23_256x240.png b/openslides/projector/static/styles/humanity/images/ui-icons_c47a23_256x240.png
deleted file mode 100644
index 69f2f553d28ebffa8648293160cf8acc44ae745a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4369
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

diff --git a/openslides/projector/static/styles/humanity/images/ui-icons_cb672b_256x240.png b/openslides/projector/static/styles/humanity/images/ui-icons_cb672b_256x240.png
deleted file mode 100644
index b75ecdabd116ba5934db42fc78595081d146fe84..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4369
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

diff --git a/openslides/projector/static/styles/humanity/images/ui-icons_f08000_256x240.png b/openslides/projector/static/styles/humanity/images/ui-icons_f08000_256x240.png
deleted file mode 100644
index f0a003fade5baeada513d011f394edd12869b1ca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5355
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
W`?Hm7LpJ~Km-$3pU#(WfA?ANdi8TrU

diff --git a/openslides/projector/static/styles/humanity/images/ui-icons_f35f07_256x240.png b/openslides/projector/static/styles/humanity/images/ui-icons_f35f07_256x240.png
deleted file mode 100644
index 1105d2a24af98c4c549181ef0add91d99a18ef7d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5355
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
Yo*KkevH@B9zhCA9ZDXxk4VSq80ohk72><{9

diff --git a/openslides/projector/static/styles/humanity/images/ui-icons_ff7519_256x240.png b/openslides/projector/static/styles/humanity/images/ui-icons_ff7519_256x240.png
deleted file mode 100644
index 544517142205f1adfc22b44eda10028e10abd42c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4369
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

diff --git a/openslides/projector/static/styles/humanity/images/ui-icons_ffffff_256x240.png b/openslides/projector/static/styles/humanity/images/ui-icons_ffffff_256x240.png
deleted file mode 100644
index 42f8f992c727ddaa617da224a522e463df690387..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4369
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

diff --git a/openslides/projector/static/styles/humanity/jquery-ui-1.8.18.custom.css b/openslides/projector/static/styles/humanity/jquery-ui-1.8.18.custom.css
deleted file mode 100644
index 3bc67982d..000000000
--- a/openslides/projector/static/styles/humanity/jquery-ui-1.8.18.custom.css
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- * jQuery UI CSS Framework 1.8.18
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Theming/API
- */
-
-/* Layout helpers
-----------------------------------*/
-.ui-helper-hidden { display: none; }
-.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
-.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
-.ui-helper-clearfix:before, .ui-helper-clearfix:after { content: ""; display: table; }
-.ui-helper-clearfix:after { clear: both; }
-.ui-helper-clearfix { zoom: 1; }
-.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
-
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-disabled { cursor: default !important; }
-
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Overlays */
-.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
-
-
-/*
- * jQuery UI CSS Framework 1.8.18
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Theming/API
- *
- * To view and modify this theme, visit http://jqueryui.com/themeroller/?tr=ffDefault=Helvetica,Arial,sans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=6px&bgColorHeader=cb842e&bgTextureHeader=02_glass.png&bgImgOpacityHeader=25&borderColorHeader=d49768&fcHeader=ffffff&iconColorHeader=ffffff&bgColorContent=f4f0ec&bgTextureContent=05_inset_soft.png&bgImgOpacityContent=100&borderColorContent=e0cfc2&fcContent=1e1b1d&iconColorContent=c47a23&bgColorDefault=ede4d4&bgTextureDefault=02_glass.png&bgImgOpacityDefault=70&borderColorDefault=cdc3b7&fcDefault=3f3731&iconColorDefault=f08000&bgColorHover=f5f0e5&bgTextureHover=02_glass.png&bgImgOpacityHover=100&borderColorHover=f5ad66&fcHover=a46313&iconColorHover=f08000&bgColorActive=f4f0ec&bgTextureActive=04_highlight_hard.png&bgImgOpacityActive=100&borderColorActive=e0cfc2&fcActive=b85700&iconColorActive=f35f07&bgColorHighlight=f5f5b5&bgTextureHighlight=04_highlight_hard.png&bgImgOpacityHighlight=75&borderColorHighlight=d9bb73&fcHighlight=060200&iconColorHighlight=cb672b&bgColorError=fee4bd&bgTextureError=04_highlight_hard.png&bgImgOpacityError=65&borderColorError=f8893f&fcError=592003&iconColorError=ff7519&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=75&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=75&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
- */
-
-
-/* Component containers
-----------------------------------*/
-.ui-widget { font-size: 1em; }
-.ui-widget .ui-widget { font-size: 1em; }
-.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-size: 1em; }
-.ui-widget-content { border: 1px solid #e0cfc2; background: #f4f0ec url(images/ui-bg_inset-soft_100_f4f0ec_1x100.png) 50% bottom repeat-x; color: #1e1b1d; }
-.ui-widget-header { border: 1px solid #d49768; background: #cb842e url(images/ui-bg_glass_25_cb842e_1x400.png) 50% 50% repeat-x; color: #ffffff; font-weight: bold; }
-.ui-widget-header a { color: #ffffff; }
-
-/* Interaction states
-----------------------------------*/
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #cdc3b7; background: #ede4d4 url(images/ui-bg_glass_70_ede4d4_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #3f3731; }
-.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #3f3731; text-decoration: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #f5ad66; background: #f5f0e5 url(images/ui-bg_glass_100_f5f0e5_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #a46313; }
-.ui-state-hover a, .ui-state-hover a:hover { color: #a46313; text-decoration: none; }
-.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #e0cfc2; background: #f4f0ec url(images/ui-bg_highlight-hard_100_f4f0ec_1x100.png) 50% 50% repeat-x; font-weight: normal; color: #b85700; }
-.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #b85700; text-decoration: none; }
-.ui-widget :active { outline: none; }
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #d9bb73; background: #f5f5b5 url(images/ui-bg_highlight-hard_75_f5f5b5_1x100.png) 50% top repeat-x; color: #060200; }
-.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #060200; }
-.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #f8893f; background: #fee4bd url(images/ui-bg_highlight-hard_65_fee4bd_1x100.png) 50% top repeat-x; color: #592003; }
-.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #592003; }
-.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #592003; }
-.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
-.ui-priority-secondary, .ui-widget-content .ui-priority-secondary,  .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
-.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_c47a23_256x240.png); }
-.ui-widget-content .ui-icon {background-image: url(images/ui-icons_c47a23_256x240.png); }
-.ui-widget-header .ui-icon {background-image: url(images/ui-icons_ffffff_256x240.png); }
-.ui-state-default .ui-icon { background-image: url(images/ui-icons_f08000_256x240.png); }
-.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_f08000_256x240.png); }
-.ui-state-active .ui-icon {background-image: url(images/ui-icons_f35f07_256x240.png); }
-.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_cb672b_256x240.png); }
-.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_ff7519_256x240.png); }
-
-/* positioning */
-.ui-icon-carat-1-n { background-position: 0 0; }
-.ui-icon-carat-1-ne { background-position: -16px 0; }
-.ui-icon-carat-1-e { background-position: -32px 0; }
-.ui-icon-carat-1-se { background-position: -48px 0; }
-.ui-icon-carat-1-s { background-position: -64px 0; }
-.ui-icon-carat-1-sw { background-position: -80px 0; }
-.ui-icon-carat-1-w { background-position: -96px 0; }
-.ui-icon-carat-1-nw { background-position: -112px 0; }
-.ui-icon-carat-2-n-s { background-position: -128px 0; }
-.ui-icon-carat-2-e-w { background-position: -144px 0; }
-.ui-icon-triangle-1-n { background-position: 0 -16px; }
-.ui-icon-triangle-1-ne { background-position: -16px -16px; }
-.ui-icon-triangle-1-e { background-position: -32px -16px; }
-.ui-icon-triangle-1-se { background-position: -48px -16px; }
-.ui-icon-triangle-1-s { background-position: -64px -16px; }
-.ui-icon-triangle-1-sw { background-position: -80px -16px; }
-.ui-icon-triangle-1-w { background-position: -96px -16px; }
-.ui-icon-triangle-1-nw { background-position: -112px -16px; }
-.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
-.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
-.ui-icon-arrow-1-n { background-position: 0 -32px; }
-.ui-icon-arrow-1-ne { background-position: -16px -32px; }
-.ui-icon-arrow-1-e { background-position: -32px -32px; }
-.ui-icon-arrow-1-se { background-position: -48px -32px; }
-.ui-icon-arrow-1-s { background-position: -64px -32px; }
-.ui-icon-arrow-1-sw { background-position: -80px -32px; }
-.ui-icon-arrow-1-w { background-position: -96px -32px; }
-.ui-icon-arrow-1-nw { background-position: -112px -32px; }
-.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
-.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
-.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
-.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
-.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
-.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
-.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
-.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
-.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
-.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
-.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
-.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
-.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
-.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
-.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
-.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
-.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
-.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
-.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
-.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
-.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
-.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
-.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
-.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
-.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
-.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
-.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
-.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
-.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
-.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
-.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
-.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
-.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
-.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
-.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
-.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
-.ui-icon-arrow-4 { background-position: 0 -80px; }
-.ui-icon-arrow-4-diag { background-position: -16px -80px; }
-.ui-icon-extlink { background-position: -32px -80px; }
-.ui-icon-newwin { background-position: -48px -80px; }
-.ui-icon-refresh { background-position: -64px -80px; }
-.ui-icon-shuffle { background-position: -80px -80px; }
-.ui-icon-transfer-e-w { background-position: -96px -80px; }
-.ui-icon-transferthick-e-w { background-position: -112px -80px; }
-.ui-icon-folder-collapsed { background-position: 0 -96px; }
-.ui-icon-folder-open { background-position: -16px -96px; }
-.ui-icon-document { background-position: -32px -96px; }
-.ui-icon-document-b { background-position: -48px -96px; }
-.ui-icon-note { background-position: -64px -96px; }
-.ui-icon-mail-closed { background-position: -80px -96px; }
-.ui-icon-mail-open { background-position: -96px -96px; }
-.ui-icon-suitcase { background-position: -112px -96px; }
-.ui-icon-comment { background-position: -128px -96px; }
-.ui-icon-person { background-position: -144px -96px; }
-.ui-icon-print { background-position: -160px -96px; }
-.ui-icon-trash { background-position: -176px -96px; }
-.ui-icon-locked { background-position: -192px -96px; }
-.ui-icon-unlocked { background-position: -208px -96px; }
-.ui-icon-bookmark { background-position: -224px -96px; }
-.ui-icon-tag { background-position: -240px -96px; }
-.ui-icon-home { background-position: 0 -112px; }
-.ui-icon-flag { background-position: -16px -112px; }
-.ui-icon-calendar { background-position: -32px -112px; }
-.ui-icon-cart { background-position: -48px -112px; }
-.ui-icon-pencil { background-position: -64px -112px; }
-.ui-icon-clock { background-position: -80px -112px; }
-.ui-icon-disk { background-position: -96px -112px; }
-.ui-icon-calculator { background-position: -112px -112px; }
-.ui-icon-zoomin { background-position: -128px -112px; }
-.ui-icon-zoomout { background-position: -144px -112px; }
-.ui-icon-search { background-position: -160px -112px; }
-.ui-icon-wrench { background-position: -176px -112px; }
-.ui-icon-gear { background-position: -192px -112px; }
-.ui-icon-heart { background-position: -208px -112px; }
-.ui-icon-star { background-position: -224px -112px; }
-.ui-icon-link { background-position: -240px -112px; }
-.ui-icon-cancel { background-position: 0 -128px; }
-.ui-icon-plus { background-position: -16px -128px; }
-.ui-icon-plusthick { background-position: -32px -128px; }
-.ui-icon-minus { background-position: -48px -128px; }
-.ui-icon-minusthick { background-position: -64px -128px; }
-.ui-icon-close { background-position: -80px -128px; }
-.ui-icon-closethick { background-position: -96px -128px; }
-.ui-icon-key { background-position: -112px -128px; }
-.ui-icon-lightbulb { background-position: -128px -128px; }
-.ui-icon-scissors { background-position: -144px -128px; }
-.ui-icon-clipboard { background-position: -160px -128px; }
-.ui-icon-copy { background-position: -176px -128px; }
-.ui-icon-contact { background-position: -192px -128px; }
-.ui-icon-image { background-position: -208px -128px; }
-.ui-icon-video { background-position: -224px -128px; }
-.ui-icon-script { background-position: -240px -128px; }
-.ui-icon-alert { background-position: 0 -144px; }
-.ui-icon-info { background-position: -16px -144px; }
-.ui-icon-notice { background-position: -32px -144px; }
-.ui-icon-help { background-position: -48px -144px; }
-.ui-icon-check { background-position: -64px -144px; }
-.ui-icon-bullet { background-position: -80px -144px; }
-.ui-icon-radio-off { background-position: -96px -144px; }
-.ui-icon-radio-on { background-position: -112px -144px; }
-.ui-icon-pin-w { background-position: -128px -144px; }
-.ui-icon-pin-s { background-position: -144px -144px; }
-.ui-icon-play { background-position: 0 -160px; }
-.ui-icon-pause { background-position: -16px -160px; }
-.ui-icon-seek-next { background-position: -32px -160px; }
-.ui-icon-seek-prev { background-position: -48px -160px; }
-.ui-icon-seek-end { background-position: -64px -160px; }
-.ui-icon-seek-start { background-position: -80px -160px; }
-/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
-.ui-icon-seek-first { background-position: -80px -160px; }
-.ui-icon-stop { background-position: -96px -160px; }
-.ui-icon-eject { background-position: -112px -160px; }
-.ui-icon-volume-off { background-position: -128px -160px; }
-.ui-icon-volume-on { background-position: -144px -160px; }
-.ui-icon-power { background-position: 0 -176px; }
-.ui-icon-signal-diag { background-position: -16px -176px; }
-.ui-icon-signal { background-position: -32px -176px; }
-.ui-icon-battery-0 { background-position: -48px -176px; }
-.ui-icon-battery-1 { background-position: -64px -176px; }
-.ui-icon-battery-2 { background-position: -80px -176px; }
-.ui-icon-battery-3 { background-position: -96px -176px; }
-.ui-icon-circle-plus { background-position: 0 -192px; }
-.ui-icon-circle-minus { background-position: -16px -192px; }
-.ui-icon-circle-close { background-position: -32px -192px; }
-.ui-icon-circle-triangle-e { background-position: -48px -192px; }
-.ui-icon-circle-triangle-s { background-position: -64px -192px; }
-.ui-icon-circle-triangle-w { background-position: -80px -192px; }
-.ui-icon-circle-triangle-n { background-position: -96px -192px; }
-.ui-icon-circle-arrow-e { background-position: -112px -192px; }
-.ui-icon-circle-arrow-s { background-position: -128px -192px; }
-.ui-icon-circle-arrow-w { background-position: -144px -192px; }
-.ui-icon-circle-arrow-n { background-position: -160px -192px; }
-.ui-icon-circle-zoomin { background-position: -176px -192px; }
-.ui-icon-circle-zoomout { background-position: -192px -192px; }
-.ui-icon-circle-check { background-position: -208px -192px; }
-.ui-icon-circlesmall-plus { background-position: 0 -208px; }
-.ui-icon-circlesmall-minus { background-position: -16px -208px; }
-.ui-icon-circlesmall-close { background-position: -32px -208px; }
-.ui-icon-squaresmall-plus { background-position: -48px -208px; }
-.ui-icon-squaresmall-minus { background-position: -64px -208px; }
-.ui-icon-squaresmall-close { background-position: -80px -208px; }
-.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
-.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
-.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
-.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
-.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
-.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Corner radius */
-.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 6px; -webkit-border-top-left-radius: 6px; -khtml-border-top-left-radius: 6px; border-top-left-radius: 6px; }
-.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 6px; -webkit-border-top-right-radius: 6px; -khtml-border-top-right-radius: 6px; border-top-right-radius: 6px; }
-.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 6px; -webkit-border-bottom-left-radius: 6px; -khtml-border-bottom-left-radius: 6px; border-bottom-left-radius: 6px; }
-.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 6px; -webkit-border-bottom-right-radius: 6px; -khtml-border-bottom-right-radius: 6px; border-bottom-right-radius: 6px; }
-
-/* Overlays */
-.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_75_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }
-.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_75_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }
\ No newline at end of file
diff --git a/openslides/projector/templates/projector/base_projector.html b/openslides/projector/templates/projector/base_projector.html
deleted file mode 100644
index 9bcc440c3..000000000
--- a/openslides/projector/templates/projector/base_projector.html
+++ /dev/null
@@ -1,26 +0,0 @@
-{% extends "base.html" %}
-
-{% load tags %}
-{% load i18n %}
-{% load staticfiles %}
-
-{% block title %}{{ block.super}} – {% trans 'Projector' %} {% endblock %}
-
-{% block submenu %}
-    {% url dashboard as url_dashboard %}
-    {% url projector_select_widgets as url_select_widget %}
-    <h4 class="sectiontitle">{% trans "Projector" %}</h4>
-    <ul>
-        <li{% if request.path == url_dashboard %} class="selected"{% endif %}>
-          <a href="{% url dashboard %}">{% trans 'Overview' %}</a>
-        </li>
-        <li{% if request.path == url_select_widget %} class="selected"{% endif %}>
-          <a href="{{ url_select_widget }}">{% trans 'Select widgets' %}</a>
-        </li>
-        {% if perms.projector.can_see_projector %}
-            <li>
-                <a href="{% url projector_show %}"><img src="{% static 'images/icons/projector.png' %}"> {% trans 'Projector view' %}</a>
-            </li>
-        {% endif %}
-    </ul>
-{% endblock %}
diff --git a/openslides/projector/templates/projector/control_countdown.html b/openslides/projector/templates/projector/control_countdown.html
index ec854d33d..fe0e27336 100644
--- a/openslides/projector/templates/projector/control_countdown.html
+++ b/openslides/projector/templates/projector/control_countdown.html
@@ -3,17 +3,22 @@
 {% load tags %}
 
 <span class="projector_countdown_spinbox">
-    <input class="projector_countdown_spinval" id="countdown_time" name="countdown_time" type="number" min="0" value="{{ countdown_time }}"> {% trans "s" context "seconds" %}
-    <a id="countdown_set" class="countdown_control" href="{% url countdown_set_default %}" title="{% trans 'Save as default' %}">
-        <img src="{% static 'images/icons/document-save.png' %}" alt="{% url countdown_set_default %}">
-    </a>
-    <a id="countdown_reset" class="countdown_control" href="{% url countdown_reset %}" title="{% trans 'Reset countdown' %}">
-        <img src="{% static 'images/icons/skip-backward.png' %}" alt="{% trans 'Reset countdown' %}">
-    </a>
-    <a id="countdown_play" class="countdown_control" href="{% url countdown_start %}" title="{% trans 'Start countdown' %}"{% if countdown_state == 'active' %} style="display:none"{% endif %}>
-        <img src="{% static 'images/icons/play.png' %}" alt="{% url countdown_start %}">
-    </a>
-    <a id="countdown_stop" class="countdown_control" href="{% url countdown_stop %}" title="{% trans 'Stop countdown' %}"{% if countdown_state == 'inactive' or countdown_state == 'paused' or countdown_state == 'expired' %} style="display:none"{% endif %}>
-        <img src="{% static 'images/icons/pause.png' %}" alt="{% url countdown_stop %}">
-    </a>
+    <div class="form-inline" style="display:inline-block;">
+        <div class="input-append">
+            <input class="projector_countdown_spinval" id="countdown_time" name="countdown_time" type="number" min="0" value="{{ countdown_time }}">
+            <span class="add-on">{% trans "s" context "seconds" %}</span>
+        </div>
+        <a id="countdown_set" class="countdown_control btn btn-small" href="{% url countdown_set_default %}" title="{% trans 'Save as default' %}">
+            <img src="{% static 'images/icons/document-save.png' %}" alt="{% url countdown_set_default %}">
+        </a>
+        <a id="countdown_reset" class="countdown_control btn btn-small" href="{% url countdown_reset %}" title="{% trans 'Reset countdown' %}">
+            <i class="icon-fast-backward"></i>
+        </a>
+        <a id="countdown_play" class="countdown_control btn btn-small" href="{% url countdown_start %}" title="{% trans 'Start countdown' %}"{% if countdown_state == 'active' %} style="display:none"{% endif %}>
+            <i class="icon-play"></i>
+        </a>
+        <a id="countdown_stop" class="countdown_control btn btn-small" href="{% url countdown_stop %}" title="{% trans 'Stop countdown' %}"{% if countdown_state == 'inactive' or countdown_state == 'paused' or countdown_state == 'expired' %} style="display:none"{% endif %}>
+            <i class="icon-pause"></i>
+        </a>
+    </div>
 </span>
diff --git a/openslides/projector/templates/projector/control_overlay_message.html b/openslides/projector/templates/projector/control_overlay_message.html
index 6741a3eff..2836f5d2e 100644
--- a/openslides/projector/templates/projector/control_overlay_message.html
+++ b/openslides/projector/templates/projector/control_overlay_message.html
@@ -2,14 +2,15 @@
 {% load i18n %}
 {% load tags %}
 
-<form id="overlay_message" action="{% url projector_overlay_message %}" method="post" style="display:inline">{% csrf_token %}
-    <input id="overlay_message_text" name='message_text' type='text' style='width: 40%' value="{% get_config 'projector_message' %}">
-    <button type="submit" class="button" name='message'>
-        <span class="icon ok">{% trans 'Apply' %}</span>
-    </button>
-    <button type="submit"
-        class="button" style="padding:4px 0;" name='message-clean' title="{% trans 'Clean message' %}">
-        <span class="icon clear">&nbsp;</span>
-    </button>
+<form id="overlay_message" action="{% url projector_overlay_message %}" method="post" style="display:inline-block;">{% csrf_token %}
+    <div class="input-append">
+        <input id="overlay_message_text" name='message_text' type='text' value="{% get_config 'projector_message' %}">
+        <button type="submit" class="btn btn-primary" name="message" rel="tooltip" data-original-title="{% trans 'Apply' %}">
+            <i class="icon-refresh icon-white"></i>
+        </button>
+        <button type="submit" class="btn" name='message-clean' title="{% trans 'Clean message' %}">
+            <i class="icon-remove"></i>
+        </button>
+    </div>
 </form>
 
diff --git a/openslides/projector/templates/projector/custom_slide_widget.html b/openslides/projector/templates/projector/custom_slide_widget.html
index ec23da189..a207f5949 100644
--- a/openslides/projector/templates/projector/custom_slide_widget.html
+++ b/openslides/projector/templates/projector/custom_slide_widget.html
@@ -15,31 +15,30 @@
     </li>
 </ul>
 <hr>
+<div class="pull-right">
+<a href='{% url customslide_new %}' class="btn btn-mini">
+    <i class="icon-plus"></i>{% trans 'New' %}
+</a>
+</div>
 <ul style="line-height: 180%">
 {% for slide in slides %}
     <li class="{% if slide.active %}activeline{% endif %}">
         <a href="{% url projector_activate_slide slide.sid %}" class="activate_link {% if slide.active %}active{% endif %}">
             <div></div>
         </a>
-        <a href="{% url customslide_delete slide.id %}" title="{% trans 'Delete' %}" class="icon delete right">
-            <span></span>
-        </a>
-        <a href="{% url customslide_edit slide.id %}" title="{% trans 'Edit' %}" class="icon edit right">
-            <span></span>
-        </a>
-        <a href="{% url projctor_preview_slide slide.sid %}" title="{% trans 'Preview' %}" class="icon preview right">
-            <span></span>
-        </a>
         <a href="{% url customslide_edit slide.id %}">{{ slide }}</a>
+        <a href="{% url customslide_edit slide.id %}" title="{% trans 'Edit' %}" class="btn btn-mini">
+            <i class="icon-pencil"></i>
+        </a>
+        <a href="{% url customslide_delete slide.id %}" title="{% trans 'Delete' %}" class="btn btn-mini">
+            <i class="icon-remove"></i>
+        </a>
+        <a href="{% url projctor_preview_slide slide.sid %}" title="{% trans 'Preview' %}" class="btn btn-mini">
+            <i class="icon-search"></i>
+        </a>
+
     </li>
 {% empty %}
     <li>{% trans 'No items available.' %}</li>
 {% endfor %}
 </ul>
-<a href='{% url customslide_new %}'>
-    <button class="button" type="button" onclick="window.location='{% url customslide_new %}'">
-        <span class="icon add">{% trans 'New slide' %}</span>
-    </button>
-</a>
-
-
diff --git a/openslides/projector/templates/projector/dashboard.html b/openslides/projector/templates/projector/dashboard.html
index 5b6b9091e..3403b9c2f 100644
--- a/openslides/projector/templates/projector/dashboard.html
+++ b/openslides/projector/templates/projector/dashboard.html
@@ -1,20 +1,26 @@
-{% extends "projector/base_projector.html" %}
+{% extends "base.html" %}
 
 {% load tags %}
 {% load i18n %}
 {% load staticfiles %}
 
 {% block header %}
-    <link type="text/css" href="{% static 'styles/humanity/jquery-ui-1.8.18.custom.css' %}" rel="stylesheet" />
+
     <link type="text/css" rel="stylesheet" media="all" href="{% static 'styles/dashboard.css' %}" />
-    <script type="text/javascript" src="{% static 'javascript/jquery-ui-1.8.18.custom.min.js' %}"></script>
+{% endblock %}
+{% block javascript %}
+    <script type="text/javascript" src="{% static 'javascript/jquery-ui.min.js' %}"></script>
     <script type="text/javascript" src="{% static 'javascript/dashboard.js' %}"></script>
     <script type="text/javascript" src="{% static 'javascript/jquery.cookie.js' %}"></script>
     <script type="text/javascript" src="{% static 'javascript/jquery.form.js' %}"></script>
 {% endblock %}
 
 {% block content %}
-    <h1>{% trans 'Dashboard' %}</h1>
+    <h1>{% trans 'Dashboard' %}
+        <small class="pull-right">
+            <a href="{% url projector_select_widgets %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Manage widgets' %}"><i class="icon-th-large"></i> {% trans 'Widgets' %}</a>
+        </small>
+    </h1>
     {% if perms.projector.can_manage_projector %}
         <div style="text-align: right; padding: 0 10px 5px 0; margin-top:-20px;">
             <!-- control projector view -->
@@ -40,9 +46,11 @@
     <div class="column" id="col1">
         {% for name, widget in widgets.items %}
             {% if widget.default_column == 1 %}
-                <div class="portlet" id="portlet_{{ widget.get_name }}">
-                    <div class="portlet-header">{% trans widget.get_title %}</div>
-                    <div class="portlet-content">
+                <div class="widget" id="widget_{{ widget.get_name }}">
+                    <div class="widget-header"><i class="icon-star"></i>
+                        <h3>{% trans widget.get_title %}</h3>
+                    </div>
+                    <div class="widget-content">
                         {{ widget.html }}
                     </div>
                 </div>
@@ -53,9 +61,11 @@
     <div class="column" id="col2">
         {% for name, widget in widgets.items %}
             {% if widget.default_column == 2 %}
-                <div class="portlet" id="portlet_{{ widget.get_name }}">
-                    <div class="portlet-header">{% trans widget.get_title %}</div>
-                    <div class="portlet-content">
+                <div class="widget" id="widget_{{ widget.get_name }}">
+                    <div class="widget-header"><i class="icon-star"></i>
+                        <h3>{% trans widget.get_title %}<h3>
+                    </div>
+                    <div class="widget-content">
                         {{ widget.html }}
                     </div>
                 </div>
diff --git a/openslides/projector/templates/projector/default.html b/openslides/projector/templates/projector/default.html
index de88476f5..8fb669de6 100644
--- a/openslides/projector/templates/projector/default.html
+++ b/openslides/projector/templates/projector/default.html
@@ -1,4 +1,4 @@
-{% extends "base-projector.html" %}
+{% extends "base.html" %}
 
 {% load tags %}
 {% load i18n %}
diff --git a/openslides/projector/templates/projector/live_view_widget.html b/openslides/projector/templates/projector/live_view_widget.html
index 69672f157..8175cd836 100644
--- a/openslides/projector/templates/projector/live_view_widget.html
+++ b/openslides/projector/templates/projector/live_view_widget.html
@@ -1,7 +1,6 @@
 {% load i18n %}
 {% load tags %}
 
-
 <a href="{% url projector_show %}" target="_blank">
     <div id="iframewrapper">
         <iframe id="iframe" src="{% url projector_show %}" frameborder="0"></iframe>
diff --git a/openslides/projector/templates/projector/new.html b/openslides/projector/templates/projector/new.html
index c63e5e0ac..6f2f07b04 100644
--- a/openslides/projector/templates/projector/new.html
+++ b/openslides/projector/templates/projector/new.html
@@ -1,4 +1,4 @@
-{% extends "projector/base_projector.html" %}
+{% extends "base.html" %}
 
 {% load tags %}
 {% load i18n %}
@@ -6,19 +6,16 @@
 {% block title %}{{ block.super }} – {% trans "Custom slide" %}{% endblock %}
 
 {% block content %}
-    <h1>{% trans 'Custom slide' %}</h1>
+    <h1>{% trans 'Custom slide' %}
+        <small class="pull-right">
+            <a href="{% url dashboard %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
+        </small>
+    </h1>
     <form action="" method="post">{% csrf_token %}
-        {{ form.as_p }}
-        <button class="button" type="submit">
-            <span class="icon ok">{% trans 'Save' %}</span>
-        </button>
-        <button class="button" type="submit" name="apply">
-            <span class="icon apply">{% trans 'Apply' %}</span>
-        </button>
-        <a href='{% url dashboard %}'>
-        <button class="button" type="button" onclick="window.location='{% url dashboard %}'">
-            <span class="icon cancel">{% trans 'Cancel' %}</span>
-        </button>
-        </a>
+        {% include "form.html" %}
+        <p>
+        {% include "formbuttons_saveapply.html" %}
+        </p>
+        <small>* {% trans "required" %}</small>
     </form>
 {% endblock %}
diff --git a/openslides/projector/templates/projector/select_widgets.html b/openslides/projector/templates/projector/select_widgets.html
index 04e4a9c05..63bccd59d 100644
--- a/openslides/projector/templates/projector/select_widgets.html
+++ b/openslides/projector/templates/projector/select_widgets.html
@@ -1,25 +1,31 @@
-{% extends "projector/base_projector.html" %}
+{% extends "base.html" %}
 
 {% load i18n %}
 
 {% block title %}{{ block.super }} – {% trans 'Select widgets' %}{% endblock %}
 
 {% block content %}
-    <h1>{% trans 'Select widgets' %}</h1>
+    <h1>{% trans 'Select widgets' %}
+        <small class="pull-right">
+            <a href="{% url dashboard %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
+        </small>
+    </h1>
 
     <form action="" method="post">{% csrf_token %}
-        <ul>
+        <ul class="unstyled">
             {% for widget_name, widget in widgets.items %}
                 <li>
-                    {{ widget.form.widget }} {{ widget }}
+                    <label class="checkbox">
+                        {{ widget.form.widget }} {{ widget }}
+                    </label>
                 </li>
             {% empty %}
                 <li>{% trans 'No widgets available' %}</li>
             {% endfor %}
         </ul>
         <p>
-            <button class="button" type="submit">
-                <span class="icon ok">{% trans 'Save' %}</span>
+            <button class="btn btn-primary" type="submit">
+                {% trans 'Save' %}
             </button>
         </p>
     </form>
diff --git a/openslides/static/javascript/utils.js b/openslides/static/javascript/utils.js
index 273cbb744..8924d473e 100644
--- a/openslides/static/javascript/utils.js
+++ b/openslides/static/javascript/utils.js
@@ -118,6 +118,11 @@ $(document).ready(function(){
       selector: "a[rel=tooltip]",
       placement: 'right'
     });
+    $(this).tooltip({
+      selector: "a[rel=tooltip]",
+      placement: 'bottom'
+    });
+
     $('h1').tooltip({
       selector: "a[rel=tooltip]",
       placement: 'bottom'

From 473c2c347f330a96c646906ff3220bb31e202f0f Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Mon, 10 Sep 2012 23:37:59 +0200
Subject: [PATCH 14/88] Removed unused base_agenda.html template.

---
 .../agenda/templates/agenda/base_agenda.html  | 43 -------------------
 1 file changed, 43 deletions(-)
 delete mode 100644 openslides/agenda/templates/agenda/base_agenda.html

diff --git a/openslides/agenda/templates/agenda/base_agenda.html b/openslides/agenda/templates/agenda/base_agenda.html
deleted file mode 100644
index 1da6ca241..000000000
--- a/openslides/agenda/templates/agenda/base_agenda.html
+++ /dev/null
@@ -1,43 +0,0 @@
-{% extends "base.html" %}
-
-{% load tags %}
-{% load i18n %}
-{% load staticfiles %}
-
-{% block submenu %}
-    {% url item_overview as url_itemoverview %}
-    {% url item_new as url_itemnew %}
-    <h4 class="sectiontitle">{% trans "Agenda" %}</h4>
-    <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>
-        {% endif %}
-        <li><a href="{% url print_agenda %}"><img src="{% static 'images/icons/pdf.png' %}"> {% trans 'Agenda as PDF' %}</a></li>
-    </ul>
-
-    {# second submenu #}
-    {% if item %}
-        <br>
-        <h3>{{ item.title }}</h3>
-            <ul>
-            {# view item #}
-                {% url item_view item.id as url_itemview %}
-                <li class="{% if request.path == url_itemview %}selected{% endif %}"><a href="{% url item_view item.id  %}">{% trans 'View item' %}</a></li>
-
-            {% if perms.agenda.can_manage_agenda %}
-                {# edit item #}
-                    {% url item_edit item.id as url_itemedit %}
-                    <li class="{% if request.path == url_itemedit %}selected{% endif %}"><a href="{% url item_edit item.id  %}"><img src="{% static 'images/icons/edit.png' %}"> {% trans 'Edit item' %}</a></li>
-                {# delete item #}
-                    <li><a href="{% url item_delete item.id  %}"><img src="{% static 'images/icons/delete.png' %}"> {% trans 'Delete item' %}</a></li>
-            {% endif %}
-
-            {# activate item #}
-            {% if perms.projector.can_manage_projector %}
-                <li><a href="{% url projector_activate_slide item.sid  %}"><img src="{% static 'images/icons/projector.png' %}"> {% trans 'Show item' %}</a></li>
-            {% endif %}
-            </ul>
-    {% endif %}
-{% endblock %}
-

From a77bb31a2aee8c22bca87b79f3a018ae85a8b092 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Mon, 10 Sep 2012 23:38:20 +0200
Subject: [PATCH 15/88] Clean template code.

---
 openslides/projector/templates/projector/dashboard.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/openslides/projector/templates/projector/dashboard.html b/openslides/projector/templates/projector/dashboard.html
index 3403b9c2f..325c40865 100644
--- a/openslides/projector/templates/projector/dashboard.html
+++ b/openslides/projector/templates/projector/dashboard.html
@@ -5,7 +5,6 @@
 {% load staticfiles %}
 
 {% block header %}
-
     <link type="text/css" rel="stylesheet" media="all" href="{% static 'styles/dashboard.css' %}" />
 {% endblock %}
 {% block javascript %}

From 2f3e57bf4ae1bad3111d4a6aa11d2b5852a32edf Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Mon, 10 Sep 2012 23:40:08 +0200
Subject: [PATCH 16/88] Removed unused base_assignment.html template.

---
 .../templates/assignment/base_assignment.html | 76 -------------------
 .../templates/assignment/poll_view.html       |  2 +-
 2 files changed, 1 insertion(+), 77 deletions(-)
 delete mode 100644 openslides/assignment/templates/assignment/base_assignment.html

diff --git a/openslides/assignment/templates/assignment/base_assignment.html b/openslides/assignment/templates/assignment/base_assignment.html
deleted file mode 100644
index 5de21867f..000000000
--- a/openslides/assignment/templates/assignment/base_assignment.html
+++ /dev/null
@@ -1,76 +0,0 @@
-{% extends "base.html" %}
-
-{% load tags %}
-{% load i18n %}
-{% load staticfiles %}
-
-{% block header %}
-    <link type="text/css" rel="stylesheet" media="all" href="{% static 'styles/assignment.css' %}" />
-    <script type="text/javascript" src="{% static 'javascript/assignment.js' %}"></script>
-{% endblock %}
-
-{% block submenu %}
-    {% url assignment_overview as url_assignment_overview %}
-    <h4 class="sectiontitle">{% trans "Elections" %}</h4>
-    <ul>
-        <li class="{% if request.path == url_assignment_overview %}selected{% endif %}"><a href="{% url assignment_overview %}">{% trans "All elections" %}</a></li>
-        {% if perms.assignment.can_manage_assignment %}
-            <li class="{% active request '/assignment/new' %}"><a href="{% url assignment_new %}">{% trans "New election" %}</a></li>
-        {% endif %}
-        <li><a href="{% url print_assignment %}"><img src="{% static 'images/icons/pdf.png' %}"> {% trans 'All elections as PDF' %}</a></li>
-    </ul>
-
-    {# second submenu #}
-    {% if assignment %}
-        <br>
-        <h3>{{assignment}}</h3>
-        <ul>
-            {# view assignemnt #}
-            {% url assignment_view assignment.id as url_assignmentview %}
-            <li class="{% if request.path == url_assignmentview %}selected{% endif %}">
-                <a href="{% url assignment_view assignment.id  %}">{% trans 'View election' %}</a>
-            </li>
-
-            {% if perms.assignment.can_manage_assignment %}
-
-                {# edit assignemnt #}
-                {% url assignment_edit assignment.id as url_assignmentedit %}
-                <li class="{% if request.path == url_assignmentedit %}selected{% endif %}">
-                    <a href="{% url assignment_edit assignment.id  %}"><img src="{% static 'images/icons/edit.png' %}"> {% trans 'Edit election' %}</a>
-                </li>
-
-                {# delete assignment #}
-                <li>
-                    <a href="{% url assignment_delete assignment.id  %}"><img src="{% static 'images/icons/delete.png' %}"> {% trans 'Delete election' %}</a>
-                </li>
-            {% endif %}
-
-            {# PDF #}
-            <li>
-                <a href="{% url print_assignment assignment.id  %}"><img src="{% static 'images/icons/pdf.png' %}"> {% trans 'Election as PDF' %}</a>
-            </li>
-
-            {# activate #}
-            {% if perms.projector.can_manage_projector %}
-            <li>
-                <a class="activate_link {% if item.active %}active{% endif %}" href="{% url projector_activate_slide assignment.sid  %}"><img src="{% static 'images/icons/projector.png' %}"> {% trans 'Show election' %}</a>
-            </li>
-            {% endif %}
-
-            {# agenda #}
-            {% if perms.agenda.can_manage_agenda %}
-            <li>
-                <a href="{% url assignment_create_agenda assignment.id  %}">{% trans 'New agenda item' %}</a>
-            </li>
-            {% endif %}
-
-            {# polls #}
-            {% if perms.assignment.can_manage_assignment %}
-            {% for poll in polls %}
-                {% url assignment_poll_view poll.id as url_assignmentpollview %}
-                <li class="{% if request.path == url_assignmentpollview %}selected{% endif %}"><a href="{% url assignment_poll_view poll.id %}"><img src="{% static 'images/icons/edit.png' %}"> {{ forloop.counter }}. {% trans "ballot" %}</a></li>
-            {% endfor %}
-            {% endif %}
-        </ul>
-    {% endif %}
-{% endblock %}
diff --git a/openslides/assignment/templates/assignment/poll_view.html b/openslides/assignment/templates/assignment/poll_view.html
index 64ff83866..b036815fa 100644
--- a/openslides/assignment/templates/assignment/poll_view.html
+++ b/openslides/assignment/templates/assignment/poll_view.html
@@ -1,4 +1,4 @@
-{% extends 'assignment/base_assignment.html' %}
+{% extends 'base.html' %}
 
 {% load i18n %}
 

From 15ab01c9d10e372c53831afacaa9d98b13dc846c Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Mon, 10 Sep 2012 23:43:33 +0200
Subject: [PATCH 17/88] Removed unused mainmenu and submenu blocks.

---
 openslides/templates/base.html       |  7 -------
 openslides/templates/front_page.html | 11 -----------
 2 files changed, 18 deletions(-)

diff --git a/openslides/templates/base.html b/openslides/templates/base.html
index 0760c075e..c4c674b4d 100644
--- a/openslides/templates/base.html
+++ b/openslides/templates/base.html
@@ -50,14 +50,7 @@
     </div> <!--/.container-fluid-->
 
 
-<!--
- {% block mainmenu %}
- {% endblock %}
- {% block submenu %}
- {% endblock %}
--->
 {% block body %}
-
 <!-- Container -->
 <div class="container-fluid" id="container">
 <div class="row-fluid">
diff --git a/openslides/templates/front_page.html b/openslides/templates/front_page.html
index 8dd40846c..1af1bab75 100644
--- a/openslides/templates/front_page.html
+++ b/openslides/templates/front_page.html
@@ -16,14 +16,3 @@
     {% endfor %}
     </ul>
 {% endblock %}
-
-{% block submenu %}
-    {% if perms.projector.can_see_projector %}
-    <h4 class="sectiontitle">{% trans "Home" %}</h4>
-    <ul>
-        <li>
-            <a href="{% url projector_show %}"><img src="{% static 'images/icons/projector.png' %}"> {% trans 'Projector view' %}</a>
-        </li>
-    </ul>
-    {% endif %}
-{% endblock %}

From 2bf992117c78106c45cb34ed1040bd10bcd33a27 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Tue, 11 Sep 2012 00:00:44 +0200
Subject: [PATCH 18/88] Updated widget titel and icons.

---
 openslides/assignment/views.py                          | 2 +-
 openslides/projector/templates/projector/dashboard.html | 3 ++-
 openslides/projector/views.py                           | 4 ++--
 openslides/static/styles/base.css                       | 6 +++---
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/openslides/assignment/views.py b/openslides/assignment/views.py
index 28277c756..f49bf097a 100644
--- a/openslides/assignment/views.py
+++ b/openslides/assignment/views.py
@@ -659,7 +659,7 @@ def register_tab(request):
 def get_widgets(request):
     return [
         Widget(
-            name=_('Assignments'),
+            name='assignments',
             template='assignment/widget.html',
             context={'assignments': Assignment.objects.all()},
             permission_required='assignment.can_manage_assignment')]
diff --git a/openslides/projector/templates/projector/dashboard.html b/openslides/projector/templates/projector/dashboard.html
index 325c40865..fd0d6fd4c 100644
--- a/openslides/projector/templates/projector/dashboard.html
+++ b/openslides/projector/templates/projector/dashboard.html
@@ -46,7 +46,8 @@
         {% for name, widget in widgets.items %}
             {% if widget.default_column == 1 %}
                 <div class="widget" id="widget_{{ widget.get_name }}">
-                    <div class="widget-header"><i class="icon-star"></i>
+                    <div class="widget-header">
+                        <i class="{% if widget %}icon-{{widget.name}}{% else %}icon-star{% endif %}"></i>
                         <h3>{% trans widget.get_title %}</h3>
                     </div>
                     <div class="widget-content">
diff --git a/openslides/projector/views.py b/openslides/projector/views.py
index cd906207c..52d6aa8e5 100644
--- a/openslides/projector/views.py
+++ b/openslides/projector/views.py
@@ -401,7 +401,7 @@ def get_widgets(request):
     context.update(csrf(request))
     widgets.append(Widget(
         name='overlays',
-        display_name=_('Manage Overlays'),
+        display_name=_('Overlays'),
         template='projector/overlay_widget.html',
         permission_required='projector.can_manage_projector',
         default_column=2,
@@ -414,7 +414,7 @@ def get_widgets(request):
         'welcomepage_is_active': not bool(config["presentation"])}
     widgets.append(Widget(
         name='custom_slide',
-        display_name=_('Custom Slide'),
+        display_name=_('Custom Slides'),
         template='projector/custom_slide_widget.html',
         context=context,
         permission_required='projector.can_manage_projector',
diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css
index 70f02084e..e26255fef 100644
--- a/openslides/static/styles/base.css
+++ b/openslides/static/styles/base.css
@@ -209,13 +209,13 @@ form .required label:after {
 .icon-agenda {
     background-position: -264px 0;
 }
-.icon-application {
+.icon-application, .icon-applications {
     background-position: -24px -24px;
 }
-.icon-assignment {
+.icon-assignment, .icon-assignments {
     background-position: -144px -72px;
 }
-.icon-participant {
+.icon-participant, .icon-participants {
     background-position: -168px 0;
 }
 .icon-config {

From 51ab5e3850b4c677f22a98c910ab6e8772e2cd15 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Tue, 11 Sep 2012 00:05:20 +0200
Subject: [PATCH 19/88] Minor style for widgets.

---
 openslides/projector/static/styles/dashboard.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/openslides/projector/static/styles/dashboard.css b/openslides/projector/static/styles/dashboard.css
index fa978c072..4a9524f65 100644
--- a/openslides/projector/static/styles/dashboard.css
+++ b/openslides/projector/static/styles/dashboard.css
@@ -61,6 +61,9 @@
     list-style: none inside none;
     margin: 0;
 }
+.widget-content hr {
+    margin: 5px 0;
+}
 
 .ui-sortable-placeholder {
     border: 2px dashed #555555;
@@ -95,6 +98,7 @@
     height: 192px;/*230px;*/
     position: relative;
     overflow: hidden;
+    border: 1px solid #D5D5D5;
 }
 
 #iframeoverlay {

From bc25937aa04760008dd7133f4a254d3f35d120b0 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Tue, 11 Sep 2012 19:57:22 +0200
Subject: [PATCH 20/88] Updated translations.

---
 openslides/locale/de/LC_MESSAGES/django.mo | Bin 32910 -> 32824 bytes
 openslides/locale/de/LC_MESSAGES/django.po | 806 ++++++++++-----------
 2 files changed, 375 insertions(+), 431 deletions(-)

diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo
index b828d33a6ff48616c810661bfffc1c744e6e0cc7..8690a85680e684f1e4a6ca3e3421247544943702 100644
GIT binary patch
delta 10176
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

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

diff --git a/openslides/locale/de/LC_MESSAGES/django.po b/openslides/locale/de/LC_MESSAGES/django.po
index 3dd8e3600..f9df2bc45 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: OpenSlides 1.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-04 23:59+0200\n"
+"POT-Creation-Date: 2012-09-11 19:40+0200\n"
 "PO-Revision-Date: 2012-07-28 11:07+0200\n"
 "Last-Translator: Oskar Hahn <mail@oshahn.de>\n"
 "Language-Team: Deutsch <mail@oshahn.de>\n"
@@ -40,9 +40,9 @@ msgstr "Titel"
 msgid "Text"
 msgstr "Text"
 
-#: agenda/models.py:44 agenda/templates/agenda/overview.html:79
+#: agenda/models.py:44 agenda/templates/agenda/overview.html:77
 #: agenda/templates/agenda/view.html:13 participant/models.py:52
-#: participant/templates/participant/overview.html:72
+#: participant/templates/participant/overview.html:108
 msgid "Comment"
 msgstr "Kommentar"
 
@@ -50,7 +50,7 @@ msgstr "Kommentar"
 msgid "Closed"
 msgstr "Abgeschlossen"
 
-#: agenda/models.py:46 agenda/templates/agenda/overview.html:85
+#: agenda/models.py:46 agenda/templates/agenda/overview.html:83
 msgid "Weight"
 msgstr "Gewichtung"
 
@@ -64,10 +64,10 @@ msgstr "Darf die Tagesordung verwalten"
 
 #: agenda/models.py:189 agenda/slides.py:20 agenda/views.py:194
 #: agenda/views.py:195 agenda/views.py:214
-#: agenda/templates/agenda/base_agenda.html:13
+#: agenda/templates/agenda/config.html:8
 #: agenda/templates/agenda/overview.html:8
-#: agenda/templates/agenda/overview.html:58
-#: agenda/templates/agenda/overview.html:91
+#: agenda/templates/agenda/overview.html:56
+#: agenda/templates/agenda/overview.html:89
 #: agenda/templates/projector/AgendaSummary.html:6
 #: agenda/templates/projector/AgendaSummary.html:10
 msgid "Agenda"
@@ -105,107 +105,88 @@ msgstr "Eintrag %s und seine Kindelemente wurde erfolgreich gelöscht."
 msgid "Item %s was successfully deleted."
 msgstr "Eintrag %s wurde erfolgreich gelöscht."
 
-#: agenda/templates/agenda/base_agenda.html:15
-msgid "All items"
-msgstr "Alle Einträge"
+#: agenda/templates/agenda/config.html:5
+msgid "Agenda settings"
+msgstr "Tagesordnungs-Einstellungen"
 
-#: agenda/templates/agenda/base_agenda.html:17
-#: agenda/templates/agenda/edit.html:10 agenda/templates/agenda/edit.html:19
-#: agenda/templates/agenda/overview.html:61
-msgid "New item"
-msgstr "Neuer Eintrag"
+#: agenda/templates/agenda/config.html:8
+#: application/templates/application/config.html:8
+#: assignment/templates/assignment/config.html:8 config/views.py:119
+#: config/templates/config/general.html:8
+#: participant/templates/participant/config.html:8
+msgid "Configuration"
+msgstr "Konfiguration"
 
-#: agenda/templates/agenda/base_agenda.html:19
-msgid "Agenda as PDF"
-msgstr "Tagesordnung als PDF"
+#: agenda/templates/agenda/config.html:15 agenda/templates/agenda/edit.html:40
+#: application/templates/application/config.html:15
+#: application/templates/application/edit.html:41
+#: application/templates/application/poll_view.html:75
+#: assignment/templates/assignment/config.html:15
+#: assignment/templates/assignment/poll_view.html:66
+#: config/templates/config/general.html:58
+#: projector/templates/projector/select_widgets.html:28
+#: templates/formbuttons_save.html:4 templates/formbuttons_saveapply.html:4
+msgid "Save"
+msgstr "Speichern"
 
-#: agenda/templates/agenda/base_agenda.html:29
-msgid "View item"
-msgstr "Eintrag anzeigen"
+#: agenda/templates/agenda/config.html:19 agenda/templates/agenda/edit.html:47
+#: application/templates/application/config.html:19
+#: application/templates/application/edit.html:48
+#: application/templates/application/import.html:41
+#: application/templates/application/poll_view.html:81
+#: assignment/templates/assignment/config.html:19
+#: assignment/templates/assignment/edit.html:31
+#: assignment/templates/assignment/poll_view.html:73
+#: config/templates/config/general.html:62
+#: participant/templates/participant/config.html:16
+#: participant/templates/participant/edit.html:36
+#: participant/templates/participant/group_edit.html:31
+#: participant/templates/participant/import.html:32
+msgid "Cancel"
+msgstr "Abbrechen"
 
-#: agenda/templates/agenda/base_agenda.html:34
 #: agenda/templates/agenda/edit.html:8 agenda/templates/agenda/edit.html:17
 #: agenda/templates/agenda/item_row.html:40
 msgid "Edit item"
 msgstr "Eintrag bearbeiten"
 
-#: agenda/templates/agenda/base_agenda.html:36
-#: agenda/templates/agenda/item_row.html:41
-msgid "Delete item"
-msgstr "Eintrag löschen"
-
-#: agenda/templates/agenda/base_agenda.html:41
-msgid "Show item"
-msgstr "Eintrag projizieren"
-
-#: agenda/templates/agenda/config.html:5 agenda/templates/agenda/config.html:8
-msgid "Agenda settings"
-msgstr "Tagesordnungs-Einstellungen"
-
-#: agenda/templates/agenda/config.html:13 agenda/templates/agenda/edit.html:40
-#: application/templates/application/config.html:13
-#: application/templates/application/edit.html:41
-#: application/templates/application/poll_view.html:75
-#: assignment/templates/assignment/config.html:13
-#: assignment/templates/assignment/edit.html:26
-#: assignment/templates/assignment/poll_view.html:66
-#: config/templates/config/general.html:56
-#: participant/templates/participant/config.html:13
-#: participant/templates/participant/edit.html:31
-#: participant/templates/participant/group_edit.html:25
-#: participant/templates/participant/password_change.html:22
-#: participant/templates/participant/settings.html:22
-#: projector/templates/projector/new.html:13
-#: projector/templates/projector/select_widgets.html:22
-msgid "Save"
-msgstr "Speichern"
-
-#: agenda/templates/agenda/config.html:17 agenda/templates/agenda/edit.html:47
-#: application/templates/application/config.html:17
-#: application/templates/application/edit.html:48
-#: application/templates/application/import.html:41
-#: application/templates/application/poll_view.html:81
-#: assignment/templates/assignment/config.html:17
-#: assignment/templates/assignment/edit.html:33
-#: assignment/templates/assignment/poll_view.html:73
-#: config/templates/config/general.html:60
-#: participant/templates/participant/config.html:17
-#: participant/templates/participant/edit.html:38
-#: participant/templates/participant/group_edit.html:32
-#: participant/templates/participant/import.html:27
-#: participant/templates/participant/password_change.html:26
-#: participant/templates/participant/settings.html:26
-#: projector/templates/projector/new.html:20
-msgid "Cancel"
-msgstr "Abbrechen"
+#: agenda/templates/agenda/edit.html:10 agenda/templates/agenda/edit.html:19
+#: agenda/templates/agenda/overview.html:59
+msgid "New item"
+msgstr "Neuer Eintrag"
 
 #: agenda/templates/agenda/edit.html:22
 #: application/templates/application/edit.html:22
 #: application/templates/application/import.html:10
 #: application/templates/application/view.html:29
+#: assignment/templates/assignment/edit.html:22
+#: assignment/templates/assignment/view.html:19
+#: participant/templates/participant/edit.html:22
+#: participant/templates/participant/group_edit.html:22
+#: participant/templates/participant/import.html:11
+#: projector/templates/projector/new.html:11
+#: projector/templates/projector/select_widgets.html:10
 msgid "Back to overview"
 msgstr "Zurück zur Übersicht"
 
 #: agenda/templates/agenda/edit.html:43
 #: application/templates/application/edit.html:44
 #: application/templates/application/poll_view.html:78
-#: assignment/templates/assignment/edit.html:29
 #: assignment/templates/assignment/poll_view.html:69
-#: assignment/templates/assignment/view.html:83
-#: participant/templates/participant/edit.html:34
-#: participant/templates/participant/group_edit.html:28
+#: assignment/templates/assignment/view.html:74
 #: projector/templates/projector/control_overlay_message.html:8
-#: projector/templates/projector/new.html:16
+#: templates/formbuttons_saveapply.html:7
 msgid "Apply"
 msgstr "Übernehmen"
 
 #: agenda/templates/agenda/edit.html:51
 #: application/templates/application/edit.html:52
 #: application/templates/application/import.html:44
-#: assignment/templates/assignment/edit.html:37
-#: participant/templates/participant/edit.html:42
-#: participant/templates/participant/group_edit.html:36
-#: participant/templates/participant/import.html:31
+#: assignment/templates/assignment/edit.html:34
+#: participant/templates/participant/edit.html:39
+#: participant/templates/participant/group_edit.html:34
+#: participant/templates/participant/import.html:35
+#: projector/templates/projector/new.html:19
 msgid "required"
 msgstr "erforderlich"
 
@@ -218,77 +199,85 @@ msgid "Item closed"
 msgstr "Eintrag erledigt"
 
 #: agenda/templates/agenda/item_row.html:35
-#: agenda/templates/agenda/overview.html:100
+#: agenda/templates/agenda/overview.html:98
 msgid "Activate item"
 msgstr "Eintrag projizieren"
 
+#: agenda/templates/agenda/item_row.html:41
+msgid "Delete item"
+msgstr "Eintrag löschen"
+
 #: agenda/templates/agenda/item_row.html:44
 #: agenda/templates/agenda/widget.html:35
 msgid "Activate summary for this item"
 msgstr "Zusammenfassung für diesen Eintrag projizieren"
 
-#: agenda/templates/agenda/overview.html:50
+#: agenda/templates/agenda/overview.html:48
 msgid "Do you want to save the changed order of agenda items?"
 msgstr "Möchten Sie die geänderte Reihenfolge der Einträge speichern?"
 
-#: agenda/templates/agenda/overview.html:52 application/models.py:574
+#: agenda/templates/agenda/overview.html:50 application/models.py:574
 #: application/views.py:486 application/views.py:798 application/views.py:849
-#: application/templates/application/view.html:215
+#: application/templates/application/view.html:216
 #: application/templates/projector/Application.html:37
 #: assignment/models.py:260 assignment/views.py:561
-#: assignment/templates/assignment/view.html:156
-#: assignment/templates/assignment/view.html:160
+#: assignment/templates/assignment/view.html:145
+#: assignment/templates/assignment/view.html:149
 #: assignment/templates/projector/Assignment.html:78
 #: assignment/templates/projector/Assignment.html:82 utils/utils.py:53
 #: utils/views.py:111
 msgid "Yes"
 msgstr "Ja"
 
-#: agenda/templates/agenda/overview.html:53 application/models.py:574
+#: agenda/templates/agenda/overview.html:51 application/models.py:574
 #: application/views.py:486 application/views.py:798 application/views.py:850
-#: application/templates/application/view.html:216
+#: application/templates/application/view.html:217
 #: application/templates/projector/Application.html:38
 #: assignment/models.py:260 assignment/views.py:562
-#: assignment/templates/assignment/view.html:157
+#: assignment/templates/assignment/view.html:146
 #: assignment/templates/projector/Assignment.html:79 utils/utils.py:53
 #: utils/views.py:111
 msgid "No"
 msgstr "Nein"
 
-#: agenda/templates/agenda/overview.html:61
-#: application/templates/application/overview.html:13
+#: agenda/templates/agenda/overview.html:59
+#: application/templates/application/overview.html:14
+#: assignment/templates/assignment/overview.html:13
+#: participant/templates/participant/group_overview.html:11
+#: participant/templates/participant/overview.html:22
+#: projector/templates/projector/custom_slide_widget.html:20
 msgid "New"
-msgstr ""
+msgstr "Neu"
 
-#: agenda/templates/agenda/overview.html:63
+#: agenda/templates/agenda/overview.html:61
 msgid "Print agenda as PDF"
 msgstr "Tagesordnung als PDF drucken"
 
-#: agenda/templates/agenda/overview.html:68
+#: agenda/templates/agenda/overview.html:66
 msgid "Hide closed items"
 msgstr "Abgeschlossene Einträge verbergen"
 
-#: agenda/templates/agenda/overview.html:72
+#: agenda/templates/agenda/overview.html:70
 msgid "item"
 msgid_plural "items"
 msgstr[0] "Eintrag"
 msgstr[1] "Einträge"
 
-#: agenda/templates/agenda/overview.html:77
+#: agenda/templates/agenda/overview.html:75
 msgid "Item"
 msgstr "Eintrag"
 
-#: agenda/templates/agenda/overview.html:82
-#: application/templates/application/overview.html:58
-#: assignment/templates/assignment/overview.html:28
-#: participant/templates/participant/group_overview.html:13
-#: participant/templates/participant/overview.html:74
+#: agenda/templates/agenda/overview.html:80
+#: application/templates/application/overview.html:60
+#: assignment/templates/assignment/overview.html:39
+#: participant/templates/participant/group_overview.html:19
+#: participant/templates/participant/overview.html:110
 msgid "Actions"
 msgstr "Aktionen"
 
-#: agenda/templates/agenda/overview.html:116
+#: agenda/templates/agenda/overview.html:114
 #: agenda/templates/agenda/widget.html:46
-#: projector/templates/projector/custom_slide_widget.html:36
+#: projector/templates/projector/custom_slide_widget.html:42
 msgid "No items available."
 msgstr "Keine Einträge vorhanden."
 
@@ -297,23 +286,23 @@ msgstr "Keine Einträge vorhanden."
 #: application/templates/application/widget.html:17
 #: assignment/templates/assignment/widget.html:17
 #: projector/templates/projector/custom_slide_widget.html:11
-#: projector/templates/projector/custom_slide_widget.html:30
+#: projector/templates/projector/custom_slide_widget.html:36
 msgid "Preview"
 msgstr "Vorschau"
 
 #: agenda/templates/agenda/widget.html:23
 #: application/templates/application/widget.html:11
-#: assignment/templates/assignment/view.html:120
+#: assignment/templates/assignment/view.html:112
 #: assignment/templates/assignment/widget.html:11
-#: projector/templates/projector/custom_slide_widget.html:24
+#: projector/templates/projector/custom_slide_widget.html:33
 msgid "Delete"
 msgstr "Löschen"
 
 #: agenda/templates/agenda/widget.html:26
 #: application/templates/application/widget.html:14
-#: assignment/templates/assignment/view.html:119
+#: assignment/templates/assignment/view.html:111
 #: assignment/templates/assignment/widget.html:14
-#: projector/templates/projector/custom_slide_widget.html:27
+#: projector/templates/projector/custom_slide_widget.html:30
 msgid "Edit"
 msgstr "Bearbeiten"
 
@@ -333,7 +322,7 @@ msgid "Trivial changes don't create a new version."
 msgstr "Triviale Änderungen erzeugen keine neue Version."
 
 #: application/forms.py:44 application/views.py:748
-#: application/templates/application/view.html:167
+#: application/templates/application/view.html:168
 msgid "Supporters"
 msgstr "Unterstützer/innen"
 
@@ -406,13 +395,13 @@ msgstr "Veröffentlicht"
 msgid "Permitted"
 msgstr "Zugelassen"
 
-#: application/models.py:47 application/templates/application/overview.html:38
-#: application/templates/application/view.html:302
+#: application/models.py:47 application/templates/application/overview.html:39
+#: application/templates/application/view.html:303
 msgid "Accepted"
 msgstr "Angenommen"
 
-#: application/models.py:48 application/templates/application/overview.html:39
-#: application/templates/application/view.html:307
+#: application/models.py:48 application/templates/application/overview.html:40
+#: application/templates/application/view.html:308
 msgid "Rejected"
 msgstr "Abgelehnt"
 
@@ -420,17 +409,17 @@ msgstr "Abgelehnt"
 msgid "Withdrawed"
 msgstr "Zurückgezogen"
 
-#: application/models.py:50 application/templates/application/view.html:322
+#: application/models.py:50 application/templates/application/view.html:323
 msgid "Adjourned"
 msgstr "Vertagt"
 
 # please check!
-#: application/models.py:51 application/templates/application/view.html:325
+#: application/models.py:51 application/templates/application/view.html:326
 msgid "Not Concerned"
 msgstr "Nicht befasst"
 
 # please check!
-#: application/models.py:52 application/templates/application/view.html:328
+#: application/models.py:52 application/templates/application/view.html:329
 msgid "Commited a bill"
 msgstr "Verwiesen (in Ausschuss)"
 
@@ -438,13 +427,13 @@ msgstr "Verwiesen (in Ausschuss)"
 msgid "Rejected (not authorized)"
 msgstr "Verworfen (nicht zulässig)"
 
-#: application/models.py:54 application/templates/application/overview.html:41
+#: application/models.py:54 application/templates/application/overview.html:42
 msgid "Needs Review"
 msgstr "Benötigt Review"
 
 #: application/models.py:66 application/views.py:732
-#: application/templates/application/overview.html:56
-#: application/templates/application/view.html:160
+#: application/templates/application/overview.html:58
+#: application/templates/application/view.html:161
 #: application/templates/projector/Application.html:55
 msgid "Submitter"
 msgstr "Antragsteller/in"
@@ -548,10 +537,11 @@ msgid "no number"
 msgstr "ohne Nummer"
 
 #: application/models.py:456
-#: application/templates/application/overview.html:46
+#: application/templates/application/overview.html:47
+#: application/templates/application/overview.html:48
 #: application/templates/application/widget.html:23
 msgid "motion"
-msgstr "antrag"
+msgstr "Antrag"
 
 #: application/models.py:481
 msgid "Poll created"
@@ -582,7 +572,7 @@ msgid "The Assembly may decide,"
 msgstr "Die Versammlung möge beschließen,"
 
 #: application/models.py:604 application/templates/application/overview.html:7
-#: application/templates/application/overview.html:10
+#: application/templates/application/overview.html:11
 msgid "Motions"
 msgstr "Anträge"
 
@@ -781,6 +771,7 @@ msgstr ""
 "entstehen."
 
 #: application/views.py:685 application/views.py:911
+#: application/templates/application/config.html:8
 msgid "Applications"
 msgstr "Anträge"
 
@@ -788,7 +779,8 @@ msgstr "Anträge"
 msgid "Application"
 msgstr "Antrag"
 
-#: application/views.py:706 application/templates/application/overview.html:99
+#: application/views.py:706
+#: application/templates/application/overview.html:101
 msgid "No motions available."
 msgstr "Keine Anträge vorhanden."
 
@@ -798,15 +790,15 @@ msgstr "Keine Anträge vorhanden."
 msgid "Motion No."
 msgstr "Antrag Nr."
 
-#: application/views.py:762 application/templates/application/overview.html:33
-#: application/templates/application/overview.html:55
-#: application/templates/application/view.html:179
+#: application/views.py:762 application/templates/application/overview.html:34
+#: application/templates/application/overview.html:57
+#: application/templates/application/view.html:180
 #: application/templates/projector/Application.html:11
-#: assignment/templates/assignment/overview.html:14
-#: assignment/templates/assignment/overview.html:27
-#: assignment/templates/assignment/view.html:11
+#: assignment/templates/assignment/overview.html:24
+#: assignment/templates/assignment/overview.html:38
+#: assignment/templates/assignment/view.html:211
 #: assignment/templates/projector/Assignment.html:18
-#: participant/templates/participant/overview.html:52
+#: participant/templates/participant/overview.html:86
 msgid "Status"
 msgstr "Status"
 
@@ -814,11 +806,11 @@ msgstr "Status"
 #: application/templates/application/view.html:98 config/models.py:131
 #: config/templates/config/version.html:5
 #: config/templates/config/version.html:8
-#: config/templates/config/version.html:11
+#: config/templates/config/version.html:13
 msgid "Version"
 msgstr "Version"
 
-#: application/views.py:791 application/templates/application/view.html:189
+#: application/views.py:791 application/templates/application/view.html:190
 #: assignment/views.py:395
 msgid "Vote results"
 msgstr "Abstimmungsergebnis"
@@ -826,33 +818,33 @@ msgstr "Abstimmungsergebnis"
 #: application/views.py:797 application/templates/application/poll_view.html:7
 #: application/templates/application/poll_view.html:14
 #: application/templates/application/view.html:54
-#: application/templates/application/view.html:207
+#: application/templates/application/view.html:208
 #: application/templates/projector/Application.html:33
 msgid "Vote"
 msgstr "Abstimmung"
 
 #: application/views.py:798 application/views.py:851
-#: application/templates/application/view.html:217
+#: application/templates/application/view.html:218
 #: application/templates/projector/Application.html:39 assignment/views.py:562
-#: assignment/templates/assignment/view.html:158
+#: assignment/templates/assignment/view.html:147
 #: assignment/templates/projector/Assignment.html:80
 msgid "Abstention"
 msgstr "Enthaltung"
 
-#: application/views.py:798 application/templates/application/view.html:218
+#: application/views.py:798 application/templates/application/view.html:219
 #: application/templates/projector/Application.html:40
-#: assignment/templates/assignment/view.html:180
+#: assignment/templates/assignment/view.html:168
 #: assignment/templates/projector/Assignment.html:101
 msgid "Invalid"
 msgstr "Ungültig"
 
 #: application/views.py:798
 #: application/templates/application/poll_view.html:61
-#: application/templates/application/view.html:220
+#: application/templates/application/view.html:221
 #: application/templates/projector/Application.html:42 assignment/views.py:446
 #: assignment/templates/assignment/poll_view.html:45
-#: assignment/templates/assignment/view.html:192
-#: assignment/templates/assignment/view.html:197
+#: assignment/templates/assignment/view.html:180
+#: assignment/templates/assignment/view.html:185
 #: assignment/templates/projector/Assignment.html:111
 #: assignment/templates/projector/Assignment.html:117 poll/models.py:76
 msgid "Votes cast"
@@ -877,26 +869,25 @@ msgid "Motion settings successfully saved."
 msgstr "Antrags-Einstellungen wurden erfolgreich gespeichert."
 
 #: application/templates/application/config.html:5
-#: application/templates/application/config.html:8
 msgid "Application settings"
 msgstr "Antrags-Einstellungen"
 
 #: application/templates/application/edit.html:8
 #: application/templates/application/edit.html:17
-#: application/templates/application/overview.html:87
+#: application/templates/application/overview.html:89
 #: application/templates/application/view.html:39
 msgid "Edit motion"
 msgstr "Antrag bearbeiten"
 
 #: application/templates/application/edit.html:10
 #: application/templates/application/edit.html:19
-#: application/templates/application/overview.html:13
+#: application/templates/application/overview.html:14
 msgid "New motion"
 msgstr "Neuer Antrag"
 
 #: application/templates/application/import.html:5
 #: application/templates/application/import.html:8
-#: application/templates/application/overview.html:14
+#: application/templates/application/overview.html:15
 msgid "Import motions"
 msgstr "Anträge importieren"
 
@@ -915,72 +906,73 @@ msgstr ""
 "sind optional und können auch leer sein)"
 
 #: application/templates/application/import.html:17
-#: participant/templates/participant/import.html:13
+#: participant/templates/participant/import.html:19
 msgid "Required CSV file encoding: UTF-8 (Unicode)."
 msgstr "Erforderliches CSV-Datei-Encoding: UTF-8 (Unicode)."
 
 #: application/templates/application/import.html:20
-#: participant/templates/participant/import.html:16
+#: participant/templates/participant/import.html:22
 msgid "A CSV example file is available in OpenSlides Wiki."
 msgstr "Eine CSV-Beispiel-Datei gibt es im OpenSlides Wiki."
 
 #: application/templates/application/import.html:38
-#: application/templates/application/overview.html:14
-#: participant/templates/participant/import.html:23
+#: application/templates/application/overview.html:15
+#: participant/templates/participant/import.html:29
+#: participant/templates/participant/overview.html:24
 msgid "Import"
 msgstr "Importieren"
 
-#: application/templates/application/overview.html:16
+#: application/templates/application/overview.html:17
 msgid "Print all motions as PDF"
 msgstr "Alle Anträge als PDF drucken"
 
-#: application/templates/application/overview.html:24
+#: application/templates/application/overview.html:25
 msgid "Need supporters"
 msgstr "Benötigt Unterstützer/innen"
 
-#: application/templates/application/overview.html:29
+#: application/templates/application/overview.html:30
 msgid "Without number"
 msgstr "Ohne Nummer"
 
-#: application/templates/application/overview.html:36
+#: application/templates/application/overview.html:37
 msgid "Not yet authorized"
 msgstr "Noch nicht zugelassen"
 
-#: application/templates/application/overview.html:37
+#: application/templates/application/overview.html:38
 msgid "Authorized"
 msgstr "Zugelassen"
 
-#: application/templates/application/overview.html:40
+#: application/templates/application/overview.html:41
 msgid "Withdrawen (by submitter)"
 msgstr "Zurückgezogen (durch Antragsteller/in)"
 
-#: application/templates/application/overview.html:50
-msgid "Number"
-msgstr "Nummer"
+#: application/templates/application/overview.html:52
+msgid "#"
+msgstr "#"
 
-#: application/templates/application/overview.html:51
+#: application/templates/application/overview.html:53
 msgid "Motion title"
 msgstr "Antragstitel"
 
-#: application/templates/application/overview.html:53
+#: application/templates/application/overview.html:55
 msgid "Number of supporters"
 msgstr "Anzahl der Unterstützer/innen"
 
-#: application/templates/application/overview.html:57
-#: application/templates/application/view.html:243
+#: application/templates/application/overview.html:59
+#: application/templates/application/view.html:244
 msgid "Creation Time"
 msgstr "Erstellungszeit"
 
-#: application/templates/application/overview.html:82
+#: application/templates/application/overview.html:84
 msgid "Activate motion"
 msgstr "Antrag projizieren"
 
-#: application/templates/application/overview.html:89
+#: application/templates/application/overview.html:91
 #: application/templates/application/view.html:43
 msgid "Delete motion"
 msgstr "Antrag löschen"
 
-#: application/templates/application/overview.html:92
+#: application/templates/application/overview.html:94
 msgid "Motion as PDF"
 msgstr "Antrag als PDF"
 
@@ -999,12 +991,12 @@ msgstr "Zurück zum Antrag"
 
 #: application/templates/application/poll_view.html:21
 #: application/templates/application/view.html:33
-#: application/templates/application/view.html:317
+#: application/templates/application/view.html:318
 msgid "More actions"
 msgstr "Mehr Aktionen"
 
 #: application/templates/application/poll_view.html:27
-#: application/templates/application/view.html:210
+#: application/templates/application/view.html:211
 msgid "Delete Vote"
 msgstr "Abstimmung löschen"
 
@@ -1039,7 +1031,7 @@ msgstr "Stimmen"
 
 #: application/templates/application/poll_view.html:57 assignment/views.py:439
 #: assignment/templates/assignment/poll_view.html:35
-#: assignment/templates/assignment/view.html:175
+#: assignment/templates/assignment/view.html:163
 #: assignment/templates/projector/Assignment.html:97
 msgid "Invalid votes"
 msgstr "Ungültige Stimmen"
@@ -1054,7 +1046,6 @@ msgid "Print this motion as PDF"
 msgstr "Alle Anträge als PDF drucken"
 
 #: application/templates/application/view.html:60
-#: assignment/templates/assignment/base_assignment.html:63
 msgid "New agenda item"
 msgstr "Neuer Tagesordnungseintrag"
 
@@ -1109,76 +1100,76 @@ msgstr "unverändert"
 msgid "Log"
 msgstr "Log"
 
-#: application/templates/application/view.html:163
+#: application/templates/application/view.html:164
 msgid "Me"
 msgstr "Ich"
 
-#: application/templates/application/view.html:195
-#: application/templates/application/view.html:227
+#: application/templates/application/view.html:196
+#: application/templates/application/view.html:228
 msgid "New vote"
 msgstr "Neue Abstimmung"
 
-#: application/templates/application/view.html:209
+#: application/templates/application/view.html:210
 msgid "Edit Vote"
 msgstr "Abstimmung bearbeiten"
 
-#: application/templates/application/view.html:234
+#: application/templates/application/view.html:235
 msgid "No results"
 msgstr "Keine Ergebnisse"
 
-#: application/templates/application/view.html:249
+#: application/templates/application/view.html:250
 msgid "Withdraw motion"
 msgstr "Antrag zurückziehen"
 
-#: application/templates/application/view.html:257
+#: application/templates/application/view.html:258
 msgid "Unsupport motion"
 msgstr "Antrag nicht unterstützen"
 
-#: application/templates/application/view.html:263
+#: application/templates/application/view.html:264
 msgid "Support"
 msgstr "Unterstützen"
 
-#: application/templates/application/view.html:270
+#: application/templates/application/view.html:271
 msgid "minimum required supporters"
 msgstr "minimal erforderliche Unterstützer/innen"
 
-#: application/templates/application/view.html:277
+#: application/templates/application/view.html:278
 msgid "Manage motion"
 msgstr "Antrag verwalten"
 
-#: application/templates/application/view.html:280
+#: application/templates/application/view.html:281
 msgid "Formal validation"
 msgstr "Formale Gültigkeitsprüfung"
 
-#: application/templates/application/view.html:283
+#: application/templates/application/view.html:284
 msgid "Publish"
 msgstr "Veröffentlichen"
 
-#: application/templates/application/view.html:286
+#: application/templates/application/view.html:287
 msgid "Permit"
 msgstr "Zulassen"
 
-#: application/templates/application/view.html:289
+#: application/templates/application/view.html:290
 msgid "Not permit"
 msgstr "Nicht zulassen"
 
-#: application/templates/application/view.html:292
+#: application/templates/application/view.html:293
 msgid "Set number"
 msgstr "Nummer vergeben"
 
-#: application/templates/application/view.html:298
+#: application/templates/application/view.html:299
 msgid "Result after vote"
 msgstr "Ergebnis nach der Abstimmung"
 
-#: application/templates/application/view.html:331
+#: application/templates/application/view.html:332
 msgid "Withdrawed by Submitter"
 msgstr "Zurückgezogen durch Antragsteller/in"
 
-#: application/templates/application/view.html:338
+#: application/templates/application/view.html:339
 msgid "For Administration only:"
 msgstr "Nur zur Administration:"
 
-#: application/templates/application/view.html:340
+#: application/templates/application/view.html:341
 msgid "Reset"
 msgstr "Zurücksetzen"
 
@@ -1195,7 +1186,7 @@ msgid "No poll results available."
 msgstr "Keine Abstimmungen vorhanden."
 
 #: assignment/forms.py:24 assignment/models.py:53 assignment/views.py:368
-#: assignment/templates/assignment/view.html:13
+#: assignment/templates/assignment/view.html:214
 #: assignment/templates/projector/Assignment.html:21
 msgid "Number of available posts"
 msgstr "Anzahl der zur Wahl stehenden Posten"
@@ -1233,18 +1224,18 @@ msgstr "Eine Stimme pro Kandidat/in."
 msgid "Always Yes-No-Abstain per candidate."
 msgstr "Ja, Nein, Enthaltung pro Kandidat/in."
 
-#: assignment/models.py:44 assignment/templates/assignment/overview.html:15
-#: assignment/templates/assignment/view.html:23
+#: assignment/models.py:44 assignment/templates/assignment/overview.html:25
+#: assignment/templates/assignment/view.html:223
 msgid "Searching for candidates"
 msgstr "Auf Kandidatensuche"
 
-#: assignment/models.py:45 assignment/templates/assignment/overview.html:16
-#: assignment/templates/assignment/view.html:25
+#: assignment/models.py:45 assignment/templates/assignment/overview.html:26
+#: assignment/templates/assignment/view.html:227
 msgid "Voting"
 msgstr "Im Wahlvorgang"
 
-#: assignment/models.py:46 assignment/templates/assignment/overview.html:17
-#: assignment/templates/assignment/view.html:27
+#: assignment/models.py:46 assignment/templates/assignment/overview.html:27
+#: assignment/templates/assignment/view.html:231
 msgid "Finished"
 msgstr "Abgeschlossen"
 
@@ -1252,7 +1243,7 @@ msgstr "Abgeschlossen"
 msgid "Name"
 msgstr "Name"
 
-#: assignment/models.py:51
+#: assignment/models.py:51 assignment/templates/assignment/view.html:30
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -1301,9 +1292,9 @@ msgid "Ballot %d"
 msgstr "Wahlgang %d"
 
 #: assignment/models.py:289 assignment/views.py:325 assignment/views.py:648
-#: assignment/templates/assignment/base_assignment.html:14
+#: assignment/templates/assignment/config.html:8
 #: assignment/templates/assignment/overview.html:6
-#: assignment/templates/assignment/overview.html:9
+#: assignment/templates/assignment/overview.html:10
 msgid "Elections"
 msgstr "Wahlen"
 
@@ -1381,7 +1372,7 @@ msgstr "Abstimmung wurde erfolgreich gelöscht."
 msgid "Assignment"
 msgstr "Wahl"
 
-#: assignment/views.py:343 assignment/templates/assignment/overview.html:53
+#: assignment/views.py:343 assignment/templates/assignment/overview.html:64
 #: assignment/templates/assignment/widget.html:23
 msgid "No assignments available."
 msgstr "Keine Wahlen vorhanden."
@@ -1392,21 +1383,19 @@ msgid "Election: %s"
 msgstr "Wahlen: %s"
 
 #: assignment/views.py:374 assignment/views.py:407
-#: assignment/templates/assignment/overview.html:26
+#: assignment/templates/assignment/overview.html:37
 #: assignment/templates/assignment/poll_view.html:18
-#: assignment/templates/assignment/view.html:36
-#: assignment/templates/assignment/view.html:108
+#: assignment/templates/assignment/view.html:38
+#: assignment/templates/assignment/view.html:100
 #: assignment/templates/projector/Assignment.html:38
 #: assignment/templates/projector/Assignment.html:56
 msgid "Candidates"
 msgstr "Kandidaten/innen"
 
-#: assignment/views.py:399
-#: assignment/templates/assignment/base_assignment.html:71
-#: assignment/templates/assignment/poll_view.html:5
+#: assignment/views.py:399 assignment/templates/assignment/poll_view.html:5
 #: assignment/templates/assignment/poll_view.html:8
-#: assignment/templates/assignment/view.html:102
-#: assignment/templates/assignment/view.html:111
+#: assignment/templates/assignment/view.html:95
+#: assignment/templates/assignment/view.html:103
 #: assignment/templates/projector/Assignment.html:59
 msgid "ballot"
 msgstr "Wahlgang"
@@ -1427,7 +1416,7 @@ msgstr ""
 "E: %(ABSTAIN)s"
 
 #: assignment/views.py:505 assignment/views.py:521
-#: assignment/templates/assignment/overview.html:25
+#: assignment/templates/assignment/overview.html:36
 #: assignment/templates/assignment/poll_view.html:5
 #: assignment/templates/assignment/view.html:6
 #: assignment/templates/projector/Assignment.html:27
@@ -1455,82 +1444,62 @@ msgstr "%d verfügbare Posten"
 msgid "Election settings successfully saved."
 msgstr "Wahl-Einstellungen wurden erfolgreich gespeichert."
 
-#: assignment/views.py:662
-msgid "Assignments"
-msgstr "Wahlen"
-
-#: assignment/templates/assignment/base_assignment.html:16
-msgid "All elections"
-msgstr "Alle Wahlen"
-
-#: assignment/templates/assignment/base_assignment.html:18
-#: assignment/templates/assignment/edit.html:10
-#: assignment/templates/assignment/edit.html:19
-msgid "New election"
-msgstr "Neue Wahl"
-
-#: assignment/templates/assignment/base_assignment.html:20
-msgid "All elections as PDF"
-msgstr "Alle Wahlen als PDF"
-
-#: assignment/templates/assignment/base_assignment.html:31
-msgid "View election"
-msgstr "Wahl anzeigen"
-
-#: assignment/templates/assignment/base_assignment.html:39
-#: assignment/templates/assignment/edit.html:8
-#: assignment/templates/assignment/edit.html:17
-#: assignment/templates/assignment/overview.html:44
-msgid "Edit election"
-msgstr "Wahl bearbeiten"
-
-#: assignment/templates/assignment/base_assignment.html:44
-#: assignment/templates/assignment/overview.html:45
-msgid "Delete election"
-msgstr "Wahl löschen"
-
-#: assignment/templates/assignment/base_assignment.html:50
-#: assignment/templates/assignment/overview.html:47
-msgid "Election as PDF"
-msgstr "Wahl als PDF"
-
-#: assignment/templates/assignment/base_assignment.html:56
-msgid "Show election"
-msgstr "Wahl projizieren"
-
 #: assignment/templates/assignment/config.html:5
-#: assignment/templates/assignment/config.html:8
 msgid "Election settings"
 msgstr "Wahl-Einstellungen"
 
-#: assignment/templates/assignment/overview.html:12
-#: participant/templates/participant/overview.html:22
+#: assignment/templates/assignment/edit.html:8
+#: assignment/templates/assignment/edit.html:17
+#: assignment/templates/assignment/overview.html:55
+msgid "Edit election"
+msgstr "Wahl bearbeiten"
+
+#: assignment/templates/assignment/edit.html:10
+#: assignment/templates/assignment/edit.html:19
+#: assignment/templates/assignment/overview.html:13
+msgid "New election"
+msgstr "Neue Wahl"
+
+#: assignment/templates/assignment/overview.html:16
+msgid "Print all elections as PDF"
+msgstr "Alle Anträge als PDF drucken"
+
+#: assignment/templates/assignment/overview.html:22
+#: participant/templates/participant/overview.html:55
 msgid "Filter"
 msgstr "Filter"
 
-#: assignment/templates/assignment/overview.html:22
+#: assignment/templates/assignment/overview.html:32
 msgid "election"
 msgid_plural "elections"
 msgstr[0] "Wahl"
 msgstr[1] "Wahlen"
 
-#: assignment/templates/assignment/overview.html:39
+#: assignment/templates/assignment/overview.html:50
 msgid "Activate election"
 msgstr "Wahl projizieren"
 
+#: assignment/templates/assignment/overview.html:56
+msgid "Delete election"
+msgstr "Wahl löschen"
+
+#: assignment/templates/assignment/overview.html:58
+msgid "Election as PDF"
+msgstr "Wahl als PDF"
+
 #: assignment/templates/assignment/poll_view.html:10
 msgid "Short description (for ballot paper)"
 msgstr "Kurzbeschreibung (für Stimmzettel)"
 
 #: assignment/templates/assignment/view.html:21
-msgid "Change status"
-msgstr "Status ändern"
+msgid "Show election"
+msgstr "Wahl projizieren"
 
-#: assignment/templates/assignment/view.html:43
+#: assignment/templates/assignment/view.html:45
 msgid "Remove candidate"
 msgstr "Kandidate/in entfernen"
 
-#: assignment/templates/assignment/view.html:48
+#: assignment/templates/assignment/view.html:50
 #: assignment/templates/projector/Assignment.html:44
 msgid "No candidates available."
 msgstr "Keine Kandidaten/innen vorhanden."
@@ -1539,43 +1508,47 @@ msgstr "Keine Kandidaten/innen vorhanden."
 msgid "Withdraw self candidature"
 msgstr "Eigene Kandidatur zurückziehen"
 
-#: assignment/templates/assignment/view.html:66
+#: assignment/templates/assignment/view.html:64
 msgid "Self candidature"
 msgstr "Selbst kandidieren"
 
-#: assignment/templates/assignment/view.html:77
+#: assignment/templates/assignment/view.html:76
 msgid "Add new participant"
 msgstr "Neue/n Teilnehmer/in hinzufügen"
 
-#: assignment/templates/assignment/view.html:93
+#: assignment/templates/assignment/view.html:88
 #: assignment/templates/projector/Assignment.html:52
 msgid "Election results"
 msgstr "Wahlergebnisse"
 
-#: assignment/templates/assignment/view.html:116
+#: assignment/templates/assignment/view.html:108
 msgid "Publish/unpublish results"
 msgstr "Ergebnisse veröffentlichen/unveröffentlichen"
 
-#: assignment/templates/assignment/view.html:128
-#: assignment/templates/assignment/view.html:216
+#: assignment/templates/assignment/view.html:119
+#: assignment/templates/assignment/view.html:201
 msgid "New ballot"
 msgstr "Neuer Wahlgang"
 
-#: assignment/templates/assignment/view.html:143
+#: assignment/templates/assignment/view.html:132
 #: assignment/templates/projector/Assignment.html:69
 msgid "Candidate is elected"
 msgstr "Kandidat/in ist gewählt"
 
-#: assignment/templates/assignment/view.html:162
+#: assignment/templates/assignment/view.html:151
 #: assignment/templates/projector/Assignment.html:84
 msgid "was not a <br> candidate"
 msgstr "war kein Kandidat"
 
-#: assignment/templates/assignment/view.html:211
+#: assignment/templates/assignment/view.html:197
 #: assignment/templates/projector/Assignment.html:126
 msgid "No ballots available."
 msgstr "Keine Wahlgänge vorhanden."
 
+#: assignment/templates/assignment/view.html:220
+msgid "Change status"
+msgstr "Status ändern"
+
 #: config/forms.py:24
 msgid "Event name"
 msgstr "Veranstaltungsname"
@@ -1625,7 +1598,7 @@ msgstr "Willkommen bei OpenSlides!"
 msgid "Get professional support for OpenSlides on %s."
 msgstr "Professionelle Unterstützung für OpenSlides gibt es unter %s."
 
-#: config/models.py:107
+#: config/models.py:107 config/templates/config/general.html:8
 msgid "General"
 msgstr "Allgemein"
 
@@ -1641,24 +1614,19 @@ msgstr ""
 msgid "General settings successfully saved."
 msgstr "Allgemeine Einstellungen erfolgreich gespeichert."
 
-#: config/views.py:119 config/templates/config/base_config.html:7
-msgid "Configuration"
-msgstr "Konfiguration"
-
 #: config/templates/config/general.html:5
-#: config/templates/config/general.html:8
 msgid "General settings"
 msgstr "Allgemeine Einstellungen"
 
-#: config/templates/config/general.html:11
+#: config/templates/config/general.html:13
 msgid "Event"
 msgstr "Veranstaltung"
 
-#: config/templates/config/general.html:26
+#: config/templates/config/general.html:28
 msgid "Frontpage"
 msgstr "Startseite"
 
-#: config/templates/config/general.html:41
+#: config/templates/config/general.html:43
 msgid "System"
 msgstr "System"
 
@@ -1669,6 +1637,7 @@ msgstr "Teilnehmer"
 #: participant/forms.py:26
 #: participant/templates/participant/group_overview.html:6
 #: participant/templates/participant/group_overview.html:9
+#: participant/templates/participant/overview.html:23
 msgid "User groups"
 msgstr "Benutzerrollen"
 
@@ -1697,40 +1666,40 @@ msgstr "System URL"
 msgid "Printed in PDF of first time passwords only."
 msgstr "Erscheint nur im PDF der Erst-Passwörter"
 
-#: participant/models.py:28 participant/templates/participant/overview.html:25
+#: participant/models.py:28 participant/templates/participant/overview.html:59
 msgid "Male"
 msgstr "Männlich"
 
-#: participant/models.py:29 participant/templates/participant/overview.html:26
+#: participant/models.py:29 participant/templates/participant/overview.html:60
 msgid "Female"
 msgstr "Weiblich"
 
-#: participant/models.py:32 participant/templates/participant/overview.html:38
+#: participant/models.py:32 participant/templates/participant/overview.html:72
 msgid "Delegate"
 msgstr "Delegierter"
 
-#: participant/models.py:33 participant/templates/participant/overview.html:39
+#: participant/models.py:33 participant/templates/participant/overview.html:73
 msgid "Observer"
 msgstr "Beobachter"
 
-#: participant/models.py:34 participant/templates/participant/overview.html:40
+#: participant/models.py:34 participant/templates/participant/overview.html:74
 msgid "Staff"
 msgstr "Mitarbeiter"
 
-#: participant/models.py:35 participant/templates/participant/overview.html:41
+#: participant/models.py:35 participant/templates/participant/overview.html:75
 msgid "Guest"
 msgstr "Gast"
 
-#: participant/models.py:40 participant/templates/participant/overview.html:30
-#: participant/templates/participant/overview.html:68
+#: participant/models.py:40 participant/templates/participant/overview.html:64
+#: participant/templates/participant/overview.html:104
 msgid "Category"
-msgstr ""
+msgstr "Kategorie"
 
 #: participant/models.py:41
 msgid "Will be shown behind the name."
 msgstr "Wird nach dem Namen angezeigt."
 
-#: participant/models.py:44 participant/templates/participant/overview.html:24
+#: participant/models.py:44 participant/templates/participant/overview.html:58
 msgid "Gender"
 msgstr "Geschlecht"
 
@@ -1743,8 +1712,8 @@ msgid "Typ"
 msgstr "Typ"
 
 #: participant/models.py:49 participant/views.py:216
-#: participant/templates/participant/overview.html:45
-#: participant/templates/participant/overview.html:70
+#: participant/templates/participant/overview.html:79
+#: participant/templates/participant/overview.html:106
 msgid "Committee"
 msgstr "Amt"
 
@@ -1772,11 +1741,13 @@ msgstr "Teilnehmerliste"
 msgid "List of Participants"
 msgstr "Teilnehmerliste"
 
-#: participant/views.py:215 participant/templates/participant/overview.html:67
+#: participant/views.py:215
+#: participant/templates/participant/overview.html:103
 msgid "Last Name"
 msgstr "Nachname"
 
-#: participant/views.py:215 participant/templates/participant/overview.html:66
+#: participant/views.py:215
+#: participant/templates/participant/overview.html:102
 msgid "First Name"
 msgstr "Vorname"
 
@@ -1784,8 +1755,8 @@ msgstr "Vorname"
 msgid "Group"
 msgstr "Gruppe"
 
-#: participant/views.py:215 participant/templates/participant/overview.html:37
-#: participant/templates/participant/overview.html:69
+#: participant/views.py:215 participant/templates/participant/overview.html:71
+#: participant/templates/participant/overview.html:105
 msgid "Type"
 msgstr "Typ"
 
@@ -1856,89 +1827,72 @@ msgstr "Nutzereinstellungen wurden erfolgreich gespeichert."
 msgid "Password successfully changed."
 msgstr "Password wurde erfolgreich geändert."
 
-#: participant/views.py:497
-#: participant/templates/participant/base_participant.html:12
+#: participant/views.py:497 participant/templates/participant/config.html:8
+#: participant/templates/participant/group_overview.html:12
 #: participant/templates/participant/overview.html:7
 #: participant/templates/participant/overview.html:18
-#: participant/templates/participant/overview.html:62
+#: participant/templates/participant/overview.html:97
 msgid "Participants"
 msgstr "Teilnehmer/innen"
 
-#: participant/templates/participant/base_participant.html:15
-msgid "All participants"
-msgstr "Alle Teilnehmer/innen"
-
-#: participant/templates/participant/base_participant.html:18
-#: participant/templates/participant/edit.html:10
-#: participant/templates/participant/edit.html:19
-msgid "New participant"
-msgstr "Neue/r Teilnehmer/in"
-
-#: participant/templates/participant/base_participant.html:19
-msgid "All user groups"
-msgstr "Alle Benutzerrollen"
-
-#: participant/templates/participant/base_participant.html:20
-#: participant/templates/participant/group_edit.html:10
-#: participant/templates/participant/group_edit.html:18
-msgid "New user group"
-msgstr "Neue Benutzerrolle"
-
-#: participant/templates/participant/base_participant.html:21
-#: participant/templates/participant/import.html:5
-#: participant/templates/participant/import.html:8
-msgid "Import participants"
-msgstr "Teilnehmer/innen importieren"
-
-#: participant/templates/participant/base_participant.html:24
-msgid "List of participants as PDF"
-msgstr "Teilnehmerliste als PDF"
-
-#: participant/templates/participant/base_participant.html:27
-msgid "First time passwords as PDF"
-msgstr "Erst-Passwörter als PDF"
-
 #: participant/templates/participant/config.html:5
-#: participant/templates/participant/config.html:8
 msgid "Participant settings"
 msgstr "Teilnehmer/innen-Einstellungen"
 
 #: participant/templates/participant/edit.html:8
 #: participant/templates/participant/edit.html:17
-#: participant/templates/participant/overview.html:94
+#: participant/templates/participant/overview.html:130
 msgid "Edit participant"
 msgstr "Teilnehmer/in bearbeiten"
 
-#: participant/templates/participant/edit.html:26
+#: participant/templates/participant/edit.html:10
+#: participant/templates/participant/edit.html:19
+#: participant/templates/participant/overview.html:22
+msgid "New participant"
+msgstr "Neue/r Teilnehmer/in"
+
+#: participant/templates/participant/edit.html:30
 msgid "Reset to First Password"
 msgstr "Auf Erst-Passwort zurücksetzen"
 
 #: participant/templates/participant/group_edit.html:8
-#: participant/templates/participant/group_edit.html:16
+#: participant/templates/participant/group_edit.html:17
 msgid "Edit user group"
 msgstr "Benutzerrolle bearbeiten"
 
-#: participant/templates/participant/group_overview.html:12
+#: participant/templates/participant/group_edit.html:10
+#: participant/templates/participant/group_edit.html:19
+#: participant/templates/participant/group_overview.html:11
+msgid "New user group"
+msgstr "Neue Benutzerrolle"
+
+#: participant/templates/participant/group_overview.html:18
 msgid "User Group"
 msgstr "Benutzerrolle"
 
-#: participant/templates/participant/group_overview.html:18
+#: participant/templates/participant/group_overview.html:24
 msgid "Edit group"
 msgstr "Benutzerrolle bearbeiten"
 
-#: participant/templates/participant/group_overview.html:20
+#: participant/templates/participant/group_overview.html:26
 msgid "Delete group"
 msgstr "Benutzerrolle löschen"
 
-#: participant/templates/participant/group_overview.html:26
+#: participant/templates/participant/group_overview.html:32
 msgid "No user groups available."
 msgstr "Keine Benutzerrollen vorhanden."
 
+#: participant/templates/participant/import.html:5
 #: participant/templates/participant/import.html:9
+#: participant/templates/participant/overview.html:24
+msgid "Import participants"
+msgstr "Teilnehmer/innen importieren"
+
+#: participant/templates/participant/import.html:15
 msgid "Select a CSV file to import participants!"
 msgstr "Wählen Sie eine CSV-Datei zum Importieren von Teilnehmer/innen aus!"
 
-#: participant/templates/participant/import.html:11
+#: participant/templates/participant/import.html:17
 msgid ""
 "Required comma separated values: <code>{first_name, last_name, gender, "
 "group, type, committee, comment}</code>"
@@ -1946,81 +1900,99 @@ msgstr ""
 "Erforderliche kommaseparierte Werte: <code>{Vorname, Nachname, Geschlecht, "
 "Gruppe, Typ, Amt, Kommentar}</code>"
 
-#: participant/templates/participant/login.html:8
 #: participant/templates/participant/login.html:16
-#: participant/templates/participant/login.html:47 templates/base.html:45
-msgid "Login"
-msgstr "Anmelden"
-
-#: participant/templates/participant/login.html:24
 msgid "Your username and password were not accepted. Please try again."
 msgstr ""
 "Benutzername und Passwort wurden nicht akzeptiert. Bitte versuchen Sie es "
 "erneut."
 
-#: participant/templates/participant/login.html:51
+#: participant/templates/participant/login.html:29
+msgid "Username"
+msgstr "Benutzername"
+
+#: participant/templates/participant/login.html:33
+msgid "Password"
+msgstr "Passwort"
+
+#: participant/templates/participant/login.html:38
+#: participant/templates/participant/overview.html:39 templates/base.html:44
+msgid "Login"
+msgstr "Anmelden"
+
+#: participant/templates/participant/login.html:42
 msgid "Continue as guest"
 msgstr "Weiter als Gast"
 
-#: participant/templates/participant/overview.html:27
-#: participant/templates/participant/overview.html:42
+#: participant/templates/participant/overview.html:23
+msgid "All user groups"
+msgstr "Alle Benutzerrollen"
+
+#: participant/templates/participant/overview.html:35
+msgid "List of participants"
+msgstr "Liste der Teilnehmer/innen"
+
+#: participant/templates/participant/overview.html:36
+msgid "First time passwords"
+msgstr "Erst-Passwörter als PDF"
+
+#: participant/templates/participant/overview.html:44
+msgid "Print list of participants as PDF"
+msgstr "Liste der Teilnehmer/innen als PDF drucken"
+
+#: participant/templates/participant/overview.html:47
+msgid "Print first time passwords as PDF"
+msgstr "Erst-Passwörter als PDF drucken"
+
+#: participant/templates/participant/overview.html:61
+#: participant/templates/participant/overview.html:76
 msgid "Not specified"
 msgstr "Nicht angegeben"
 
-#: participant/templates/participant/overview.html:53 projector/models.py:66
+#: participant/templates/participant/overview.html:87 projector/models.py:66
 msgid "Active"
 msgstr "Aktiv"
 
-#: participant/templates/participant/overview.html:54
+#: participant/templates/participant/overview.html:88
 msgid "Inactive"
 msgstr "Inaktiv"
 
-#: participant/templates/participant/overview.html:60
+#: participant/templates/participant/overview.html:95
 msgid "participant"
 msgid_plural "participants"
 msgstr[0] "Teilnehmer/in"
 msgstr[1] "Teilnehmer/innen"
 
-#: participant/templates/participant/overview.html:62
+#: participant/templates/participant/overview.html:97
 msgid "of"
 msgstr "von"
 
-#: participant/templates/participant/overview.html:73
+#: participant/templates/participant/overview.html:109
 msgid "Last Login"
 msgstr "Letzer Login"
 
-#: participant/templates/participant/overview.html:97
+#: participant/templates/participant/overview.html:133
 msgid "Delete participant"
 msgstr "Teilnehmer/in löschen"
 
-#: participant/templates/participant/overview.html:99
+#: participant/templates/participant/overview.html:135
 msgid "Change status to inactive"
 msgstr "Status ändern zu inaktiv"
 
-#: participant/templates/participant/overview.html:102
+#: participant/templates/participant/overview.html:138
 msgid "Change status to active"
 msgstr "Status ändern zu aktiv"
 
-#: participant/templates/participant/overview.html:111
+#: participant/templates/participant/overview.html:147
 msgid "No participants available."
 msgstr "Keine Teilnehmer/innen vorhanden."
 
 #: participant/templates/participant/password_change.html:5
-#: participant/templates/participant/password_change.html:11
-#: participant/templates/participant/password_change.html:16
-#: participant/templates/participant/settings.html:11
+#: participant/templates/participant/password_change.html:8
 msgid "Password Settings"
 msgstr "Passwort Einstellungen"
 
-#: participant/templates/participant/password_change.html:8
-#: participant/templates/participant/settings.html:8
-msgid "User Settings"
-msgstr "Benutzereinstellungen"
-
-#: participant/templates/participant/password_change.html:10
 #: participant/templates/participant/settings.html:5
-#: participant/templates/participant/settings.html:10
-#: participant/templates/participant/settings.html:16
+#: participant/templates/participant/settings.html:8
 msgid "Personal Settings"
 msgstr "Persönliche Einstellungen"
 
@@ -2048,7 +2020,7 @@ msgstr "Darf das Dashboard sehen"
 msgid "Errors in the form"
 msgstr "Fehler im Formular"
 
-#: projector/views.py:360 projector/templates/projector/dashboard.html:17
+#: projector/views.py:360 projector/templates/projector/dashboard.html:18
 msgid "Dashboard"
 msgstr "Dashboard"
 
@@ -2057,51 +2029,30 @@ msgid "Projector live view"
 msgstr "Projektor-Live-Ansicht"
 
 #: projector/views.py:404
-msgid "Manage Overlays"
-msgstr "Einblendungen verwalten"
+msgid "Overlays"
+msgstr "Einblendungen"
 
 #: projector/views.py:417
-msgid "Custom Slide"
-msgstr "Benutzerdefinierte Folie"
+msgid "Custom Slides"
+msgstr "Benutzerdefinierte Folien"
 
-#: projector/templates/projector/base_projector.html:7
-#: projector/templates/projector/base_projector.html:12
-msgid "Projector"
-msgstr "Projektor"
-
-#: projector/templates/projector/base_projector.html:15
-msgid "Overview"
-msgstr "Übersicht"
-
-#: projector/templates/projector/base_projector.html:18
-#: projector/templates/projector/select_widgets.html:5
-#: projector/templates/projector/select_widgets.html:8
-msgid "Select widgets"
-msgstr "Widgets auswählen"
-
-#: projector/templates/projector/base_projector.html:22
-#: templates/front_page.html:25
-msgid "Projector view"
-msgstr "Projektor-Ansicht"
-
-#: projector/templates/projector/control_countdown.html:6
+#: projector/templates/projector/control_countdown.html:9
 msgid "s"
 msgstr "s"
 
-#: projector/templates/projector/control_countdown.html:7
+#: projector/templates/projector/control_countdown.html:11
 msgid "Save as default"
 msgstr "Als Voreinstellung speichern"
 
-#: projector/templates/projector/control_countdown.html:10
-#: projector/templates/projector/control_countdown.html:11
+#: projector/templates/projector/control_countdown.html:14
 msgid "Reset countdown"
 msgstr "Countdown zurücksetzen"
 
-#: projector/templates/projector/control_countdown.html:13
+#: projector/templates/projector/control_countdown.html:17
 msgid "Start countdown"
 msgstr "Countdown starten"
 
-#: projector/templates/projector/control_countdown.html:16
+#: projector/templates/projector/control_countdown.html:20
 msgid "Stop countdown"
 msgstr "Countdown stoppen"
 
@@ -2113,31 +2064,35 @@ msgstr "Message leeren"
 msgid "Welcome Page"
 msgstr "Willkommensseite"
 
-#: projector/templates/projector/custom_slide_widget.html:41
-msgid "New slide"
-msgstr "Neue Folie"
+#: projector/templates/projector/dashboard.html:20
+msgid "Manage widgets"
+msgstr "Widgets verwalten"
 
-#: projector/templates/projector/dashboard.html:21
+#: projector/templates/projector/dashboard.html:20
+msgid "Widgets"
+msgstr "Widgets"
+
+#: projector/templates/projector/dashboard.html:26
 msgid "Adjust projector view"
 msgstr "Projektor-Ansicht anpassen"
 
-#: projector/templates/projector/dashboard.html:22
+#: projector/templates/projector/dashboard.html:27
 msgid "Zoom in"
 msgstr "Vergrößern"
 
-#: projector/templates/projector/dashboard.html:25
+#: projector/templates/projector/dashboard.html:30
 msgid "Zoom out"
 msgstr "Verkleinern"
 
-#: projector/templates/projector/dashboard.html:28
+#: projector/templates/projector/dashboard.html:33
 msgid "Scroll text up"
 msgstr "Text nach oben scrollen"
 
-#: projector/templates/projector/dashboard.html:31
+#: projector/templates/projector/dashboard.html:36
 msgid "Scroll text down"
 msgstr "Text nach unten scrollen"
 
-#: projector/templates/projector/dashboard.html:34
+#: projector/templates/projector/dashboard.html:39
 msgid "Reset projector view"
 msgstr "Projektor-Ansicht zurücksetzen"
 
@@ -2146,7 +2101,12 @@ msgstr "Projektor-Ansicht zurücksetzen"
 msgid "Custom slide"
 msgstr "Benutzerdefinierte Folie"
 
-#: projector/templates/projector/select_widgets.html:17
+#: projector/templates/projector/select_widgets.html:5
+#: projector/templates/projector/select_widgets.html:8
+msgid "Select widgets"
+msgstr "Widgets auswählen"
+
+#: projector/templates/projector/select_widgets.html:23
 msgid "No widgets available"
 msgstr "Keine Widgets vorhanden."
 
@@ -2158,20 +2118,19 @@ msgstr "Seite nicht gefunden."
 msgid "Server Error"
 msgstr "Serverfehler"
 
-#: templates/base.html:29 templates/front_page.html:6
-#: templates/front_page.html.py:22
+#: templates/base.html:28 templates/front_page.html:6
 msgid "Home"
 msgstr "Startseite"
 
-#: templates/base.html:39
+#: templates/base.html:38
 msgid "Profile"
 msgstr "Profil"
 
-#: templates/base.html:40
+#: templates/base.html:39
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: templates/base.html:42
+#: templates/base.html:41
 msgid "Logout"
 msgstr "Abmelden"
 
@@ -2204,11 +2163,11 @@ msgstr "Bedaure, Sie haben keine Berechtigung diese Seite zu sehen."
 
 #: utils/views.py:109
 msgid "Are you sure?"
-msgstr ""
+msgstr "Sind Sie sicher?"
 
 #: utils/views.py:110
 msgid "Thank you for your answer"
-msgstr ""
+msgstr "Danke für Ihre Antwort"
 
 #: utils/views.py:232
 #, python-format
@@ -2232,18 +2191,3 @@ msgstr "undefinierter-dateiname"
 #: utils/jsonfield/fields.py:21
 msgid "Enter valid JSON"
 msgstr "Gebe valides JSON ein"
-
-#~ msgid "All motions"
-#~ msgstr "Alle Anträge"
-
-#~ msgid "Application No."
-#~ msgstr "Antrag Nr."
-
-#~ msgid "View motion"
-#~ msgstr "Antrag anzeigen"
-
-#~ msgid "Enter result"
-#~ msgstr "Ergebnis eingeben"
-
-#~ msgid "Result after debate"
-#~ msgstr "Ergebnis nach der Debatte"

From e9ac336b61c413940a95dc9a4e9ca05d235418ba Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Tue, 11 Sep 2012 20:20:58 +0200
Subject: [PATCH 21/88] Fixed wrong permissions: can_create_applications
 instead of can_manage_applications

---
 openslides/application/templates/application/overview.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/openslides/application/templates/application/overview.html b/openslides/application/templates/application/overview.html
index ef4b9a7ca..7145990dc 100644
--- a/openslides/application/templates/application/overview.html
+++ b/openslides/application/templates/application/overview.html
@@ -10,8 +10,10 @@
     <h1>
         {% trans "Motions" %}
         <small class="pull-right">
-        {% if perms.application.can_manage_application %}
+        {% if perms.application.can_create_application %}
             <a href="{% url application_new %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'New motion' %}"><i class="icon-plus"></i> {% trans "New" %}</a>
+        {% endif %}
+        {% if perms.application.can_manage_application %}
             <a href="{% url application_import %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Import motions' %}"><i class="icon-share-alt"></i> {% trans 'Import' %}</a>
         {% endif %}
         <a href="{% url print_applications %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print all motions as PDF' %}"><i class="icon-print"></i> PDF</a>

From d6717409664e378d20c0605f32fa9565e61260bb Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Wed, 2 Jan 2013 23:22:12 +0100
Subject: [PATCH 22/88] Fixed merged errors.

---
 openslides/motion/templates/motion/edit.html          |  2 +-
 openslides/motion/templates/motion/import.html        |  4 ++--
 openslides/motion/templates/motion/overview.html      | 10 +++++-----
 openslides/motion/templates/motion/poll_view.html     |  6 +++---
 openslides/motion/views.py                            |  1 +
 openslides/projector/templates/base-projector.html    |  2 +-
 openslides/projector/templates/projector/default.html |  2 +-
 openslides/static/styles/base.css                     |  2 +-
 8 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/openslides/motion/templates/motion/edit.html b/openslides/motion/templates/motion/edit.html
index 045d66dc3..60da48b78 100644
--- a/openslides/motion/templates/motion/edit.html
+++ b/openslides/motion/templates/motion/edit.html
@@ -19,7 +19,7 @@
         {% trans "New motion" %}
     {% endif %}
     <small class="pull-right">
-    <a href="{% url application_overview %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
+    <a href="{% url motion_overview %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
     </small>
     </h1>
     <form action="" method="post">{% csrf_token %}
diff --git a/openslides/motion/templates/motion/import.html b/openslides/motion/templates/motion/import.html
index ba04ca732..16ca5bc5a 100644
--- a/openslides/motion/templates/motion/import.html
+++ b/openslides/motion/templates/motion/import.html
@@ -7,7 +7,7 @@
 {% block content %}
     <h1>{% trans "Import motions" %}
         <small class="pull-right">
-        <a href="{% url application_overview %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
+        <a href="{% url motion_overview %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
         </small>
     </h1>
 
@@ -40,7 +40,7 @@
         <button class="btn btn-primary" type="submit">
             {% trans 'Import' %}
         </button>
-        <a href='{% url motionn_overview %}' class="btn">
+        <a href='{% url motion_overview %}' class="btn">
             {% trans 'Cancel' %}
         </a>
         </div>
diff --git a/openslides/motion/templates/motion/overview.html b/openslides/motion/templates/motion/overview.html
index 2bec26f5f..ad9d81f2b 100644
--- a/openslides/motion/templates/motion/overview.html
+++ b/openslides/motion/templates/motion/overview.html
@@ -10,13 +10,13 @@
     <h1>
         {% trans "Motions" %}
         <small class="pull-right">
-        {% if perms.application.can_create_application %}
-            <a href="{% url application_new %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'New motion' %}"><i class="icon-plus"></i> {% trans "New" %}</a>
+        {% if perms.motion.can_create_motion %}
+            <a href="{% url motion_new %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'New motion' %}"><i class="icon-plus"></i> {% trans "New" %}</a>
         {% endif %}
-        {% if perms.application.can_manage_application %}
-            <a href="{% url application_import %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Import motions' %}"><i class="icon-share-alt"></i> {% trans 'Import' %}</a>
+        {% if perms.motion.can_manage_motion %}
+            <a href="{% url motion_import %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Import motions' %}"><i class="icon-share-alt"></i> {% trans 'Import' %}</a>
         {% endif %}
-        <a href="{% url print_applications %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print all motions as PDF' %}"><i class="icon-print"></i> PDF</a>
+        <a href="{% url print_motions %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print all motions as PDF' %}"><i class="icon-print"></i> PDF</a>
         </small>
     </h1>
 
diff --git a/openslides/motion/templates/motion/poll_view.html b/openslides/motion/templates/motion/poll_view.html
index 3dee1c3af..ee9414378 100644
--- a/openslides/motion/templates/motion/poll_view.html
+++ b/openslides/motion/templates/motion/poll_view.html
@@ -15,7 +15,7 @@
     </small>
     <small class="pull-right">
     <div class="btn-toolbar">
-        <a href="{% url application_view application.id %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to motion" %}</a>
+        <a href="{% url motion_view motion.id %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to motion" %}</a>
         <div class="btn-group">
             <a data-toggle="dropdown" href="#" class="btn btn-mini dropdown-toggle">
                 {% trans 'More actions' %}
@@ -24,12 +24,12 @@
             <ul class="dropdown-menu pull-right">
                 <!-- delete -->
                 {% if "delete" in actions %}
-                    <li><a href="{% url application_poll_delete poll.id %}"><i class="icon-remove"></i> {% trans 'Delete Vote' %}</a></li>
+                    <li><a href="{% url motion_poll_delete poll.id %}"><i class="icon-remove"></i> {% trans 'Delete Vote' %}</a></li>
                 {% endif %}
                 <!-- activate projector -->
                 {% if perms.projector.can_manage_projector %}
                     <li>
-                        <a class="activate_link {% if item.active %}active{% endif %}" href="{% url projector_activate_slide application.sid  %}"><i class="icon-facetime-video"></i> {% trans 'Show Application' %}</a>
+                        <a class="activate_link {% if item.active %}active{% endif %}" href="{% url projector_activate_slide motion.sid  %}"><i class="icon-facetime-video"></i> {% trans 'Show motion' %}</a>
                     </li>
                 {% endif %}
             </ul>
diff --git a/openslides/motion/views.py b/openslides/motion/views.py
index 76b2ba4c3..6c8f68820 100644
--- a/openslides/motion/views.py
+++ b/openslides/motion/views.py
@@ -941,6 +941,7 @@ def register_tab(request):
     selected = True if request.path.startswith('/motion/') else False
     return Tab(
         title=_('Motions'),
+        app='motion',
         url=reverse('motion_overview'),
         permission=request.user.has_perm('motion.can_see_motion') or request.user.has_perm('motion.can_support_motion') or request.user.has_perm('motion.can_support_motion') or request.user.has_perm('motion.can_manage_motion'),
         selected=selected,
diff --git a/openslides/projector/templates/base-projector.html b/openslides/projector/templates/base-projector.html
index a7a5ac98b..9f06c1ad1 100644
--- a/openslides/projector/templates/base-projector.html
+++ b/openslides/projector/templates/base-projector.html
@@ -10,7 +10,7 @@
         <link rel="shortcut icon" href="{% static 'images/favicon.png' %}" type="image/png" />
         <script type="text/javascript" src="{% static 'javascript/jquery.js' %}"></script>
         <script type="text/javascript" src="{% static 'javascript/projector.js' %}"></script>
-        <title>{% block title %} {% get_config 'event_name' %} {% endblock %}</title>
+        <title>XX{% block title %} {% get_config 'event_name' %} {% endblock %}</title>
         {% block header %}
         {% endblock %}
     </head>
diff --git a/openslides/projector/templates/projector/default.html b/openslides/projector/templates/projector/default.html
index 99d605672..3ce29380c 100644
--- a/openslides/projector/templates/projector/default.html
+++ b/openslides/projector/templates/projector/default.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base-projector.html" %}
 
 {% load tags %}
 {% load i18n %}
diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css
index 5fff36b34..b3c6b40c5 100644
--- a/openslides/static/styles/base.css
+++ b/openslides/static/styles/base.css
@@ -209,7 +209,7 @@ form .required label:after {
 .icon-agenda {
     background-position: -264px 0;
 }
-.icon-application, .icon-applications {
+.icon-motion, .icon-motions {
     background-position: -24px -24px;
 }
 .icon-assignment, .icon-assignments {

From 13cd52bd96e0af142155afc000914fcdb4d2d5c5 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Sat, 5 Jan 2013 15:29:57 +0100
Subject: [PATCH 23/88] Merged (conflicts).

---
 .gitignore                                    | 10 ++--
 .travis.yml                                   |  2 +-
 INSTALL.txt                                   |  6 +-
 openslides/__init__.py                        |  2 +-
 .../agenda/templates/agenda/config.html       |  4 +-
 openslides/agenda/templates/agenda/edit.html  |  6 +-
 .../agenda/templates/agenda/item_row.html     |  6 +-
 .../agenda/templates/agenda/overview.html     |  8 +--
 .../agenda/templates/agenda/widget.html       | 10 ++--
 .../templates/assignment/config.html          |  4 +-
 .../assignment/templates/assignment/edit.html |  4 +-
 .../templates/assignment/overview.html        | 14 ++---
 .../templates/assignment/poll_view.html       |  8 +--
 .../assignment/templates/assignment/view.html | 37 ++++++------
 .../templates/assignment/widget.html          |  4 +-
 .../config/templates/config/general.html      |  4 +-
 openslides/global_settings.py                 |  4 +-
 openslides/main.py                            |  3 -
 .../motion/templates/motion/base_motion.html  | 30 +++++-----
 .../motion/templates/motion/config.html       |  4 +-
 openslides/motion/templates/motion/edit.html  |  6 +-
 .../motion/templates/motion/import.html       |  4 +-
 .../motion/templates/motion/overview.html     | 16 ++---
 .../motion/templates/motion/poll_view.html    | 10 ++--
 openslides/motion/templates/motion/view.html  | 58 +++++++++----------
 .../motion/templates/motion/widget.html       |  4 +-
 openslides/motion/views.py                    |  8 +--
 openslides/participant/api.py                 |  3 -
 openslides/participant/forms.py               |  3 +
 .../templates/participant/config.html         |  2 +-
 .../templates/participant/edit.html           |  6 +-
 .../templates/participant/group_edit.html     |  4 +-
 .../templates/participant/group_overview.html |  8 +--
 .../templates/participant/group_widget.html   |  4 +-
 .../templates/participant/import.html         |  4 +-
 .../templates/participant/login.html          | 10 +++-
 .../templates/participant/overview.html       | 26 ++++-----
 .../templates/participant/settings.html       | 11 ++++
 .../templates/participant/user_widget.html    |  4 +-
 openslides/participant/views.py               | 23 ++++----
 .../projector/control_countdown.html          | 11 ++--
 .../projector/control_overlay_message.html    |  3 +-
 .../projector/custom_slide_widget.html        | 18 +++---
 .../templates/projector/dashboard.html        |  2 +-
 .../templates/projector/live_view_widget.html | 14 ++---
 .../projector/templates/projector/new.html    |  2 +-
 .../templates/projector/overlay_widget.html   |  4 +-
 .../templates/projector/select_widgets.html   |  2 +-
 openslides/templates/base.html                | 13 +++--
 openslides/utils/jsonfield/fields.py          |  4 +-
 openslides/utils/pdf.py                       |  3 +-
 openslides/utils/utils.py                     |  6 +-
 openslides/utils/views.py                     |  6 +-
 requirements.txt                              | 15 +++--
 54 files changed, 239 insertions(+), 248 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7f7a1c453..b8b12bc11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,18 +1,16 @@
 .venv/*
-openslides/.venv/
 *.pyc
 *.swp
-openslides/settings.py
-database.db
 *~
-extras/website/*
-extras/website-old/*
+settings.py
+database.sqlite
+
+# Package building
 docs/_build/*
 *.egg-info
 build/*
 dist/*
 .DS_Store
-settings.py
 versiontools*
 
 # Unit test / coverage reports
diff --git a/.travis.yml b/.travis.yml
index f91d92918..ade84bd88 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,9 @@
 language: python
 python:
-  - "2.5"
   - "2.6"
   - "2.7"
 install:
+  - easy_install https://www.djangoproject.com/download/1.5b2/tarball/
   - pip install -r requirements.txt --use-mirrors
   - python extras/scripts/create_local_settings.py
 script:
diff --git a/INSTALL.txt b/INSTALL.txt
index f57e7f00e..739431350 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -18,7 +18,7 @@ I. Installation on GNU/Linux and MacOSX using the Python Package Index (PyPI)
   1. Check requirements:
 
         Make sure that you have installed Python Programming Language 2
-        (>= 2.5) on your system.
+        (>= 2.6) on your system.
 
   2. Setup a virtual environment with virtualenv (optional):
 
@@ -65,7 +65,7 @@ II. Installation on GNU/Linux and MacOSX using the sources
 
         OpenSlides requires following programs, which should be
         installed first:
-          + Python Programming Language 2 (>= 2.5)
+          + Python Programming Language 2 (>= 2.6)
           + virtualenv (>= 1.4.1)
           + ReportLab Toolkit
           + Python Imaging Library (PIL)
@@ -141,7 +141,7 @@ portable version you should run the following install steps.
 
         The OpenSlides install requires following programs, which should be
         installed first:
-          + Python Programming Language 2 (>= 2.5)
+          + Python Programming Language 2 (>= 2.6)
           + Setuptools
 
      a) Download and run 32bit MSI installer from http://www.python.org/:
diff --git a/openslides/__init__.py b/openslides/__init__.py
index 7cd9d7464..dcf78b46d 100644
--- a/openslides/__init__.py
+++ b/openslides/__init__.py
@@ -5,7 +5,7 @@
     :license: GNU GPL, see LICENSE for more details.
 """
 
-VERSION = (1, 4, 0, 'alpha', 0)  # During development it is the next release
+VERSION = (1, 4, 0, 'alpha', 1)  # During development it is the next release
 RELEASE = False
 
 
diff --git a/openslides/agenda/templates/agenda/config.html b/openslides/agenda/templates/agenda/config.html
index 4c2a85804..db29bde09 100644
--- a/openslides/agenda/templates/agenda/config.html
+++ b/openslides/agenda/templates/agenda/config.html
@@ -14,8 +14,8 @@
     <button class="button" type="submit">
         <span class="icon ok">{% trans 'Save' %}</span>
     </button>
-    <a href='{% url config_agenda %}'>
-    <button class="button" type="button" onclick="window.location='{% url config_agenda %}'">
+    <a href="{% url 'config_agenda' %}">
+    <button class="button" type="button" onclick="window.location='{% url 'config_agenda' %}'">
         <span class="icon cancel">{% trans 'Cancel' %}</span>
     </button>
     </a>
diff --git a/openslides/agenda/templates/agenda/edit.html b/openslides/agenda/templates/agenda/edit.html
index 2291fbc2a..e022f59ac 100644
--- a/openslides/agenda/templates/agenda/edit.html
+++ b/openslides/agenda/templates/agenda/edit.html
@@ -19,7 +19,7 @@
             {% trans "New item" %}
         {% endif %}
         <small class="pull-right">
-        <a href="{% url item_overview %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
+        <a href="{% url 'item_overview' %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
         </small>
     </h1>
     <form action="" method="post">{% csrf_token %}
@@ -42,8 +42,8 @@
             <button class="btn" type="submit" name="apply">
                 {% trans 'Apply' %}
             </button>
-            <a href='{% url item_overview %}'>
-            <button class="btn" type="button" onclick="window.location='{% url item_overview %}'">
+            <a href='{% url 'item_overview' %}'>
+            <button class="btn" type="button" onclick="window.location='{% url 'item_overview' %}'">
                 {% trans 'Cancel' %}</span>
             </button>
             </a>
diff --git a/openslides/agenda/templates/agenda/item_row.html b/openslides/agenda/templates/agenda/item_row.html
index 4846b62e5..d8bfc5114 100644
--- a/openslides/agenda/templates/agenda/item_row.html
+++ b/openslides/agenda/templates/agenda/item_row.html
@@ -5,7 +5,7 @@
     <td>
         <span class="close_link{% if item.closed %} closed{% endif %}">
             {% if perms.agenda.can_manage_agenda %}
-               <a href="{% if item.closed %}{% url item_open item.id %}{% else %}{% url item_close item.id %}{% endif %}" title="{% trans 'Mark item as done' %}">
+               <a href="{% if item.closed %}{% url 'item_open' item.id %}{% else %}{% url 'item_close' item.id %}{% endif %}" title="{% trans 'Mark item as done' %}">
                     <span></span>
                 </a>
             {% elif item.closed %}
@@ -32,7 +32,7 @@
     <td>
         <span style="width: 1px; white-space: nowrap;">
         {% if perms.projector.can_manage_projector %}
-            <a class="activate_link {% if item.active %}active{% endif %}" href="{% url projector_activate_slide item.sid %}" title="{% trans 'Activate item' %}">
+            <a class="activate_link {% if item.active %}active{% endif %}" href="{% url 'projector_activate_slide' item.sid %}" title="{% trans 'Activate item' %}">
                 <span></span>
             </a>
         {% endif %}
@@ -40,7 +40,7 @@
             <a href="{% model_url item 'edit' %}"><img src="{% static 'images/icons/edit.png' %}" title="{% trans 'Edit item' %}"></a>
             <a href="{% model_url item 'delete' %}"><img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Delete item' %}"></a>
             {% if not item.is_leaf_node %}
-                <a class="activate_link" href="{% url projector_activate_slide item.sid 'summary' %}">
+                <a class="activate_link" href="{% url 'projector_activate_slide' item.sid 'summary' %}">
                     <img src="{% static 'images/icons/summary.png' %}" title="{% trans 'Activate summary for this item' %}">
                 </a>
             {% endif %}
diff --git a/openslides/agenda/templates/agenda/overview.html b/openslides/agenda/templates/agenda/overview.html
index ed8f6f8e6..af86c2276 100644
--- a/openslides/agenda/templates/agenda/overview.html
+++ b/openslides/agenda/templates/agenda/overview.html
@@ -48,7 +48,7 @@
            <p>{% trans "Do you want to save the changed order of agenda items?" %}</p>
            <p>
                <button class="btn" type="submit">{% trans 'Yes' %}</button>
-               <a href="{% url item_overview %}" class="btn">{% trans 'No' %}</a>
+               <a href="{% url 'item_overview' %}" class="btn">{% trans 'No' %}</a>
             </p>
        </div>
        {% endif %}
@@ -56,9 +56,9 @@
         <h1>{% trans "Agenda" %} 
             <small class="pull-right">
             {% if perms.agenda.can_manage_agenda %}
-            <a href="{% url item_new %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'New item' %}"><i class="icon-plus"></i> {% trans "New" %}</a>
+            <a href="{% url 'item_new' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'New item' %}"><i class="icon-plus"></i> {% trans "New" %}</a>
             {% endif %}
-            <a href="{% url print_agenda %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print agenda as PDF' %}"><i class="icon-print"></i> PDF</a>
+            <a href="{% url 'print_agenda' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print agenda as PDF' %}"><i class="icon-print"></i> PDF</a>
             </small>
         </h1>
 
@@ -95,7 +95,7 @@
                 <td>
                 {% if perms.projector.can_manage_projector %}
                     <span>
-                        <a class="activate_link{% if active_sid == 'agenda' %} active{% endif %}" href="{% url projector_activate_slide 'agenda' %}" title="{% trans 'Activate item' %}">
+                        <a class="activate_link{% if active_sid == 'agenda' %} active{% endif %}" href="{% url 'projector_activate_slide' 'agenda' %}" title="{% trans 'Activate item' %}">
                             <span></span>
                         </a>
                     </span>
diff --git a/openslides/agenda/templates/agenda/widget.html b/openslides/agenda/templates/agenda/widget.html
index e638756b8..b1dc4bdd2 100644
--- a/openslides/agenda/templates/agenda/widget.html
+++ b/openslides/agenda/templates/agenda/widget.html
@@ -4,10 +4,10 @@
 
 <ul style="line-height: 180%">
     <li class="{% if agenda.active %}activeline{% endif %}">
-        <a href="{% url projector_activate_slide agenda.key %}" class="activate_link {% if agenda.active %}active{% endif %}">
+        <a href="{% url 'projector_activate_slide' agenda.key %}" class="activate_link {% if agenda.active %}active{% endif %}">
             <div></div>
         </a>
-        <a href="{% url projctor_preview_slide agenda.key %}" title="{% trans 'Preview' %}" class="icon preview right">
+        <a href="{% url 'projctor_preview_slide' agenda.key %}" title="{% trans 'Preview' %}" class="icon preview right">
             <span></span>
         </a>
         {{ agenda.name }}
@@ -17,7 +17,7 @@
 <ul style="line-height: 180%">
 {% for item in items %}
     <li class="{% if item.active %}activeline{% endif %}">
-        <a href="{% url projector_activate_slide item.sid %}" class="activate_link {% if item.active %}active{% endif %}">
+        <a href="{% url 'projector_activate_slide' item.sid %}" class="activate_link {% if item.active %}active{% endif %}">
             <div></div>
         </a>
         <a href="{% model_url item 'delete' %}" title="{% trans 'Delete' %}" class="icon delete right">
@@ -26,11 +26,11 @@
         <a href="{% model_url item 'edit' %}" title="{% trans 'Edit' %}" class="icon edit right">
             <span></span>
         </a>
-        <a href="{% url projctor_preview_slide item.sid %}" title="{% trans 'Preview' %}" class="icon preview right">
+        <a href="{% url 'projctor_preview_slide' item.sid %}" title="{% trans 'Preview' %}" class="icon preview right">
             <span></span>
         </a>
         {% if not item.is_leaf_node %}
-        <a class="activate_link right" href="{% url projector_activate_slide item.sid 'summary' %}">
+        <a class="activate_link right" href="{% url 'projector_activate_slide' item.sid 'summary' %}">
             <img src="{% static 'images/icons/summary.png' %}"
                 title="{% trans 'Activate summary for this item' %}"
                 style="padding-right: 2px;">
diff --git a/openslides/assignment/templates/assignment/config.html b/openslides/assignment/templates/assignment/config.html
index b2feb2412..4468d33c9 100644
--- a/openslides/assignment/templates/assignment/config.html
+++ b/openslides/assignment/templates/assignment/config.html
@@ -14,8 +14,8 @@
     <button class="button" type="submit">
         <span class="icon ok">{% trans 'Save' %}</span>
     </button>
-    <a href='{% url config_assignment %}'>
-    <button class="button" type="button" onclick="window.location='{% url config_assignment %}'">
+    <a href="{% url 'config_assignment' %}">
+    <button class="button" type="button" onclick="window.location='{% url 'config_assignment' %}'">
         <span class="icon cancel">{% trans 'Cancel' %}</span>
     </button>
     </a>
diff --git a/openslides/assignment/templates/assignment/edit.html b/openslides/assignment/templates/assignment/edit.html
index 4d14a7dad..e5f56e87f 100644
--- a/openslides/assignment/templates/assignment/edit.html
+++ b/openslides/assignment/templates/assignment/edit.html
@@ -19,7 +19,7 @@
             {% trans "New election" %}
         {% endif %}
         <small class="pull-right">
-        <a href="{% url assignment_overview %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
+        <a href="{% url 'assignment_overview' %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
         </small>
     </h1>
 
@@ -27,7 +27,7 @@
         {% include "form.html" %}
         <p>
         {% include "formbuttons_saveapply.html" %}
-        <a href='{% url assignment_overview %}' class="btn">
+        <a href='{% url 'assignment_overview' %}' class="btn">
             {% trans 'Cancel' %}
         </a>
         </p>
diff --git a/openslides/assignment/templates/assignment/overview.html b/openslides/assignment/templates/assignment/overview.html
index ac884f08a..2f58ebeca 100644
--- a/openslides/assignment/templates/assignment/overview.html
+++ b/openslides/assignment/templates/assignment/overview.html
@@ -10,10 +10,10 @@
     <h1>{% trans "Elections" %}
         <small class="pull-right">
         {% if perms.assignment.can_manage_assignment %}
-            <a href="{% url assignment_new %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'New election' %}"><i class="icon-plus"></i> {% trans "New" %}</a>
+            <a href="{% url 'assignment_new' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'New election' %}"><i class="icon-plus"></i> {% trans "New" %}</a>
         {% endif %}
         {% if perms.assignment.can_see_assignment %}
-            <a href="{% url print_assignment %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print all elections as PDF' %}"><i class="icon-print"></i> PDF</a>
+            <a href="{% url 'print_assignment' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print all elections as PDF' %}"><i class="icon-print"></i> PDF</a>
         {% endif %}
         </small>
     </h1>
@@ -41,7 +41,7 @@
     {% for assignment in assignments %}
         <tr class="{% cycle '' 'odd' %}
             {% if assignment.active %}activeline{% endif %}">
-            <td><a href="{% url assignment_view assignment.id %}">{{ assignment }}</a></td>
+            <td><a href="{% url 'assignment_view' assignment.id %}">{{ assignment }}</a></td>
             <td>
                 {% blocktrans with posts=assignment.posts context "Number of searched candidates for an election"%}posts: {{ posts }}{% endblocktrans %}
                 {% if assignment.status != 'fin' %}
@@ -53,15 +53,15 @@
             <td>
                 <span style="width: 1px; white-space: nowrap;">
                 {% if perms.projector.can_manage_projector %}
-                    <a class="activate_link {% if assignment.active %}active{% endif %}" href="{% url projector_activate_slide assignment.sid %}" title="{% trans 'Activate election' %}">
+                    <a class="activate_link {% if assignment.active %}active{% endif %}" href="{% url 'projector_activate_slide' assignment.sid %}" title="{% trans 'Activate election' %}">
                         <span></span>
                     </a>
                 {% endif %}
                 {% if perms.assignment.can_manage_assignment %}
-                    <a href="{% url assignment_edit assignment.id %}"><img src="{% static 'images/icons/edit.png' %}" title="{% trans 'Edit election' %}"></a>
-                    <a href="{% url assignment_delete assignment.id %}"><img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Delete election' %}"></a>
+                    <a href="{% url 'assignment_edit' assignment.id %}"><img src="{% static 'images/icons/edit.png' %}" title="{% trans 'Edit election' %}"></a>
+                    <a href="{% url 'assignment_delete' assignment.id %}"><img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Delete election' %}"></a>
                 {% endif %}
-                <a href="{% url print_assignment assignment.id %}" title="{% trans 'Election as PDF' %}"><img src="{% static 'images/icons/pdf.png' %}"></a>
+                <a href="{% url 'print_assignment' assignment.id %}" title="{% trans 'Election as PDF' %}"><img src="{% static 'images/icons/pdf.png' %}"></a>
                 </span>
             </td>
         </tr>
diff --git a/openslides/assignment/templates/assignment/poll_view.html b/openslides/assignment/templates/assignment/poll_view.html
index b036815fa..dea08982f 100644
--- a/openslides/assignment/templates/assignment/poll_view.html
+++ b/openslides/assignment/templates/assignment/poll_view.html
@@ -54,8 +54,8 @@
     </table>
 
     <p>
-    <a href='{% url print_assignment_poll poll.id %}'>
-    <button class="button" type="button" onclick="window.location='{% url print_assignment_poll poll.id %}'">
+    <a href="{% url 'print_assignment_poll' poll.id %}">
+    <button class="button" type="button" onclick="window.location='{% url 'print_assignment_poll' poll.id %}'">
         <span class="icon pdf">{% trans 'Ballot paper as PDF' %}</span>
     </button>
     </a>
@@ -68,8 +68,8 @@
     <button class="button" type="submit" name="apply">
         <span class="icon apply">{% trans 'Apply' %}</span>
     </button>
-    <a href='{% url assignment_view poll.assignment.id %}'>
-    <button class="button" type="button" onclick="window.location='{% url assignment_view poll.assignment.id %}'">
+    <a href="{% url 'assignment_view' poll.assignment.id %}">
+    <button class="button" type="button" onclick="window.location='{% url 'assignment_view' poll.assignment.id %}'">
         <span class="icon cancel">{% trans 'Cancel' %}</span>
     </button>
     </a>
diff --git a/openslides/assignment/templates/assignment/view.html b/openslides/assignment/templates/assignment/view.html
index 0829675f5..bab75395b 100644
--- a/openslides/assignment/templates/assignment/view.html
+++ b/openslides/assignment/templates/assignment/view.html
@@ -16,9 +16,9 @@
 {% block content %}
     <h1>{{ assignment }}
         <small class="pull-right">
-        <a href="{% url assignment_overview %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
+        <a href="{% url 'assignment_overview' %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
         {% if perms.projector.can_manage_projector %}
-            <a href="{% url projector_activate_slide assignment.sid  %}" class="btn btn-primary btn-mini" title="{% trans 'Show election' %}"><i class="icon-facetime-video icon-white"></i></a>
+            <a href="{% url 'projector_activate_slide' assignment.sid  %}" class="btn btn-primary btn-mini" title="{% trans 'Show election' %}"><i class="icon-facetime-video icon-white"></i></a>
         {% endif %}
         </small>
     </h1>
@@ -43,14 +43,14 @@
             {{ person }}
             {% if perms.assignment.can_manage_assignment %}
                 {% if assignment.status == "sea" or assignment.status == "vot" %}
-                    <a href="{% url assignment_delother assignment.id person.person_id %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Remove candidate' %}"><i class="icon-remove"></i></a>
+                    <a href="{% url 'assignment_delother' assignment.id person.person_id %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Remove candidate' %}"><i class="icon-remove"></i></a>
                 {% endif %}
             {% endif %}
             {% if person in assignment.elected %}
                 | <b>{% trans "elected" %}</b>
                 {% if perms.assignment.can_manage_assignment %}
                     {% if assignment.status == "sea" or assignment.status == "vot" %}
-                        <a href="{% url assignment_user_not_elected assignment.id person.person_id %}"><img src="{% static 'images/icons/dialog-cancel.png' %}" title="{% trans 'Mark candidate as not elected' %}"></a>
+                        <a href="{% url 'assignment_user_not_elected' assignment.id person.person_id %}"><img src="{% static 'images/icons/dialog-cancel.png' %}" title="{% trans 'Mark candidate as not elected' %}"></a>
                     {% endif %}
                 {% endif %}
             {% endif %}
@@ -65,11 +65,11 @@
         {% if perms.assignment.can_nominate_self %}
             <p>
             {% if user_is_candidate %}
-                <a href='{% url assignment_delrun assignment.id %}' class="btn btn-mini">
+                <a href='{% url 'assignment_delrun' assignment.id %}' class="btn btn-mini">
                     <i class="icon-remove"></i> {% trans 'Withdraw self candidature' %}
                 </a>
             {% else %}
-                <a href='{% url assignment_run assignment.id %}' class="btn btn-mini">
+                <a href='{% url 'assignment_run' assignment.id %}' class="btn btn-mini">
                     <i class="icon-plus"></i> {% trans 'Self candidature' %}
                 </a>
             {% endif %}
@@ -82,12 +82,11 @@
                     {{ field }}
                     <button class="btn btn-primary" type="submit">{% trans 'Apply' %}</button>
                     {% if perms.participant.can_see_participant and perms.participant.can_manage_participant %}
-                        <a href="{% url user_new %}" target="_blank" class="btn"><img src="{% static 'images/icons/add-user.png' %}" title="{% trans 'Add new participant' %}"></a>
+                        <a href="{% url 'user_new' %}" target="_blank" class="btn"><img src="{% static 'images/icons/add-user.png' %}" title="{% trans 'Add new participant' %}"></a>
                     {% endif %}
                 </div>
             {% endfor %}
             <p>
-  
             </p>
         {% endif %}
     </form>
@@ -100,7 +99,7 @@
     <ul>
     {% for person in blocked_candidates %}
         <li>
-            {{ person }}<a href="{% url assignment_delother assignment.id person.person_id %}"><img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Remove candidate' %}"></a>
+            {{ person }}<a href="{% url 'assignment_delother' assignment.id person.person_id %}"><img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Remove candidate' %}"></a>
         </li>
     {% empty %}
         <li>{% trans "No blocked candidates available." %}</li>
@@ -130,18 +129,18 @@
                     {% if perms.assignment.can_manage_assignment %}
                         <br>
                         <a class="publish_link {% if poll.published %}published{% endif %}"
-                        href="{% url assignment_poll_publish_status poll.id %}"
+                        href="{% url 'assignment_poll_publish_status' poll.id %}"
                         title="{% trans 'Publish/unpublish results' %}">
                         <span></span>
                         </a>
-                        <a href="{% url assignment_poll_view poll.id %}" class="btn btn-mini" title="{% trans 'Edit' %}"><i class="icon-pencil"></i></a>
-                        <a href="{% url assignment_poll_delete poll.id %}" class="btn btn-mini" title="{% trans 'Delete' %}"><i class="icon-remove"></i></a>
+                        <a href="{% url 'assignment_poll_view' poll.id %}" class="btn btn-mini" title="{% trans 'Edit' %}"><i class="icon-pencil"></i></a>
+                        <a href="{% url 'assignment_poll_delete' poll.id %}" class="btn btn-mini" title="{% trans 'Delete' %}"><i class="icon-remove"></i></a>
                     {% endif %}
                 </th>
             {% endfor %}
             {% if assignment.candidates and perms.assignment.can_manage_assignment and assignment.status == "vot" %}
                 <th class="span1 nobr">
-                    <a href='{% url assignment_gen_poll assignment.id %}' class="btn btn-mini">
+                    <a href="{% url 'assignment_gen_poll' assignment.id %}" class="btn btn-mini">
                        <i class="icon-plus"></i> {% trans 'New ballot' %}
                     </a>
                 </th>
@@ -152,7 +151,7 @@
             <td>
                 {% if candidate in assignment.elected %}
                     {% if perms.assignment.can_manage_assignment %}
-                        <a class="election_link elected" href='{% url assignment_user_not_elected assignment.id candidate.person_id %}'></a>
+                        <a class="election_link elected" href="{% url 'assignment_user_not_elected assignment.id' candidate.person_id %}"></a>
                     {% else %}
                         <a class="elected">
                             <img src="{% static 'images/icons/voting-yes.png' %}" title="{% trans 'Candidate is elected' %}">
@@ -160,7 +159,7 @@
                     {% endif %}
                 {% else %}
                     {% if perms.assignment.can_manage_assignment %}
-                        <a class="election_link" href='{% url assignment_user_elected assignment.id candidate.person_id %}'></a>
+                        <a class="election_link" href="{% url 'assignment_user_elected' assignment.id candidate.person_id %}"></a>
                     {% endif %}
                 {% endif %}
                 {{ candidate }}
@@ -222,7 +221,7 @@
         <i>{% trans "No ballots available." %}</i>
         {% if assignment.candidates and perms.assignment.can_manage_assignment and assignment.status == "vot" %}
             <p>
-            <a href='{% url assignment_gen_poll assignment.id %}' class="btn">
+            <a href='{% url 'assignment_gen_poll' assignment.id %}' class="btn">
                <i class="icon-plus"></i> {% trans 'New ballot' %}
             </a>
             </p>
@@ -244,15 +243,15 @@
     <div class="well">
         <h4>{% trans "Change status" %}:</h4>
         <label class="radio">
-            <input type="radio" name="status" onclick="window.location.href='{% url assignment_set_status assignment.id 'sea' %}';"
+            <input type="radio" name="status" onclick="window.location.href='{% url 'assignment_set_status' assignment.id 'sea' %}';"
                 {% if 'sea' in assignment.status %}checked{% endif %}>{% trans 'Searching for candidates' %}
         </label>
         <label class="radio">
-            <input type="radio" name="status" onclick="window.location.href='{% url assignment_set_status assignment.id 'vot' %}';"
+            <input type="radio" name="status" onclick="window.location.href='{% url 'assignment_set_status' assignment.id 'vot' %}';"
                 {% if 'vot' in assignment.status %}checked{% endif %}>{% trans 'Voting' %}<br>
         </label>
         <label class="radio">
-            <input type="radio" name="status" onclick="window.location.href='{% url assignment_set_status assignment.id 'fin' %}';"
+            <input type="radio" name="status" onclick="window.location.href='{% url 'assignment_set_status' assignment.id 'fin' %}';"
                 {% if 'fin' in assignment.status %}checked{% endif %}>{% trans 'Finished' %}
         </label>
     </div> <!--/well-->
diff --git a/openslides/assignment/templates/assignment/widget.html b/openslides/assignment/templates/assignment/widget.html
index fa4abd55f..985db4e20 100644
--- a/openslides/assignment/templates/assignment/widget.html
+++ b/openslides/assignment/templates/assignment/widget.html
@@ -5,7 +5,7 @@
 <ul style="line-height: 180%">
 {% for assignment in assignments %}
     <li class="{% if assignment.active %}activeline{% endif %}">
-        <a href="{% url projector_activate_slide assignment.sid %}" class="activate_link {% if assignment.active %}active{% endif %}">
+        <a href="{% url 'projector_activate_slide' assignment.sid %}" class="activate_link {% if assignment.active %}active{% endif %}">
             <div></div>
         </a>
         <a href="{% model_url assignment 'delete' %}" title="{% trans 'Delete' %}" class="icon delete right">
@@ -14,7 +14,7 @@
         <a href="{% model_url assignment 'edit' %}" title="{% trans 'Edit' %}" class="icon edit right">
             <span></span>
         </a>
-        <a href="{% url projctor_preview_slide assignment.sid %}" title="{% trans 'Preview' %}" class="icon preview right">
+        <a href="{% url 'projctor_preview_slide' assignment.sid %}" title="{% trans 'Preview' %}" class="icon preview right">
             <span></span>
         </a>
         <a href="{% model_url assignment 'view' %}">{{ assignment }}</a>
diff --git a/openslides/config/templates/config/general.html b/openslides/config/templates/config/general.html
index 904913a28..b77bf75dc 100644
--- a/openslides/config/templates/config/general.html
+++ b/openslides/config/templates/config/general.html
@@ -57,8 +57,8 @@
     <button class="button" type="submit">
         <span class="icon ok">{% trans 'Save' %}</span>
     </button>
-    <a href='{% url config_general %}'>
-    <button class="button" type="button" onclick="window.location='{% url config_general %}'">
+    <a href="{% url 'config_general' %}">
+    <button class="button" type="button" onclick="window.location='{% url 'config_general' %}'">
         <span class="icon cancel">{% trans 'Cancel' %}</span>
     </button>
     </a>
diff --git a/openslides/global_settings.py b/openslides/global_settings.py
index adb51aea7..94f900059 100644
--- a/openslides/global_settings.py
+++ b/openslides/global_settings.py
@@ -88,12 +88,12 @@ TEMPLATE_LOADERS = (
 )
 
 MIDDLEWARE_CLASSES = (
-    'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.locale.LocaleMiddleware',
+    'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'openslides.participant.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
-    'django.middleware.locale.LocaleMiddleware',
 )
 
 ROOT_URLCONF = 'openslides.urls'
diff --git a/openslides/main.py b/openslides/main.py
index bc23fb3bd..d25305a4d 100755
--- a/openslides/main.py
+++ b/openslides/main.py
@@ -10,9 +10,6 @@
     :license: GNU GPL, see LICENSE for more details.
 """
 
-# for python 2.5 support
-from __future__ import with_statement
-
 import base64
 import ctypes
 import optparse
diff --git a/openslides/motion/templates/motion/base_motion.html b/openslides/motion/templates/motion/base_motion.html
index 1466bfcf2..0dc5846a6 100644
--- a/openslides/motion/templates/motion/base_motion.html
+++ b/openslides/motion/templates/motion/base_motion.html
@@ -5,17 +5,17 @@
 {% load staticfiles %}
 
 {% block submenu %}
-    {% url motion_overview as url_motionoverview %}
+    {% url 'motion_overview' as url_motionoverview %}
     <h4>{% trans "Motions" %}</h4>
     <ul>
-        <li class="{% if request.path == url_motionoverview %}selected{% endif %}"><a href="{% url motion_overview %}">{% trans "All motions" %}</a></li>
+        <li class="{% if request.path == url_motionoverview %}selected{% endif %}"><a href="{% url 'motion_overview' %}">{% trans "All motions" %}</a></li>
         {% if perms.motion.can_create_motion or perms.motion.can_manage_motion %}
-            <li class="{% active request '/motion/new' %}"><a href="{%  url motion_new %}">{% trans "New motion" %}</a></li>
+            <li class="{% active request '/motion/new' %}"><a href="{% url 'motion_new' %}">{% trans "New motion" %}</a></li>
         {% endif %}
         {% if perms.motion.can_manage_motion %}
-            <li class="{% active request '/motion/import' %}"><a href="{%  url motion_import %}">{% trans 'Import motions' %}</a></li>
+            <li class="{% active request '/motion/import' %}"><a href="{% url 'motion_import' %}">{% trans 'Import motions' %}</a></li>
         {% endif %}
-        <li><a href="{% url print_motions %}"><img src="{% static 'images/icons/pdf.png' %}"> {% trans 'All motions as PDF' %}</a></li>
+        <li><a href="{% url 'print_motions' %}"><img src="{% static 'images/icons/pdf.png' %}"> {% trans 'All motions as PDF' %}</a></li>
     </ul>
 
     {# second submenu #}
@@ -30,35 +30,35 @@
         </h3>
         <ul>
         {# view motion #}
-            {% url motion_view motion.id as url_motionview %}
-            <li class="{% if request.path == url_motionview %}selected{% endif %}"><a href="{% url motion_view motion.id  %}">{% trans 'View motion' %}</a></li>
+            {% url 'motion_view' motion.id as url_motionview %}
+            <li class="{% if request.path == url_motionview %}selected{% endif %}"><a href="{% url 'motion_view' motion.id  %}">{% trans 'View motion' %}</a></li>
         {# edit motion #}
             {% if "edit" in actions %}
-            {% url motion_edit motion.id as url_motionedit %}
-            <li class="{% if request.path == url_motionedit %}selected{% endif %}"><a href="{% url motion_edit motion.id  %}"><img src="{% static 'images/icons/edit.png' %}"> {% trans 'Edit motion' %}</a></li>
+            {% url 'motion_edit' motion.id as url_motionedit %}
+            <li class="{% if request.path == url_motionedit %}selected{% endif %}"><a href="{% url 'motion_edit' motion.id  %}"><img src="{% static 'images/icons/edit.png' %}"> {% trans 'Edit motion' %}</a></li>
             {% endif %}
         {# delete motion #}
             {% if "delete" in actions %}
-            <li><a href="{% url motion_delete motion.id  %}"><img src="{% static 'images/icons/delete.png' %}"> {% trans 'Delete motion' %}</a></li>
+            <li><a href="{% url 'motion_delete' motion.id  %}"><img src="{% static 'images/icons/delete.png' %}"> {% trans 'Delete motion' %}</a></li>
             {% endif %}
         {# PDF #}
-            <li><a href="{% url print_motion motion.id  %}"><img src="{% static 'images/icons/pdf.png' %}"> {% trans 'Motion as PDF' %}</a></li>
+            <li><a href="{% url 'print_motion' motion.id  %}"><img src="{% static 'images/icons/pdf.png' %}"> {% trans 'Motion as PDF' %}</a></li>
         {# activate and polls #}
             {% if perms.projector.can_manage_projector %}
                 <li>
-                    <a class="activate_link {% if item.active %}active{% endif %}" href="{% url projector_activate_slide motion.sid  %}"><img src="{% static 'images/icons/projector.png' %}"> {% trans 'Show Motion' %}</a>
+                    <a class="activate_link {% if item.active %}active{% endif %}" href="{% url 'projector_activate_slide' motion.sid  %}"><img src="{% static 'images/icons/projector.png' %}"> {% trans 'Show Motion' %}</a>
                 </li>
             {% endif %}
             {% if perms.motion.can_manage_motion %}
                 {% for poll in motion.polls %}
-                    {% url motion_poll_view poll.id as url_motionpollview %}
-                    <li class="{% if request.path == url_motionpollview %}selected{% endif %}"><a href="{% url motion_poll_view poll.id %}"><img src="{% static 'images/icons/edit.png' %}"> {{ forloop.counter }}. {% trans "Vote" %}</a></li>
+                    {% url 'motion_poll_view' poll.id as url_motionpollview %}
+                    <li class="{% if request.path == url_motionpollview %}selected{% endif %}"><a href="{% url 'motion_poll_view' poll.id %}"><img src="{% static 'images/icons/edit.png' %}"> {{ forloop.counter }}. {% trans "Vote" %}</a></li>
                 {% endfor %}
             {% endif %}
         {# Agenda Item #}
             {% if perms.agenda.can_manage_agenda %}
             <li>
-                <a href="{% url motion_create_agenda motion.id  %}">{% trans 'New agenda item' %}</a>
+                <a href="{% url 'motion_create_agenda' motion.id  %}">{% trans 'New agenda item' %}</a>
             </li>
             {% endif %}
         </ul>
diff --git a/openslides/motion/templates/motion/config.html b/openslides/motion/templates/motion/config.html
index 0dda79f7c..7f0503147 100644
--- a/openslides/motion/templates/motion/config.html
+++ b/openslides/motion/templates/motion/config.html
@@ -14,8 +14,8 @@
     <button class="button" type="submit">
         <span class="icon ok">{% trans 'Save' %}</span>
     </button>
-    <a href='{% url config_motion %}'>
-    <button class="button" type="button" onclick="window.location='{% url config_motion %}'">
+    <a href="{% url 'config_motion' %}">
+    <button class="button" type="button" onclick="window.location='{% url 'config_motion' %}'">
         <span class="icon cancel">{% trans 'Cancel' %}</span>
     </button>
     </a>
diff --git a/openslides/motion/templates/motion/edit.html b/openslides/motion/templates/motion/edit.html
index 60da48b78..65945b9b3 100644
--- a/openslides/motion/templates/motion/edit.html
+++ b/openslides/motion/templates/motion/edit.html
@@ -19,7 +19,7 @@
         {% trans "New motion" %}
     {% endif %}
     <small class="pull-right">
-    <a href="{% url motion_overview %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
+    <a href="{% url 'motion_overview' %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
     </small>
     </h1>
     <form action="" method="post">{% csrf_token %}
@@ -43,9 +43,9 @@
         <button class="btn" type="submit" name="apply">
             {% trans 'Apply' %}
         </button>
-        <a href='{% url motion_overview %}'>
-        <button class="btn" type="button" onclick="window.location='{% url motion_overview %}'">
+        <a href="{% url 'motion_overview' %}" class="btn">
             {% trans 'Cancel' %}
+        </a>
         </button>
         </a>
         </div>
diff --git a/openslides/motion/templates/motion/import.html b/openslides/motion/templates/motion/import.html
index 16ca5bc5a..88e763157 100644
--- a/openslides/motion/templates/motion/import.html
+++ b/openslides/motion/templates/motion/import.html
@@ -7,7 +7,7 @@
 {% block content %}
     <h1>{% trans "Import motions" %}
         <small class="pull-right">
-        <a href="{% url motion_overview %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
+        <a href="{% url 'motion_overview' %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
         </small>
     </h1>
 
@@ -40,7 +40,7 @@
         <button class="btn btn-primary" type="submit">
             {% trans 'Import' %}
         </button>
-        <a href='{% url motion_overview %}' class="btn">
+        <a href="{% url 'motion_overview' %}" class="btn">
             {% trans 'Cancel' %}
         </a>
         </div>
diff --git a/openslides/motion/templates/motion/overview.html b/openslides/motion/templates/motion/overview.html
index ad9d81f2b..d35de0978 100644
--- a/openslides/motion/templates/motion/overview.html
+++ b/openslides/motion/templates/motion/overview.html
@@ -11,12 +11,12 @@
         {% trans "Motions" %}
         <small class="pull-right">
         {% if perms.motion.can_create_motion %}
-            <a href="{% url motion_new %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'New motion' %}"><i class="icon-plus"></i> {% trans "New" %}</a>
+            <a href="{% url 'motion_new' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'New motion' %}"><i class="icon-plus"></i> {% trans "New" %}</a>
         {% endif %}
         {% if perms.motion.can_manage_motion %}
-            <a href="{% url motion_import %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Import motions' %}"><i class="icon-share-alt"></i> {% trans 'Import' %}</a>
+            <a href="{% url 'motion_import' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Import motions' %}"><i class="icon-share-alt"></i> {% trans 'Import' %}</a>
         {% endif %}
-        <a href="{% url print_motions %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print all motions as PDF' %}"><i class="icon-print"></i> PDF</a>
+        <a href="{% url 'print_motions' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print all motions as PDF' %}"><i class="icon-print"></i> PDF</a>
         </small>
     </h1>
 
@@ -64,7 +64,7 @@
         <tr class="{% cycle '' 'odd' %}
             {% if motion.active %}activeline{% endif %}">
             <td>{% if motion.number %}{{ motion.number }}{% else %}-{% endif %}</td>
-            <td><a href="{% url motion_view motion.id %}">{{ motion.public_version.title }}</a></td>
+            <td><a href="{% url 'motion_view' motion.id %}">{{ motion.public_version.title }}</a></td>
         {% if min_supporters > 0 %}
             <td>{{ motion.count_supporters }}</td>
         {% endif %}
@@ -81,17 +81,17 @@
             <td>
                 <span style="width: 1px; white-space: nowrap;">
                 {% if perms.projector.can_manage_projector %}
-                    <a class="activate_link {% if motion.active %}active{% endif %}" href="{% url projector_activate_slide motion.sid %}" title="{% trans 'Activate motion' %}">
+                    <a class="activate_link {% if motion.active %}active{% endif %}" href="{% url 'projector_activate_slide' motion.sid %}" title="{% trans 'Activate motion' %}">
                         <span></span>
                     </a>
                 {% endif %}
                 {% if perms.motion.can_manage_motion %}
-                    <a href="{% url motion_edit motion.id %}"><img src="{% static 'images/icons/edit.png' %}" title="{% trans 'Edit motion' %}"></a>
+                    <a href="{% url 'motion_edit' motion.id %}"><img src="{% static 'images/icons/edit.png' %}" title="{% trans 'Edit motion' %}"></a>
                     {% if "delete" in useractions %}
-                    <a href="{% url motion_delete motion.id %}"><img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Delete motion' %}"></a>
+                    <a href="{% url 'motion_delete' motion.id %}"><img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Delete motion' %}"></a>
                     {% endif %}
                 {% endif %}
-                <a href="{% url print_motion motion.id  %}" title="{% trans 'Motion as PDF' %}"><img src="{% static 'images/icons/pdf.png' %}"></a>
+                <a href="{% url 'print_motion' motion.id  %}" title="{% trans 'Motion as PDF' %}"><img src="{% static 'images/icons/pdf.png' %}"></a>
                 </span>
             </td>
         </tr>
diff --git a/openslides/motion/templates/motion/poll_view.html b/openslides/motion/templates/motion/poll_view.html
index ee9414378..b4365a90f 100644
--- a/openslides/motion/templates/motion/poll_view.html
+++ b/openslides/motion/templates/motion/poll_view.html
@@ -15,7 +15,7 @@
     </small>
     <small class="pull-right">
     <div class="btn-toolbar">
-        <a href="{% url motion_view motion.id %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to motion" %}</a>
+        <a href="{% url 'motion_view' motion.id %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to motion" %}</a>
         <div class="btn-group">
             <a data-toggle="dropdown" href="#" class="btn btn-mini dropdown-toggle">
                 {% trans 'More actions' %}
@@ -24,12 +24,12 @@
             <ul class="dropdown-menu pull-right">
                 <!-- delete -->
                 {% if "delete" in actions %}
-                    <li><a href="{% url motion_poll_delete poll.id %}"><i class="icon-remove"></i> {% trans 'Delete Vote' %}</a></li>
+                    <li><a href="{% url 'motion_poll_delete' poll.id %}"><i class="icon-remove"></i> {% trans 'Delete Vote' %}</a></li>
                 {% endif %}
                 <!-- activate projector -->
                 {% if perms.projector.can_manage_projector %}
                     <li>
-                        <a class="activate_link {% if item.active %}active{% endif %}" href="{% url projector_activate_slide motion.sid  %}"><i class="icon-facetime-video"></i> {% trans 'Show motion' %}</a>
+                        <a class="activate_link {% if item.active %}active{% endif %}" href="{% url 'projector_activate_slide' motion.sid  %}"><i class="icon-facetime-video"></i> {% trans 'Show motion' %}</a>
                     </li>
                 {% endif %}
             </ul>
@@ -66,7 +66,7 @@
         {{ post_form }}
         <!-- ballot paper button -->
         <p>
-        <a href='{% url print_motion_poll poll.id %}' class="btn">
+        <a href="{% url 'print_motion_poll' poll.id %}" class="btn">
             <i class="icon-print"></i> {% trans 'Ballot paper as PDF' %}
         </a>
         </p>
@@ -78,7 +78,7 @@
             <button type="submit" name="apply" class="btn">
                 {% trans 'Apply' %}
             </button>
-            <a href='{% url motion_view motion.id %}' class="btn">
+            <a href="{% url 'motion_view' motion.id %}" class="btn">
                 {% trans 'Cancel' %}
             </a>
         </div>
diff --git a/openslides/motion/templates/motion/view.html b/openslides/motion/templates/motion/view.html
index 7ab3eb32d..9fdeb3b5b 100644
--- a/openslides/motion/templates/motion/view.html
+++ b/openslides/motion/templates/motion/view.html
@@ -26,8 +26,8 @@
     </small>
     <small class="pull-right">
     <div class="btn-toolbar">
-        <a href="{% url motion_overview %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
-        <a href="{% url print_motion motion.id  %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print this motion as PDF' %}"><i class="icon-print"></i> PDF</a>
+        <a href="{% url 'motion_overview' %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
+        <a href="{% url 'print_motion' motion.id  %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print this motion as PDF' %}"><i class="icon-print"></i> PDF</a>
         <div class="btn-group">
             <a data-toggle="dropdown" href="#" class="btn btn-mini dropdown-toggle">
                 {% trans 'More actions' %}
@@ -36,28 +36,28 @@
             <ul class="dropdown-menu pull-right">
                 <!-- edit -->
                 {% if "edit" in actions %}
-                     <li><a href="{% url motion_edit motion.id  %}"><i class="icon-edit"></i> {% trans 'Edit motion' %}</a></li>
+                     <li><a href="{% url 'motion_edit' motion.id  %}"><i class="icon-edit"></i> {% trans 'Edit motion' %}</a></li>
                 {% endif %}
                 <!-- delete -->
                 {% if "delete" in actions %}
-                    <li><a href="{% url motion_delete motion.id  %}"><i class="icon-remove"></i> {% trans 'Delete motion' %}</a></li>
+                    <li><a href="{% url 'motion_delete' motion.id  %}"><i class="icon-remove"></i> {% trans 'Delete motion' %}</a></li>
                 {% endif %}
                 <!-- activate projector -->
                 {% if perms.projector.can_manage_projector %}
                     <li>
-                        <a class="activate_link {% if item.active %}active{% endif %}" href="{% url projector_activate_slide motion.sid  %}"><i class="icon-facetime-video"></i> {% trans 'Show motion' %}</a>
+                        <a class="activate_link {% if item.active %}active{% endif %}" href="{% url 'projector_activate_slide' motion.sid  %}"><i class="icon-facetime-video"></i> {% trans 'Show motion' %}</a>
                     </li>
                 {% endif %}
                 <!-- edit poll -->
                 {% if perms.motion.can_manage_motion %}
                     {% for poll in motion.polls %}
-                        <li><a href="{% url motion_poll_view poll.id %}"><i class="icon-edit"></i> {{ forloop.counter }}. {% trans "Vote" %}</a></li>
+                        <li><a href="{% url 'motion_poll_view' poll.id %}"><i class="icon-edit"></i> {{ forloop.counter }}. {% trans "Vote" %}</a></li>
                     {% endfor %}
                 {% endif %}
                 <!-- create agenda item -->
                 {% if perms.agenda.can_manage_agenda %}
                 <li>
-                    <a href="{% url motion_create_agenda motion.id  %}"><i class="icon-plus"></i> {% trans 'New agenda item' %}</a>
+                    <a href="{% url 'motion_create_agenda' motion.id  %}"><i class="icon-plus"></i> {% trans 'New agenda item' %}</a>
                 </li>
                 {% endif %}
             </ul>
@@ -71,9 +71,9 @@
     {% if motion.public_version != motion.last_version %}
         &#8901;
         {% if version == motion.public_version %}
-            {% trans "This is not the newest version." %} <a href="{% url motion_view_newest motion.id %}">{% trans "Go to version" %} {{ motion.last_version.aid }}.</a>
+            {% trans "This is not the newest version." %} <a href="{% url 'motion_view_newest' motion.id %}">{% trans "Go to version" %} {{ motion.last_version.aid }}.</a>
         {% else %}
-            {% trans "This is not the authorized version." %} <a href="{% url motion_view motion.id %}">{% trans "Go to version" %} {{ motion.public_version.aid }}.</a>
+            {% trans "This is not the authorized version." %} <a href="{% url 'motion_view' motion.id %}">{% trans "Go to version" %} {{ motion.public_version.aid }}.</a>
         {% endif %}
     {% endif %}
 
@@ -109,10 +109,10 @@
                  <img title="{% trans 'Version authorized' %}" src="{% static 'images/icons/accept.png' %}">
             {% else %}
                  {% if perms.motion.can_manage_motion %}
-                     <a href="{% url motion_version_permit revision.id %}"><img title="{% trans 'Permit Version' %}" src="{% static 'images/icons/accept-grey.png' %}"></a>
+                     <a href="{% url 'motion_version_permit' revision.id %}"><img title="{% trans 'Permit Version' %}" src="{% static 'images/icons/accept-grey.png' %}"></a>
                  {% endif %}
                  {% if not revision.rejected and revision.id > motion.permitted.id and perms.motion.can_manage_motion %}
-                     <a href="{% url motion_version_reject revision.id %}"><img title="{% trans 'Reject Version' %}" src="{% static 'images/icons/reject-grey.png' %}"></a>
+                     <a href="{% url 'motion_version_reject' revision.id %}"><img title="{% trans 'Reject Version' %}" src="{% static 'images/icons/reject-grey.png' %}"></a>
                  {% endif %}
             {% endif %}
             {% if revision.rejected %}
@@ -190,7 +190,7 @@
             {% if not polls.exists %}
                 {% if perms.motion.can_manage_motion %}
                     {% if "genpoll" in actions %}
-                    <a href='{% url motion_gen_poll motion.id %}' class="btn btn-mini">
+                    <a href="{% url 'motion_gen_poll' motion.id %}" class="btn btn-mini">
                         <i class="icon-signal"></i> {% trans 'New vote' %}
                     </a>
                     {% else %}
@@ -205,8 +205,8 @@
             {% if perms.motion.can_manage_motion or poll.has_votes %}
                 <li>{% trans "Vote" %}
                     {% if perms.motion.can_manage_motion %}
-                        <a class="btn btn-mini" href="{% url motion_poll_view poll.id %}" title="{% trans 'Edit Vote' %}"><i class="icon-edit"></i></a>
-                        <a class="btn btn-mini" href="{% url motion_poll_delete poll.id %}" title="{% trans 'Delete Vote' %}"><i class="icon-remove"></i></a>
+                        <a class="btn btn-mini" href="{% url 'motion_poll_view' poll.id %}" title="{% trans 'Edit Vote' %}"><i class="icon-edit"></i></a>
+                        <a class="btn btn-mini" href="{% url 'motion_poll_delete' poll.id %}" title="{% trans 'Delete Vote' %}"><i class="icon-remove"></i></a>
                     {% endif %}
                     <br>
                     {% if poll.has_votes %}
@@ -222,7 +222,7 @@
                         {% if perms.motion.can_manage_motion %}
                             {% if forloop.last %}
                             {% if "genpoll" in actions %}
-                            <a href='{% url motion_gen_poll motion.id %}' class="btn btn-mini">
+                            <a href="{% url 'motion_gen_poll' motion.id %}" class="btn btn-mini">
                                 <i class="icon-signal"></i> {% trans 'New vote' %}
                             </a>
                             {% endif %}
@@ -244,7 +244,7 @@
         <!-- Widthdraw button -->
         {% if "wit" in actions and user == motion.submitter.user %}
             <br><br>
-            <a href='{% url motion_set_status motion.id 'wit' %}' class="btn">
+            <a href="{% url 'motion_set_status' motion.id 'wit' %}" class="btn">
                 <span class="icon revert">{% trans 'Withdraw motion' %}</span>
             </a>
         {% endif %}
@@ -252,13 +252,13 @@
         {% if perms.motion.can_support_motion and min_supporters > 0 %}
             {% if "unsupport" in actions %}
                 <br><br>
-                <a href='{% url motion_unsupport motion.id %}' class="btn">
+                <a href="{% url 'motion_unsupport' motion.id %}" class="btn">
                     {% trans 'Unsupport motion' %}
                 </a>
             {% endif %}
             {% if "support" in actions %}
                 <br><br>
-                <a href='{% url motion_support motion.id %}'>
+                <a href="{% url 'motion_support' motion.id %}">
                     {% trans 'Support' %}
                 </a>
             {% endif %}
@@ -279,16 +279,16 @@
         <h5>{% trans "Formal validation" %}:</h5>
         <div class="btn-group btn-group-vertical">
             {% if "pub" in actions %}
-                <a href='{% url motion_set_status motion.id 'pub' %}' class="btn">{% trans 'Publish' %}</a>
+                <a href="{% url 'motion_set_status' motion.id 'pub' %}" class="btn">{% trans 'Publish' %}</a>
             {% endif %}
             {% if "per" in actions %}
-                <a href='{% url motion_permit motion.id %}' class="btn btn-info">{% trans 'Permit' %}</a>
+                <a href="{% url 'motion_permit' motion.id %}" class="btn btn-info">{% trans 'Permit' %}</a>
             {% endif %}
             {% if "nop" in actions %}
-                <a href='{% url motion_notpermit motion.id %}' class="btn">{% trans 'Not permit' %}</a>
+                <a href="{% url 'motion_notpermit' motion.id %}" class="btn">{% trans 'Not permit' %}</a>
             {% endif %}
             {% if "setnumber" in actions %}
-                <a href='{% url motion_set_number motion.id %}' class="btn">{% trans 'Set number' %}</a>
+                <a href="{% url 'motion_set_number' motion.id %}" class="btn">{% trans 'Set number' %}</a>
             {% endif %}
         </div>
     {% endif %}
@@ -297,12 +297,12 @@
         <h5>{% trans "Result after vote" %}:</h5>
         <div class="btn-group btn-group-vertical">
             {% if "acc" in actions %}
-            <a href='{% url motion_set_status motion.id 'acc' %}' class="btn btn-success">
+            <a href="{% url 'motion_set_status' motion.id 'acc' %}" class="btn btn-success">
                 <i class="icon-ok icon-white"></i> {% trans 'Accepted' %}
             </a>
             {% endif %}
             {% if "rej" in actions %}
-            <a href='{% url motion_set_status motion.id 'rej' %}' class="btn btn-danger">
+            <a href="{% url 'motion_set_status' motion.id 'rej' %}" class="btn btn-danger">
                 <i class="icon-ban-circle icon-white"></i> {% trans 'Rejected' %}
             </a>
             {% endif %}
@@ -318,16 +318,16 @@
             </a>
             <ul class="dropdown-menu pull-right">
                 {% if "adj" in actions %}
-                    <li><a href='{% url motion_set_status motion.id 'adj' %}'>{% trans 'Adjourned' %}</a></li>
+                    <li><a href="{% url 'motion_set_status' motion.id 'adj' %}">{% trans 'Adjourned' %}</a></li>
                 {% endif %}
                 {% if "noc" in actions %}
-                    <li><a href='{% url motion_set_status motion.id 'noc' %}'>{% trans 'Not Concerned' %}</a></li>
+                    <li><a href="{% url 'motion_set_status' motion.id 'noc' %}">{% trans 'Not Concerned' %}</a></li>
                 {% endif %}
                 {% if "com" in actions %}
-                    <li><a href='{% url motion_set_status motion.id 'com' %}'>{% trans 'Commited a bill' %}</a></li>
+                    <li><a href="{% url 'motion_set_status' motion.id 'com' %}">{% trans 'Commited a bill' %}</a></li>
                 {% endif %}
                 {% if "wit" in actions %}
-                    <li><a href='{% url motion_set_status motion.id 'wit' %}'>{% trans 'Withdrawed by Submitter' %}</a></li>
+                    <li><a href="{% url 'motion_set_status' motion.id 'wit' %}">{% trans 'Withdrawed by Submitter' %}</a></li>
                 {% endif %}
             </ul>
         </div>
@@ -335,7 +335,7 @@
     <p></p>
     <hr>
     <h5>{% trans "For Administration only:" %}</h5>
-    <a href='{% url motion_reset motion.id %}' class="btn btn-danger">
+    <a href="{% url 'motion_reset' motion.id %}" class="btn btn-danger">
         {% trans 'Reset' %}
     </a>
     </div> <!--/well-->
diff --git a/openslides/motion/templates/motion/widget.html b/openslides/motion/templates/motion/widget.html
index 0495d7ac9..c0796de89 100644
--- a/openslides/motion/templates/motion/widget.html
+++ b/openslides/motion/templates/motion/widget.html
@@ -5,7 +5,7 @@
 <ul style="line-height: 180%">
 {% for motion in motions %}
     <li class="{% if motion.active %}activeline{% endif %}">
-        <a href="{% url projector_activate_slide motion.sid %}" class="activate_link {% if motion.active %}active{% endif %}">
+        <a href="{% url 'projector_activate_slide' motion.sid %}" class="activate_link {% if motion.active %}active{% endif %}">
             <div></div>
         </a>
         <a href="{% model_url motion 'delete' %}" title="{% trans 'Delete' %}" class="icon delete right">
@@ -14,7 +14,7 @@
         <a href="{% model_url motion 'edit' %}" title="{% trans 'Edit' %}" class="icon edit right">
             <span></span>
         </a>
-        <a href="{% url projctor_preview_slide motion.sid %}" title="{% trans 'Preview' %}" class="icon preview right">
+        <a href="{% url 'projctor_preview_slide' motion.sid %}" title="{% trans 'Preview' %}" class="icon preview right">
             <span></span>
         </a>
         <a href="{% model_url motion 'view' %}">
diff --git a/openslides/motion/views.py b/openslides/motion/views.py
index 6c8f68820..a323b5594 100644
--- a/openslides/motion/views.py
+++ b/openslides/motion/views.py
@@ -10,16 +10,10 @@
     :license: GNU GPL, see LICENSE for more details.
 """
 
-# for python 2.5 support
-from __future__ import with_statement
-
 import csv
 import os
 
-try:
-    from urlparse import parse_qs
-except ImportError:  # python <= 2.5
-    from cgi import parse_qs
+from urlparse import parse_qs
 
 from reportlab.lib import colors
 from reportlab.lib.units import cm
diff --git a/openslides/participant/api.py b/openslides/participant/api.py
index fb5325628..f7b5a80a2 100644
--- a/openslides/participant/api.py
+++ b/openslides/participant/api.py
@@ -10,9 +10,6 @@
     :license: GNU GPL, see LICENSE for more details.
 """
 
-# for python 2.5 support
-from __future__ import with_statement
-
 from random import choice
 import csv
 
diff --git a/openslides/participant/forms.py b/openslides/participant/forms.py
index 8085f313f..854abe91e 100644
--- a/openslides/participant/forms.py
+++ b/openslides/participant/forms.py
@@ -13,6 +13,7 @@
 from django import forms
 from django.contrib.auth.models import Permission
 from django.utils.translation import ugettext_lazy as _
+from django.conf import settings
 
 from openslides.utils.forms import (
     CssClassMixin, LocalizedModelMultipleChoiceField)
@@ -101,6 +102,8 @@ class GroupForm(forms.ModelForm, CssClassMixin):
 
 
 class UsersettingsForm(forms.ModelForm, CssClassMixin):
+    language = forms.ChoiceField(choices=settings.LANGUAGES)
+
     class Meta:
         model = User
         fields = ('username', 'first_name', 'last_name', 'gender', 'email', 'committee', 'about_me')
diff --git a/openslides/participant/templates/participant/config.html b/openslides/participant/templates/participant/config.html
index 283fb40b9..8548a5bd2 100644
--- a/openslides/participant/templates/participant/config.html
+++ b/openslides/participant/templates/participant/config.html
@@ -12,7 +12,7 @@
         {% include "form.html" %}
         <p>
         {% include "formbuttons_save.html" %}
-        <a href='{% url config_participant %}' class="btn">
+        <a href="{% url 'config_participant' %}" class="btn">
             {% trans 'Cancel' %}
         </a>
         </p>
diff --git a/openslides/participant/templates/participant/edit.html b/openslides/participant/templates/participant/edit.html
index abfb03bae..7ea413779 100644
--- a/openslides/participant/templates/participant/edit.html
+++ b/openslides/participant/templates/participant/edit.html
@@ -19,7 +19,7 @@
             {% trans "New participant" %}
         {% endif %}
         <small class="pull-right">
-        <a href="{% url user_overview %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
+        <a href="{% url 'user_overview' %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
         </small>
     </h1>
 
@@ -27,12 +27,12 @@
         {% include "form.html" %}
         {% if edit_user %}
             <p>
-                <a href="{% url user_reset_password edit_user.id %}">{% trans 'Reset to First Password' %}</a>
+                <a href="{% url 'user_reset_password' edit_user.id %}">{% trans 'Reset to First Password' %}</a>
             </p>
         {% endif %}
         <p>
         {% include "formbuttons_saveapply.html" %}
-        <a href='{% url user_overview %}' class="btn">
+        <a href="{% url 'user_overview' %}" class="btn">
             {% trans 'Cancel' %}
         </a>
         </p>
diff --git a/openslides/participant/templates/participant/group_edit.html b/openslides/participant/templates/participant/group_edit.html
index a392cf0dd..8020247d2 100644
--- a/openslides/participant/templates/participant/group_edit.html
+++ b/openslides/participant/templates/participant/group_edit.html
@@ -19,7 +19,7 @@
         {% trans "New group" %}
     {% endif %}
         <small class="pull-right">
-        <a href="{% url user_group_overview %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
+        <a href="{% url 'user_group_overview' %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
         </small>
     </h1>
 
@@ -27,7 +27,7 @@
         {% include "form.html" %}
         <p>
         {% include "formbuttons_saveapply.html" %}
-        <a href='{% url user_group_overview %}' class="btn">
+        <a href="{% url 'user_group_overview' %}" class="btn">
             {% trans 'Cancel' %}
         </a>
         </p>
diff --git a/openslides/participant/templates/participant/group_overview.html b/openslides/participant/templates/participant/group_overview.html
index 6f7de45f5..08e09ea57 100644
--- a/openslides/participant/templates/participant/group_overview.html
+++ b/openslides/participant/templates/participant/group_overview.html
@@ -9,8 +9,8 @@
 {% block content %}
     <h1>{% trans "Groups" %}
         <small class="pull-right">
-        <a href="{% url user_group_new %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'New group' %}"><i class="icon-plus"></i> {% trans "New" %}</a>
-        <a href="{% url user_overview %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Participants" %}</a>
+        <a href="{% url 'user_group_new' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'New group' %}"><i class="icon-plus"></i> {% trans "New" %}</a>
+        <a href="{% url 'user_overview' %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Participants" %}</a>
         </small>
     </h1>
 
@@ -22,9 +22,9 @@
     {% for group in groups %}
         <tr class="{% cycle '' 'odd' %}">
             <td><a href="{% model_url group 'view' %}">{{ group.name }}</a></td>
-            <td><a href="{% url user_group_edit group.id %}"><img src="{% static 'images/icons/edit.png' %}" title="{% trans 'Edit group' %}"></a>
+            <td><a href="{% url 'user_group_edit' group.id %}"><img src="{% static 'images/icons/edit.png' %}" title="{% trans 'Edit group' %}"></a>
             {% if group.name|lower != 'anonymous' and group.name|lower != 'registered' %}
-            <a href="{% url user_group_delete group.id %}"><img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Delete group' %}"></a>
+            <a href="{% url 'user_group_delete' group.id %}"><img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Delete group' %}"></a>
             {% endif %}
             </td>
         </tr>
diff --git a/openslides/participant/templates/participant/group_widget.html b/openslides/participant/templates/participant/group_widget.html
index 5c6e285a7..88a2eb91c 100644
--- a/openslides/participant/templates/participant/group_widget.html
+++ b/openslides/participant/templates/participant/group_widget.html
@@ -5,7 +5,7 @@
 {% for group in groups %}
     {% if group.name != 'Anonymous' and group.name != 'Registered' %}
     <li class="{% if group.active %}activeline{% endif %}">
-        <a href="{% url projector_activate_slide group.sid %}" class="activate_link {% if group.active %}active{% endif %}">
+        <a href="{% url 'projector_activate_slide' group.sid %}" class="activate_link {% if group.active %}active{% endif %}">
             <div></div>
         </a>
         <a href="{% model_url group 'delete' %}" title="{% trans 'Delete' %}" class="icon delete right">
@@ -14,7 +14,7 @@
         <a href="{% model_url group 'edit' %}" title="{% trans 'Edit' %}" class="icon edit right">
             <span></span>
         </a>
-        <a href="{% url projctor_preview_slide group.sid %}" title="{% trans 'Preview' %}" class="icon preview right">
+        <a href="{% url 'projctor_preview_slide' group.sid %}" title="{% trans 'Preview' %}" class="icon preview right">
             <span></span>
         </a>
         <a href="{% model_url group 'view' %}">{{ group }}</a>
diff --git a/openslides/participant/templates/participant/import.html b/openslides/participant/templates/participant/import.html
index 74d475886..e374845b7 100644
--- a/openslides/participant/templates/participant/import.html
+++ b/openslides/participant/templates/participant/import.html
@@ -8,7 +8,7 @@
     <h1>
         {% trans 'Import participants' %}
         <small class="pull-right">
-        <a href="{% url user_overview %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
+        <a href="{% url 'user_overview' %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
         </small>
     </h1>
 
@@ -29,7 +29,7 @@
         <button class="btn btn-primary" type="submit">
             <span class="icon import">{% trans 'Import' %}</span>
         </button>
-        <a href="{% url user_overview%}" class="btn">
+        <a href="{% url 'user_overview' %}" class="btn">
             {% trans 'Cancel' %}
         </a>
         </p>
diff --git a/openslides/participant/templates/participant/login.html b/openslides/participant/templates/participant/login.html
index cd969f77f..3558d0562 100644
--- a/openslides/participant/templates/participant/login.html
+++ b/openslides/participant/templates/participant/login.html
@@ -22,7 +22,13 @@
             <em>{{ first_time_message|safe }}</em>
         </div>
     {% endif %}
-    <form method="post" action="{% url user_login %}{% if next %}?next={{ next }}{% endif %}" class="well">
+
+    <script>
+        $("div.notification").click(function () {
+            $(this).hide("fast");
+        });
+    </script>
+    <form method="post" action="{% url 'user_login' %}{% if next %}?next={{ next }}{% endif %}" class="well">
         {% csrf_token %}
         <div class="input-prepend">
             <span class="add-on"><i class="icon-user"></i></span>
@@ -48,7 +54,7 @@
     {% if os_enable_anonymous_login %}
         <script>
             $("#anonymous_login").live('click', function () {
-                window.location.href = '{% url item_overview %}';
+                window.location.href = "{% url 'item_overview' %}";
                 return false;
             });
         </script>
diff --git a/openslides/participant/templates/participant/overview.html b/openslides/participant/templates/participant/overview.html
index 9528c230e..b272a7fcc 100644
--- a/openslides/participant/templates/participant/overview.html
+++ b/openslides/participant/templates/participant/overview.html
@@ -19,9 +19,9 @@
         <small class="pull-right">
         <div class="btn-toolbar">
             {% if perms.participant.can_manage_participant %}
-                <a href="{% url user_new %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'New participant' %}"><i class="icon-plus"></i> {% trans "New" %}</a>
-                <a href="{% url user_group_overview %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'All user groups' %}"><i class="icon-user"></i> {% trans "User groups" %}</a>
-                <a href="{% url user_import %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Import participants' %}"><i class="icon-share-alt"></i> {% trans 'Import' %}</a>
+                <a href="{% url 'user_new' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'New participant' %}"><i class="icon-plus"></i> {% trans "New" %}</a>
+                <a href="{% url 'user_group_overview' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'All user groups' %}"><i class="icon-user"></i> {% trans "User groups" %}</a>
+                <a href="{% url 'user_import' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Import participants' %}"><i class="icon-share-alt"></i> {% trans 'Import' %}</a>
             {% endif %}
             {% if perms.participant.can_see_participant and perms.participant.can_manage_participant %}
                 <div class="btn-group pull-right">
@@ -31,20 +31,20 @@
                           <span class="caret"></span>
                     </a>
                     <ul class="dropdown-menu">
-                        {% url user_settings as url_usersettings %}
-                        <li><a href="{% url user_print %}"><i class="icon-list"></i> {% trans 'List of participants' %}</a></li>
-                        <li><a href="{% url print_passwords %}"><i class="icon-th-large"></i> {% trans 'First time passwords' %}</a></li>
+                        {% url 'user_settings' as url_usersettings %}
+                        <li><a href="{% url 'user_print' %}"><i class="icon-list"></i> {% trans 'List of participants' %}</a></li>
+                        <li><a href="{% url 'print_passwords' %}"><i class="icon-th-large"></i> {% trans 'First time passwords' %}</a></li>
                     </ul>
                     {% else %}
-                        <a href="{% url user_login %}" class="btn">{% trans "Login" %}</a>
+                        <a href="{% url 'user_login' %}" class="btn">{% trans "Login" %}</a>
                     {% endif %}
                 </div>
             {% else %}
                 {% if perms.participant.can_see_participant %}
-                    <a href="{% url user_print %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print list of participants as PDF' %}"><i class="icon-print"></i> PDF</a>
+                    <a href="{% url 'user_print' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print list of participants as PDF' %}"><i class="icon-print"></i> PDF</a>
                 {% endif %}
                 {% if perms.participant.can_manage_participant %}
-                    <a href="{% url print_passwords %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print first time passwords as PDF' %}"><i class="icon-print"></i> PDF</a>
+                    <a href="{% url 'print_passwords' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print first time passwords as PDF' %}"><i class="icon-print"></i> PDF</a>
                 {% endif %}
             {% endif %}
         </div>
@@ -126,19 +126,19 @@
                     </td>
                     <td>
                         <span style="width: 1px; white-space: nowrap;">
-                            <a href="{% url user_edit user.id %}">
+                            <a href="{% url 'user_edit' user.id %}">
                                 <img src="{% static 'images/icons/edit.png' %}" title="{% trans 'Edit participant' %}">
                             </a>
                             {% if user != request_user %}
-                            <a href="{% url user_delete user.id %}">
+                            <a href="{% url 'user_delete' user.id %}">
                                 <img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Delete participant' %}">
                             </a>
                             {% endif %}
                             {% if user != request_user and not user.is_superuser %}
-                            <a class="status_link deactivate" href="{% url user_status_deactivate user.id %}" title="{% trans 'Change status to inactive' %}"{% if not user.is_active %} style="display:none"{% endif %}>
+                            <a class="status_link deactivate" href="{% url 'user_status_deactivate' user.id %}" title="{% trans 'Change status to inactive' %}"{% if not user.is_active %} style="display:none"{% endif %}>
                                 <span></span>
                             </a>
-                            <a class="status_link activate" href="{% url user_status_activate user.id %}" title="{% trans 'Change status to active' %}"{% if user.is_active %} style="display:none"{% endif %}>
+                            <a class="status_link activate" href="{% url 'user_status_activate' user.id %}" title="{% trans 'Change status to active' %}"{% if user.is_active %} style="display:none"{% endif %}>
                                 <span></span>
                             </a>
                             {% endif %}
diff --git a/openslides/participant/templates/participant/settings.html b/openslides/participant/templates/participant/settings.html
index 746722cf3..25afa5bde 100644
--- a/openslides/participant/templates/participant/settings.html
+++ b/openslides/participant/templates/participant/settings.html
@@ -4,6 +4,17 @@
 
 {% block title %}{{ block.super }} – {% trans "Personal Settings" %}{% endblock %}
 
+<<<<<<< .merge_file_gQQrGK
+=======
+{% block submenu %}
+    <h4 class="sectiontitle">{% trans "User Settings" %}</h4>
+    <ul>
+        <li class="selected"><a href="{% url 'user_settings' %}">{% trans "Personal Settings" %}</a></li>
+        <li><a href="{% url 'password_change' %}">{% trans "Password Settings" %}</a></li>
+    </ul>
+{% endblock %}
+
+>>>>>>> .merge_file_n8pEk9
 {% block content %}
     <h1>{% trans "Personal Settings" %}</h1>
 
diff --git a/openslides/participant/templates/participant/user_widget.html b/openslides/participant/templates/participant/user_widget.html
index 00082aac7..ab762774e 100644
--- a/openslides/participant/templates/participant/user_widget.html
+++ b/openslides/participant/templates/participant/user_widget.html
@@ -4,7 +4,7 @@
 <ul style="line-height: 180%">
 {% for user in users %}
     <li class="{% if user.active %}activeline{% endif %}">
-        <a href="{% url projector_activate_slide user.sid %}" class="activate_link {% if user.active %}active{% endif %}">
+        <a href="{% url 'projector_activate_slide' user.sid %}" class="activate_link {% if user.active %}active{% endif %}">
             <div></div>
         </a>
         <a href="{% model_url user 'delete' %}" title="{% trans 'Delete' %}" class="icon delete right">
@@ -13,7 +13,7 @@
         <a href="{% model_url user 'edit' %}" title="{% trans 'Edit' %}" class="icon edit right">
             <span></span>
         </a>
-        <a href="{% url projctor_preview_slide user.sid %}" title="{% trans 'Preview' %}" class="icon preview right">
+        <a href="{% url 'projctor_preview_slide' user.sid %}" title="{% trans 'Preview' %}" class="icon preview right">
             <span></span>
         </a>
         <a href="{% model_url user 'view' %}">{{ user }}</a>
diff --git a/openslides/participant/views.py b/openslides/participant/views.py
index db6fa6d15..985d65f3d 100644
--- a/openslides/participant/views.py
+++ b/openslides/participant/views.py
@@ -10,15 +10,8 @@
     :license: GNU GPL, see LICENSE for more details.
 """
 
-# for python 2.5 support
-from __future__ import with_statement
-
 from urllib import urlencode
-
-try:
-    from urlparse import parse_qs
-except ImportError:  # python <= 2.5 grab it from cgi
-    from cgi import parse_qs
+from urlparse import parse_qs
 
 from reportlab.lib import colors
 from reportlab.lib.units import cm
@@ -31,7 +24,7 @@ from django.contrib.auth.forms import PasswordChangeForm
 from django.contrib.auth.views import login as django_login
 from django.core.urlresolvers import reverse
 from django.shortcuts import redirect
-from django.utils.translation import ugettext as _, ugettext_lazy
+from django.utils.translation import ugettext as _, ugettext_lazy, activate
 
 from openslides.utils.pdf import stylesheet
 from openslides.utils.template import Tab
@@ -500,14 +493,18 @@ def user_settings(request):
     Edit own user account.
     """
     if request.method == 'POST':
-        form = UsersettingsForm(request.POST, instance=request.user)
-        if form.is_valid():
-            form.save()
+        form_user = UsersettingsForm(request.POST, instance=request.user)
+        if form_user.is_valid():
+            form_user.save()
+            language = request.LANGUAGE_CODE = \
+                request.session['django_language'] = form_user.cleaned_data['language']
+            activate(language)
             messages.success(request, _('User settings successfully saved.'))
         else:
             messages.error(request, _('Please check the form for errors.'))
     else:
-        form = UsersettingsForm(instance=request.user)
+        language = request.session.get('django_language', request.LANGUAGE_CODE)
+        form_user = UsersettingsForm(instance=request.user, initial={'language': language})
 
     return {
         'form': form,
diff --git a/openslides/projector/templates/projector/control_countdown.html b/openslides/projector/templates/projector/control_countdown.html
index fe0e27336..4d9b8248b 100644
--- a/openslides/projector/templates/projector/control_countdown.html
+++ b/openslides/projector/templates/projector/control_countdown.html
@@ -8,16 +8,17 @@
             <input class="projector_countdown_spinval" id="countdown_time" name="countdown_time" type="number" min="0" value="{{ countdown_time }}">
             <span class="add-on">{% trans "s" context "seconds" %}</span>
         </div>
-        <a id="countdown_set" class="countdown_control btn btn-small" href="{% url countdown_set_default %}" title="{% trans 'Save as default' %}">
-            <img src="{% static 'images/icons/document-save.png' %}" alt="{% url countdown_set_default %}">
+        <a id="countdown_set" class="countdown_control btn btn-small" href="{% url 'countdown_set_default' %}" title="{% trans 'Save as default' %}">
+            <img src="{% static 'images/icons/document-save.png' %}" alt="{% url 'countdown_set_default' %}">
         </a>
-        <a id="countdown_reset" class="countdown_control btn btn-small" href="{% url countdown_reset %}" title="{% trans 'Reset countdown' %}">
+
+        <a id="countdown_reset" class="countdown_control btn btn-small" href="{% url 'countdown_reset' %}" title="{% trans 'Reset countdown' %}">
             <i class="icon-fast-backward"></i>
         </a>
-        <a id="countdown_play" class="countdown_control btn btn-small" href="{% url countdown_start %}" title="{% trans 'Start countdown' %}"{% if countdown_state == 'active' %} style="display:none"{% endif %}>
+        <a id="countdown_play" class="countdown_control btn btn-small" href="{% url 'countdown_start' %}" title="{% trans 'Start countdown' %}"{% if countdown_state == 'active' %} style="display:none"{% endif %}>
             <i class="icon-play"></i>
         </a>
-        <a id="countdown_stop" class="countdown_control btn btn-small" href="{% url countdown_stop %}" title="{% trans 'Stop countdown' %}"{% if countdown_state == 'inactive' or countdown_state == 'paused' or countdown_state == 'expired' %} style="display:none"{% endif %}>
+        <a id="countdown_stop" class="countdown_control btn btn-small" href="{% url 'countdown_stop' %}" title="{% trans 'Stop countdown' %}"{% if countdown_state == 'inactive' or countdown_state == 'paused' or countdown_state == 'expired' %} style="display:none"{% endif %}>
             <i class="icon-pause"></i>
         </a>
     </div>
diff --git a/openslides/projector/templates/projector/control_overlay_message.html b/openslides/projector/templates/projector/control_overlay_message.html
index 2836f5d2e..4d3b5ea99 100644
--- a/openslides/projector/templates/projector/control_overlay_message.html
+++ b/openslides/projector/templates/projector/control_overlay_message.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% load tags %}
 
-<form id="overlay_message" action="{% url projector_overlay_message %}" method="post" style="display:inline-block;">{% csrf_token %}
+<form id="overlay_message" action="{% url 'projector_overlay_message' %}" method="post" style="display:inline-block;">{% csrf_token %}
     <div class="input-append">
         <input id="overlay_message_text" name='message_text' type='text' value="{% get_config 'projector_message' %}">
         <button type="submit" class="btn btn-primary" name="message" rel="tooltip" data-original-title="{% trans 'Apply' %}">
@@ -13,4 +13,3 @@
         </button>
     </div>
 </form>
-
diff --git a/openslides/projector/templates/projector/custom_slide_widget.html b/openslides/projector/templates/projector/custom_slide_widget.html
index a207f5949..631b28d6c 100644
--- a/openslides/projector/templates/projector/custom_slide_widget.html
+++ b/openslides/projector/templates/projector/custom_slide_widget.html
@@ -2,13 +2,12 @@
 {% load i18n %}
 {% load tags %}
 
-
 <ul style="line-height: 180%">
     <li class="{% if welcomepage_is_active %}activeline{% endif %}">
-        <a href="{% url projector_activate_welcomepage %}" class="activate_link {% if welcomepage_is_active %}active{% endif %}">
+        <a href="{% url 'projector_activate_welcomepage' %}" class="activate_link {% if welcomepage_is_active %}active{% endif %}">
             <div></div>
         </a>
-        <a href="{% url projctor_preview_welcomepage %}" title="{% trans 'Preview' %}" class="icon preview right">
+        <a href="{% url 'projctor_preview_welcomepage' %}" title="{% trans 'Preview' %}" class="icon preview right">
             <span></span>
         </a>
         {% trans 'Welcome Page' %}
@@ -16,27 +15,26 @@
 </ul>
 <hr>
 <div class="pull-right">
-<a href='{% url customslide_new %}' class="btn btn-mini">
+<a href="{% url 'customslide_new' %}" class="btn btn-mini">
     <i class="icon-plus"></i>{% trans 'New' %}
 </a>
 </div>
 <ul style="line-height: 180%">
 {% for slide in slides %}
     <li class="{% if slide.active %}activeline{% endif %}">
-        <a href="{% url projector_activate_slide slide.sid %}" class="activate_link {% if slide.active %}active{% endif %}">
+        <a href="{% url 'projector_activate_slide' slide.sid %}" class="activate_link {% if slide.active %}active{% endif %}">
             <div></div>
         </a>
-        <a href="{% url customslide_edit slide.id %}">{{ slide }}</a>
-        <a href="{% url customslide_edit slide.id %}" title="{% trans 'Edit' %}" class="btn btn-mini">
+        <a href="{% url 'customslide_edit' slide.id %}">{{ slide }}</a>
+        <a href="{% url 'customslide_edit' slide.id %}" title="{% trans 'Edit' %}" class="btn btn-mini">
             <i class="icon-pencil"></i>
         </a>
-        <a href="{% url customslide_delete slide.id %}" title="{% trans 'Delete' %}" class="btn btn-mini">
+        <a href="{% url 'customslide_delete' slide.id %}" title="{% trans 'Delete' %}" class="btn btn-mini">
             <i class="icon-remove"></i>
         </a>
-        <a href="{% url projctor_preview_slide slide.sid %}" title="{% trans 'Preview' %}" class="btn btn-mini">
+        <a href="{% url 'projctor_preview_slide' slide.sid %}" title="{% trans 'Preview' %}" class="btn btn-mini">
             <i class="icon-search"></i>
         </a>
-
     </li>
 {% empty %}
     <li>{% trans 'No items available.' %}</li>
diff --git a/openslides/projector/templates/projector/dashboard.html b/openslides/projector/templates/projector/dashboard.html
index 99874b91e..02442910f 100644
--- a/openslides/projector/templates/projector/dashboard.html
+++ b/openslides/projector/templates/projector/dashboard.html
@@ -17,7 +17,7 @@
 {% block content %}
     <h1>{% trans 'Dashboard' %}
         <small class="pull-right">
-            <a href="{% url projector_select_widgets %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Manage widgets' %}"><i class="icon-th-large"></i> {% trans 'Widgets' %}</a>
+            <a href="{% url 'projector_select_widgets' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Manage widgets' %}"><i class="icon-th-large"></i> {% trans 'Widgets' %}</a>
         </small>
     </h1>
 
diff --git a/openslides/projector/templates/projector/live_view_widget.html b/openslides/projector/templates/projector/live_view_widget.html
index fd917caf3..d1594a6f9 100644
--- a/openslides/projector/templates/projector/live_view_widget.html
+++ b/openslides/projector/templates/projector/live_view_widget.html
@@ -6,23 +6,23 @@
 {% if perms.projector.can_manage_projector %}
     <div style="float: right;">
         <p>
-        <a class="projector_edit" href="{% url projector_bigger %}" title="{% trans 'Zoom in' %}">
+        <a class="projector_edit" href="{% url 'projector_bigger' %}" title="{% trans 'Zoom in' %}">
             <img src="{% static 'images/icons/zoom-in.png' %}" />
         </a><br>
-        <a class="projector_edit" href="{% url projector_smaller %}" title="{% trans 'Zoom out' %}">
+        <a class="projector_edit" href="{% url 'projector_smaller' %}" title="{% trans 'Zoom out' %}">
             <img src="{% static 'images/icons/zoom-out.png' %}" />
         </a>
         </p>
         <p>
-        <a class="projector_edit" href="{% url projector_up %}" title="{% trans 'Scroll text up' %}">
+        <a class="projector_edit" href="{% url 'projector_up' %}" title="{% trans 'Scroll text up' %}">
             <img src="{% static 'images/icons/go-up.png' %}" />
         </a><br>
-        <a class="projector_edit" href="{% url projector_down %}" title="{% trans 'Scroll text down' %}">
+        <a class="projector_edit" href="{% url 'projector_down' %}" title="{% trans 'Scroll text down' %}">
             <img src="{% static 'images/icons/go-down.png' %}" />
         </a>
         </p>
         <p>
-        <a class="projector_edit" href="{% url projector_clean %}" title="{% trans 'Reset projector view' %}">
+        <a class="projector_edit" href="{% url 'projector_clean' %}" title="{% trans 'Reset projector view' %}">
             <img src="{% static 'images/icons/view-reset.png' %}" />
         </a>
         </p>
@@ -30,9 +30,9 @@
 {% endif %}
 
 <!-- projector live view -->
-<a href="{% url projector_show %}" target="_blank">
+<a href="{% url 'projector_show' %}" target="_blank">
     <div id="iframewrapper">
-        <iframe id="iframe" src="{% url projector_show %}" frameborder="0"></iframe>
+        <iframe id="iframe" src="{% url 'projector_show' %}" frameborder="0"></iframe>
         <div id="iframeoverlay"></div>
     </div>
 </a>
diff --git a/openslides/projector/templates/projector/new.html b/openslides/projector/templates/projector/new.html
index 6f2f07b04..f61e5a049 100644
--- a/openslides/projector/templates/projector/new.html
+++ b/openslides/projector/templates/projector/new.html
@@ -8,7 +8,7 @@
 {% block content %}
     <h1>{% trans 'Custom slide' %}
         <small class="pull-right">
-            <a href="{% url dashboard %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
+            <a href="{% url 'dashboard' %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
         </small>
     </h1>
     <form action="" method="post">{% csrf_token %}
diff --git a/openslides/projector/templates/projector/overlay_widget.html b/openslides/projector/templates/projector/overlay_widget.html
index 8b47a4539..7a98c67de 100644
--- a/openslides/projector/templates/projector/overlay_widget.html
+++ b/openslides/projector/templates/projector/overlay_widget.html
@@ -4,10 +4,10 @@
 <ul>
     {% for overlay in overlays %}
         <li>
-            <a id="{{ overlay.def_name }}_inactive" href="{% url projector_overlay_activate overlay.def_name %}" class="overlay"{% if overlay.active %} style="display:none"{% endif %}>
+            <a id="{{ overlay.def_name }}_inactive" href="{% url 'projector_overlay_activate' overlay.def_name %}" class="overlay"{% if overlay.active %} style="display:none"{% endif %}>
                 <div></div>
             </a>
-            <a id="{{ overlay.def_name }}_active" href="{% url projector_overlay_deactivate overlay.def_name %}" class="overlay active"{% if not overlay.active %} style="display:none"{% endif %}>
+            <a id="{{ overlay.def_name }}_active" href="{% url 'projector_overlay_deactivate' overlay.def_name %}" class="overlay active"{% if not overlay.active %} style="display:none"{% endif %}>
                 <div></div>
             </a>
 
diff --git a/openslides/projector/templates/projector/select_widgets.html b/openslides/projector/templates/projector/select_widgets.html
index 63bccd59d..75d1f6f86 100644
--- a/openslides/projector/templates/projector/select_widgets.html
+++ b/openslides/projector/templates/projector/select_widgets.html
@@ -7,7 +7,7 @@
 {% block content %}
     <h1>{% trans 'Select widgets' %}
         <small class="pull-right">
-            <a href="{% url dashboard %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
+            <a href="{% url 'dashboard' %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
         </small>
     </h1>
 
diff --git a/openslides/templates/base.html b/openslides/templates/base.html
index b3e57f8cf..c9832a7b2 100644
--- a/openslides/templates/base.html
+++ b/openslides/templates/base.html
@@ -16,6 +16,7 @@
     <link href="{% static 'styles/bootstrap-responsive.css' %}" type="text/css" rel="stylesheet">
     <link href="{% static 'styles/base.css' %}" type="text/css" rel="stylesheet">
     <link href="{% static 'img/favicon.png' %}" type="image/png" rel="shortcut icon" />
+
     {% block header %}
     {% endblock %}
 </head>
@@ -34,14 +35,14 @@
                               <span class="caret"></span>
                         </a>
                         <ul class="dropdown-menu">
-                            {% url user_settings as url_usersettings %}
-                            <li><a href="{% url user_settings %}"><i class="icon-cog"></i> {% trans "Profile" %}</a></li>
-                            <li><a href="{% url password_change %}"><i class="icon-lock"></i> {% trans "Change password" %}</a></li>
+                            {% url 'user_settings' as url_usersettings %}
+                            <li><a href="{% url 'user_settings' %}"><i class="icon-cog"></i> {% trans "Profile" %}</a></li>
+                            <li><a href="{% url 'password_change' %}"><i class="icon-lock"></i> {% trans "Change password" %}</a></li>
                             <li class="divider"></li>
-                            <li><a href="{% url user_logout %}"><i class="icon-off"></i> {% trans "Logout" %}</a></li>
+                            <li><a href="{% url 'user_logout' %}"><i class="icon-off"></i> {% trans "Logout" %}</a></li>
                         </ul>
                         {% else %}
-                            <a href="{% url user_login %}" class="btn">{% trans "Login" %}</a>
+                            <a href="{% url 'user_login' %}" class="btn">{% trans "Login" %}</a>
                         {% endif %}
                     </div>
                 </div> <!--/#header-->
@@ -109,7 +110,7 @@
     <script src="{% static 'javascript/jquery.js' %}" type="text/javascript"></script>
     <script src="{% static 'javascript/utils.js' %}" type="text/javascript"></script>
     <script src="{% static 'javascript/bootstrap.min.js' %}" type="text/javascript"></script>
-    <script type="text/javascript" src="{% url django.views.i18n.javascript_catalog %}"></script>
+    <script type="text/javascript" src="{% url 'django.views.i18n.javascript_catalog' %}"></script>
     {% block javascript %}
     {% endblock %}
 </body>
diff --git a/openslides/utils/jsonfield/fields.py b/openslides/utils/jsonfield/fields.py
index 45c66aee4..9b1762214 100644
--- a/openslides/utils/jsonfield/fields.py
+++ b/openslides/utils/jsonfield/fields.py
@@ -1,8 +1,8 @@
+import json
+
 from django.db import models
 from django.core.serializers.json import DjangoJSONEncoder
-from django.utils import simplejson as json
 from django.utils.translation import ugettext_lazy as _
-
 from django.forms.fields import Field
 from django.forms.util import ValidationError as FormValidationError
 
diff --git a/openslides/utils/pdf.py b/openslides/utils/pdf.py
index 4064f109e..cf6db3c44 100755
--- a/openslides/utils/pdf.py
+++ b/openslides/utils/pdf.py
@@ -21,8 +21,7 @@ from reportlab.rl_config import defaultPageSize
 
 from django.conf import settings
 from django.utils import formats
-# Import gettext for python 2.5 support
-from django.utils.translation import ugettext as _, gettext
+from django.utils.translation import ugettext as _
 
 from openslides.config.models import config
 
diff --git a/openslides/utils/utils.py b/openslides/utils/utils.py
index 8c7565337..d5898703b 100644
--- a/openslides/utils/utils.py
+++ b/openslides/utils/utils.py
@@ -11,11 +11,7 @@
 """
 
 import sys
-
-try:
-    import json
-except ImportError:  # For python 2.5 support
-    import simplejson as json
+import json
 
 from django.contrib import messages
 from django.contrib.auth.models import Permission
diff --git a/openslides/utils/views.py b/openslides/utils/views.py
index 9e94d7191..d65156db2 100644
--- a/openslides/utils/views.py
+++ b/openslides/utils/views.py
@@ -10,11 +10,7 @@
     :license: GNU GPL, see LICENSE for more details.
 """
 
-try:
-    import json
-except ImportError:
-    # for python 2.5 support
-    import simplejson as json
+import json
 
 try:
     from cStringIO import StringIO
diff --git a/requirements.txt b/requirements.txt
index e43764974..8602f17e8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,8 +1,7 @@
-Django==1.4.2
-django-mptt
-reportlab
-PIL
-simplejson
-coverage
-django-discover-runner
-pep8
+Django==1.5b2
+django-mptt==0.5.5
+reportlab==2.6
+PIL==1.1.7
+coverage==3.6b1
+django-discover-runner==0.2.2
+pep8==1.3.3

From 369f418b0efb3bee44496695d64ec341704e3e24 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Sat, 5 Jan 2013 15:43:52 +0100
Subject: [PATCH 24/88] Fixed missing endif

---
 openslides/assignment/templates/assignment/view.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openslides/assignment/templates/assignment/view.html b/openslides/assignment/templates/assignment/view.html
index bab75395b..138609886 100644
--- a/openslides/assignment/templates/assignment/view.html
+++ b/openslides/assignment/templates/assignment/view.html
@@ -227,6 +227,7 @@
             </p>
         {% endif %}
     {% endif %}
+{% endif %}
 </div> <!--/span-->
 
 <div class="span3">

From 0231fe37f5830ef20903c39d4c7d2539a6d04f80 Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Sun, 6 Jan 2013 12:07:37 +0100
Subject: [PATCH 25/88] Start to rewrite the motion app

---
 openslides/motion/forms.py                    |  51 +-
 openslides/motion/models.py                   | 705 ++++---------
 .../motion/templates/motion/base_motion.html  |  66 --
 .../motion/templates/motion/config.html       |  22 -
 openslides/motion/templates/motion/edit.html  |  40 -
 .../motion/templates/motion/import.html       |  36 -
 .../templates/motion/motion_detail.html       |  12 +
 .../motion/templates/motion/motion_form.html  |  26 +
 .../motion/templates/motion/motion_list.html  |  16 +
 .../motion/templates/motion/overview.html     |  88 --
 .../motion/templates/motion/poll_view.html    |  64 --
 openslides/motion/templates/motion/view.html  | 303 ------
 .../motion/templates/motion/widget.html       |  34 -
 openslides/motion/urls.py                     | 125 +--
 openslides/motion/views.py                    | 957 +-----------------
 openslides/participant/views.py               |  40 +-
 openslides/utils/views.py                     | 115 +--
 17 files changed, 368 insertions(+), 2332 deletions(-)
 delete mode 100644 openslides/motion/templates/motion/base_motion.html
 delete mode 100644 openslides/motion/templates/motion/config.html
 delete mode 100644 openslides/motion/templates/motion/edit.html
 delete mode 100644 openslides/motion/templates/motion/import.html
 create mode 100644 openslides/motion/templates/motion/motion_detail.html
 create mode 100644 openslides/motion/templates/motion/motion_form.html
 create mode 100644 openslides/motion/templates/motion/motion_list.html
 delete mode 100644 openslides/motion/templates/motion/overview.html
 delete mode 100644 openslides/motion/templates/motion/poll_view.html
 delete mode 100644 openslides/motion/templates/motion/view.html
 delete mode 100644 openslides/motion/templates/motion/widget.html

diff --git a/openslides/motion/forms.py b/openslides/motion/forms.py
index 6fbfc9cff..9f35e4bab 100644
--- a/openslides/motion/forms.py
+++ b/openslides/motion/forms.py
@@ -11,50 +11,39 @@
 """
 
 from django import forms
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import ugettext as _
 
 from openslides.utils.forms import CssClassMixin
 from openslides.utils.person import PersonFormField, MultiplePersonFormField
-from openslides.motion.models import Motion
+from .models import Motion
 
 
-class MotionForm(forms.Form, CssClassMixin):
+class BaseMotionForm(forms.ModelForm, CssClassMixin):
+    class Meta:
+        model = Motion
+        fields = ()
+
+    def __init__(self, *args, **kwargs):
+        motion = kwargs.get('instance', None)
+        if motion is not None:
+            initial = kwargs.setdefault('initial', {})
+            initial['title'] = motion.title
+            initial['text'] = motion.text
+            initial['reason'] = motion.reason
+        super(BaseMotionForm, self).__init__(*args, **kwargs)
+
     title = forms.CharField(widget=forms.TextInput(), label=_("Title"))
     text = forms.CharField(widget=forms.Textarea(), label=_("Text"))
     reason = forms.CharField(
         widget=forms.Textarea(), required=False, label=_("Reason"))
 
 
-class MotionFormTrivialChanges(MotionForm):
-    trivial_change = forms.BooleanField(
-        required=False, label=_("Trivial change"),
-        help_text=_("Trivial changes don't create a new version."))
+class MotionCreateForm(BaseMotionForm):
+    pass
 
 
-class MotionManagerForm(forms.ModelForm, CssClassMixin):
-    submitter = PersonFormField(label=_("Submitter"))
-
-    class Meta:
-        model = Motion
-        exclude = ('number', 'status', 'permitted', 'log', 'supporter')
-
-
-class MotionManagerFormSupporter(MotionManagerForm):
-    # TODO: Do not show the submitter in the user-list
-    supporter = MultiplePersonFormField(required=False, label=_("Supporters"))
-
-
-class MotionImportForm(forms.Form, CssClassMixin):
-    csvfile = forms.FileField(
-        widget=forms.FileInput(attrs={'size': '50'}),
-        label=_("CSV File"),
-    )
-    import_permitted = forms.BooleanField(
-        required=False,
-        label=_("Import motions with status \"authorized\""),
-        help_text=_('Set the initial status for each motion to '
-                    '"authorized"'),
-    )
+class MotionUpdateForm(BaseMotionForm):
+    pass
 
 
 class ConfigForm(forms.Form, CssClassMixin):
diff --git a/openslides/motion/models.py b/openslides/motion/models.py
index 7127e521c..780e848bc 100644
--- a/openslides/motion/models.py
+++ b/openslides/motion/models.py
@@ -31,576 +31,217 @@ from openslides.projector.models import SlideMixin
 from openslides.agenda.models import Item
 
 
-class MotionSupporter(models.Model):
-    motion = models.ForeignKey("Motion")
-    person = PersonField()
+RELATION = (
+    (1, _('Submitter')),
+    (2, _('Supporter')))
 
 
-class Motion(models.Model, SlideMixin):
-    prefix = "motion"
-    STATUS = (
-        ('pub', _('Published')),
-        ('per', _('Permitted')),
-        ('acc', _('Accepted')),
-        ('rej', _('Rejected')),
-        ('wit', _('Withdrawed')),
-        ('adj', _('Adjourned')),
-        ('noc', _('Not Concerned')),
-        ('com', _('Commited a bill')),
-        ('nop', _('Rejected (not authorized)')),
-        ('rev', _('Needs Review')),  # Where is this status used?
-        #additional actions:
-        # edit
-        # delete
-        # setnumber
-        # support
-        # unsupport
-        # createitem
-        # activateitem
-        # genpoll
-    )
-
-    submitter = PersonField(verbose_name=_("Submitter"))
-    number = models.PositiveSmallIntegerField(blank=True, null=True,
-                                              unique=True)
-    status = models.CharField(max_length=3, choices=STATUS, default='pub')
-    permitted = models.ForeignKey('AVersion', related_name='permitted',
-                                  null=True, blank=True)
-    log = models.TextField(blank=True, null=True)
-
-    @property
-    def last_version(self):
-        """
-        Return last version of the motion.
-        """
-        try:
-            return AVersion.objects.filter(motion=self).order_by('id') \
-                                   .reverse()[0]
-        except IndexError:
-            return None
-
-    @property
-    def public_version(self):
-        """
-        Return permitted, if the motion was permitted, else last_version
-        """
-        if self.permitted is not None:
-            return self.permitted
-        else:
-            return self.last_version
-
-    def accept_version(self, version, user=None):
-        """
-        accept a Version
-        """
-        self.permitted = version
-        self.save(nonewversion=True)
-        version.rejected = False
-        version.save()
-        self.writelog(_("Version %d authorized") % version.aid, user)
-
-    def reject_version(self, version, user=None):
-        if version.id > self.permitted.id:
-            version.rejected = True
-            version.save()
-            self.writelog(pgettext(
-                "Rejected means not authorized", "Version %d rejected")
-                % version.aid, user)
-            return True
-        return False
-
-    @property
-    def versions(self):
-        """
-        Return a list of all versions of the motion.
-        """
-        return AVersion.objects.filter(motion=self)
-
-    @property
-    def creation_time(self):
-        """
-        Return the time of the creation of the motion.
-        """
-        try:
-            return self.versions[0].time
-        except IndexError:
-            return None
-
-    @property
-    def notes(self):
-        """
-        Return some information of the motion.
-        """
-        note = []
-        if self.status == "pub" and not self.enough_supporters:
-            note.append(ugettext("Searching for supporters."))
-        if self.status == "pub" and self.permitted is None:
-            note.append(ugettext("Not yet authorized."))
-        elif self.unpermitted_changes and self.permitted:
-            note.append(ugettext("Not yet authorized changes."))
-        return note
-
-    @property
-    def unpermitted_changes(self):
-        """
-        Return True if the motion has unpermitted changes.
-
-        The motion has unpermitted changes, if the permitted-version
-        is not the lastone and the lastone is not rejected.
-        TODO: rename the property in unchecked__changes
-        """
-        if (self.last_version != self.permitted and
-                not self.last_version.rejected):
-            return True
-        else:
-            return False
-
-    @property
-    def supporters(self):
-        return sorted([object.person for object in self.motionsupporter_set.all()],
-                      key=lambda person: person.sort_name)
-
-    def is_supporter(self, person):
-        try:
-            return self.motionsupporter_set.filter(person=person).exists()
-        except AttributeError:
-            return False
-
-    @property
-    def enough_supporters(self):
-        """
-        Return True, if the motion has enough supporters
-        """
-        min_supporters = int(config['motion_min_supporters'])
-        if self.status == "pub":
-            return self.count_supporters() >= min_supporters
-        else:
-            return True
-
-    def count_supporters(self):
-        return self.motionsupporter_set.count()
-
-    @property
-    def missing_supporters(self):
-        """
-        Return number of missing supporters
-        """
-        min_supporters = int(config['motion_min_supporters'])
-        delta = min_supporters - self.count_supporters()
-        if delta > 0:
-            return delta
-        else:
-            return 0
-
-    def save(self, user=None, nonewversion=False, trivial_change=False):
-        """
-        Save the Motion, and create a new AVersion if necessary
-        """
-        super(Motion, self).save()
-        if nonewversion:
-            return
-        last_version = self.last_version
-        fields = ["text", "title", "reason"]
-        if last_version is not None:
-            changed_fields = [
-                f for f in fields
-                if getattr(last_version, f) != getattr(self, f)]
-            if not changed_fields:
-                return  # No changes
-        try:
-            if trivial_change and last_version is not None:
-                last_version.text = self.text
-                last_version.title = self.title
-                last_version.reason = self.reason
-                last_version.save()
-
-                meta = AVersion._meta
-                field_names = [
-                    unicode(meta.get_field(f).verbose_name)
-                    for f in changed_fields]
-
-                self.writelog(
-                    _("Trivial changes to version %(version)d; "
-                      "changed fields: %(changed_fields)s")
-                    % dict(version=last_version.aid,
-                           changed_fields=", ".join(field_names)))
-                return  # Done
-
-            version = AVersion(
-                title=getattr(self, 'title', ''),
-                text=getattr(self, 'text', ''),
-                reason=getattr(self, 'reason', ''),
-                motion=self)
-            version.save()
-            self.writelog(_("Version %s created") % version.aid, user)
-            is_manager = user.has_perm('motion.can_manage_motion')
-        except AttributeError:
-            is_manager = False
-
-        supporters = self.motionsupporter_set.all()
-        if (self.status == "pub" and
-                supporters and not is_manager):
-            supporters.delete()
-            self.writelog(_("Supporters removed"), user)
-
-    def reset(self, user):
-        """
-        Reset the motion.
-        """
-        self.status = "pub"
-        self.permitted = None
-        self.save()
-        self.writelog(_("Status reseted to: %s") % (self.get_status_display()), user)
-
-    def support(self, person):
-        """
-        Add a Supporter to the list of supporters of the motion.
-        """
-        if person == self.submitter:
-            # TODO: Use own Exception
-            raise NameError('Supporter can not be the submitter of a '
-                            'motion.')
-        if not self.is_supporter(person):
-            MotionSupporter(motion=self, person=person).save()
-            self.writelog(_("Supporter: +%s") % (person))
-        # TODO: Raise a precise exception for the view in else-clause
-
-    def unsupport(self, person):
-        """
-        remove a supporter from the list of supporters of the motion
-        """
-        try:
-            self.motionsupporter_set.get(person=person).delete()
-        except MotionSupporter.DoesNotExist:
-            # TODO: Don't do nothing but raise a precise exception for the view
-            pass
-        else:
-            self.writelog(_("Supporter: -%s") % (person))
-
-    def set_number(self, number=None, user=None):
-        """
-        Set a number for ths motion.
-        """
-        if self.number is not None:
-            # TODO: Use own Exception
-            raise NameError('This motion has already a number.')
-        if number is None:
-            try:
-                number = Motion.objects.aggregate(Max('number'))['number__max'] + 1
-            except TypeError:
-                number = 1
-        self.number = number
-        self.save()
-        self.writelog(_("Number set: %s") % (self.number), user)
-        return self.number
-
-    def permit(self, user=None):
-        """
-        Change the status of this motion to permit.
-        """
-        self.set_status(user, "per")
-        aversion = self.last_version
-        if self.number is None:
-            self.set_number()
-        self.permitted = aversion
-        self.save()
-        self.writelog(_("Version %s authorized") % (aversion.aid), user)
-        return self.permitted
-
-    def notpermit(self, user=None):
-        """
-        Change the status of this motion to 'not permitted (rejected)'.
-        """
-        self.set_status(user, "nop")
-        #TODO: reject last version
-        if self.number is None:
-            self.set_number()
-        self.save()
-        self.writelog(_("Version %s not authorized") % (self.last_version.aid), user)
-
-    def set_status(self, user, status, force=False):
-        """
-        Set the status of the motion.
-        """
-        error = True
-        for a, b in Motion.STATUS:
-            if status == a:
-                error = False
+class RelatedPersonsManager(models.Manager):
+    def __init__(self, relation, *args, **kwargs):
+        super(RelatedPersonsManager, self).__init__(*args, **kwargs)
+        for key, value in RELATION:
+            if key == relation:
+                self.relation = key
                 break
-        if error:
-            # TODO: Use the Right Error
-            raise NameError(_('%s is not a valid status.') % status)
-        if self.status == status:
-            # TODO: Use the Right Error
-            raise NameError(_('The motion status is already \'%s.\'')
-                            % self.status)
+        else:
+            raise ValueError('Unknown relation with id %d' % relation)
 
-        actions = []
-        actions = self.get_allowed_actions(user)
-        if status not in actions and not force:
-            #TODO: Use the Right Error
-            raise NameError(_(
-                'The motion status is: \'%(currentstatus)s\'. '
-                'You can not set the status to \'%(newstatus)s\'.') % {
-                    'currentstatus': self.status,
-                    'newstatus': status})
+    def get_query_set(self):
+        return (super(RelatedPersonsManager, self).get_query_set()
+                .filter(relation=self.relation))
 
-        oldstatus = self.get_status_display()
-        self.status = status
-        self.save()
-        self.writelog(_("Status modified") + ": %s -> %s"
-                      % (oldstatus, self.get_status_display()), user)
 
-    def get_allowed_actions(self, user):
-        """
-        Return a list of all the allowed status.
-        """
-        actions = []
+class MotionRelatedPersons(models.Model):
+    submitter = RelatedPersonsManager(relation=1)
+    supporter = RelatedPersonsManager(relation=2)
+    objects = models.Manager()
 
-        # check if user allowed to withdraw an motion
-        if  ((self.status == "pub"
-          and self.number
-          and user == self.submitter)
-        or   (self.status == "pub"
-          and self.number
-          and user.has_perm("motion.can_manage_motion"))
-        or   (self.status == "per"
-          and user == self.submitter)
-        or (self.status == "per"
-          and user.has_perm("motion.can_manage_motion"))):
-            actions.append("wit")
-        #Check if the user can review the motion
-        if  (self.status == "rev"
-        and (self.submitter == user
-          or user.has_perm("motion.can_manage_motion"))):
-            actions.append("pub")
+    person = PersonField()
+    relation = models.IntegerField(default=1, choices=RELATION)
+    motion = models.ForeignKey('Motion', related_name="persons")
 
-        # Check if the user can support and unspoort the motion
-        if  (self.status == "pub"
-          and user != self.submitter
-          and not self.is_supporter(user)):
-            actions.append("support")
 
-        if self.status == "pub" and self.is_supporter(user):
-            actions.append("unsupport")
+class Motion(SlideMixin, models.Model):
+    prefix = "motion"  # Rename this in the slide-system
 
-        #Check if the user can edit the motion
-        if (user == self.submitter \
-          and (self.status in ('pub', 'per'))) \
-        or user.has_perm("motion.can_manage_motion"):
-            actions.append("edit")
+    # TODO: Use this attribute for the default_version, if the permission system
+    #       is deactivated. Maybe it has to be renamed.
+    permitted_version = models.ForeignKey(
+        'MotionVersion', null=True, blank=True, related_name="permitted")
+    # TODO: Define status
+    status = models.CharField(max_length=3)
+    # Log (Translatable)
+    identifier = models.CharField(max_length=255, null=True, blank=True,
+                                  unique=True)
+    category = models.ForeignKey('Category', null=True, blank=True)
+    # TODO proposal
+    # Maybe rename to master_copy
+    master = models.ForeignKey('self', null=True, blank=True)
 
-        # Check if the user can delete the motion (admin, manager, owner)
-        # reworked as requiered in #100
-        if (user.has_perm("motion.can_delete_all_motions") or
-           (user.has_perm("motion.can_manage_motion") and
-               self.number is None) or
-           (self.submitter == user and self.number is None)):
-            actions.append("delete")
+    class Meta:
+        permissions = (
+            ('can_see_motion', ugettext_noop('Can see motions')),
+            ('can_create_motion', ugettext_noop('Can create motions')),
+            ('can_support_motion', ugettext_noop('Can support motions')),
+            ('can_manage_motion', ugettext_noop('Can manage motions')),
+        )
+        # TODO: order per default by category and identifier
+        # ordering = ('number',)
 
-        #For the rest, all actions need the manage permission
-        if not user.has_perm("motion.can_manage_motion"):
-            return actions
+    def __unicode__(self):
+        return self.get_title()
 
-        if self.status == "pub":
-            actions.append("nop")
-            actions.append("per")
-            if self.number == None:
-                actions.append("setnumber")
-
-        if self.status == "per":
-            actions.append("acc")
-            actions.append("rej")
-            actions.append("adj")
-            actions.append("noc")
-            actions.append("com")
-            actions.append("genpoll")
-            if self.unpermitted_changes:
-                actions.append("permitversion")
-                actions.append("rejectversion")
-
-        return actions
-
-    def delete(self, force=False):
-        """
-        Delete the motion. It is not possible, if the motion has
-        allready a number
-        """
-        if self.number and not force:
-            raise NameError('The motion has already a number. '
-                            'You can not delete it.')
-
-        for item in Item.objects.filter(related_sid=self.sid):
-            item.delete()
-        super(Motion, self).delete()
-
-    def writelog(self, text, user=None):
-        if not self.log:
-            self.log = ""
-        self.log += u"%s | %s" % (datetime.now().strftime("%d.%m.%Y %H:%M:%S"), _propper_unicode(text))
-        if user is not None:
-            if isinstance(user, User):
-                self.log += u" (%s %s)" % (_("by"), _propper_unicode(user.username))
-            else:
-                self.log += u" (%s %s)" % (_("by"), _propper_unicode(str(user)))
-        self.log += "\n"
-        self.save()
-
-    def get_agenda_title(self):
-        return self.public_version.title
-
-    def get_agenda_title_supplement(self):
-        number = self.number or '<i>[%s]</i>' % ugettext('no number')
-        return '(%s %s)' % (ugettext('motion'), number)
-
-    def __getattr__(self, name):
-        """
-        if name is title, text, reason or time,
-            Return this attribute from the newest version of the motion
-        """
-        if name in ('title', 'text', 'reason', 'time', 'aid'):
+    # TODO: Use transaction
+    def save(self, *args, **kwargs):
+        super(Motion, self).save(*args, **kwargs)
+        new_data = False
+        for attr in ['_title', '_text', '_reason']:
+            if hasattr(self, attr):
+                new_data = True
+                break
+        need_new_version = True #  TODO: Do we need a new version (look in config)
+        if hasattr(self, '_version') or (new_data and need_new_version):
+            version = self.new_version
+            del self._new_version
+            version.motion = self  # Test if this line is realy neccessary.
+        elif new_data and not need_new_version:
+            # TODO: choose an explicit version
+            version = self.last_version
+        else:
+            # We do not need to save the motion version
+            return
+        for attr in ['title', 'text', 'reason']:
+            _attr = '_%s' % attr
             try:
-                if name == 'aid':
-                    return self.last_version.aid
-                return self.last_version.__dict__[name]
-            except TypeError:
-                raise AttributeError(name)
+                setattr(version, attr, getattr(self, _attr))
             except AttributeError:
-                raise AttributeError(name)
-        raise AttributeError(name)
+                setattr(version, attr, getattr(self.last_version, attr))
+        version.save()
 
-    def gen_poll(self, user=None):
-        """
-        Generates a poll object for the motion
-        """
-        poll = MotionPoll(motion=self)
-        poll.save()
-        poll.set_options()
-        self.writelog(_("Poll created"), user)
-        return poll
-
-    @property
-    def polls(self):
-        return self.motionpoll_set.all()
-
-    @property
-    def results(self):
-        return self.get_poll_results()
-
-    def get_poll_results(self):
-        """
-        Return a list of voting results
-        """
-        results = []
-        for poll in self.polls:
-            for option in poll.get_options():
-                if option.get_votes().exists():
-                    results.append((
-                        option['Yes'], option['No'],
-                        option['Abstain'], poll.print_votesinvalid(),
-                        poll.print_votescast()))
-        return results
-
-    def slide(self):
-        """
-        return the slide dict
-        """
-        data = super(Motion, self).slide()
-        data['motion'] = self
-        data['title'] = self.title
-        data['template'] = 'projector/Motion.html'
-        return data
-
-    def get_absolute_url(self, link='view'):
-        if link == 'view':
-            return reverse('motion_view', args=[str(self.id)])
+    def get_absolute_url(self, link='detail'):
+        if link == 'view' or link == 'detail':
+            return reverse('motion_detail', args=[str(self.id)])
         if link == 'edit':
             return reverse('motion_edit', args=[str(self.id)])
         if link == 'delete':
             return reverse('motion_delete', args=[str(self.id)])
 
-    def __unicode__(self):
+    def get_title(self):
         try:
-            return self.last_version.title
+            return self._title
         except AttributeError:
-            return "no title jet"
+            return self.default_version.title
 
-    class Meta:
-        permissions = (
-            ('can_see_motion', ugettext_noop("Can see motions")),
-            ('can_create_motion', ugettext_noop("Can create motions")),
-            ('can_support_motion', ugettext_noop("Can support motions")),
-            ('can_manage_motion', ugettext_noop("Can manage motions")),
-        )
-        ordering = ('number',)
+    def set_title(self, title):
+        self._title = title
 
+    title = property(get_title, set_title)
 
-class AVersion(models.Model):
-    title = models.CharField(max_length=100, verbose_name=_("Title"))
-    text = models.TextField(verbose_name=_("Text"))
-    reason = models.TextField(null=True, blank=True, verbose_name=_("Reason"))
-    rejected = models.BooleanField()  # = Not Permitted
-    time = models.DateTimeField(auto_now=True)
-    motion = models.ForeignKey(Motion)
+    def get_text(self):
+        try:
+            return self._text
+        except AttributeError:
+            return self.default_version.text
 
-    def __unicode__(self):
-        return "%s %s" % (self.id, self.title)
+    def set_text(self, text):
+        self._text = text
+
+    text = property(get_text, set_text)
+
+    def get_reason(self):
+        try:
+            return self._reason
+        except AttributeError:
+            return self.default_version.reason
+
+    def set_reason(self, reason):
+        self._reason = reason
+
+    reason = property(get_reason, set_reason)
 
     @property
-    def aid(self):
+    def new_version(self):
         try:
-            return self._aid
+            return self._new_version
         except AttributeError:
-            self._aid = AVersion.objects \
-                .filter(motion=self.motion) \
-                .filter(id__lte=self.id).count()
-            return self._aid
+            self._new_version = MotionVersion(motion=self)
+            return self._new_version
 
-register_slidemodel(Motion)
+    @property
+    def submitter(self):
+        return MotionRelatedPersons.submitter.filter(motion=self)
+
+    @property
+    def supporter(self):
+        return MotionRelatedPersons.supporter.filter(motion=self)
+
+    def get_version(self, version_id):
+        # TODO: Check case, if version_id is not one of this motion
+        return self.versions.get(pk=version_id)
 
 
-class MotionVote(BaseVote):
-    option = models.ForeignKey('MotionOption')
+    def get_default_version(self):
+        try:
+            return self._default_version
+        except AttributeError:
+            # TODO: choose right version via config
+            return self.last_version
+
+    def set_default_version(self, version):
+        if version is None:
+            try:
+                del self._default_version
+            except AttributeError:
+                pass
+        else:
+            if type(version) is int:
+                version = self.versions.all()[version]
+            elif type(version) is not MotionVersion:
+                raise ValueError('The argument \'version\' has to be int or '
+                                 'MotionVersion, not %s' % type(version))
+            self._default_version = version
+
+    default_version = property(get_default_version, set_default_version)
+
+    @property
+    def last_version(self):
+        # TODO: Fix the case, that the motion has no Version
+        try:
+            return self.versions.order_by('id').reverse()[0]
+        except IndexError:
+            return self.new_version
 
 
-class MotionOption(BaseOption):
-    poll = models.ForeignKey('MotionPoll')
-    vote_class = MotionVote
+class MotionVersion(models.Model):
+    title = models.CharField(max_length=255, verbose_name=_("Title"))
+    text = models.TextField(verbose_name=_("Text"))
+    reason = models.TextField(null=True, blank=True, verbose_name=_("Reason"))
+    rejected = models.BooleanField(default=False)
+    creation_time = models.DateTimeField(auto_now=True)
+    motion = models.ForeignKey(Motion, related_name='versions')
+    identifier = models.CharField(max_length=255, verbose_name=_("Version identifier"))
+    note = models.TextField(null=True, blank=True)
+
+    def __unicode__(self):
+        return "%s Version %s" % (self.motion, self.get_version_number())
+
+    def get_version_number(self):
+        if self.pk is None:
+            return 'new'
+        return (MotionVersion.objects.filter(motion=self.motion)
+                                     .filter(id__lte=self.pk).count())
 
 
-class MotionPoll(BasePoll, CountInvalid, CountVotesCast):
-    option_class = MotionOption
-    vote_values = [
-        ugettext_noop('Yes'), ugettext_noop('No'), ugettext_noop('Abstain')]
+class Category(models.Model):
+    name = models.CharField(max_length=255, verbose_name=_("Category name"))
+    prefix = models.CharField(max_length=32, verbose_name=_("Category prefix"))
 
-    motion = models.ForeignKey(Motion)
-
-    def get_motion(self):
-        return self.motion
-
-    def set_options(self):
-        #TODO: maybe it is possible with .create() to call this without poll=self
-        self.get_option_class()(poll=self).save()
-
-    def append_pollform_fields(self, fields):
-        CountInvalid.append_pollform_fields(self, fields)
-        CountVotesCast.append_pollform_fields(self, fields)
-
-    def get_absolute_url(self):
-        return reverse('motion_poll_view', args=[self.id])
-
-    def get_ballot(self):
-        return self.motion.motionpoll_set.filter(id__lte=self.id).count()
+    def __unicode__(self):
+        return self.name
 
 
-@receiver(default_config_value, dispatch_uid="motion_default_config")
-def default_config(sender, key, **kwargs):
-    return {
-        'motion_min_supporters': 0,
-        'motion_preamble': _('The assembly may decide,'),
-        'motion_pdf_ballot_papers_selection': 'CUSTOM_NUMBER',
-        'motion_pdf_ballot_papers_number': '8',
-        'motion_pdf_title': _('Motions'),
-        'motion_pdf_preamble': '',
-        'motion_allow_trivial_change': False,
-    }.get(key)
+class Comment(models.Model):
+    motion_version = models.ForeignKey(MotionVersion)
+    text = models.TextField()
+    author = PersonField()
+    creation_time = models.DateTimeField(auto_now=True)
diff --git a/openslides/motion/templates/motion/base_motion.html b/openslides/motion/templates/motion/base_motion.html
deleted file mode 100644
index 0dc5846a6..000000000
--- a/openslides/motion/templates/motion/base_motion.html
+++ /dev/null
@@ -1,66 +0,0 @@
-{% extends "base.html" %}
-
-{% load tags %}
-{% load i18n %}
-{% load staticfiles %}
-
-{% block submenu %}
-    {% url 'motion_overview' as url_motionoverview %}
-    <h4>{% trans "Motions" %}</h4>
-    <ul>
-        <li class="{% if request.path == url_motionoverview %}selected{% endif %}"><a href="{% url 'motion_overview' %}">{% trans "All motions" %}</a></li>
-        {% if perms.motion.can_create_motion or perms.motion.can_manage_motion %}
-            <li class="{% active request '/motion/new' %}"><a href="{% url 'motion_new' %}">{% trans "New motion" %}</a></li>
-        {% endif %}
-        {% if perms.motion.can_manage_motion %}
-            <li class="{% active request '/motion/import' %}"><a href="{% url 'motion_import' %}">{% trans 'Import motions' %}</a></li>
-        {% endif %}
-        <li><a href="{% url 'print_motions' %}"><img src="{% static 'images/icons/pdf.png' %}"> {% trans 'All motions as PDF' %}</a></li>
-    </ul>
-
-    {# second submenu #}
-    {% if motion %}
-        <br>
-        <h3>{% trans "Motion No." %}
-            {% if motion.number != None %}
-                {{ motion.number }}
-            {% else %}
-                <i>[-]</i>
-            {% endif %}
-        </h3>
-        <ul>
-        {# view motion #}
-            {% url 'motion_view' motion.id as url_motionview %}
-            <li class="{% if request.path == url_motionview %}selected{% endif %}"><a href="{% url 'motion_view' motion.id  %}">{% trans 'View motion' %}</a></li>
-        {# edit motion #}
-            {% if "edit" in actions %}
-            {% url 'motion_edit' motion.id as url_motionedit %}
-            <li class="{% if request.path == url_motionedit %}selected{% endif %}"><a href="{% url 'motion_edit' motion.id  %}"><img src="{% static 'images/icons/edit.png' %}"> {% trans 'Edit motion' %}</a></li>
-            {% endif %}
-        {# delete motion #}
-            {% if "delete" in actions %}
-            <li><a href="{% url 'motion_delete' motion.id  %}"><img src="{% static 'images/icons/delete.png' %}"> {% trans 'Delete motion' %}</a></li>
-            {% endif %}
-        {# PDF #}
-            <li><a href="{% url 'print_motion' motion.id  %}"><img src="{% static 'images/icons/pdf.png' %}"> {% trans 'Motion as PDF' %}</a></li>
-        {# activate and polls #}
-            {% if perms.projector.can_manage_projector %}
-                <li>
-                    <a class="activate_link {% if item.active %}active{% endif %}" href="{% url 'projector_activate_slide' motion.sid  %}"><img src="{% static 'images/icons/projector.png' %}"> {% trans 'Show Motion' %}</a>
-                </li>
-            {% endif %}
-            {% if perms.motion.can_manage_motion %}
-                {% for poll in motion.polls %}
-                    {% url 'motion_poll_view' poll.id as url_motionpollview %}
-                    <li class="{% if request.path == url_motionpollview %}selected{% endif %}"><a href="{% url 'motion_poll_view' poll.id %}"><img src="{% static 'images/icons/edit.png' %}"> {{ forloop.counter }}. {% trans "Vote" %}</a></li>
-                {% endfor %}
-            {% endif %}
-        {# Agenda Item #}
-            {% if perms.agenda.can_manage_agenda %}
-            <li>
-                <a href="{% url 'motion_create_agenda' motion.id  %}">{% trans 'New agenda item' %}</a>
-            </li>
-            {% endif %}
-        </ul>
-    {% endif %}
-{% endblock %}
diff --git a/openslides/motion/templates/motion/config.html b/openslides/motion/templates/motion/config.html
deleted file mode 100644
index 42e064444..000000000
--- a/openslides/motion/templates/motion/config.html
+++ /dev/null
@@ -1,22 +0,0 @@
-{% extends "config/base_config.html" %}
-
-{% load i18n %}
-
-{% block title %}{{ block.super }} – {% trans "Motion settings" %}{% endblock %}
-
-{% block content %}
-    <h1>{% trans "Motion settings" %}</h1>
-    <form action="" method="post">{% csrf_token %}
-    {{ form.as_p }}
-    <p>
-    <button class="button" type="submit">
-        <span class="icon ok">{% trans 'Save' %}</span>
-    </button>
-    <a href="{% url 'config_motion' %}">
-    <button class="button" type="button" onclick="window.location='{% url 'config_motion' %}'">
-        <span class="icon cancel">{% trans 'Cancel' %}</span>
-    </button>
-    </a>
-    </p>
-    </form>
-{% endblock %}
diff --git a/openslides/motion/templates/motion/edit.html b/openslides/motion/templates/motion/edit.html
deleted file mode 100644
index 7c5f09ed4..000000000
--- a/openslides/motion/templates/motion/edit.html
+++ /dev/null
@@ -1,40 +0,0 @@
-{% extends "motion/base_motion.html" %}
-
-{% load i18n %}
-
-{% block title %}
-    {{ block.super }} –
-    {% if motion %}
-        {% trans "Edit motion" %}
-    {% else %}
-        {% trans "New motion" %}
-    {% endif %}
-{% endblock %}
-
-{% block content %}
-    {% if motion %}
-        <h1>{% trans "Edit motion" %}</h1>
-    {% else %}
-        <h1>{% trans "New motion" %}</h1>
-    {% endif %}
-
-    <form action="" method="post">{% csrf_token %}
-        {{ form.as_p }}
-        {{ managerform.as_p }}
-        <p>
-        <button class="button" type="submit">
-            <span class="icon ok">{% trans 'Save' %}</span>
-        </button>
-        <button class="button" type="submit" name="apply">
-            <span class="icon apply">{% trans 'Apply' %}</span>
-        </button>
-        <a href="{% url 'motion_overview' %}">
-        <button class="button" type="button" onclick="window.location='{% url 'motion_overview' %}'">
-            <span class="icon cancel">{% trans 'Cancel' %}</span>
-        </button>
-        </a>
-        </p>
-        <small>* {% trans "required" %}</small>
-    </form>
-
-{% endblock %}
diff --git a/openslides/motion/templates/motion/import.html b/openslides/motion/templates/motion/import.html
deleted file mode 100644
index 8a0d8eab1..000000000
--- a/openslides/motion/templates/motion/import.html
+++ /dev/null
@@ -1,36 +0,0 @@
-{% extends "motion/base_motion.html" %}
-
-{% load i18n %}
-
-{% block title %}{{ block.super }} – {% trans "Import motions" %} {% endblock %}
-
-{% block content %}
-    <h1>{% trans "Import motions" %}</h1>
-    <p>{% trans 'Select a CSV file to import motions!' %}</p>
-
-    <p>{% trans 'Required comma separated values' %}:
-    <code>({% trans 'number, title, text, reason, first_name, last_name, is_group' %})</code>
-    <br>
-    {% trans '<code>number</code>, <code>reason</code> and <code>is_group</code> are optional and may be empty' %}.
-    <br>
-    {% trans 'Required CSV file encoding: UTF-8 (Unicode).' %}
-    </p>
-
-    <p><a href="http://dev.openslides.org/wiki/CSVImport" target="_blank">{% trans 'A CSV example file is available in OpenSlides Wiki.' %}</a>
-    </p>
-
-    <form enctype="multipart/form-data" action="" method="post">{% csrf_token %}
-        {{ form.as_p }}
-        <p>
-        <button class="button" type="submit">
-            <span class="icon import">{% trans 'Import' %}</span>
-        </button>
-        <a href="{% url 'motion_overview' %}">
-        <button class="button" type="button"  onclick="window.location='{% url 'motion_overview' %}'">
-            <span class="icon cancel">{% trans 'Cancel' %}</span>
-        </button>
-        </a>
-        </p>
-        <small>* {% trans "required" %}</small>
-    </form>
-{% endblock %}
diff --git a/openslides/motion/templates/motion/motion_detail.html b/openslides/motion/templates/motion/motion_detail.html
new file mode 100644
index 000000000..9cd880936
--- /dev/null
+++ b/openslides/motion/templates/motion/motion_detail.html
@@ -0,0 +1,12 @@
+{% extends "base.html" %}
+
+{% load tags %}
+{% load i18n %}
+{% load staticfiles %}
+
+{% block title %}{{ block.super }} – {% trans "Motion" %} "{{ version.title }}"{% endblock %}
+
+{% block content %}
+<p>Titel: {{ object.title }} </p>
+<p>Text: {{ object.text }}</p>
+{% endblock %}
diff --git a/openslides/motion/templates/motion/motion_form.html b/openslides/motion/templates/motion/motion_form.html
new file mode 100644
index 000000000..ddffb8254
--- /dev/null
+++ b/openslides/motion/templates/motion/motion_form.html
@@ -0,0 +1,26 @@
+{% extends "base.html" %}
+
+{% load tags %}
+{% load i18n %}
+{% load staticfiles %}
+
+{% block title %}{{ block.super }} – {% trans "Motion Form" %}{% endblock %}
+
+{% block content %}
+    <h1>{% trans "Motions Forms" %}</h1>
+    <form action="" method="post">{% csrf_token %}
+        {{ form.as_p }}
+        <button class="button" type="submit">
+            <span class="icon ok">{% trans 'Save' %}</span>
+        </button>
+        <button class="button" type="submit" name="apply">
+            <span class="icon apply">{% trans 'Apply' %}</span>
+        </button>
+        <a href="{% url 'motion_list' %}">
+            <button class="button" type="button" onclick="window.location='{% url 'motion_list' %}'">
+                <span class="icon cancel">{% trans 'Cancel' %}</span>
+            </button>
+        </a>
+        <small>* {% trans "required" %}</small>
+    </form>
+{% endblock %}
diff --git a/openslides/motion/templates/motion/motion_list.html b/openslides/motion/templates/motion/motion_list.html
new file mode 100644
index 000000000..32118ff73
--- /dev/null
+++ b/openslides/motion/templates/motion/motion_list.html
@@ -0,0 +1,16 @@
+{% extends "base.html" %}
+
+{% load tags %}
+{% load i18n %}
+{% load staticfiles %}
+
+{% block title %}{{ block.super }} – {% trans "Motions" %}{% endblock %}
+
+{% block content %}
+    <h1>{% trans "Motions" %}</h1>
+    <ul>
+    {% for motion in motion_list %}
+        <li>{{ motion }}</li>
+    {% endfor %}
+    </ul>
+{% endblock %}
diff --git a/openslides/motion/templates/motion/overview.html b/openslides/motion/templates/motion/overview.html
deleted file mode 100644
index e11c6f2b5..000000000
--- a/openslides/motion/templates/motion/overview.html
+++ /dev/null
@@ -1,88 +0,0 @@
-{% extends "motion/base_motion.html" %}
-
-{% load tags %}
-{% load i18n %}
-{% load staticfiles %}
-
-{% block title %}{{ block.super }} – {% trans "Motions" %}{% endblock %}
-
-{% block content %}
-    <h1>{% trans "Motions" %}</h1>
-    <p><form action="{{ request.url }}" name="filter" method="get">
-        {% trans "Filter" %}:
-        {% if min_supporters > 0 %}
-        <input type="checkbox" name="needsup" onchange="document.forms['filter'].submit()"
-            {% if 'on' in request.GET.needsup %}checked{% endif %}> {% trans "Need supporters" %} &nbsp;
-        {% endif %}
-        <input type="checkbox" name="number" onchange="document.forms['filter'].submit()"
-            {% if 'on' in request.GET.number %}checked{% endif %}> {% trans "Without number" %} &nbsp;
-        <input type="checkbox" name="status" onchange="document.forms['filter'].submit()"
-            {% if 'on' in request.GET.status %}checked{% endif %}> {% trans "Status" %}:
-        <select class="default-input" name="statusvalue" onchange="{% if 'on' in request.GET.status %}document.forms['filter'].submit(){% endif %}">
-            <option value="pub" {% if 'pub' in request.GET.statusvalue %}selected{% endif %}>{% trans "Not yet authorized" %}</option>
-            <option value="per" {% if 'on' in request.GET.status and 'per' in request.GET.statusvalue %}selected{% endif %}>{% trans "Authorized" %}</option>
-            <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 "Withdrawen (by submitter)" %}</option>
-            <option value="rev" {% if 'rev' in request.GET.statusvalue %}selected{% endif %}>{% trans "Needs Review" %}</option>
-        </select>
-        </form>
-    </p>
-    {{ motions|length }}
-    {% blocktrans count counter=motions|length context "number of motions"%}motion{% plural %}motions{% endblocktrans %}
-    <table>
-        <tr>
-            <th><a href="?sort=number{% if 'number' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Number" %}</a></th>
-            <th><a href="?sort=title{% if 'title' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Motion title" %}</a></th>
-            {% if min_supporters > 0 %}
-            <th><a href="?sort=supporter{% if 'supporter' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Number of supporters" %}</a></th>
-            {% endif %}
-            <th><a href="?sort=status{% if 'status' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Status" %}</a></th>
-            <th><a href="?sort=submitter{% if 'submitter' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Submitter" %}</a></th>
-            <th><a href="?sort=time{% if 'time' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Creation Time" %}<a></th>
-            <th style="width: 1px;">{% trans "Actions" %}</th>
-        </tr>
-    {% for app_info in motions %}
-    {% with motion=app_info.motion useractions=app_info.actions %}
-        <tr class="{% cycle '' 'odd' %}
-            {% if motion.active %}activeline{% endif %}">
-            <td>{% if motion.number %}{{ motion.number }}{% else %}-{% endif %}</td>
-            <td><a href="{% url 'motion_view' motion.id %}">{{ motion.public_version.title }}</a></td>
-        {% if min_supporters > 0 %}
-            <td>{{ motion.count_supporters }}</td>
-        {% endif %}
-            <td>{% if motion.status != "pub" %}
-                {{ motion.get_status_display }}<br>
-                {% endif %}
-                {% for note in motion.notes %}
-                {{ note }}
-                {% if not forloop.last %}<br>{%endif%}
-                {% endfor %}
-            </td>
-            <td>{{ motion.submitter }}</td>
-            <td>{{ motion.creation_time }}</td>
-            <td>
-                <span style="width: 1px; white-space: nowrap;">
-                {% if perms.projector.can_manage_projector %}
-                    <a class="activate_link {% if motion.active %}active{% endif %}" href="{% url 'projector_activate_slide' motion.sid %}" title="{% trans 'Activate motion' %}">
-                        <span></span>
-                    </a>
-                {% endif %}
-                {% if perms.motion.can_manage_motion %}
-                    <a href="{% url 'motion_edit' motion.id %}"><img src="{% static 'images/icons/edit.png' %}" title="{% trans 'Edit motion' %}"></a>
-                    {% if "delete" in useractions %}
-                    <a href="{% url 'motion_delete' motion.id %}"><img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Delete motion' %}"></a>
-                    {% endif %}
-                {% endif %}
-                <a href="{% url 'print_motion' motion.id  %}" title="{% trans 'Motion as PDF' %}"><img src="{% static 'images/icons/pdf.png' %}"></a>
-                </span>
-            </td>
-        </tr>
-    {% endwith %}
-    {% empty %}
-        <tr>
-        <td colspan="7"><i>{% trans "No motions available." %}</i></td>
-        </tr>
-    {% endfor %}
-    </table>
-{% endblock %}
diff --git a/openslides/motion/templates/motion/poll_view.html b/openslides/motion/templates/motion/poll_view.html
deleted file mode 100644
index 9894cd51e..000000000
--- a/openslides/motion/templates/motion/poll_view.html
+++ /dev/null
@@ -1,64 +0,0 @@
-{% extends 'motion/base_motion.html' %}
-
-{% load i18n %}
-{% load staticfiles %}
-
-{% block title %}
-    {{ block.super }} – {% trans "Motion" %} "{{ motion.public_version.title }}"
-    – {{ ballot }}. {% trans "Vote" %}
-{% endblock %}
-
-{% block content %}
-    <h1>{{ motion.public_version.title }} ({% trans "Motion" %}
-    {{ motion.number }}) – {{ ballot }}. {% trans "Vote" %}</h1>
-    <i class="helptext">{% trans "Special values" %}: -1 = {% trans 'majority' %}; -2 = {% trans 'undocumented' %}</i>
-    <form action="" method="post" class="small-form">{% csrf_token %}
-        {{ pre_form }}
-        <span id="poll_id" style="display:none">{{ poll.id }}</span>
-
-        <table class="table" style="width: auto;">
-            <tr>
-                <th>{% trans "Option" %}</th>
-                <th>{% trans "Votes" %}</th>
-            </tr>
-            {% for value in forms.0 %}
-                <tr>
-                    <td>{{ value.label }}</td>
-                    <td>{{ value.errors }}{{ value }}</td>
-                </tr>
-            {% endfor %}
-            <tr class="total">
-                <td>{% trans "Invalid votes" %}</td>
-                <td>{{ pollform.votesinvalid.errors }}{{ pollform.votesinvalid }}</td>
-            </tr>
-            <tr class="total">
-                <td>{% trans "Votes cast" %}</td>
-                <td>{{ pollform.votescast.errors }}{{ pollform.votescast }}</td>
-            </tr>
-        </table>
-
-        {{ post_form }}
-
-        <p>
-        <a href="{% url 'print_motion_poll' poll.id %}">
-        <button class="button" type="button" onclick="window.location='{% url 'print_motion_poll' poll.id %}'">
-            <span class="icon pdf">{% trans 'Ballot paper as PDF' %}</span>
-        </button>
-        </a>
-        </p>
-
-        <p>
-        <button class="button" type="submit">
-            <span class="icon ok">{% trans 'Save' %}</span>
-        </button>
-        <button class="button" type="submit" name="apply">
-            <span class="icon apply">{% trans 'Apply' %}</span>
-        </button>
-        <a href="{% url 'motion_view' motion.id %}">
-        <button class="button" type="button" onclick="window.location='{% url 'motion_view' motion.id %}'">
-            <span class="icon cancel">{% trans 'Cancel' %}</span>
-        </button>
-        </a>
-        </p>
-    </form>
-{% endblock %}
diff --git a/openslides/motion/templates/motion/view.html b/openslides/motion/templates/motion/view.html
deleted file mode 100644
index 3d2ad91b1..000000000
--- a/openslides/motion/templates/motion/view.html
+++ /dev/null
@@ -1,303 +0,0 @@
-{% extends "motion/base_motion.html" %}
-
-{% load tags %}
-{% load i18n %}
-{% load staticfiles %}
-
-{% block title %}{{ block.super }} – {% trans "Motion" %} "{{ version.title }}"{% endblock %}
-
-
-{% block submenu %}
-    {{ block.super }}
-
-{% endblock %}
-
-{% block content %}
-<div id="sidebar">
-    <div class="box">
-    <h4>{% trans "Submitter" %}:</h4>
-    {{ motion.submitter }}
-
-    {% if min_supporters > 0 %}
-        <h4>{% trans "Supporters" %}: *</h4>
-        {% if not motion.supporters %}
-        -
-        {% else %}
-            <ol>
-            {% for supporter in motion.supporters %}
-                <li> {{ supporter }}</li>
-            {% endfor %}
-            </ol>
-        {% endif %}
-    {% endif %}
-
-    <h4>{% trans "Status" %}:</h4>
-    {% if motion.status != "pub" %}
-    {% trans motion.get_status_display %}
-    <br>
-    {% endif %}
-    {% for note in motion.notes %}
-        {{ note }}
-    {% if not forloop.last %}<br>{% endif %}
-    {% endfor %}
-
-    <h4>{% trans "Vote results" %}:</h4>
-        {% with motion.polls as polls %}
-        {% if not polls.exists %}
-            {% if perms.motion.can_manage_motion %}
-                {% if "genpoll" in actions %}
-                <a href="{% url 'motion_gen_poll' motion.id %}">
-                    <span class="button">
-                        <span class="icon statistics">{% trans 'New vote' %}</span>
-                    </span>
-                </a>
-                {% else %}
-                -
-                {% endif %}
-            {% else %}
-            -
-            {% endif %}
-        {% endif %}
-        <ul class="results">
-        {% for poll in polls %}
-        {% if perms.motion.can_manage_motion or poll.has_votes %}
-            <li>
-                {% if perms.motion.can_manage_motion %}
-                    <strong>{{ forloop.counter }}. {% trans "Vote" %} </strong>
-                    <a class="icon edit" href="{% url 'motion_poll_view' poll.id %}" title="{% trans 'Edit Vote' %}">
-                            <span></span>
-                    </a>
-                    <a class="icon delete" href="{% url 'motion_poll_delete' poll.id %}" title="{% trans 'Delete Vote' %}">
-                        <span></span>
-                    </a>
-                {% elif poll.has_votes %}
-                    <strong>{{ forloop.counter }}. {% trans "Vote" %}:</strong>
-                {% endif %}
-                <br>
-                {% if poll.has_votes %}
-                    {% with poll.get_options.0 as option %}
-                        <img src="{% static 'images/icons/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ option.Yes }}<br>
-                        <img src="{% static 'images/icons/voting-no.png' %}" title="{% trans 'No' %}"> {{ option.No }}<br>
-                        <img src="{% static 'images/icons/voting-abstention.png' %}" title="{% trans 'Abstention' %}"> {{ option.Abstain }}<br>
-                        <img src="{% static 'images/icons/voting-invalid.png' %}" title="{% trans 'Invalid' %}"> {{ poll.print_votesinvalid }}<br>
-                        <div style="border-top: 1px solid; padding-top: 5px; margin: 5px 0; width: 10em;">
-                            <img src="{% static 'images/icons/voting-total.png' %}" title="{% trans 'Votes cast' %}"> {{ poll.print_votescast }}
-                        </div>
-                    {% endwith %}
-                    {% if perms.motion.can_manage_motion %}
-                        {% if forloop.last %}
-                        {% if "genpoll" in actions %}
-                        <a href="{% url 'motion_gen_poll' motion.id %}">
-                            <span class="button"><span class="icon statistics">{% trans 'New vote' %}</span></span>
-                        </a>
-                        {% endif %}
-                        {% endif %}
-                    {% endif %}
-                {% else %}
-                    {% if perms.motion.can_manage_motion %}
-                        <a href="{% url 'motion_poll_view' poll.id %}">
-                            <span class="button"><span class="icon statistics">{% trans 'Enter result' %}</span></span>
-                        </a>
-                     {% endif %}
-                {% endif %}
-            </li>
-        {% endif %}
-        {% endfor %}
-        </ul>
-        {% endwith %}
-
-    <h4>{% trans "Creation Time" %}:</h4>
-    {{ motion.creation_time }}
-
-    <p></p>
-    {% if "wit" in actions and user == motion.submitter.user %}
-    <p></p>
-        <a href="{% url 'motion_set_status' motion.id 'wit' %}">
-            <span class="button"><span class="icon revert">{% trans 'Withdraw' %}</span></span>
-        </a>
-    {% endif %}
-
-    {% if perms.motion.can_support_motion and min_supporters > 0 %}
-        {% if "unsupport" in actions %}
-        <p></p>
-        <a href="{% url 'motion_unsupport' motion.id %}">
-            <span class="button"><span class="icon remove">{% trans 'Unsupport' %}</span></span>
-        </a>
-        {% endif %}
-        {% if "support" in actions %}
-        <p></p>
-        <a href="{% url 'motion_support' motion.id %}">
-            <span class="button"><span class="icon add">{% trans 'Support' %}</span></span>
-        </a>
-        {% endif %}
-    {% endif %}
-    </div>
-    {% if min_supporters > 0 %}
-    <small>* {% trans "minimum required supporters" %}: {{ min_supporters }}</small>
-    {% endif %}
-
-    <br><br>
-
-    {% if perms.motion.can_manage_motion %}
-    <div class="box">
-    <h4><b>{% trans "Manage motion" %}</b></h4>
-
-    {% 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 'motion_set_status' motion.id 'pub' %}"><span class="button"><span class="icon ok-blue">{% trans 'Publish' %}</span></span></a>
-        {% endif %}
-        {% if "per" in actions %}
-        <a href="{% url 'motion_permit' motion.id %}"><span class="button"><span class="icon ok-blue">{% trans 'Permit' %}</span></span></a>
-        {% endif %}
-        {% if "nop" in actions %}
-        <a href="{% url 'motion_notpermit' motion.id %}"><span class="button"><span class="icon reject">{% trans 'Not permit (reject)' %}</span></span></a>
-        {% endif %}
-        {% if "setnumber" in actions %}
-        <a href="{% url 'motion_set_number' motion.id %}"><span class="button"><span class="icon number">{% trans 'Set number' %}</span></span></a>
-        {% endif %}
-        </p>
-    {% endif %}
-
-    <h4></h4>
-    {% if "acc" in actions or "rej" in actions %}
-        <h4>{% trans "Result after vote" %}:</h4>
-        {% if "acc" in actions %}
-        <a href="{% url 'motion_set_status' motion.id 'acc' %}">
-            <span class="button"><span class="icon done">{% trans 'Accepted' %}</span></span>
-        </a>
-        {% endif %}
-        {% if "rej" in actions %}
-        <a href="{% url 'motion_set_status' motion.id 'rej' %}">
-            <span class="button"><span class="icon reject">{% trans 'Rejected' %}</span></span>
-        </a>
-        {% endif %}
-    {% endif %}
-
-    {% if "adj" in actions or "noc" in actions or "com" in actions or "wit" in actions %}
-        <h4>{% trans 'Result after debate' %}:</h4>
-        {% if "adj" in actions %}
-        <a href="{% url 'motion_set_status' motion.id 'adj' %}"><span class="button">{% trans 'Adjourned' %}</span></a><br>
-        {% endif %}
-        {% if "noc" in actions %}
-        <a href="{% url 'motion_set_status' motion.id 'noc' %}'><span class="button">{% trans 'Not Concerned' %}</span></a><br>
-        {% endif %}
-        {% if "com" in actions %}
-        <a href="{% url 'motion_set_status' motion.id 'com' %}'><span class="button">{% trans 'Commited a bill' %}</span></a><br>
-        {% endif %}
-        {% if "wit" in actions %}
-        <a href="{% url 'motion_set_status' motion.id 'wit' %}'><span class="button">{% trans 'Withdrawed by submitter' %}</span></a>
-        {% endif %}
-    {% endif %}
-    <p></p>
-    <hr>
-    <h4>{% trans "For Administration only:" %}</h4>
-    <a href="{% url 'motion_reset' motion.id %}">
-        <span class="button"><span class="icon undo">{% trans 'Reset' %}</span></span>
-    </a>
-    </div>
-    {% endif %} {# end perms.motion.can_support_motion #}
-</div> <!-- end sidebar -->
-
-
-<div id="main">
-    <h1>
-        {{ version.title }}
-        ({% trans "Motion" %}
-        {% if motion.number != None %}
-            {{ motion.number }})
-        {% else %}
-            <i>[{% trans "no number" %}]</i>)
-        {% endif %}
-    </h1>
-
-    {% trans "Version" %} {{ version.aid }}
-
-    {% if motion.public_version != motion.last_version %}
-        &#8901;
-        {% if version == motion.public_version %}
-            {% trans "This is not the newest version." %} <a href="{% url 'motion_view_newest' motion.id %}">{% trans "Go to version" %} {{ motion.last_version.aid }}.</a>
-        {% else %}
-            {% trans "This is not the authorized version." %} <a href="{% url 'motion_view' motion.id %}">{% trans "Go to version" %} {{ motion.public_version.aid }}.</a>
-        {% endif %}
-    {% endif %}
-
-    <h2>{% trans "Motion" %}:</h2>
-
-    {{ version.text|linebreaks }}
-
-    <h2>{% trans "Reason" %}:</h2>
-
-    {% if version.reason %}
-        {{ version.reason|linebreaks }}
-    {% else %}
-        –
-    {% endif %}
-
-
-    {% if motion.versions|length > 1 %}
-    <h2>{% trans "Version History" %}:</h2>
-
-    <table class="table valigntop" style="width: auto;">
-    <tr>
-        <th></th>
-        <th>{% trans "Version" %}</th>
-        <th>{% trans "Time" %}</th>
-        <th>{% trans "Title" %}</th>
-        <th>{% trans "Text" %}</th>
-
-        <th>{% trans "Reason" %}</th>
-    </tr>
-    {% for revision in motion.versions  %}
-    <tr class="{% cycle 'odd' '' %}">
-        <td style="white-space:nowrap;">
-        {% if motion.status != "pub" %}
-        {% if revision == motion.permitted %}
-             <img title="{% trans 'Version authorized' %}" src="{% static 'images/icons/accept.png' %}">
-        {% else %}
-             {% if perms.motion.can_manage_motion %}
-                 <a href="{% url 'motion_version_permit' revision.id %}"><img title="{% trans 'Permit Version' %}" src="{% static 'images/icons/accept-grey.png' %}"></a>
-             {% endif %}
-             {% if not revision.rejected and revision.id > motion.permitted.id and perms.motion.can_manage_motion %}
-                 <a href="{% url 'motion_version_reject' revision.id %}"><img title="{% trans 'Reject Version' %}" src="{% static 'images/icons/reject-grey.png' %}"></a>
-             {% endif %}
-        {% endif %}
-        {% if revision.rejected %}
-            <img title="{% trans 'Version rejected' %}" src="{% static 'images/icons/reject.png' %}">
-        {% endif %}
-        {% endif %}
-        </td>
-        <td>{{ revision.aid }}</td>
-        <td><i>{{ revision.time }}</i></td>
-        <td>
-            {% ifchanged %}
-            <b>{{ revision.title }}</b>
-            {% else %}
-            <i>[{% trans "unchanged" %}]</i>
-            {% endifchanged %}
-        </td>
-        <td>
-            {% ifchanged %}
-            {{ revision.text|linebreaks }}
-            {% else %}
-            <i>[{% trans "unchanged" %}]</i>
-            {% endifchanged %}
-        </td>
-        <td>
-            {% ifchanged %}
-            {{ revision.reason|linebreaks }}
-            {% else %}
-            <i>[{% trans "unchanged" %}]</i>
-            {% endifchanged %}
-        </td>
-    </tr>
-    {% endfor %}
-    </table>
-    {% endif %}
-
-    {% if perms.motion.can_manage_motion %}
-    <h2>{% trans "Log" %}:</h2>
-    {{ motion.log|linebreaks }}
-    {% endif %}
-</div>
-{% endblock %}
diff --git a/openslides/motion/templates/motion/widget.html b/openslides/motion/templates/motion/widget.html
deleted file mode 100644
index c0796de89..000000000
--- a/openslides/motion/templates/motion/widget.html
+++ /dev/null
@@ -1,34 +0,0 @@
-{% load staticfiles %}
-{% load i18n %}
-{% load tags %}
-
-<ul style="line-height: 180%">
-{% for motion in motions %}
-    <li class="{% if motion.active %}activeline{% endif %}">
-        <a href="{% url 'projector_activate_slide' motion.sid %}" class="activate_link {% if motion.active %}active{% endif %}">
-            <div></div>
-        </a>
-        <a href="{% model_url motion 'delete' %}" title="{% trans 'Delete' %}" class="icon delete right">
-            <span></span>
-        </a>
-        <a href="{% model_url motion 'edit' %}" title="{% trans 'Edit' %}" class="icon edit right">
-            <span></span>
-        </a>
-        <a href="{% url 'projctor_preview_slide' motion.sid %}" title="{% trans 'Preview' %}" class="icon preview right">
-            <span></span>
-        </a>
-        <a href="{% model_url motion 'view' %}">
-            {{ motion.public_version.title }}
-        </a>
-        ({% trans "motion" %}
-        {% if motion.number %}
-            {{ motion.number }})
-        {% else %}
-            <i>[{% trans "no number" %}]</i>)
-        {% endif %}
-    </li>
-{% empty %}
-    <li>{% trans 'No motion available.' %}</li>
-{% endfor %}
-</ul>
-
diff --git a/openslides/motion/urls.py b/openslides/motion/urls.py
index aff36a491..3020f074e 100644
--- a/openslides/motion/urls.py
+++ b/openslides/motion/urls.py
@@ -12,130 +12,29 @@
 
 from django.conf.urls import url, patterns
 
-from openslides.motion.views import (MotionDelete, ViewPoll,
-    MotionPDF, MotionPollPDF, CreateAgendaItem, SupportView)
-
 urlpatterns = patterns('openslides.motion.views',
     url(r'^$',
-        'overview',
-        name='motion_overview',
+        'motion_list',
+        name='motion_list',
     ),
 
-    url(r'^(?P<motion_id>\d+)/$',
-        'view',
-        name='motion_view',
-    ),
-
-    url(r'^(?P<motion_id>\d+)/agenda/$',
-        CreateAgendaItem.as_view(),
-        name='motion_create_agenda',
-    ),
-
-    url(r'^(?P<motion_id>\d+)/newest/$',
-        'view',
-        {'newest': True},
-        name='motion_view_newest',
-    ),
-
-    url(r'^new/$',
-        'edit',
+    url(r'^create/$',
+        'motion_create',
         name='motion_new',
     ),
 
-    url(r'^import/$',
-        'motion_import',
-        name='motion_import',
+    url(r'^(?P<pk>\d+)/$',
+        'motion_detail',
+        name='motion_detail',
     ),
 
-    url(r'^(?P<motion_id>\d+)/edit/$',
-        'edit',
+    url(r'^(?P<pk>\d+)/edit/$',
+        'motion_edit',
         name='motion_edit',
     ),
 
-    url(r'^(?P<motion_id>\d+)/del/$',
-        MotionDelete.as_view(),
-        name='motion_delete',
-    ),
-
-    url(r'^del/$',
-        MotionDelete.as_view(),
-        { 'motion_id' : None , 'motion_ids' : None },
-        name='motion_delete',
-    ),
-
-    url(r'^(?P<motion_id>\d+)/setnumber/$',
-        'set_number',
-        name='motion_set_number',
-    ),
-
-    url(r'^(?P<motion_id>\d+)/setstatus/(?P<status>[a-z]{3})/$',
-        'set_status',
-        name='motion_set_status',
-    ),
-
-    url(r'^(?P<motion_id>\d+)/permit/$',
-        'permit',
-        name='motion_permit',
-    ),
-
-    url(r'^version/(?P<aversion_id>\d+)/permit/$',
-        'permit_version',
-        name='motion_version_permit',
-    ),
-
-    url(r'^version/(?P<aversion_id>\d+)/reject/$',
-        'reject_version',
-        name='motion_version_reject',
-    ),
-
-    url(r'^(?P<motion_id>\d+)/notpermit/$',
-        'notpermit',
-        name='motion_notpermit',
-    ),
-
-    url(r'^(?P<motion_id>\d+)/reset/$',
-        'reset',
-        name='motion_reset',
-    ),
-
-    url(r'^(?P<motion_id>\d+)/support/$',
-        SupportView.as_view(support=True),
-        name='motion_support',
-    ),
-
-    url(r'^(?P<motion_id>\d+)/unsupport/$',
-        SupportView.as_view(support=False),
-        name='motion_unsupport',
-    ),
-
-    url(r'^(?P<motion_id>\d+)/gen_poll/$',
-        'gen_poll',
-        name='motion_gen_poll',
-    ),
-
-    url(r'^print/$',
-        MotionPDF.as_view(),
-        {'motion_id': None},
-        name='print_motions',
-    ),
-
-    url(r'^(?P<motion_id>\d+)/print/$',
-        MotionPDF.as_view(),
-        name='print_motion',
-    ),
-
-    url(r'^poll/(?P<poll_id>\d+)/print/$',
-        MotionPollPDF.as_view(),
-        name='print_motion_poll',
-    ),
-
-    url(r'^poll/(?P<poll_id>\d+)/$',
-        ViewPoll.as_view(),
-        name='motion_poll_view',
-    ),
-
-    url(r'^poll/(?P<poll_id>\d+)/del/$',
-        'delete_poll',
-        name='motion_poll_delete',
+    url(r'^(?P<pk>\d+)/version/(?P<version_id>\d+)/$',
+        'motion_detail',
+        name='motion_version_detail',
     ),
 )
diff --git a/openslides/motion/views.py b/openslides/motion/views.py
index deff7eaef..49f4a7ffc 100644
--- a/openslides/motion/views.py
+++ b/openslides/motion/views.py
@@ -2,950 +2,75 @@
 # -*- coding: utf-8 -*-
 """
     openslides.motion.views
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    ~~~~~~~~~~~~~~~~~~~~~~~
 
     Views for the motion app.
 
-    :copyright: 2011, 2012 by OpenSlides team, see AUTHORS.
+    :copyright: 2011, 2012 by the OpenSlides team, see AUTHORS.
     :license: GNU GPL, see LICENSE for more details.
 """
+from reportlab.platypus import Paragraph
 
-import csv
-import os
-
-from urlparse import parse_qs
-
-from reportlab.lib import colors
-from reportlab.lib.units import cm
-from reportlab.platypus import (
-    SimpleDocTemplate, PageBreak, Paragraph, Spacer, Table, TableStyle)
-
-from django.conf import settings
-from django.contrib import messages
-from django.contrib.auth.decorators import login_required
 from django.core.urlresolvers import reverse
+from django.contrib import messages
 from django.db import transaction
-from django.shortcuts import redirect
-from django.utils.translation import ugettext as _, ungettext
+from django.db.models import Model
+from django.utils.translation import ugettext as _, ugettext_lazy
+from django.views.generic.detail import SingleObjectMixin
 
-from openslides.utils import csv_ext
 from openslides.utils.pdf import stylesheet
-from openslides.utils.template import Tab
-from openslides.utils.utils import (
-    template, permission_required, del_confirm_form, gen_confirm_form)
 from openslides.utils.views import (
-    PDFView, RedirectView, DeleteView, FormView, SingleObjectMixin,
-    QuestionMixin)
-from openslides.utils.person import get_person
-from openslides.config.models import config
-from openslides.projector.projector import Widget
-from openslides.poll.views import PollFormView
-from openslides.participant.api import gen_username, gen_password
-from openslides.participant.models import User, Group
-from openslides.agenda.models import Item
-from openslides.motion.models import Motion, AVersion, MotionPoll
-from openslides.motion.forms import (
-    MotionForm, MotionFormTrivialChanges, MotionManagerForm,
-    MotionManagerFormSupporter, MotionImportForm, ConfigForm)
+    TemplateView, RedirectView, UpdateView, CreateView, DeleteView, PDFView,
+    DetailView, ListView)
+from openslides.utils.template import Tab
+from openslides.utils.utils import html_strong
+from openslides.projector.api import get_active_slide
+from openslides.projector.projector import Widget, SLIDE
+from .models import Motion
+from .forms import MotionCreateForm, MotionUpdateForm
 
 
-@permission_required('motion.can_see_motion')
-@template('motion/overview.html')
-def overview(request):
-    """
-    View all motions
-    """
-    try:
-        sortfilter = parse_qs(request.COOKIES['votecollector_sortfilter'])
-        for value in sortfilter:
-            sortfilter[value] = sortfilter[value][0]
-    except KeyError:
-        sortfilter = {}
-
-    for value in [u'sort', u'reverse', u'number', u'status', u'needsup', u'statusvalue']:
-        if value in request.REQUEST:
-            if request.REQUEST[value] == '0':
-                try:
-                    del sortfilter[value]
-                except KeyError:
-                    pass
-            else:
-                sortfilter[value] = request.REQUEST[value]
-
-    query = Motion.objects.all()
-    if 'number' in sortfilter:
-        query = query.filter(number=None)
-    if 'status' in sortfilter:
-        if 'statusvalue' in sortfilter and 'on' in sortfilter['status']:
-            query = query.filter(status__iexact=sortfilter['statusvalue'])
-
-    if 'sort' in sortfilter:
-        if sortfilter['sort'] == 'title':
-            sort = 'aversion__title'
-        elif sortfilter['sort'] == 'time':
-            sort = 'aversion__time'
-        else:
-            sort = sortfilter['sort']
-        query = query.order_by(sort)
-        if sort.startswith('aversion_'):
-            # limit result to last version of an motion
-            query = query.filter(aversion__id__in=[x.last_version.id for x in Motion.objects.all()])
-
-    if 'reverse' in sortfilter:
-        query = query.reverse()
-
-    # todo: rewrite this with a .filter()
-    if 'needsup' in sortfilter:
-        motions = []
-        for motion in query.all():
-            if not motion.enough_supporters:
-                motions.append(motion)
-    else:
-        motions = query
-
-    if type(motions) is not list:
-        motions = list(query.all())
-
-    # not the most efficient way to do this but 'get_allowed_actions'
-    # is not callable from within djangos templates..
-    for (i, motion) in enumerate(motions):
-        try:
-            motions[i] = {
-                'actions': motion.get_allowed_actions(request.user),
-                'motion': motion
-            }
-        except:
-            # todo: except what?
-            motions[i] = {
-                'actions': [],
-                'motion': motion
-            }
-
-    return {
-        'motions': motions,
-        'min_supporters': int(config['motion_min_supporters']),
-    }
+from django.views.generic.edit import ModelFormMixin
 
 
-@permission_required('motion.can_see_motion')
-@template('motion/view.html')
-def view(request, motion_id, newest=False):
-    """
-    View one motion.
-    """
-    motion = Motion.objects.get(pk=motion_id)
-    if newest:
-        version = motion.last_version
-    else:
-        version = motion.public_version
-    revisions = motion.versions
-    actions = motion.get_allowed_actions(user=request.user)
-
-    return {
-        'motion': motion,
-        'revisions': revisions,
-        'actions': actions,
-        'min_supporters': int(config['motion_min_supporters']),
-        'version': version,
-        #'results': motion.results
-    }
-
-
-@login_required
-@template('motion/edit.html')
-def edit(request, motion_id=None):
-    """
-    View a form to edit or create a motion.
-    """
-    if request.user.has_perm('motion.can_manage_motion'):
-        is_manager = True
-    else:
-        is_manager = False
-
-    if not is_manager \
-    and not request.user.has_perm('motion.can_create_motion'):
-        messages.error(request, _("You have not the necessary rights to create or edit motions."))
-        return redirect(reverse('motion_overview'))
-    if motion_id is not None:
-        motion = Motion.objects.get(id=motion_id)
-        if not 'edit' in motion.get_allowed_actions(request.user):
-            messages.error(request, _("You can not edit this motion."))
-            return redirect(reverse('motion_view', args=[motion.id]))
-        actions = motion.get_allowed_actions(user=request.user)
-    else:
-        motion = None
-        actions = None
-
-    formclass = MotionFormTrivialChanges \
-        if config['motion_allow_trivial_change'] and motion_id \
-        else MotionForm
-
-    managerformclass = MotionManagerFormSupporter \
-                       if config['motion_min_supporters'] \
-                       else MotionManagerForm
-
-    if request.method == 'POST':
-        dataform = formclass(request.POST, prefix="data")
-        valid = dataform.is_valid()
-
-        if is_manager:
-            managerform = managerformclass(request.POST,
-                            instance=motion,
-                            prefix="manager")
-            valid = valid and managerform.is_valid()
-        else:
-            managerform = None
-
-        if valid:
-            if is_manager:
-                motion = managerform.save(commit=False)
-            elif motion_id is None:
-                motion = Motion(submitter=request.user)
-            motion.title = dataform.cleaned_data['title']
-            motion.text = dataform.cleaned_data['text']
-            motion.reason = dataform.cleaned_data['reason']
-
-            try:
-                trivial_change = config['motion_allow_trivial_change'] \
-                    and dataform.cleaned_data['trivial_change']
-            except KeyError:
-                trivial_change = False
-            motion.save(request.user, trivial_change=trivial_change)
-            if is_manager:
-                try:
-                    new_supporters = set(managerform.cleaned_data['supporter'])
-                except KeyError:
-                    # The managerform has no field for the supporters
-                    pass
-                else:
-                    old_supporters = set(motion.supporters)
-                    # add new supporters
-                    for supporter in new_supporters.difference(old_supporters):
-                        motion.support(supporter)
-                    # remove old supporters
-                    for supporter in old_supporters.difference(new_supporters):
-                        motion.unsupport(supporter)
-
-            if motion_id is None:
-                messages.success(request, _('New motion was successfully created.'))
-            else:
-                messages.success(request, _('Motion was successfully modified.'))
-
-            if not 'apply' in request.POST:
-                return redirect(reverse('motion_view', args=[motion.id]))
-            if motion_id is None:
-                return redirect(reverse('motion_edit', args=[motion.id]))
-        else:
-            messages.error(request, _('Please check the form for errors.'))
-    else:
-        if motion_id is None:
-            initial = {'text': config['motion_preamble']}
-        else:
-            if motion.status == "pub" and motion.supporters:
-                if request.user.has_perm('motion.can_manage_motion'):
-                    messages.warning(request, _("Attention: Do you really want to edit this motion? The supporters will <b>not</b> be removed automatically because you can manage motions. Please check if the supports are valid after your changing!"))
-                else:
-                    messages.warning(request, _("Attention: Do you really want to edit this motion? All <b>%s</b> supporters will be removed! Try to convince the supporters again.") % motion.count_supporters() )
-            initial = {'title': motion.title,
-                       'text': motion.text,
-                       'reason': motion.reason}
-
-        dataform = formclass(initial=initial, prefix="data")
-        if is_manager:
-            if motion_id is None:
-                initial = {'submitter': request.user.person_id}
-            else:
-                initial = {'submitter': motion.submitter.person_id,
-                    'supporter': [supporter.person_id for supporter in motion.supporters]}
-            managerform = managerformclass(initial=initial,
-                instance=motion, prefix="manager")
-        else:
-            managerform = None
-    return {
-        'form': dataform,
-        'managerform': managerform,
-        'motion': motion,
-        'actions': actions,
-    }
-
-
-@permission_required('motion.can_manage_motion')
-@template('motion/view.html')
-def set_number(request, motion_id):
-    """
-    set a number for an motion.
-    """
-    try:
-        Motion.objects.get(pk=motion_id).set_number(user=request.user)
-        messages.success(request, _("Motion number was successfully set."))
-    except Motion.DoesNotExist:
-        pass
-    except NameError:
-        pass
-    return redirect(reverse('motion_view', args=[motion_id]))
-
-
-@permission_required('motion.can_manage_motion')
-@template('motion/view.html')
-def permit(request, motion_id):
-    """
-    permit an motion.
-    """
-    try:
-        Motion.objects.get(pk=motion_id).permit(user=request.user)
-        messages.success(request, _("Motion was successfully authorized."))
-    except Motion.DoesNotExist:
-        pass
-    except NameError, e:
-        messages.error(request, e)
-    return redirect(reverse('motion_view', args=[motion_id]))
-
-@permission_required('motion.can_manage_motion')
-@template('motion/view.html')
-def notpermit(request, motion_id):
-    """
-    reject (not permit) an motion.
-    """
-    try:
-        Motion.objects.get(pk=motion_id).notpermit(user=request.user)
-        messages.success(request, _("Motion was successfully rejected."))
-    except Motion.DoesNotExist:
-        pass
-    except NameError, e:
-        messages.error(request, e)
-    return redirect(reverse('motion_view', args=[motion_id]))
-
-@template('motion/view.html')
-def set_status(request, motion_id=None, status=None):
-    """
-    set a status of an motion.
-    """
-    try:
-        if status is not None:
-            motion = Motion.objects.get(pk=motion_id)
-            motion.set_status(user=request.user, status=status)
-            messages.success(request, _("Motion status was set to: <b>%s</b>.") % motion.get_status_display())
-    except Motion.DoesNotExist:
-        pass
-    except NameError, e:
-        messages.error(request, e)
-    return redirect(reverse('motion_view', args=[motion_id]))
-
-
-@permission_required('motion.can_manage_motion')
-@template('motion/view.html')
-def reset(request, motion_id):
-    """
-    reset an motion.
-    """
-    try:
-        Motion.objects.get(pk=motion_id).reset(user=request.user)
-        messages.success(request, _("Motion status was reset.") )
-    except Motion.DoesNotExist:
-        pass
-    return redirect(reverse('motion_view', args=[motion_id]))
-
-
-class SupportView(SingleObjectMixin, QuestionMixin, RedirectView):
-    """
-    Classed based view to support or unsupport a motion. Use
-    support=True or support=False in urls.py
-    """
-    permission_required = 'motion.can_support_motion'
+class MotionListView(ListView):
+    permission_required = 'motion.can_see_motion'
     model = Motion
-    pk_url_kwarg = 'motion_id'
-    support = True
 
-    def get(self, request, *args, **kwargs):
-        self.object = self.get_object()
-        return super(SupportView, self).get(request, *args, **kwargs)
-
-    def check_allowed_actions(self, request):
-        """
-        Checks whether request.user can support or unsupport the motion.
-        Returns True or False.
-        """
-        allowed_actions = self.object.get_allowed_actions(request.user)
-        if self.support and not 'support' in allowed_actions:
-            messages.error(request, _('You can not support this motion.'))
-            return False
-        elif not self.support and not 'unsupport' in allowed_actions:
-            messages.error(request, _('You can not unsupport this motion.'))
-            return False
-        else:
-            return True
-
-    def pre_redirect(self, request, *args, **kwargs):
-        if self.check_allowed_actions(request):
-            super(SupportView, self).pre_redirect(request, *args, **kwargs)
-
-    def get_question(self):
-        if self.support:
-            return _('Do you really want to support this motion?')
-        else:
-            return _('Do you really want to unsupport this motion?')
-
-    def case_yes(self):
-        if self.check_allowed_actions(self.request):
-            if self.support:
-                self.object.support(person=self.request.user)
-            else:
-                self.object.unsupport(person=self.request.user)
-
-    def get_success_message(self):
-        if self.support:
-            return _("You have supported this motion successfully.")
-        else:
-            return _("You have unsupported this motion successfully.")
-
-    def get_redirect_url(self, **kwargs):
-        return reverse('motion_view', args=[kwargs[self.pk_url_kwarg]])
+motion_list = MotionListView.as_view()
 
 
-@permission_required('motion.can_manage_motion')
-@template('motion/view.html')
-def gen_poll(request, motion_id):
-    """
-    gen a poll for this motion.
-    """
-    try:
-        poll = Motion.objects.get(pk=motion_id).gen_poll(user=request.user)
-        messages.success(request, _("New vote was successfully created.") )
-    except Motion.DoesNotExist:
-        pass # TODO: do not call poll after this excaption
-    return redirect(reverse('motion_poll_view', args=[poll.id]))
-
-
-@permission_required('motion.can_manage_motion')
-def delete_poll(request, poll_id):
-    """
-    delete a poll from this motion
-    """
-    poll = MotionPoll.objects.get(pk=poll_id)
-    motion = poll.motion
-    count = motion.polls.filter(id__lte=poll_id).count()
-    if request.method == 'POST':
-        poll.delete()
-        motion.writelog(_("Poll deleted"), request.user)
-        messages.success(request, _('Poll was successfully deleted.'))
-    else:
-        del_confirm_form(request, poll, name=_("the %s. poll") % count, delete_link=reverse('motion_poll_delete', args=[poll_id]))
-    return redirect(reverse('motion_view', args=[motion.id]))
-
-
-class MotionDelete(DeleteView):
-    """
-    Delete one or more Motions.
-    """
+class MotionDetailView(DetailView):
+    permission_required = 'motion.can_see_motion'
     model = Motion
-    url = 'motion_overview'
-
-    def has_permission(self, request, *args, **kwargs):
-        self.kwargs = kwargs
-        return self.get_object().get_allowed_actions(request.user)
+    template_name = 'motion/motion_detail.html'
 
     def get_object(self):
-        self.motions = []
+        object = super(MotionDetailView, self).get_object()
+        version_id = self.kwargs.get('version_id', None)
+        if version_id is not None:
+            object.default_version = int(version_id) -1
+        return object
 
-        if self.kwargs.get('motion_id', None):
-            try:
-                return Motion.objects.get(id=int(self.kwargs['motion_id']))
-            except Motion.DoesNotExist:
-                return None
+motion_detail = MotionDetailView.as_view()
 
-        if self.kwargs.get('motion_ids', []):
-            for appid in self.kwargs['motion_ids']:
-                try:
-                    self.motions.append(Motion.objects.get(id=int(appid)))
-                except Motion.DoesNotExist:
-                    pass
 
-            if self.motions:
-                return self.motions[0]
-        return None
+class MotionMixin(object):
+    def manipulate_object(self, form):
+        for attr in ['title', 'text', 'reason']:
+            setattr(self.object, attr, form.cleaned_data[attr])
 
-    def pre_post_redirect(self, request, *args, **kwargs):
-        self.object = self.get_object()
 
-        if len(self.motions):
-            for motion in self.motions:
-                if not 'delete' in motion.get_allowed_actions(user=request.user):
-                    messages.error(request, _("You can not delete motion <b>%s</b>.") % motion)
-                    continue
+class MotionCreateView(MotionMixin, CreateView):
+    permission_required = 'motion.can_create_motion'
+    model = Motion
+    form_class = MotionCreateForm
 
-                title = motion.title
-                motion.delete(force=True)
-                messages.success(request, _("Motion <b>%s</b> was successfully deleted.") % title)
+motion_create = MotionCreateView.as_view()
 
-        elif self.object:
-            if not 'delete' in self.object.get_allowed_actions(user=request.user):
-                messages.error(request, _("You can not delete motion <b>%s</b>.") % self.object)
-            elif self.get_answer() == 'yes':
-                title = self.object.title
-                self.object.delete(force=True)
-                messages.success(request, _("Motion <b>%s</b> was successfully deleted.") % title)
-        else:
-            messages.error(request, _("Invalid request"))
 
+class MotionUpdateView(MotionMixin, UpdateView):
+    model = Motion
+    form_class = MotionUpdateForm
 
-class ViewPoll(PollFormView):
-    permission_required = 'motion.can_manage_motion'
-    poll_class = MotionPoll
-    template_name = 'motion/poll_view.html'
-
-    def get_context_data(self, **kwargs):
-        context = super(ViewPoll, self).get_context_data(**kwargs)
-        self.motion = self.poll.get_motion()
-        context['motion'] = self.motion
-        context['ballot'] = self.poll.get_ballot()
-        context['actions'] = self.motion.get_allowed_actions(user=self.request.user)
-        return context
-
-    def get_modelform_class(self):
-        cls = super(ViewPoll, self).get_modelform_class()
-        user = self.request.user
-
-        class ViewPollFormClass(cls):
-            def save(self, commit = True):
-                instance = super(ViewPollFormClass, self).save(commit)
-                motion = instance.motion
-                motion.writelog(_("Poll was updated"), user)
-                return instance
-
-        return ViewPollFormClass
-
-    def get_success_url(self):
-        if not 'apply' in self.request.POST:
-            return reverse('motion_view', args=[self.poll.motion.id])
-        return ''
-
-
-@permission_required('motion.can_manage_motion')
-def permit_version(request, aversion_id):
-    aversion = AVersion.objects.get(pk=aversion_id)
-    motion = aversion.motion
-    if request.method == 'POST':
-        motion.accept_version(aversion, user=request.user)
-        messages.success(request, _("Version <b>%s</b> accepted.") % (aversion.aid))
-    else:
-        gen_confirm_form(request, _('Do you really want to authorize version <b>%s</b>?') % aversion.aid, reverse('motion_version_permit', args=[aversion.id]))
-    return redirect(reverse('motion_view', args=[motion.id]))
-
-
-@permission_required('motion.can_manage_motion')
-def reject_version(request, aversion_id):
-    aversion = AVersion.objects.get(pk=aversion_id)
-    motion = aversion.motion
-    if request.method == 'POST':
-        if motion.reject_version(aversion, user=request.user):
-            messages.success(request, _("Version <b>%s</b> rejected.") % (aversion.aid))
-        else:
-            messages.error(request, _("ERROR by rejecting the version.") )
-    else:
-        gen_confirm_form(request, _('Do you really want to reject version <b>%s</b>?') % aversion.aid, reverse('motion_version_reject', args=[aversion.id]))
-    return redirect(reverse('motion_view', args=[motion.id]))
-
-
-@permission_required('motion.can_manage_motion')
-@template('motion/import.html')
-def motion_import(request):
-    if request.method == 'POST':
-        form = MotionImportForm(request.POST, request.FILES)
-        if form.is_valid():
-            import_permitted = form.cleaned_data['import_permitted']
-            try:
-                # check for valid encoding (will raise UnicodeDecodeError if not)
-                request.FILES['csvfile'].read().decode('utf-8')
-                request.FILES['csvfile'].seek(0)
-
-                users_generated = 0
-                motions_generated = 0
-                motions_modified = 0
-                groups_assigned = 0
-                groups_generated = 0
-                with transaction.commit_on_success():
-                    dialect = csv.Sniffer().sniff(request.FILES['csvfile'].readline())
-                    dialect = csv_ext.patchup(dialect)
-                    request.FILES['csvfile'].seek(0)
-                    for (lno, line) in enumerate(csv.reader(request.FILES['csvfile'], dialect=dialect)):
-                        # basic input verification
-                        if lno < 1:
-                            continue
-                        try:
-                            (number, title, text, reason, first_name, last_name, is_group) = line[:7]
-                            if is_group.strip().lower() in ['y', 'j', 't', 'yes', 'ja', 'true', '1', 1]:
-                                is_group = True
-                            else:
-                                is_group = False
-                        except ValueError:
-                            messages.error(request, _('Ignoring malformed line %d in import file.') % (lno + 1))
-                            continue
-                        form = MotionForm({'title': title, 'text': text, 'reason': reason})
-                        if not form.is_valid():
-                            messages.error(request, _('Ignoring malformed line %d in import file.') % (lno + 1))
-                            continue
-                        if number:
-                            try:
-                                number = abs(long(number))
-                                if number < 1:
-                                    messages.error(request, _('Ignoring malformed line %d in import file.') % (lno + 1))
-                                    continue
-                            except ValueError:
-                                messages.error(request, _('Ignoring malformed line %d in import file.') % (lno + 1))
-                                continue
-
-                        if is_group:
-                            # fetch existing groups or issue an error message
-                            try:
-                                user = Group.objects.get(name=last_name)
-                                if user.group_as_person == False:
-                                    messages.error(request, _('Ignoring line %d because the assigned group may not act as a person.') % (lno + 1))
-                                    continue
-                                else:
-                                    user = get_person(user.person_id)
-
-                                groups_assigned += 1
-                            except Group.DoesNotExist:
-                                group = Group()
-                                group.group_as_person = True
-                                group.description = _('Created by motion import.')
-                                group.name = last_name
-                                group.save()
-                                groups_generated += 1
-
-                                user = get_person(group.person_id)
-                        else:
-                            # fetch existing users or create new users as needed
-                            try:
-                                user = User.objects.get(first_name=first_name, last_name=last_name)
-                            except User.DoesNotExist:
-                                user = None
-                            if user is None:
-                                if not first_name or not last_name:
-                                    messages.error(request, _('Ignoring line %d because it contains an incomplete first / last name pair.') % (lno + 1))
-                                    continue
-
-                                user = User()
-                                user.last_name = last_name
-                                user.first_name = first_name
-                                user.username = gen_username(first_name, last_name)
-                                user.structure_level = ''
-                                user.committee = ''
-                                user.gender = ''
-                                user.type = ''
-                                user.default_password = gen_password()
-                                user.save()
-                                user.reset_password()
-                                users_generated += 1
-                        # create / modify the motion
-                        motion = None
-                        if number:
-                            try:
-                                motion = Motion.objects.get(number=number)
-                                motions_modified += 1
-                            except Motion.DoesNotExist:
-                                motion = None
-                        if motion is None:
-                            motion = Motion(submitter=user)
-                            if number:
-                                motion.number = number
-                            motions_generated += 1
-
-                        motion.title = form.cleaned_data['title']
-                        motion.text = form.cleaned_data['text']
-                        motion.reason = form.cleaned_data['reason']
-                        if import_permitted:
-                            motion.status = 'per'
-
-                        motion.save(user, trivial_change=True)
-
-                if motions_generated:
-                    messages.success(request, ungettext('%d motion was successfully imported.',
-                                                '%d motions were successfully imported.', motions_generated) % motions_generated)
-                if motions_modified:
-                    messages.success(request, ungettext('%d motion was successfully modified.',
-                                                '%d motions were successfully modified.', motions_modified) % motions_modified)
-                if users_generated:
-                    messages.success(request, ungettext('%d new user was added.', '%d new users were added.', users_generated) % users_generated)
-
-                if groups_generated:
-                    messages.success(request, ungettext('%d new group was added.', '%d new groups were added.', groups_generated) % groups_generated)
-
-                if groups_assigned:
-                    messages.success(request, ungettext('%d group assigned to motions.', '%d groups assigned to motions.', groups_assigned) % groups_assigned)
-                return redirect(reverse('motion_overview'))
-
-            except csv.Error:
-                messages.error(request, _('Import aborted because of severe errors in the input file.'))
-            except UnicodeDecodeError:
-                messages.error(request, _('Import file has wrong character encoding, only UTF-8 is supported!'))
-        else:
-            messages.error(request, _('Please check the form for errors.'))
-    else:
-        messages.warning(request, _("Attention: Existing motions will be modified if you import new motions with the same number."))
-        messages.warning(request, _("Attention: Importing an motions without a number multiple times will create duplicates."))
-        form = MotionImportForm()
-    return {
-        'form': form,
-    }
-
-
-class CreateAgendaItem(RedirectView):
-    permission_required = 'agenda.can_manage_agenda'
-
-    def pre_redirect(self, request, *args, **kwargs):
-        self.motion = Motion.objects.get(pk=kwargs['motion_id'])
-        self.item = Item(related_sid=self.motion.sid)
-        self.item.save()
-
-    def get_redirect_url(self, **kwargs):
-        return reverse('item_overview')
-
-
-class MotionPDF(PDFView):
-    permission_required = 'motion.can_see_motion'
-    top_space = 0
-
-    def get_filename(self):
-        motion_id = self.kwargs['motion_id']
-        if motion_id is None:
-            filename = _("Motions")
-        else:
-            motion = Motion.objects.get(id=motion_id)
-            if motion.number:
-                number = motion.number
-            else:
-                number = ""
-            filename = u'%s%s' % (_("Motion"), str(number))
-        return filename
-
-    def append_to_pdf(self, story):
-        motion_id = self.kwargs['motion_id']
-        if motion_id is None:  #print all motions
-            title = config["motion_pdf_title"]
-            story.append(Paragraph(title, stylesheet['Heading1']))
-            preamble = config["motion_pdf_preamble"]
-            if preamble:
-                story.append(Paragraph("%s" % preamble.replace('\r\n','<br/>'), stylesheet['Paragraph']))
-            story.append(Spacer(0,0.75*cm))
-            motions = Motion.objects.all()
-            if not motions: # No motions existing
-                story.append(Paragraph(_("No motions available."), stylesheet['Heading3']))
-            else: # Print all Motions
-                # List of motions
-                for motion in motions:
-                    if motion.number:
-                        story.append(Paragraph(_("Motion No.")+" %s: %s" % (motion.number, motion.title), stylesheet['Heading3']))
-                    else:
-                        story.append(Paragraph(_("Motion No.")+"&nbsp;&nbsp;&nbsp;: %s" % (motion.title), stylesheet['Heading3']))
-                # Motions details (each motion on single page)
-                for motion in motions:
-                    story.append(PageBreak())
-                    story = self.get_motion(motion, story)
-        else:  # print selected motion
-            motion = Motion.objects.get(id=motion_id)
-            story = self.get_motion(motion, story)
-
-    def get_motion(self, motion, story):
-        # Preparing Table
-        data = []
-
-        # motion number
-        if motion.number:
-            story.append(Paragraph(_("Motion No.")+" %s" % motion.number, stylesheet['Heading1']))
-        else:
-            story.append(Paragraph(_("Motion No."), stylesheet['Heading1']))
-
-        # submitter
-        cell1a = []
-        cell1a.append(Spacer(0, 0.2 * cm))
-        cell1a.append(Paragraph("<font name='Ubuntu-Bold'>%s:</font>" % _("Submitter"), stylesheet['Heading4']))
-        cell1b = []
-        cell1b.append(Spacer(0, 0.2 * cm))
-        cell1b.append(Paragraph("%s" % motion.submitter, stylesheet['Normal']))
-        data.append([cell1a, cell1b])
-
-        if motion.status == "pub":
-            # Cell for the signature
-            cell2a = []
-            cell2b = []
-            cell2a.append(Paragraph("<font name='Ubuntu-Bold'>%s:</font>" % _("Signature"), stylesheet['Heading4']))
-            cell2b.append(Paragraph("__________________________________________", stylesheet['Signaturefield']))
-            cell2b.append(Spacer(0, 0.1 * cm))
-            cell2b.append(Spacer(0,0.2*cm))
-            data.append([cell2a, cell2b])
-
-        # supporters
-        if config['motion_min_supporters']:
-            cell3a = []
-            cell3b = []
-            cell3a.append(Paragraph("<font name='Ubuntu-Bold'>%s:</font><seqreset id='counter'>" % _("Supporters"), stylesheet['Heading4']))
-            for supporter in motion.supporters:
-                cell3b.append(Paragraph("<seq id='counter'/>.&nbsp; %s" % supporter, stylesheet['Signaturefield']))
-            if motion.status == "pub":
-                for x in range(motion.missing_supporters):
-                    cell3b.append(Paragraph("<seq id='counter'/>.&nbsp; __________________________________________",stylesheet['Signaturefield']))
-            cell3b.append(Spacer(0, 0.2 * cm))
-            data.append([cell3a, cell3b])
-
-        # status
-        cell4a = []
-        cell4b = []
-        note = " ".join(motion.notes)
-        cell4a.append(Paragraph("<font name='Ubuntu-Bold'>%s:</font>" % _("Status"), stylesheet['Heading4']))
-        if note != "":
-            if motion.status == "pub":
-                cell4b.append(Paragraph(note, stylesheet['Normal']))
-            else:
-                cell4b.append(Paragraph("%s | %s" % (motion.get_status_display(), note), stylesheet['Normal']))
-        else:
-            cell4b.append(Paragraph("%s" % motion.get_status_display(), stylesheet['Normal']))
-        data.append([cell4a, cell4b])
-
-        # Version number (aid)
-        if motion.public_version.aid > 1:
-            cell5a = []
-            cell5b = []
-            cell5a.append(Paragraph("<font name='Ubuntu-Bold'>%s:</font>" % _("Version"), stylesheet['Heading4']))
-            cell5b.append(Paragraph("%s" % motion.public_version.aid, stylesheet['Normal']))
-            data.append([cell5a, cell5b])
-
-        # voting results
-        poll_results = motion.get_poll_results()
-        if poll_results:
-            cell6a = []
-            cell6a.append(Paragraph("<font name='Ubuntu-Bold'>%s:</font>" % _("Vote results"), stylesheet['Heading4']))
-            cell6b = []
-            ballotcounter = 0
-            for result in poll_results:
-                ballotcounter += 1
-                if len(poll_results) > 1:
-                    cell6b.append(Paragraph("%s. %s" % (ballotcounter, _("Vote")), stylesheet['Bold']))
-                cell6b.append(Paragraph("%s: %s <br/> %s: %s <br/> %s: %s <br/> %s: %s <br/> %s: %s" % (_("Yes"), result[0], _("No"), result[1], _("Abstention"), result[2], _("Invalid"), result[3], _("Votes cast"), result[4]), stylesheet['Normal']))
-                cell6b.append(Spacer(0, 0.2*cm))
-            data.append([cell6a, cell6b])
-
-        # Creating Table
-        t = Table(data)
-        t._argW[0] = 4.5 * cm
-        t._argW[1] = 11 * cm
-        t.setStyle(TableStyle([('BOX', (0, 0), (-1, -1), 1, colors.black),
-                               ('VALIGN', (0,0), (-1,-1), 'TOP')]))
-        story.append(t)
-        story.append(Spacer(0, 1 * cm))
-
-        # title
-        story.append(Paragraph(motion.public_version.title, stylesheet['Heading3']))
-        # text
-        story.append(Paragraph("%s" % motion.public_version.text.replace('\r\n','<br/>'), stylesheet['Paragraph']))
-        # reason
-        if motion.public_version.reason:
-            story.append(Paragraph(_("Reason")+":", stylesheet['Heading3']))
-            story.append(Paragraph("%s" % motion.public_version.reason.replace('\r\n','<br/>'), stylesheet['Paragraph']))
-        return story
-
-
-class MotionPollPDF(PDFView):
-    permission_required = 'motion.can_manage_motion'
-    top_space = 0
-
-    def get(self, request, *args, **kwargs):
-        self.poll = MotionPoll.objects.get(id=self.kwargs['poll_id'])
-        return super(MotionPollPDF, self).get(request, *args, **kwargs)
-
-    def get_filename(self):
-        filename = u'%s%s_%s' % (_("Motion"), str(self.poll.motion.number), _("Poll"))
-        return filename
-
-    def get_template(self, buffer):
-        return SimpleDocTemplate(buffer, topMargin=-6, bottomMargin=-6, leftMargin=0, rightMargin=0, showBoundary=False)
-
-    def build_document(self, pdf_document, story):
-        pdf_document.build(story)
-
-    def append_to_pdf(self, story):
-        imgpath = os.path.join(settings.SITE_ROOT, 'static/images/circle.png')
-        circle = "<img src='%s' width='15' height='15'/>&nbsp;&nbsp;" % imgpath
-        cell = []
-        cell.append(Spacer(0,0.8*cm))
-        cell.append(Paragraph(_("Motion No. %s") % self.poll.motion.number, stylesheet['Ballot_title']))
-        cell.append(Paragraph(self.poll.motion.title, stylesheet['Ballot_subtitle']))
-        cell.append(Paragraph(_("%d. Vote") % self.poll.get_ballot(), stylesheet['Ballot_description']))
-        cell.append(Spacer(0,0.5*cm))
-        cell.append(Paragraph(circle + unicode(_("Yes")), stylesheet['Ballot_option']))
-        cell.append(Paragraph(circle + unicode(_("No")), stylesheet['Ballot_option']))
-        cell.append(Paragraph(circle + unicode(_("Abstention")), stylesheet['Ballot_option']))
-        data= []
-        # get ballot papers config values
-        ballot_papers_selection = config["motion_pdf_ballot_papers_selection"]
-        ballot_papers_number = config["motion_pdf_ballot_papers_number"]
-
-        # set number of ballot papers
-        if ballot_papers_selection == "NUMBER_OF_DELEGATES":
-            number = User.objects.filter(type__iexact="delegate").count()
-        elif ballot_papers_selection == "NUMBER_OF_ALL_PARTICIPANTS":
-            number = int(User.objects.count())
-        else: # ballot_papers_selection == "CUSTOM_NUMBER"
-            number = int(ballot_papers_number)
-        number = max(1, number)
-
-        # print ballot papers
-        if number > 0:
-            for user in xrange(number / 2):
-                data.append([cell, cell])
-            rest = number % 2
-            if rest:
-                data.append([cell, ''])
-            t=Table(data, 10.5 * cm, 7.42 * cm)
-            t.setStyle(TableStyle([('GRID', (0, 0), (-1, -1), 0.25, colors.grey),
-                ('VALIGN', (0, 0), (-1, -1), 'TOP'),
-            ]))
-            story.append(t)
-
-
-class Config(FormView):
-    permission_required = 'config.can_manage_config'
-    form_class = ConfigForm
-    template_name = 'motion/config.html'
-
-    def get_initial(self):
-        return {
-            'motion_min_supporters': config['motion_min_supporters'],
-            'motion_preamble': config['motion_preamble'],
-            'motion_pdf_ballot_papers_selection': config['motion_pdf_ballot_papers_selection'],
-            'motion_pdf_ballot_papers_number': config['motion_pdf_ballot_papers_number'],
-            'motion_pdf_title': config['motion_pdf_title'],
-            'motion_pdf_preamble': config['motion_pdf_preamble'],
-            'motion_allow_trivial_change': config['motion_allow_trivial_change'],
-        }
-
-    def form_valid(self, form):
-        config['motion_min_supporters'] = form.cleaned_data['motion_min_supporters']
-        config['motion_preamble'] = form.cleaned_data['motion_preamble']
-        config['motion_pdf_ballot_papers_selection'] = form.cleaned_data['motion_pdf_ballot_papers_selection']
-        config['motion_pdf_ballot_papers_number'] = form.cleaned_data['motion_pdf_ballot_papers_number']
-        config['motion_pdf_title'] = form.cleaned_data['motion_pdf_title']
-        config['motion_pdf_preamble'] = form.cleaned_data['motion_pdf_preamble']
-        config['motion_allow_trivial_change'] = form.cleaned_data['motion_allow_trivial_change']
-        messages.success(self.request, _('Motion settings successfully saved.'))
-        return super(Config, self).form_valid(form)
-
-
-def register_tab(request):
-    selected = True if request.path.startswith('/motion/') else False
-    return Tab(
-        title=_('Motions'),
-        url=reverse('motion_overview'),
-        permission=request.user.has_perm('motion.can_see_motion') or request.user.has_perm('motion.can_support_motion') or request.user.has_perm('motion.can_support_motion') or request.user.has_perm('motion.can_manage_motion'),
-        selected=selected,
-    )
-
-
-def get_widgets(request):
-    return [
-        Widget(
-            name='motions',
-            display_name=_('Motions'),
-            template='motion/widget.html',
-            context={'motions': Motion.objects.all()},
-            permission_required='projector.can_manage_projector')]
+motion_edit = MotionUpdateView.as_view()
diff --git a/openslides/participant/views.py b/openslides/participant/views.py
index ded8a55c7..e39b5d9e6 100644
--- a/openslides/participant/views.py
+++ b/openslides/participant/views.py
@@ -554,30 +554,30 @@ def get_widgets(request):
     group_widget and a personal_info_widget.
     """
     return [
-        get_personal_info_widget(request),
+        #get_personal_info_widget(request),
         get_user_widget(request),
         get_group_widget(request)]
 
 
-def get_personal_info_widget(request):
-    """
-    Provides a widget for personal info. It shows your submitted motions
-    and where you are supporter or candidate.
-    """
-    personal_info_context = {
-        'submitted_motions': Motion.objects.filter(submitter=request.user),
-        'config_motion_min_supporters': config['motion_min_supporters'],
-        'supported_motions': Motion.objects.filter(motionsupporter=request.user),
-        'assignments': Assignment.objects.filter(
-            assignmentcandidate__person=request.user,
-            assignmentcandidate__blocked=False)}
-    return Widget(
-        name='personal_info',
-        display_name=_('My motions and elections'),
-        template='participant/personal_info_widget.html',
-        context=personal_info_context,
-        permission_required=None,
-        default_column=1)
+## def get_personal_info_widget(request):
+    ## """
+    ## Provides a widget for personal info. It shows your submitted motions
+    ## and where you are supporter or candidate.
+    ## """
+    ## personal_info_context = {
+        ## 'submitted_motions': Motion.objects.filter(submitter=request.user),
+        ## 'config_motion_min_supporters': config['motion_min_supporters'],
+        ## 'supported_motions': Motion.objects.filter(motionsupporter=request.user),
+        ## 'assignments': Assignment.objects.filter(
+            ## assignmentcandidate__person=request.user,
+            ## assignmentcandidate__blocked=False)}
+    ## return Widget(
+        ## name='personal_info',
+        ## display_name=_('My motions and elections'),
+        ## template='participant/personal_info_widget.html',
+        ## context=personal_info_context,
+        ## permission_required=None,
+        ## default_column=1)
 
 
 def get_user_widget(request):
diff --git a/openslides/utils/views.py b/openslides/utils/views.py
index 33bdafc32..c13087592 100644
--- a/openslides/utils/views.py
+++ b/openslides/utils/views.py
@@ -41,6 +41,7 @@ from django.views.generic import (
     View as _View,
     FormView as _FormView,
     ListView as _ListView,
+    DetailView as _DetailView,
 )
 from django.views.generic.detail import SingleObjectMixin
 from django.views.generic.list import TemplateResponseMixin
@@ -98,6 +99,31 @@ class AjaxMixin(object):
         return HttpResponse(json.dumps(self.get_ajax_context(**kwargs)))
 
 
+class ExtraContextMixin(object):
+    def get_context_data(self, **kwargs):
+        context = super(ExtraContextMixin, self).get_context_data(**kwargs)
+        template_manipulation.send(
+            sender=self.__class__, request=self.request, context=context)
+        return context
+
+
+class SuccessUrlMixin(object):
+    def get_success_url(self):
+        messages.success(self.request, self.get_success_message())
+        if 'apply' in self.request.POST:
+            return reverse(self.get_apply_url(), args=[self.object.id])
+        if self.success_url:
+            url = reverse(success_url)
+        else:
+            try:
+                url = self.object.get_absolute_url()
+            except AttributeError:
+                raise ImproperlyConfigured(
+                    "No URL to redirect to.  Either provide a url or define"
+                    " a get_absolute_url method on the Model.")
+        return url
+
+
 class QuestionMixin(object):
     question = ugettext_lazy('Are you sure?')
     success_message = ugettext_lazy('Thank you for your answer')
@@ -157,21 +183,12 @@ class QuestionMixin(object):
         return self.success_message
 
 
-class TemplateView(PermissionMixin, _TemplateView):
-    def get_context_data(self, **kwargs):
-        context = super(TemplateView, self).get_context_data(**kwargs)
-        template_manipulation.send(
-            sender=self.__class__, request=self.request, context=context)
-        return context
+class TemplateView(PermissionMixin, ExtraContextMixin, _TemplateView):
+    pass
 
 
-class ListView(PermissionMixin, SetCookieMixin, _ListView):
-    def get_context_data(self, **kwargs):
-        context = super(ListView, self).get_context_data(**kwargs)
-        template_manipulation.send(
-            sender=self.__class__, request=self.request, context=context)
-        return context
-
+class ListView(PermissionMixin, SetCookieMixin, ExtraContextMixin, _ListView):
+    pass
 
 class AjaxView(PermissionMixin, AjaxMixin, View):
     def get(self, request, *args, **kwargs):
@@ -202,36 +219,26 @@ class RedirectView(PermissionMixin, AjaxMixin, _RedirectView):
         return reverse(super(RedirectView, self).get_redirect_url(**kwargs))
 
 
-class FormView(PermissionMixin, _FormView):
-    def get_success_url(self):
-        if not self.success_url:
-            return ''
-        return reverse(super(FormView, self).get_success_url())
-
-    def get_context_data(self, **kwargs):
-        context = super(FormView, self).get_context_data(**kwargs)
-        template_manipulation.send(
-            sender=self.__class__, request=self.request, context=context)
-        return context
-
+class FormView(PermissionMixin, ExtraContextMixin, SuccessUrlMixin, _FormView):
     def form_invalid(self, form):
         messages.error(self.request, _('Please check the form for errors.'))
         return super(FormView, self).form_invalid(form)
 
 
-class UpdateView(PermissionMixin, _UpdateView):
-    def get_success_url(self):
-        messages.success(self.request, self.get_success_message())
-        if 'apply' in self.request.POST:
-            return ''
-        return reverse(super(UpdateView, self).get_success_url())
+class ModelFormMixin(object):
+    def form_valid(self, form):
+        self.object = form.save(commit=False)
+        self.manipulate_object(form)
+        self.object.save()
+        form.save_m2m()
+        return HttpResponseRedirect(self.get_success_url())
 
-    def get_context_data(self, **kwargs):
-        context = super(UpdateView, self).get_context_data(**kwargs)
-        template_manipulation.send(
-            sender=self.__class__, request=self.request, context=context)
-        return context
+    def manipulate_object(self, form):
+        pass
 
+
+class UpdateView(PermissionMixin, SuccessUrlMixin, ExtraContextMixin,
+        ModelFormMixin, _UpdateView):
     def form_invalid(self, form):
         messages.error(self.request, _('Please check the form for errors.'))
         return super(UpdateView, self).form_invalid(form)
@@ -240,46 +247,25 @@ class UpdateView(PermissionMixin, _UpdateView):
         return _('%s was successfully modified.') % html_strong(self.object)
 
 
-class CreateView(PermissionMixin, _CreateView):
+class CreateView(PermissionMixin, SuccessUrlMixin, ExtraContextMixin,
+        ModelFormMixin, _CreateView):
     apply_url = None
-
-    def get_success_url(self):
-        messages.success(self.request, self.get_success_message())
-        if 'apply' in self.request.POST:
-            return reverse(self.get_apply_url(), args=[self.object.id])
-        return reverse(super(CreateView, self).get_success_url())
-
-    def get_context_data(self, **kwargs):
-        context = super(CreateView, self).get_context_data(**kwargs)
-        template_manipulation.send(
-            sender=self.__class__, request=self.request, context=context)
-        return context
+    success_url = None
 
     def get_apply_url(self):
-        if self apply_url:
+        if self.apply_url:
             return self.apply_url
         else:
             raise ImproperlyConfigured(
                 "No URL to redirect to. Provide a apply_url.")
 
-
     def form_invalid(self, form):
         messages.error(self.request, _('Please check the form for errors.'))
         return super(CreateView, self).form_invalid(form)
 
-    def form_valid(self, form):
-        self.object = form.save(commit=False)
-        self.manipulate_object(form)
-        self.object.save()
-        form.save_m2m()
-        return HttpResponseRedirect(self.get_success_url())
-
     def get_success_message(self):
         return _('%s was successfully created.') % html_strong(self.object)
 
-    def manipulate_object(self, form):
-        pass
-
 
 class DeleteView(SingleObjectMixin, QuestionMixin, RedirectView):
     def get(self, request, *args, **kwargs):
@@ -296,16 +282,11 @@ class DeleteView(SingleObjectMixin, QuestionMixin, RedirectView):
         return _('%s was successfully deleted.') % html_strong(self.object)
 
 
-class DetailView(TemplateView, SingleObjectMixin):
+class DetailView(PermissionMixin, ExtraContextMixin, _DetailView):
     def get(self, request, *args, **kwargs):
         self.object = self.get_object()
         return super(DetailView, self).get(request, *args, **kwargs)
 
-    def get_context_data(self, **kwargs):
-        context = super(DetailView, self).get_context_data(**kwargs)
-        context.update(SingleObjectMixin.get_context_data(self, **kwargs))
-        return context
-
 
 class PDFView(PermissionMixin, View):
     filename = _('undefined-filename')

From 586425354d257180e604e25729d1f97078fc3c00 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Tue, 8 Jan 2013 23:05:35 +0100
Subject: [PATCH 26/88] Reworked new template, especially agenda and dashboard.

---
 openslides/agenda/static/javascript/agenda.js |  12 ++++--
 openslides/agenda/static/styles/agenda.css    |   5 +++
 openslides/agenda/templates/agenda/edit.html  |   6 +--
 .../agenda/templates/agenda/item_row.html     |  35 ++++++++++--------
 .../agenda/templates/agenda/overview.html     |  18 ++++-----
 openslides/agenda/templates/agenda/view.html  |  26 ++++++++++++-
 .../agenda/templates/agenda/widget.html       |  12 +++---
 .../motion/templates/motion/overview.html     |   8 ++--
 .../templates/participant/login.html          |   2 +
 openslides/participant/views.py               |   2 +-
 .../static/img/glyphicons_152_check.png       | Bin 0 -> 321 bytes
 .../static/img/glyphicons_153_unchecked.png   | Bin 0 -> 204 bytes
 openslides/static/javascript/utils.js         |   8 ++--
 openslides/static/styles/base.css             |  16 ++++++++
 openslides/utils/utils.py                     |   4 +-
 openslides/utils/views.py                     |   2 +-
 16 files changed, 106 insertions(+), 50 deletions(-)
 create mode 100644 openslides/static/img/glyphicons_152_check.png
 create mode 100644 openslides/static/img/glyphicons_153_unchecked.png

diff --git a/openslides/agenda/static/javascript/agenda.js b/openslides/agenda/static/javascript/agenda.js
index 93b2db91c..c2be1928f 100644
--- a/openslides/agenda/static/javascript/agenda.js
+++ b/openslides/agenda/static/javascript/agenda.js
@@ -37,19 +37,23 @@ function hideClosedSlides(hide) {
 $(function() {
     $('.close_link a').click(function(event) {
         event.preventDefault();
-        slide = $(this);
+        var link = $(this);
         $.ajax({
             type: 'GET',
-            url: slide.attr('href'),
+            url: $(this).attr('href'),
             dataType: 'json',
             success: function(data) {
                 if (data.closed) {
                     newclass = 'closed';
+                    link.parent().parent().parent().addClass('itemdoneline');
                 } else {
                     newclass = 'open';
+                    link.parent().parent().parent().removeClass('itemdoneline');
                 }
-                slide.parent().removeClass('closed open').addClass(newclass);
-                slide.attr('href', data.link);
+                link.parent().removeClass('closed open').addClass(newclass);
+
+
+                link.attr('href', data.link);
             }
         });
     });
diff --git a/openslides/agenda/static/styles/agenda.css b/openslides/agenda/static/styles/agenda.css
index 2f9c3d6ab..3851b9db8 100644
--- a/openslides/agenda/static/styles/agenda.css
+++ b/openslides/agenda/static/styles/agenda.css
@@ -18,3 +18,8 @@
 .close_link.closed span {
     background-image: url(../images/icons/close.png);
 }
+
+tr.topline td {
+    border-bottom: 1px solid #333333;
+    background-color: #CDCDCD;
+}
\ No newline at end of file
diff --git a/openslides/agenda/templates/agenda/edit.html b/openslides/agenda/templates/agenda/edit.html
index e022f59ac..95f414f49 100644
--- a/openslides/agenda/templates/agenda/edit.html
+++ b/openslides/agenda/templates/agenda/edit.html
@@ -42,10 +42,8 @@
             <button class="btn" type="submit" name="apply">
                 {% trans 'Apply' %}
             </button>
-            <a href='{% url 'item_overview' %}'>
-            <button class="btn" type="button" onclick="window.location='{% url 'item_overview' %}'">
-                {% trans 'Cancel' %}</span>
-            </button>
+            <a href="{% url 'item_overview' %}" class="btn">
+                {% trans 'Cancel' %}
             </a>
         </div>
         <small>* {% trans "required" %}</small>
diff --git a/openslides/agenda/templates/agenda/item_row.html b/openslides/agenda/templates/agenda/item_row.html
index d8bfc5114..6dab2dcf6 100644
--- a/openslides/agenda/templates/agenda/item_row.html
+++ b/openslides/agenda/templates/agenda/item_row.html
@@ -3,14 +3,15 @@
 {% load tags %}
 
     <td>
-        <span class="close_link{% if item.closed %} closed{% endif %}">
-            {% if perms.agenda.can_manage_agenda %}
-               <a href="{% if item.closed %}{% url 'item_open' item.id %}{% else %}{% url 'item_close' item.id %}{% endif %}" title="{% trans 'Mark item as done' %}">
-                    <span></span>
-                </a>
-            {% elif item.closed %}
-                <img src="{% static 'images/icons/close.png' %}" title="{% trans 'Item closed' %}">
-            {% endif %}
+        <span class="close_link {% if item.closed %}closed{% else %}open{% endif %}">
+        {% if perms.agenda.can_manage_agenda %}
+            <a href="{% if item.closed %}{% url 'item_open' item.id %}{% else %}{% url 'item_close' item.id %}{% endif %}" 
+                class="btn btn-mini" title="{% trans 'Reopen item' %}">
+                <i class="icon- custom-icons"></i>
+            </a>
+        {% else %}
+            <i class="icon- custom-icons"></i>
+        {% endif %}
         </span>
     </td>
     <td>
@@ -24,7 +25,7 @@
         {{ item.get_title_supplement|safe }}
     </td>
     {% if perms.agenda.can_manage_agenda %}
-    <td>
+    <td class="optional">
         {{ item.comment|first_line }}
     </td>
     {% endif %}
@@ -32,16 +33,20 @@
     <td>
         <span style="width: 1px; white-space: nowrap;">
         {% if perms.projector.can_manage_projector %}
-            <a class="activate_link {% if item.active %}active{% endif %}" href="{% url 'projector_activate_slide' item.sid %}" title="{% trans 'Activate item' %}">
-                <span></span>
+            <a href="{% url 'projector_activate_slide' item.sid  %}" class="activate_link btn {% if item.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Activate item' %}">
+                <i class="icon icon-facetime-video {% if item.active %}icon-white{% endif %}"></i>
             </a>
         {% endif %}
         {% if perms.agenda.can_manage_agenda %}
-            <a href="{% model_url item 'edit' %}"><img src="{% static 'images/icons/edit.png' %}" title="{% trans 'Edit item' %}"></a>
-            <a href="{% model_url item 'delete' %}"><img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Delete item' %}"></a>
+            <a href="{% model_url item 'edit' %}" title="{% trans 'Edit' %}" class="btn btn-mini">
+                <i class="icon-pencil"></i>
+            </a>
+            <a href="{% model_url item 'delete' %}" title="{% trans 'Delete' %}" class="btn btn-mini">
+                <i class="icon-remove"></i>
+            </a>
             {% if not item.is_leaf_node %}
-                <a class="activate_link" href="{% url 'projector_activate_slide' item.sid 'summary' %}">
-                    <img src="{% static 'images/icons/summary.png' %}" title="{% trans 'Activate summary for this item' %}">
+                <a href="{% url 'projector_activate_slide' item.sid 'summary' %}" class="activate_link btn btn-mini" title="{% trans 'Activate summary for this item' %}">
+                    <img src="{% static 'images/icons/summary.png' %}">
                 </a>
             {% endif %}
         {% endif %}
diff --git a/openslides/agenda/templates/agenda/overview.html b/openslides/agenda/templates/agenda/overview.html
index af86c2276..55f8e1490 100644
--- a/openslides/agenda/templates/agenda/overview.html
+++ b/openslides/agenda/templates/agenda/overview.html
@@ -63,7 +63,7 @@
         </h1>
 
         <label class="checkbox">
-        <input type="checkbox" id="hide_closed_items"> {% trans "Hide closed items" %}
+            <input type="checkbox" id="hide_closed_items"> {% trans "Hide closed items" %}
         </label>
 
         <small><i>{{ items|length }}
@@ -74,7 +74,7 @@
                 <th width="10px"></th>
                 <th>{% trans "Item" %}</th>
                 {% if perms.agenda.can_manage_agenda %}
-                    <th width="200">{% trans "Comment" %}</th>
+                    <th width="200" class="optional">{% trans "Comment" %}</th>
                 {% endif %}
                 {% if perms.agenda.can_manage_agenda or perms.projector.can_manage_projector %}
                     <th width="50">{% trans "Actions" %}</th>
@@ -86,26 +86,26 @@
             <tr class="topline{% if active_sid == 'agenda' %} activeline{% endif %}">
                 <td></td>
                 <td>
-                    <strong>{% trans "Agenda" %}</strong>
+                    {% trans "Agenda" %}
                 </td>
                 {% if perms.agenda.can_manage_agenda %}
-                <td></td>
+                <td class="optional"></td>
                 {% endif %}
                 {% if perms.agenda.can_manage_agenda or perms.projector.can_manage_projector %}
                 <td>
                 {% if perms.projector.can_manage_projector %}
                     <span>
-                        <a class="activate_link{% if active_sid == 'agenda' %} active{% endif %}" href="{% url 'projector_activate_slide' 'agenda' %}" title="{% trans 'Activate item' %}">
-                            <span></span>
-                        </a>
-                    </span>
+                    <a href="{% url 'projector_activate_slide' 'agenda' %}" class="activate_link btn {% if active_sid == 'agenda' %}btn-primary{% endif %} btn-mini" title="{% trans 'Activate agenda' %}">
+                        <i class="icon icon-facetime-video {% if active_sid == 'agenda' %}icon-white{% endif %}"></i>
+                    </a>
+                    <span>
                 {% endif %}
                 </td>
                 {% endif %}
             </tr>
         {% if items %}
             {% for item in items %}
-            <tr class="itemline draggable{% cycle ' odd' '' %}{% if item.active %} activeline{% endif %}">
+            <tr class="draggable{% if item.active %} activeline{% endif %}{% if item.closed %} itemdoneline{% endif %}">
                 {% include "agenda/item_row.html" %}
             </tr>
             {% endfor %}
diff --git a/openslides/agenda/templates/agenda/view.html b/openslides/agenda/templates/agenda/view.html
index 94ad22f00..844461cc9 100644
--- a/openslides/agenda/templates/agenda/view.html
+++ b/openslides/agenda/templates/agenda/view.html
@@ -5,7 +5,31 @@
 {% block title %}{{ block.super }} – {{ item.title }}{% endblock %}
 
 {% block content %}
-    <h1>{{ item }}</h1>
+<h1>
+    {{ item }}
+    <small class="pull-right">
+    <div class="btn-toolbar">
+        <a href="{% url 'item_overview' %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
+        <div class="btn-group">
+            <a data-toggle="dropdown" href="#" class="btn btn-mini dropdown-toggle">
+                {% trans 'More actions' %}
+                <span class="caret"></span>
+            </a>
+            {% if perms.agenda.can_manage_agenda %}
+            <ul class="dropdown-menu pull-right">
+                <li><a href="{% url 'item_edit' item.id %}"><i class="icon-edit"></i> {% trans 'Edit item' %}</a></li>
+                <li><a href="{% url 'item_delete' item.id %}"><i class="icon-remove"></i> {% trans 'Delete item' %}</a></li>
+            </ul>
+            {% endif %}
+        </div>
+            {% if perms.projector.can_manage_projector %}
+                <a href="{% url 'projector_activate_slide' item.sid  %}" class="activate_link btn btn-mini {% if item.active %}btn-primary{% endif %}"  rel="tooltip" data-original-title="{% trans 'Show item' %}">
+                    <i class="icon icon-facetime-video {% if item.active %}icon-white{% endif %}"></i>
+                </a>
+            {% endif %}
+    </div>
+    </small>
+</h1>
     <p>{{ item.text|safe|linebreaks }}</p>
 
     {% if perms.agenda.can_manage_agenda %}
diff --git a/openslides/agenda/templates/agenda/widget.html b/openslides/agenda/templates/agenda/widget.html
index b1dc4bdd2..f5438b966 100644
--- a/openslides/agenda/templates/agenda/widget.html
+++ b/openslides/agenda/templates/agenda/widget.html
@@ -4,9 +4,9 @@
 
 <ul style="line-height: 180%">
     <li class="{% if agenda.active %}activeline{% endif %}">
-        <a href="{% url 'projector_activate_slide' agenda.key %}" class="activate_link {% if agenda.active %}active{% endif %}">
-            <div></div>
-        </a>
+        <a href="{% url 'projector_activate_slide' agenda.key  %}" class="activate_link btn {% if agenda.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show agenda' %}">
+            <i class="icon icon-facetime-video {% if item.active %}icon-white{% endif %}"></i>
+        </a>&nbsp;
         <a href="{% url 'projctor_preview_slide' agenda.key %}" title="{% trans 'Preview' %}" class="icon preview right">
             <span></span>
         </a>
@@ -17,9 +17,9 @@
 <ul style="line-height: 180%">
 {% for item in items %}
     <li class="{% if item.active %}activeline{% endif %}">
-        <a href="{% url 'projector_activate_slide' item.sid %}" class="activate_link {% if item.active %}active{% endif %}">
-            <div></div>
-        </a>
+        <a href="{% url 'projector_activate_slide' item.sid  %}" class="activate_link btn {% if item.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show item' %}">
+            <i class="icon icon-facetime-video {% if item.active %}icon-white{% endif %}"></i>
+        </a>&nbsp;
         <a href="{% model_url item 'delete' %}" title="{% trans 'Delete' %}" class="icon delete right">
             <span></span>
         </a>
diff --git a/openslides/motion/templates/motion/overview.html b/openslides/motion/templates/motion/overview.html
index d35de0978..736d68c6c 100644
--- a/openslides/motion/templates/motion/overview.html
+++ b/openslides/motion/templates/motion/overview.html
@@ -52,10 +52,10 @@
             <th><a href="?sort=number{% if 'number' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "#" %}</a></th>
             <th><a href="?sort=title{% if 'title' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Motion title" %}</a></th>
             {% if min_supporters > 0 %}
-            <th><a href="?sort=supporter{% if 'supporter' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Number of supporters" %}</a></th>
+            <th class="optional"><a href="?sort=supporter{% if 'supporter' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Number of supporters" %}</a></th>
             {% endif %}
             <th><a href="?sort=status{% if 'status' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Status" %}</a></th>
-            <th><a href="?sort=submitter{% if 'submitter' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Submitter" %}</a></th>
+            <th class="optional"><a href="?sort=submitter{% if 'submitter' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Submitter" %}</a></th>
             <th class="optional"><a href="?sort=time{% if 'time' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Creation Time" %}<a></th>
             <th style="width: 1px;">{% trans "Actions" %}</th>
         </tr>
@@ -66,7 +66,7 @@
             <td>{% if motion.number %}{{ motion.number }}{% else %}-{% endif %}</td>
             <td><a href="{% url 'motion_view' motion.id %}">{{ motion.public_version.title }}</a></td>
         {% if min_supporters > 0 %}
-            <td>{{ motion.count_supporters }}</td>
+            <td class="optional">{{ motion.count_supporters }}</td>
         {% endif %}
             <td>{% if motion.status != "pub" %}
                 {{ motion.get_status_display }}<br>
@@ -76,7 +76,7 @@
                 {% if not forloop.last %}<br>{%endif%}
                 {% endfor %}
             </td>
-            <td>{{ motion.submitter }}</td>
+            <td class="optional">{{ motion.submitter }}</td>
             <td class="optional">{{ motion.creation_time }}</td>
             <td>
                 <span style="width: 1px; white-space: nowrap;">
diff --git a/openslides/participant/templates/participant/login.html b/openslides/participant/templates/participant/login.html
index 3558d0562..af1083ce1 100644
--- a/openslides/participant/templates/participant/login.html
+++ b/openslides/participant/templates/participant/login.html
@@ -51,6 +51,8 @@
         <input type="hidden" name="next" value="{{ next }}" />
         </p>
     </form>
+{% endblock %}
+{% block javascript %}
     {% if os_enable_anonymous_login %}
         <script>
             $("#anonymous_login").live('click', function () {
diff --git a/openslides/participant/views.py b/openslides/participant/views.py
index 985d65f3d..d94b48911 100644
--- a/openslides/participant/views.py
+++ b/openslides/participant/views.py
@@ -507,7 +507,7 @@ def user_settings(request):
         form_user = UsersettingsForm(instance=request.user, initial={'language': language})
 
     return {
-        'form': form,
+        'form': form_user,
         'edituser': request.user,
     }
 
diff --git a/openslides/static/img/glyphicons_152_check.png b/openslides/static/img/glyphicons_152_check.png
new file mode 100644
index 0000000000000000000000000000000000000000..bbb6dcae5b939f349e973613ad5b0135cca54e90
GIT binary patch
literal 321
zcmeAS@N?(olHy`uVBq!ia0vp^d_c_2!3HG#TlXXZDYhhUcNd2LAh=-f^2tCE&H|6f
zVxTHv5N2eUHAey{$X?><>&kwYkwe6Q`S^houYp46JY5_^G|u;4TIlEOD8PE*^8#Ok
zh?M$<32G7#m<4<Tw(?HR2=R4Zm8BK%w@pe#?z+NnR)q;OnpSB%QM6irGiSDVp3%)S
zclQ>n8*``saETNambOXkoXiv-v7kM9cf@1a^E){6RJG=<I_`b#V6y6-F7~-6&I@16
zE_iJrzpDGx#<`(;57<0zTWC4KLgwMxG>7ua|Cy^@c~%|Ccj=6ld1NIXmv&UFGuVCy
ze^1fFeJjshID5@##U!?UhQ8k-9<YDUSR~q<)$&^G|4&QRV=G_q&kXhvj^OxV4fGj<
Mr>mdKI;Vst0DRDToB#j-

literal 0
HcmV?d00001

diff --git a/openslides/static/img/glyphicons_153_unchecked.png b/openslides/static/img/glyphicons_153_unchecked.png
new file mode 100644
index 0000000000000000000000000000000000000000..23bced66aa9c49c154e5a0f92fd28ed43563cc17
GIT binary patch
literal 204
zcmeAS@N?(olHy`uVBq!ia0vp^+#t-s1|(OmDOUqhY)RhkE)4%caKYZ?lYt_f1s;*b
zKvlvZ%*Zfnjs#GUy~NYkmHjRwhlnvl>625FfI^X;E{-7*m(N~2$k|{Z;Bs+!g)j3;
zCC!6HYfcosIjQTQZ^_Ygakjiz*@O3~Vq9f1{F@i^<lfw%uv0j~Fnjt<W69$;oL-&a
sbd&!vQ$|)lVb_-%uPqns`;%bHc*;m#KRoSW4$u+?Pgg&ebxsLQ08`0Ak^lez

literal 0
HcmV?d00001

diff --git a/openslides/static/javascript/utils.js b/openslides/static/javascript/utils.js
index 8924d473e..b676bc80b 100644
--- a/openslides/static/javascript/utils.js
+++ b/openslides/static/javascript/utils.js
@@ -23,14 +23,16 @@ $(function () {
         var link = $(this);
         $.ajax({
             type: 'GET',
-            url: $(this).attr('href'),
+            url: link.attr('href'),
             dataType: 'json',
             data: '',
             success: function(data) {
-                $('.activate_link').removeClass('active');
+                $('.activate_link').removeClass('btn-primary');
+                $('.icon').removeClass('icon-white');
                 $('tr').removeClass('activeline');
                 link.parent().parent().parent().addClass('activeline');
-                link.addClass('active');
+                link.addClass('btn-primary');
+                link.find('.icon').addClass('icon-white');
             }
         });
     });
diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css
index b3c6b40c5..6c8c6950e 100644
--- a/openslides/static/styles/base.css
+++ b/openslides/static/styles/base.css
@@ -79,6 +79,12 @@ a:hover {
 
 
 /** Utils **/
+tr.activeline td, li.activeline {
+    background-color: #bed4de !important;
+}
+tr.itemdoneline td, li.itemdoneline {
+    background-color: #EAEAEA !important;
+}
 .nopadding {
     padding: 0;
 }
@@ -222,6 +228,16 @@ form .required label:after {
     background-position: -360px -144px;
 }
 
+/** More glyphicons free icons **/
+.custom-icons {
+    background-position: 0;
+}
+.icon-check_new, .close_link.closed i {
+    background-image: url("../img/glyphicons_152_check.png");
+}
+.icon-uncheck_new, .close_link.open i {
+    background-image: url("../img/glyphicons_153_unchecked.png");
+}
 
 /** Responsive **/
 @media (max-width: 767px) {
diff --git a/openslides/utils/utils.py b/openslides/utils/utils.py
index d5898703b..b7744c9a7 100644
--- a/openslides/utils/utils.py
+++ b/openslides/utils/utils.py
@@ -38,8 +38,8 @@ def gen_confirm_form(request, message, url):
         %s
         <form action="%s" method="post">
             <input type="hidden" value="%s" name="csrfmiddlewaretoken">
-            <button type="submit" class="btn">%s</button>
-            <button class="btn">%s</button>
+            <button type="submit" class="btn btn-mini">%s</button>
+            <button class="btn btn-mini">%s</button>
         </form>
         """
         % (message, url, csrf(request)['csrf_token'], _("Yes"), _("No")))
diff --git a/openslides/utils/views.py b/openslides/utils/views.py
index d65156db2..69f024dcb 100644
--- a/openslides/utils/views.py
+++ b/openslides/utils/views.py
@@ -121,7 +121,7 @@ class QuestionMixin(object):
 
     def confirm_form(self):
         option_fields = "\n".join([
-            '<button type="submit" class="btn" name="%s">%s</button>' % (option[0], unicode(option[1]))
+            '<button type="submit" class="btn btn-mini" name="%s">%s</button>' % (option[0], unicode(option[1]))
             for option in self.get_answer_options()])
         messages.warning(
             self.request,

From a4592ec8493410feebded1e9ee83efaaf3bf1d60 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Fri, 18 Jan 2013 21:44:47 +0100
Subject: [PATCH 27/88] Reworked projector activate buttons in agenda widget.

---
 openslides/agenda/templates/agenda/widget.html      |  8 ++++----
 openslides/projector/static/javascript/dashboard.js | 10 ++++++----
 openslides/static/styles/base.css                   |  6 +++---
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/openslides/agenda/templates/agenda/widget.html b/openslides/agenda/templates/agenda/widget.html
index f5438b966..ce856707b 100644
--- a/openslides/agenda/templates/agenda/widget.html
+++ b/openslides/agenda/templates/agenda/widget.html
@@ -4,8 +4,8 @@
 
 <ul style="line-height: 180%">
     <li class="{% if agenda.active %}activeline{% endif %}">
-        <a href="{% url 'projector_activate_slide' agenda.key  %}" class="activate_link btn {% if agenda.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show agenda' %}">
-            <i class="icon icon-facetime-video {% if item.active %}icon-white{% endif %}"></i>
+        <a href="{% url 'projector_activate_slide' agenda.key  %}" class="activate_projector btn {% if agenda.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show agenda' %}">
+            <i class="icon icon-facetime-video {% if agenda.active %}icon-white{% endif %}"></i>
         </a>&nbsp;
         <a href="{% url 'projctor_preview_slide' agenda.key %}" title="{% trans 'Preview' %}" class="icon preview right">
             <span></span>
@@ -17,7 +17,7 @@
 <ul style="line-height: 180%">
 {% for item in items %}
     <li class="{% if item.active %}activeline{% endif %}">
-        <a href="{% url 'projector_activate_slide' item.sid  %}" class="activate_link btn {% if item.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show item' %}">
+        <a href="{% url 'projector_activate_slide' item.sid  %}" class="activate_projector btn {% if item.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show item' %}">
             <i class="icon icon-facetime-video {% if item.active %}icon-white{% endif %}"></i>
         </a>&nbsp;
         <a href="{% model_url item 'delete' %}" title="{% trans 'Delete' %}" class="icon delete right">
@@ -30,7 +30,7 @@
             <span></span>
         </a>
         {% if not item.is_leaf_node %}
-        <a class="activate_link right" href="{% url 'projector_activate_slide' item.sid 'summary' %}">
+        <a class="activate_projector right" href="{% url 'projector_activate_slide' item.sid 'summary' %}">
             <img src="{% static 'images/icons/summary.png' %}"
                 title="{% trans 'Activate summary for this item' %}"
                 style="padding-right: 2px;">
diff --git a/openslides/projector/static/javascript/dashboard.js b/openslides/projector/static/javascript/dashboard.js
index 430709c72..d258c7e1c 100644
--- a/openslides/projector/static/javascript/dashboard.js
+++ b/openslides/projector/static/javascript/dashboard.js
@@ -51,7 +51,7 @@ $(function() {
     }
 
     // activate an element to show it on projector
-    $('.activate_link').click(function(event) {
+    $('.activate_projector').click(function(event) {
         event.preventDefault();
         var link = $(this);
         $.ajax({
@@ -59,10 +59,12 @@ $(function() {
             url: $(this).attr('href'),
             dataType: 'json',
             success: function(data) {
-                $('.activate_link').removeClass('active');
+                $('.activate_projector').removeClass('btn-primary');
+                $('.activate_projector .icon').removeClass('icon-white');
                 $('li').removeClass('activeline');
-                $('div').removeClass('activeline');
-                link.addClass('active');
+                //$('div').removeClass('activeline');
+                link.addClass('btn-primary');
+                link.find('.icon').addClass('icon-white');
                 link.parent().addClass('activeline');
             },
             error: function () {
diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css
index 6c8c6950e..edaa7be43 100644
--- a/openslides/static/styles/base.css
+++ b/openslides/static/styles/base.css
@@ -79,12 +79,12 @@ a:hover {
 
 
 /** Utils **/
-tr.activeline td, li.activeline {
-    background-color: #bed4de !important;
-}
 tr.itemdoneline td, li.itemdoneline {
     background-color: #EAEAEA !important;
 }
+tr.activeline td, li.activeline {
+    background-color: #bed4de !important;
+}
 .nopadding {
     padding: 0;
 }

From da4ed365bcf15438da78d14ae1c011dbcd50b1c5 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Fri, 18 Jan 2013 22:10:00 +0100
Subject: [PATCH 28/88] Updated js and css libraries (twitter bootstrap to
 2.2.2 and jquery to 1.9.0).

---
 extras/benchmark/bench.py                     |    6 +-
 openslides/motion/templates/motion/view.html  |    5 +-
 .../projector/templates/base-projector.html   |    2 +-
 openslides/static/javascript/bootstrap.min.js |    2 +-
 openslides/static/javascript/jquery.js        |    4 -
 openslides/static/javascript/jquery.min.js    |    4 +
 .../static/styles/bootstrap-responsive.css    | 1040 ---
 .../styles/bootstrap-responsive.min.css       |    9 +
 openslides/static/styles/bootstrap.css        | 5624 -----------------
 openslides/static/styles/bootstrap.min.css    |    9 +
 openslides/templates/base.html                |    6 +-
 11 files changed, 33 insertions(+), 6678 deletions(-)
 delete mode 100644 openslides/static/javascript/jquery.js
 create mode 100644 openslides/static/javascript/jquery.min.js
 delete mode 100644 openslides/static/styles/bootstrap-responsive.css
 create mode 100644 openslides/static/styles/bootstrap-responsive.min.css
 delete mode 100644 openslides/static/styles/bootstrap.css
 create mode 100644 openslides/static/styles/bootstrap.min.css

diff --git a/extras/benchmark/bench.py b/extras/benchmark/bench.py
index 7b9ca4178..edcfa3075 100755
--- a/extras/benchmark/bench.py
+++ b/extras/benchmark/bench.py
@@ -31,7 +31,7 @@ URL_SETS = {
         "/jsi18n/",
         "/static/styles/base.css",
         "/static/javascript/utils.js",
-        "/static/javascript/jquery.js",
+        "/static/javascript/jquery.min.js",
         "/static/images/bg-submenu.gif",
         "/static/images/bg-header.gif",
         "/static/images/logo.png",
@@ -44,7 +44,7 @@ URL_SETS = {
         "/static/styles/tabledrag.css",
         "/static/javascript/utils.js",
         "/static/styles/agenda.css",
-        "/static/javascript/jquery.js",
+        "/static/javascript/jquery.min.js",
         "/jsi18n/",
         "/static/images/bg-header.gif",
         "/static/images/bg-submenu.gif",
@@ -56,7 +56,7 @@ URL_SETS = {
         "/application/",
         "/static/styles/base.css",
         "/static/javascript/utils.js",
-        "/static/javascript/jquery.js",
+        "/static/javascript/jquery.min.js",
         "/jsi18n/",
         "/static/images/bg-header.gif",
         "/static/images/bg-submenu.gif",
diff --git a/openslides/motion/templates/motion/view.html b/openslides/motion/templates/motion/view.html
index 9fdeb3b5b..cbae6988f 100644
--- a/openslides/motion/templates/motion/view.html
+++ b/openslides/motion/templates/motion/view.html
@@ -16,6 +16,7 @@
 {% block content %}
 <h1>
     {{ version.title }}
+    <br>
     <small>
     {% if motion.number != None %}
         {% trans "Motion" %} {{ motion.number }},
@@ -67,7 +68,7 @@
 </h1>
 
 <div class="row-fluid">
-<div class="span9">
+<div class="span8">
     {% if motion.public_version != motion.last_version %}
         &#8901;
         {% if version == motion.public_version %}
@@ -156,7 +157,7 @@
 </div> <!--/span-->
 
 
-<div class="span3">
+<div class="span4">
     <div class="well">
         <!-- Submitter -->
         <h5>{% trans "Submitter" %}:</h5>
diff --git a/openslides/projector/templates/base-projector.html b/openslides/projector/templates/base-projector.html
index 9f06c1ad1..e86cd52d6 100644
--- a/openslides/projector/templates/base-projector.html
+++ b/openslides/projector/templates/base-projector.html
@@ -8,7 +8,7 @@
     <head>
         <link type="text/css" rel="stylesheet" href="{% static 'styles/projector.css' %}">
         <link rel="shortcut icon" href="{% static 'images/favicon.png' %}" type="image/png" />
-        <script type="text/javascript" src="{% static 'javascript/jquery.js' %}"></script>
+        <script type="text/javascript" src="{% static 'javascript/jquery.min.js' %}"></script>
         <script type="text/javascript" src="{% static 'javascript/projector.js' %}"></script>
         <title>XX{% block title %} {% get_config 'event_name' %} {% endblock %}</title>
         {% block header %}
diff --git a/openslides/static/javascript/bootstrap.min.js b/openslides/static/javascript/bootstrap.min.js
index 66e887bb3..6eeb15ce3 100644
--- a/openslides/static/javascript/bootstrap.min.js
+++ b/openslides/static/javascript/bootstrap.min.js
@@ -3,4 +3,4 @@
 * Copyright 2012 Twitter, Inc.
 * http://www.apache.org/licenses/LICENSE-2.0.txt
 */
-!function(e){e(function(){"use strict";e.support.transition=function(){var e=function(){var e=document.createElement("bootstrap"),t={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"},n;for(n in t)if(e.style[n]!==undefined)return t[n]}();return e&&{end:e}}()})}(window.jQuery),!function(e){"use strict";var t='[data-dismiss="alert"]',n=function(n){e(n).on("click",t,this.close)};n.prototype.close=function(t){function s(){i.trigger("closed").remove()}var n=e(this),r=n.attr("data-target"),i;r||(r=n.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,"")),i=e(r),t&&t.preventDefault(),i.length||(i=n.hasClass("alert")?n:n.parent()),i.trigger(t=e.Event("close"));if(t.isDefaultPrevented())return;i.removeClass("in"),e.support.transition&&i.hasClass("fade")?i.on(e.support.transition.end,s):s()},e.fn.alert=function(t){return this.each(function(){var r=e(this),i=r.data("alert");i||r.data("alert",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.alert.Constructor=n,e(function(){e("body").on("click.alert.data-api",t,n.prototype.close)})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.button.defaults,n)};t.prototype.setState=function(e){var t="disabled",n=this.$element,r=n.data(),i=n.is("input")?"val":"html";e+="Text",r.resetText||n.data("resetText",n[i]()),n[i](r[e]||this.options[e]),setTimeout(function(){e=="loadingText"?n.addClass(t).attr(t,t):n.removeClass(t).removeAttr(t)},0)},t.prototype.toggle=function(){var e=this.$element.parent('[data-toggle="buttons-radio"]');e&&e.find(".active").removeClass("active"),this.$element.toggleClass("active")},e.fn.button=function(n){return this.each(function(){var r=e(this),i=r.data("button"),s=typeof n=="object"&&n;i||r.data("button",i=new t(this,s)),n=="toggle"?i.toggle():n&&i.setState(n)})},e.fn.button.defaults={loadingText:"loading..."},e.fn.button.Constructor=t,e(function(){e("body").on("click.button.data-api","[data-toggle^=button]",function(t){var n=e(t.target);n.hasClass("btn")||(n=n.closest(".btn")),n.button("toggle")})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=n,this.options.slide&&this.slide(this.options.slide),this.options.pause=="hover"&&this.$element.on("mouseenter",e.proxy(this.pause,this)).on("mouseleave",e.proxy(this.cycle,this))};t.prototype={cycle:function(t){return t||(this.paused=!1),this.options.interval&&!this.paused&&(this.interval=setInterval(e.proxy(this.next,this),this.options.interval)),this},to:function(t){var n=this.$element.find(".item.active"),r=n.parent().children(),i=r.index(n),s=this;if(t>r.length-1||t<0)return;return this.sliding?this.$element.one("slid",function(){s.to(t)}):i==t?this.pause().cycle():this.slide(t>i?"next":"prev",e(r[t]))},pause:function(t){return t||(this.paused=!0),this.$element.find(".next, .prev").length&&e.support.transition.end&&(this.$element.trigger(e.support.transition.end),this.cycle()),clearInterval(this.interval),this.interval=null,this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(t,n){var r=this.$element.find(".item.active"),i=n||r[t](),s=this.interval,o=t=="next"?"left":"right",u=t=="next"?"first":"last",a=this,f=e.Event("slide",{relatedTarget:i[0]});this.sliding=!0,s&&this.pause(),i=i.length?i:this.$element.find(".item")[u]();if(i.hasClass("active"))return;if(e.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(f);if(f.isDefaultPrevented())return;i.addClass(t),i[0].offsetWidth,r.addClass(o),i.addClass(o),this.$element.one(e.support.transition.end,function(){i.removeClass([t,o].join(" ")).addClass("active"),r.removeClass(["active",o].join(" ")),a.sliding=!1,setTimeout(function(){a.$element.trigger("slid")},0)})}else{this.$element.trigger(f);if(f.isDefaultPrevented())return;r.removeClass("active"),i.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return s&&this.cycle(),this}},e.fn.carousel=function(n){return this.each(function(){var r=e(this),i=r.data("carousel"),s=e.extend({},e.fn.carousel.defaults,typeof n=="object"&&n),o=typeof n=="string"?n:s.slide;i||r.data("carousel",i=new t(this,s)),typeof n=="number"?i.to(n):o?i[o]():s.interval&&i.cycle()})},e.fn.carousel.defaults={interval:5e3,pause:"hover"},e.fn.carousel.Constructor=t,e(function(){e("body").on("click.carousel.data-api","[data-slide]",function(t){var n=e(this),r,i=e(n.attr("data-target")||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,"")),s=!i.data("modal")&&e.extend({},i.data(),n.data());i.carousel(s),t.preventDefault()})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.collapse.defaults,n),this.options.parent&&(this.$parent=e(this.options.parent)),this.options.toggle&&this.toggle()};t.prototype={constructor:t,dimension:function(){var e=this.$element.hasClass("width");return e?"width":"height"},show:function(){var t,n,r,i;if(this.transitioning)return;t=this.dimension(),n=e.camelCase(["scroll",t].join("-")),r=this.$parent&&this.$parent.find("> .accordion-group > .in");if(r&&r.length){i=r.data("collapse");if(i&&i.transitioning)return;r.collapse("hide"),i||r.data("collapse",null)}this.$element[t](0),this.transition("addClass",e.Event("show"),"shown"),e.support.transition&&this.$element[t](this.$element[0][n])},hide:function(){var t;if(this.transitioning)return;t=this.dimension(),this.reset(this.$element[t]()),this.transition("removeClass",e.Event("hide"),"hidden"),this.$element[t](0)},reset:function(e){var t=this.dimension();return this.$element.removeClass("collapse")[t](e||"auto")[0].offsetWidth,this.$element[e!==null?"addClass":"removeClass"]("collapse"),this},transition:function(t,n,r){var i=this,s=function(){n.type=="show"&&i.reset(),i.transitioning=0,i.$element.trigger(r)};this.$element.trigger(n);if(n.isDefaultPrevented())return;this.transitioning=1,this.$element[t]("in"),e.support.transition&&this.$element.hasClass("collapse")?this.$element.one(e.support.transition.end,s):s()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}},e.fn.collapse=function(n){return this.each(function(){var r=e(this),i=r.data("collapse"),s=typeof n=="object"&&n;i||r.data("collapse",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.collapse.defaults={toggle:!0},e.fn.collapse.Constructor=t,e(function(){e("body").on("click.collapse.data-api","[data-toggle=collapse]",function(t){var n=e(this),r,i=n.attr("data-target")||t.preventDefault()||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,""),s=e(i).data("collapse")?"toggle":n.data();n[e(i).hasClass("in")?"addClass":"removeClass"]("collapsed"),e(i).collapse(s)})})}(window.jQuery),!function(e){"use strict";function r(){i(e(t)).removeClass("open")}function i(t){var n=t.attr("data-target"),r;return n||(n=t.attr("href"),n=n&&n.replace(/.*(?=#[^\s]*$)/,"")),r=e(n),r.length||(r=t.parent()),r}var t="[data-toggle=dropdown]",n=function(t){var n=e(t).on("click.dropdown.data-api",this.toggle);e("html").on("click.dropdown.data-api",function(){n.parent().removeClass("open")})};n.prototype={constructor:n,toggle:function(t){var n=e(this),s,o;if(n.is(".disabled, :disabled"))return;return s=i(n),o=s.hasClass("open"),r(),o||(s.toggleClass("open"),n.focus()),!1},keydown:function(t){var n,r,s,o,u,a;if(!/(38|40|27)/.test(t.keyCode))return;n=e(this),t.preventDefault(),t.stopPropagation();if(n.is(".disabled, :disabled"))return;o=i(n),u=o.hasClass("open");if(!u||u&&t.keyCode==27)return n.click();r=e("[role=menu] li:not(.divider) a",o);if(!r.length)return;a=r.index(r.filter(":focus")),t.keyCode==38&&a>0&&a--,t.keyCode==40&&a<r.length-1&&a++,~a||(a=0),r.eq(a).focus()}},e.fn.dropdown=function(t){return this.each(function(){var r=e(this),i=r.data("dropdown");i||r.data("dropdown",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.dropdown.Constructor=n,e(function(){e("html").on("click.dropdown.data-api touchstart.dropdown.data-api",r),e("body").on("click.dropdown touchstart.dropdown.data-api",".dropdown",function(e){e.stopPropagation()}).on("click.dropdown.data-api touchstart.dropdown.data-api",t,n.prototype.toggle).on("keydown.dropdown.data-api touchstart.dropdown.data-api",t+", [role=menu]",n.prototype.keydown)})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.options=n,this.$element=e(t).delegate('[data-dismiss="modal"]',"click.dismiss.modal",e.proxy(this.hide,this)),this.options.remote&&this.$element.find(".modal-body").load(this.options.remote)};t.prototype={constructor:t,toggle:function(){return this[this.isShown?"hide":"show"]()},show:function(){var t=this,n=e.Event("show");this.$element.trigger(n);if(this.isShown||n.isDefaultPrevented())return;e("body").addClass("modal-open"),this.isShown=!0,this.escape(),this.backdrop(function(){var n=e.support.transition&&t.$element.hasClass("fade");t.$element.parent().length||t.$element.appendTo(document.body),t.$element.show(),n&&t.$element[0].offsetWidth,t.$element.addClass("in").attr("aria-hidden",!1).focus(),t.enforceFocus(),n?t.$element.one(e.support.transition.end,function(){t.$element.trigger("shown")}):t.$element.trigger("shown")})},hide:function(t){t&&t.preventDefault();var n=this;t=e.Event("hide"),this.$element.trigger(t);if(!this.isShown||t.isDefaultPrevented())return;this.isShown=!1,e("body").removeClass("modal-open"),this.escape(),e(document).off("focusin.modal"),this.$element.removeClass("in").attr("aria-hidden",!0),e.support.transition&&this.$element.hasClass("fade")?this.hideWithTransition():this.hideModal()},enforceFocus:function(){var t=this;e(document).on("focusin.modal",function(e){t.$element[0]!==e.target&&!t.$element.has(e.target).length&&t.$element.focus()})},escape:function(){var e=this;this.isShown&&this.options.keyboard?this.$element.on("keyup.dismiss.modal",function(t){t.which==27&&e.hide()}):this.isShown||this.$element.off("keyup.dismiss.modal")},hideWithTransition:function(){var t=this,n=setTimeout(function(){t.$element.off(e.support.transition.end),t.hideModal()},500);this.$element.one(e.support.transition.end,function(){clearTimeout(n),t.hideModal()})},hideModal:function(e){this.$element.hide().trigger("hidden"),this.backdrop()},removeBackdrop:function(){this.$backdrop.remove(),this.$backdrop=null},backdrop:function(t){var n=this,r=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var i=e.support.transition&&r;this.$backdrop=e('<div class="modal-backdrop '+r+'" />').appendTo(document.body),this.options.backdrop!="static"&&this.$backdrop.click(e.proxy(this.hide,this)),i&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),i?this.$backdrop.one(e.support.transition.end,t):t()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),e.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(e.support.transition.end,e.proxy(this.removeBackdrop,this)):this.removeBackdrop()):t&&t()}},e.fn.modal=function(n){return this.each(function(){var r=e(this),i=r.data("modal"),s=e.extend({},e.fn.modal.defaults,r.data(),typeof n=="object"&&n);i||r.data("modal",i=new t(this,s)),typeof n=="string"?i[n]():s.show&&i.show()})},e.fn.modal.defaults={backdrop:!0,keyboard:!0,show:!0},e.fn.modal.Constructor=t,e(function(){e("body").on("click.modal.data-api",'[data-toggle="modal"]',function(t){var n=e(this),r=n.attr("href"),i=e(n.attr("data-target")||r&&r.replace(/.*(?=#[^\s]+$)/,"")),s=i.data("modal")?"toggle":e.extend({remote:!/#/.test(r)&&r},i.data(),n.data());t.preventDefault(),i.modal(s).one("hide",function(){n.focus()})})})}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("tooltip",e,t)};t.prototype={constructor:t,init:function(t,n,r){var i,s;this.type=t,this.$element=e(n),this.options=this.getOptions(r),this.enabled=!0,this.options.trigger=="click"?this.$element.on("click."+this.type,this.options.selector,e.proxy(this.toggle,this)):this.options.trigger!="manual"&&(i=this.options.trigger=="hover"?"mouseenter":"focus",s=this.options.trigger=="hover"?"mouseleave":"blur",this.$element.on(i+"."+this.type,this.options.selector,e.proxy(this.enter,this)),this.$element.on(s+"."+this.type,this.options.selector,e.proxy(this.leave,this))),this.options.selector?this._options=e.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(t){return t=e.extend({},e.fn[this.type].defaults,t,this.$element.data()),t.delay&&typeof t.delay=="number"&&(t.delay={show:t.delay,hide:t.delay}),t},enter:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);if(!n.options.delay||!n.options.delay.show)return n.show();clearTimeout(this.timeout),n.hoverState="in",this.timeout=setTimeout(function(){n.hoverState=="in"&&n.show()},n.options.delay.show)},leave:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);this.timeout&&clearTimeout(this.timeout);if(!n.options.delay||!n.options.delay.hide)return n.hide();n.hoverState="out",this.timeout=setTimeout(function(){n.hoverState=="out"&&n.hide()},n.options.delay.hide)},show:function(){var e,t,n,r,i,s,o;if(this.hasContent()&&this.enabled){e=this.tip(),this.setContent(),this.options.animation&&e.addClass("fade"),s=typeof this.options.placement=="function"?this.options.placement.call(this,e[0],this.$element[0]):this.options.placement,t=/in/.test(s),e.remove().css({top:0,left:0,display:"block"}).appendTo(t?this.$element:document.body),n=this.getPosition(t),r=e[0].offsetWidth,i=e[0].offsetHeight;switch(t?s.split(" ")[1]:s){case"bottom":o={top:n.top+n.height,left:n.left+n.width/2-r/2};break;case"top":o={top:n.top-i,left:n.left+n.width/2-r/2};break;case"left":o={top:n.top+n.height/2-i/2,left:n.left-r};break;case"right":o={top:n.top+n.height/2-i/2,left:n.left+n.width}}e.css(o).addClass(s).addClass("in")}},setContent:function(){var e=this.tip(),t=this.getTitle();e.find(".tooltip-inner")[this.options.html?"html":"text"](t),e.removeClass("fade in top bottom left right")},hide:function(){function r(){var t=setTimeout(function(){n.off(e.support.transition.end).remove()},500);n.one(e.support.transition.end,function(){clearTimeout(t),n.remove()})}var t=this,n=this.tip();return n.removeClass("in"),e.support.transition&&this.$tip.hasClass("fade")?r():n.remove(),this},fixTitle:function(){var e=this.$element;(e.attr("title")||typeof e.attr("data-original-title")!="string")&&e.attr("data-original-title",e.attr("title")||"").removeAttr("title")},hasContent:function(){return this.getTitle()},getPosition:function(t){return e.extend({},t?{top:0,left:0}:this.$element.offset(),{width:this.$element[0].offsetWidth,height:this.$element[0].offsetHeight})},getTitle:function(){var e,t=this.$element,n=this.options;return e=t.attr("data-original-title")||(typeof n.title=="function"?n.title.call(t[0]):n.title),e},tip:function(){return this.$tip=this.$tip||e(this.options.template)},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(){this[this.tip().hasClass("in")?"hide":"show"]()},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}},e.fn.tooltip=function(n){return this.each(function(){var r=e(this),i=r.data("tooltip"),s=typeof n=="object"&&n;i||r.data("tooltip",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.tooltip.Constructor=t,e.fn.tooltip.defaults={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover",title:"",delay:0,html:!0}}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("popover",e,t)};t.prototype=e.extend({},e.fn.tooltip.Constructor.prototype,{constructor:t,setContent:function(){var e=this.tip(),t=this.getTitle(),n=this.getContent();e.find(".popover-title")[this.options.html?"html":"text"](t),e.find(".popover-content > *")[this.options.html?"html":"text"](n),e.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var e,t=this.$element,n=this.options;return e=t.attr("data-content")||(typeof n.content=="function"?n.content.call(t[0]):n.content),e},tip:function(){return this.$tip||(this.$tip=e(this.options.template)),this.$tip},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}}),e.fn.popover=function(n){return this.each(function(){var r=e(this),i=r.data("popover"),s=typeof n=="object"&&n;i||r.data("popover",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.popover.Constructor=t,e.fn.popover.defaults=e.extend({},e.fn.tooltip.defaults,{placement:"right",trigger:"click",content:"",template:'<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>'})}(window.jQuery),!function(e){"use strict";function t(t,n){var r=e.proxy(this.process,this),i=e(t).is("body")?e(window):e(t),s;this.options=e.extend({},e.fn.scrollspy.defaults,n),this.$scrollElement=i.on("scroll.scroll-spy.data-api",r),this.selector=(this.options.target||(s=e(t).attr("href"))&&s.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=e("body"),this.refresh(),this.process()}t.prototype={constructor:t,refresh:function(){var t=this,n;this.offsets=e([]),this.targets=e([]),n=this.$body.find(this.selector).map(function(){var t=e(this),n=t.data("target")||t.attr("href"),r=/^#\w/.test(n)&&e(n);return r&&r.length&&[[r.position().top,n]]||null}).sort(function(e,t){return e[0]-t[0]}).each(function(){t.offsets.push(this[0]),t.targets.push(this[1])})},process:function(){var e=this.$scrollElement.scrollTop()+this.options.offset,t=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,n=t-this.$scrollElement.height(),r=this.offsets,i=this.targets,s=this.activeTarget,o;if(e>=n)return s!=(o=i.last()[0])&&this.activate(o);for(o=r.length;o--;)s!=i[o]&&e>=r[o]&&(!r[o+1]||e<=r[o+1])&&this.activate(i[o])},activate:function(t){var n,r;this.activeTarget=t,e(this.selector).parent(".active").removeClass("active"),r=this.selector+'[data-target="'+t+'"],'+this.selector+'[href="'+t+'"]',n=e(r).parent("li").addClass("active"),n.parent(".dropdown-menu").length&&(n=n.closest("li.dropdown").addClass("active")),n.trigger("activate")}},e.fn.scrollspy=function(n){return this.each(function(){var r=e(this),i=r.data("scrollspy"),s=typeof n=="object"&&n;i||r.data("scrollspy",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.scrollspy.Constructor=t,e.fn.scrollspy.defaults={offset:10},e(window).on("load",function(){e('[data-spy="scroll"]').each(function(){var t=e(this);t.scrollspy(t.data())})})}(window.jQuery),!function(e){"use strict";var t=function(t){this.element=e(t)};t.prototype={constructor:t,show:function(){var t=this.element,n=t.closest("ul:not(.dropdown-menu)"),r=t.attr("data-target"),i,s,o;r||(r=t.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,""));if(t.parent("li").hasClass("active"))return;i=n.find(".active a").last()[0],o=e.Event("show",{relatedTarget:i}),t.trigger(o);if(o.isDefaultPrevented())return;s=e(r),this.activate(t.parent("li"),n),this.activate(s,s.parent(),function(){t.trigger({type:"shown",relatedTarget:i})})},activate:function(t,n,r){function o(){i.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),t.addClass("active"),s?(t[0].offsetWidth,t.addClass("in")):t.removeClass("fade"),t.parent(".dropdown-menu")&&t.closest("li.dropdown").addClass("active"),r&&r()}var i=n.find("> .active"),s=r&&e.support.transition&&i.hasClass("fade");s?i.one(e.support.transition.end,o):o(),i.removeClass("in")}},e.fn.tab=function(n){return this.each(function(){var r=e(this),i=r.data("tab");i||r.data("tab",i=new t(this)),typeof n=="string"&&i[n]()})},e.fn.tab.Constructor=t,e(function(){e("body").on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(t){t.preventDefault(),e(this).tab("show")})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.typeahead.defaults,n),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.updater=this.options.updater||this.updater,this.$menu=e(this.options.menu).appendTo("body"),this.source=this.options.source,this.shown=!1,this.listen()};t.prototype={constructor:t,select:function(){var e=this.$menu.find(".active").attr("data-value");return this.$element.val(this.updater(e)).change(),this.hide()},updater:function(e){return e},show:function(){var t=e.extend({},this.$element.offset(),{height:this.$element[0].offsetHeight});return this.$menu.css({top:t.top+t.height,left:t.left}),this.$menu.show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(t){var n;return this.query=this.$element.val(),!this.query||this.query.length<this.options.minLength?this.shown?this.hide():this:(n=e.isFunction(this.source)?this.source(this.query,e.proxy(this.process,this)):this.source,n?this.process(n):this)},process:function(t){var n=this;return t=e.grep(t,function(e){return n.matcher(e)}),t=this.sorter(t),t.length?this.render(t.slice(0,this.options.items)).show():this.shown?this.hide():this},matcher:function(e){return~e.toLowerCase().indexOf(this.query.toLowerCase())},sorter:function(e){var t=[],n=[],r=[],i;while(i=e.shift())i.toLowerCase().indexOf(this.query.toLowerCase())?~i.indexOf(this.query)?n.push(i):r.push(i):t.push(i);return t.concat(n,r)},highlighter:function(e){var t=this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&");return e.replace(new RegExp("("+t+")","ig"),function(e,t){return"<strong>"+t+"</strong>"})},render:function(t){var n=this;return t=e(t).map(function(t,r){return t=e(n.options.item).attr("data-value",r),t.find("a").html(n.highlighter(r)),t[0]}),t.first().addClass("active"),this.$menu.html(t),this},next:function(t){var n=this.$menu.find(".active").removeClass("active"),r=n.next();r.length||(r=e(this.$menu.find("li")[0])),r.addClass("active")},prev:function(e){var t=this.$menu.find(".active").removeClass("active"),n=t.prev();n.length||(n=this.$menu.find("li").last()),n.addClass("active")},listen:function(){this.$element.on("blur",e.proxy(this.blur,this)).on("keypress",e.proxy(this.keypress,this)).on("keyup",e.proxy(this.keyup,this)),(e.browser.webkit||e.browser.msie)&&this.$element.on("keydown",e.proxy(this.keydown,this)),this.$menu.on("click",e.proxy(this.click,this)).on("mouseenter","li",e.proxy(this.mouseenter,this))},move:function(e){if(!this.shown)return;switch(e.keyCode){case 9:case 13:case 27:e.preventDefault();break;case 38:e.preventDefault(),this.prev();break;case 40:e.preventDefault(),this.next()}e.stopPropagation()},keydown:function(t){this.suppressKeyPressRepeat=!~e.inArray(t.keyCode,[40,38,9,13,27]),this.move(t)},keypress:function(e){if(this.suppressKeyPressRepeat)return;this.move(e)},keyup:function(e){switch(e.keyCode){case 40:case 38:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}e.stopPropagation(),e.preventDefault()},blur:function(e){var t=this;setTimeout(function(){t.hide()},150)},click:function(e){e.stopPropagation(),e.preventDefault(),this.select()},mouseenter:function(t){this.$menu.find(".active").removeClass("active"),e(t.currentTarget).addClass("active")}},e.fn.typeahead=function(n){return this.each(function(){var r=e(this),i=r.data("typeahead"),s=typeof n=="object"&&n;i||r.data("typeahead",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.typeahead.defaults={source:[],items:8,menu:'<ul class="typeahead dropdown-menu"></ul>',item:'<li><a href="#"></a></li>',minLength:1},e.fn.typeahead.Constructor=t,e(function(){e("body").on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(t){var n=e(this);if(n.data("typeahead"))return;t.preventDefault(),n.typeahead(n.data())})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.options=e.extend({},e.fn.affix.defaults,n),this.$window=e(window).on("scroll.affix.data-api",e.proxy(this.checkPosition,this)),this.$element=e(t),this.checkPosition()};t.prototype.checkPosition=function(){if(!this.$element.is(":visible"))return;var t=e(document).height(),n=this.$window.scrollTop(),r=this.$element.offset(),i=this.options.offset,s=i.bottom,o=i.top,u="affix affix-top affix-bottom",a;typeof i!="object"&&(s=o=i),typeof o=="function"&&(o=i.top()),typeof s=="function"&&(s=i.bottom()),a=this.unpin!=null&&n+this.unpin<=r.top?!1:s!=null&&r.top+this.$element.height()>=t-s?"bottom":o!=null&&n<=o?"top":!1;if(this.affixed===a)return;this.affixed=a,this.unpin=a=="bottom"?r.top-n:null,this.$element.removeClass(u).addClass("affix"+(a?"-"+a:""))},e.fn.affix=function(n){return this.each(function(){var r=e(this),i=r.data("affix"),s=typeof n=="object"&&n;i||r.data("affix",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.affix.Constructor=t,e.fn.affix.defaults={offset:0},e(window).on("load",function(){e('[data-spy="affix"]').each(function(){var t=e(this),n=t.data();n.offset=n.offset||{},n.offsetBottom&&(n.offset.bottom=n.offsetBottom),n.offsetTop&&(n.offset.top=n.offsetTop),t.affix(n)})})}(window.jQuery);
\ No newline at end of file
+!function($){"use strict";$(function(){$.support.transition=function(){var transitionEnd=function(){var name,el=document.createElement("bootstrap"),transEndEventNames={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(name in transEndEventNames)if(void 0!==el.style[name])return transEndEventNames[name]}();return transitionEnd&&{end:transitionEnd}}()})}(window.jQuery),!function($){"use strict";var dismiss='[data-dismiss="alert"]',Alert=function(el){$(el).on("click",dismiss,this.close)};Alert.prototype.close=function(e){function removeElement(){$parent.trigger("closed").remove()}var $parent,$this=$(this),selector=$this.attr("data-target");selector||(selector=$this.attr("href"),selector=selector&&selector.replace(/.*(?=#[^\s]*$)/,"")),$parent=$(selector),e&&e.preventDefault(),$parent.length||($parent=$this.hasClass("alert")?$this:$this.parent()),$parent.trigger(e=$.Event("close")),e.isDefaultPrevented()||($parent.removeClass("in"),$.support.transition&&$parent.hasClass("fade")?$parent.on($.support.transition.end,removeElement):removeElement())};var old=$.fn.alert;$.fn.alert=function(option){return this.each(function(){var $this=$(this),data=$this.data("alert");data||$this.data("alert",data=new Alert(this)),"string"==typeof option&&data[option].call($this)})},$.fn.alert.Constructor=Alert,$.fn.alert.noConflict=function(){return $.fn.alert=old,this},$(document).on("click.alert.data-api",dismiss,Alert.prototype.close)}(window.jQuery),!function($){"use strict";var Button=function(element,options){this.$element=$(element),this.options=$.extend({},$.fn.button.defaults,options)};Button.prototype.setState=function(state){var d="disabled",$el=this.$element,data=$el.data(),val=$el.is("input")?"val":"html";state+="Text",data.resetText||$el.data("resetText",$el[val]()),$el[val](data[state]||this.options[state]),setTimeout(function(){"loadingText"==state?$el.addClass(d).attr(d,d):$el.removeClass(d).removeAttr(d)},0)},Button.prototype.toggle=function(){var $parent=this.$element.closest('[data-toggle="buttons-radio"]');$parent&&$parent.find(".active").removeClass("active"),this.$element.toggleClass("active")};var old=$.fn.button;$.fn.button=function(option){return this.each(function(){var $this=$(this),data=$this.data("button"),options="object"==typeof option&&option;data||$this.data("button",data=new Button(this,options)),"toggle"==option?data.toggle():option&&data.setState(option)})},$.fn.button.defaults={loadingText:"loading..."},$.fn.button.Constructor=Button,$.fn.button.noConflict=function(){return $.fn.button=old,this},$(document).on("click.button.data-api","[data-toggle^=button]",function(e){var $btn=$(e.target);$btn.hasClass("btn")||($btn=$btn.closest(".btn")),$btn.button("toggle")})}(window.jQuery),!function($){"use strict";var Carousel=function(element,options){this.$element=$(element),this.options=options,"hover"==this.options.pause&&this.$element.on("mouseenter",$.proxy(this.pause,this)).on("mouseleave",$.proxy(this.cycle,this))};Carousel.prototype={cycle:function(e){return e||(this.paused=!1),this.options.interval&&!this.paused&&(this.interval=setInterval($.proxy(this.next,this),this.options.interval)),this},to:function(pos){var $active=this.$element.find(".item.active"),children=$active.parent().children(),activePos=children.index($active),that=this;if(!(pos>children.length-1||0>pos))return this.sliding?this.$element.one("slid",function(){that.to(pos)}):activePos==pos?this.pause().cycle():this.slide(pos>activePos?"next":"prev",$(children[pos]))},pause:function(e){return e||(this.paused=!0),this.$element.find(".next, .prev").length&&$.support.transition.end&&(this.$element.trigger($.support.transition.end),this.cycle()),clearInterval(this.interval),this.interval=null,this},next:function(){return this.sliding?void 0:this.slide("next")},prev:function(){return this.sliding?void 0:this.slide("prev")},slide:function(type,next){var e,$active=this.$element.find(".item.active"),$next=next||$active[type](),isCycling=this.interval,direction="next"==type?"left":"right",fallback="next"==type?"first":"last",that=this;if(this.sliding=!0,isCycling&&this.pause(),$next=$next.length?$next:this.$element.find(".item")[fallback](),e=$.Event("slide",{relatedTarget:$next[0]}),!$next.hasClass("active")){if($.support.transition&&this.$element.hasClass("slide")){if(this.$element.trigger(e),e.isDefaultPrevented())return;$next.addClass(type),$next[0].offsetWidth,$active.addClass(direction),$next.addClass(direction),this.$element.one($.support.transition.end,function(){$next.removeClass([type,direction].join(" ")).addClass("active"),$active.removeClass(["active",direction].join(" ")),that.sliding=!1,setTimeout(function(){that.$element.trigger("slid")},0)})}else{if(this.$element.trigger(e),e.isDefaultPrevented())return;$active.removeClass("active"),$next.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return isCycling&&this.cycle(),this}}};var old=$.fn.carousel;$.fn.carousel=function(option){return this.each(function(){var $this=$(this),data=$this.data("carousel"),options=$.extend({},$.fn.carousel.defaults,"object"==typeof option&&option),action="string"==typeof option?option:options.slide;data||$this.data("carousel",data=new Carousel(this,options)),"number"==typeof option?data.to(option):action?data[action]():options.interval&&data.cycle()})},$.fn.carousel.defaults={interval:5e3,pause:"hover"},$.fn.carousel.Constructor=Carousel,$.fn.carousel.noConflict=function(){return $.fn.carousel=old,this},$(document).on("click.carousel.data-api","[data-slide]",function(e){var href,$this=$(this),$target=$($this.attr("data-target")||(href=$this.attr("href"))&&href.replace(/.*(?=#[^\s]+$)/,"")),options=$.extend({},$target.data(),$this.data());$target.carousel(options),e.preventDefault()})}(window.jQuery),!function($){"use strict";var Collapse=function(element,options){this.$element=$(element),this.options=$.extend({},$.fn.collapse.defaults,options),this.options.parent&&(this.$parent=$(this.options.parent)),this.options.toggle&&this.toggle()};Collapse.prototype={constructor:Collapse,dimension:function(){var hasWidth=this.$element.hasClass("width");return hasWidth?"width":"height"},show:function(){var dimension,scroll,actives,hasData;if(!this.transitioning){if(dimension=this.dimension(),scroll=$.camelCase(["scroll",dimension].join("-")),actives=this.$parent&&this.$parent.find("> .accordion-group > .in"),actives&&actives.length){if(hasData=actives.data("collapse"),hasData&&hasData.transitioning)return;actives.collapse("hide"),hasData||actives.data("collapse",null)}this.$element[dimension](0),this.transition("addClass",$.Event("show"),"shown"),$.support.transition&&this.$element[dimension](this.$element[0][scroll])}},hide:function(){var dimension;this.transitioning||(dimension=this.dimension(),this.reset(this.$element[dimension]()),this.transition("removeClass",$.Event("hide"),"hidden"),this.$element[dimension](0))},reset:function(size){var dimension=this.dimension();return this.$element.removeClass("collapse")[dimension](size||"auto")[0].offsetWidth,this.$element[null!==size?"addClass":"removeClass"]("collapse"),this},transition:function(method,startEvent,completeEvent){var that=this,complete=function(){"show"==startEvent.type&&that.reset(),that.transitioning=0,that.$element.trigger(completeEvent)};this.$element.trigger(startEvent),startEvent.isDefaultPrevented()||(this.transitioning=1,this.$element[method]("in"),$.support.transition&&this.$element.hasClass("collapse")?this.$element.one($.support.transition.end,complete):complete())},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}};var old=$.fn.collapse;$.fn.collapse=function(option){return this.each(function(){var $this=$(this),data=$this.data("collapse"),options="object"==typeof option&&option;data||$this.data("collapse",data=new Collapse(this,options)),"string"==typeof option&&data[option]()})},$.fn.collapse.defaults={toggle:!0},$.fn.collapse.Constructor=Collapse,$.fn.collapse.noConflict=function(){return $.fn.collapse=old,this},$(document).on("click.collapse.data-api","[data-toggle=collapse]",function(e){var href,$this=$(this),target=$this.attr("data-target")||e.preventDefault()||(href=$this.attr("href"))&&href.replace(/.*(?=#[^\s]+$)/,""),option=$(target).data("collapse")?"toggle":$this.data();$this[$(target).hasClass("in")?"addClass":"removeClass"]("collapsed"),$(target).collapse(option)})}(window.jQuery),!function($){"use strict";function clearMenus(){$(toggle).each(function(){getParent($(this)).removeClass("open")})}function getParent($this){var $parent,selector=$this.attr("data-target");return selector||(selector=$this.attr("href"),selector=selector&&/#/.test(selector)&&selector.replace(/.*(?=#[^\s]*$)/,"")),$parent=$(selector),$parent.length||($parent=$this.parent()),$parent}var toggle="[data-toggle=dropdown]",Dropdown=function(element){var $el=$(element).on("click.dropdown.data-api",this.toggle);$("html").on("click.dropdown.data-api",function(){$el.parent().removeClass("open")})};Dropdown.prototype={constructor:Dropdown,toggle:function(){var $parent,isActive,$this=$(this);if(!$this.is(".disabled, :disabled"))return $parent=getParent($this),isActive=$parent.hasClass("open"),clearMenus(),isActive||$parent.toggleClass("open"),$this.focus(),!1},keydown:function(e){var $this,$items,$parent,isActive,index;if(/(38|40|27)/.test(e.keyCode)&&($this=$(this),e.preventDefault(),e.stopPropagation(),!$this.is(".disabled, :disabled"))){if($parent=getParent($this),isActive=$parent.hasClass("open"),!isActive||isActive&&27==e.keyCode)return $this.click();$items=$("[role=menu] li:not(.divider):visible a",$parent),$items.length&&(index=$items.index($items.filter(":focus")),38==e.keyCode&&index>0&&index--,40==e.keyCode&&$items.length-1>index&&index++,~index||(index=0),$items.eq(index).focus())}}};var old=$.fn.dropdown;$.fn.dropdown=function(option){return this.each(function(){var $this=$(this),data=$this.data("dropdown");data||$this.data("dropdown",data=new Dropdown(this)),"string"==typeof option&&data[option].call($this)})},$.fn.dropdown.Constructor=Dropdown,$.fn.dropdown.noConflict=function(){return $.fn.dropdown=old,this},$(document).on("click.dropdown.data-api touchstart.dropdown.data-api",clearMenus).on("click.dropdown touchstart.dropdown.data-api",".dropdown form",function(e){e.stopPropagation()}).on("touchstart.dropdown.data-api",".dropdown-menu",function(e){e.stopPropagation()}).on("click.dropdown.data-api touchstart.dropdown.data-api",toggle,Dropdown.prototype.toggle).on("keydown.dropdown.data-api touchstart.dropdown.data-api",toggle+", [role=menu]",Dropdown.prototype.keydown)}(window.jQuery),!function($){"use strict";var Modal=function(element,options){this.options=options,this.$element=$(element).delegate('[data-dismiss="modal"]',"click.dismiss.modal",$.proxy(this.hide,this)),this.options.remote&&this.$element.find(".modal-body").load(this.options.remote)};Modal.prototype={constructor:Modal,toggle:function(){return this[this.isShown?"hide":"show"]()},show:function(){var that=this,e=$.Event("show");this.$element.trigger(e),this.isShown||e.isDefaultPrevented()||(this.isShown=!0,this.escape(),this.backdrop(function(){var transition=$.support.transition&&that.$element.hasClass("fade");that.$element.parent().length||that.$element.appendTo(document.body),that.$element.show(),transition&&that.$element[0].offsetWidth,that.$element.addClass("in").attr("aria-hidden",!1),that.enforceFocus(),transition?that.$element.one($.support.transition.end,function(){that.$element.focus().trigger("shown")}):that.$element.focus().trigger("shown")}))},hide:function(e){e&&e.preventDefault(),e=$.Event("hide"),this.$element.trigger(e),this.isShown&&!e.isDefaultPrevented()&&(this.isShown=!1,this.escape(),$(document).off("focusin.modal"),this.$element.removeClass("in").attr("aria-hidden",!0),$.support.transition&&this.$element.hasClass("fade")?this.hideWithTransition():this.hideModal())},enforceFocus:function(){var that=this;$(document).on("focusin.modal",function(e){that.$element[0]===e.target||that.$element.has(e.target).length||that.$element.focus()})},escape:function(){var that=this;this.isShown&&this.options.keyboard?this.$element.on("keyup.dismiss.modal",function(e){27==e.which&&that.hide()}):this.isShown||this.$element.off("keyup.dismiss.modal")},hideWithTransition:function(){var that=this,timeout=setTimeout(function(){that.$element.off($.support.transition.end),that.hideModal()},500);this.$element.one($.support.transition.end,function(){clearTimeout(timeout),that.hideModal()})},hideModal:function(){this.$element.hide().trigger("hidden"),this.backdrop()},removeBackdrop:function(){this.$backdrop.remove(),this.$backdrop=null},backdrop:function(callback){var animate=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var doAnimate=$.support.transition&&animate;this.$backdrop=$('<div class="modal-backdrop '+animate+'" />').appendTo(document.body),this.$backdrop.click("static"==this.options.backdrop?$.proxy(this.$element[0].focus,this.$element[0]):$.proxy(this.hide,this)),doAnimate&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),doAnimate?this.$backdrop.one($.support.transition.end,callback):callback()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),$.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one($.support.transition.end,$.proxy(this.removeBackdrop,this)):this.removeBackdrop()):callback&&callback()}};var old=$.fn.modal;$.fn.modal=function(option){return this.each(function(){var $this=$(this),data=$this.data("modal"),options=$.extend({},$.fn.modal.defaults,$this.data(),"object"==typeof option&&option);data||$this.data("modal",data=new Modal(this,options)),"string"==typeof option?data[option]():options.show&&data.show()})},$.fn.modal.defaults={backdrop:!0,keyboard:!0,show:!0},$.fn.modal.Constructor=Modal,$.fn.modal.noConflict=function(){return $.fn.modal=old,this},$(document).on("click.modal.data-api",'[data-toggle="modal"]',function(e){var $this=$(this),href=$this.attr("href"),$target=$($this.attr("data-target")||href&&href.replace(/.*(?=#[^\s]+$)/,"")),option=$target.data("modal")?"toggle":$.extend({remote:!/#/.test(href)&&href},$target.data(),$this.data());e.preventDefault(),$target.modal(option).one("hide",function(){$this.focus()})})}(window.jQuery),!function($){"use strict";var Tooltip=function(element,options){this.init("tooltip",element,options)};Tooltip.prototype={constructor:Tooltip,init:function(type,element,options){var eventIn,eventOut;this.type=type,this.$element=$(element),this.options=this.getOptions(options),this.enabled=!0,"click"==this.options.trigger?this.$element.on("click."+this.type,this.options.selector,$.proxy(this.toggle,this)):"manual"!=this.options.trigger&&(eventIn="hover"==this.options.trigger?"mouseenter":"focus",eventOut="hover"==this.options.trigger?"mouseleave":"blur",this.$element.on(eventIn+"."+this.type,this.options.selector,$.proxy(this.enter,this)),this.$element.on(eventOut+"."+this.type,this.options.selector,$.proxy(this.leave,this))),this.options.selector?this._options=$.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(options){return options=$.extend({},$.fn[this.type].defaults,options,this.$element.data()),options.delay&&"number"==typeof options.delay&&(options.delay={show:options.delay,hide:options.delay}),options},enter:function(e){var self=$(e.currentTarget)[this.type](this._options).data(this.type);return self.options.delay&&self.options.delay.show?(clearTimeout(this.timeout),self.hoverState="in",this.timeout=setTimeout(function(){"in"==self.hoverState&&self.show()},self.options.delay.show),void 0):self.show()},leave:function(e){var self=$(e.currentTarget)[this.type](this._options).data(this.type);return this.timeout&&clearTimeout(this.timeout),self.options.delay&&self.options.delay.hide?(self.hoverState="out",this.timeout=setTimeout(function(){"out"==self.hoverState&&self.hide()},self.options.delay.hide),void 0):self.hide()},show:function(){var $tip,inside,pos,actualWidth,actualHeight,placement,tp;if(this.hasContent()&&this.enabled){switch($tip=this.tip(),this.setContent(),this.options.animation&&$tip.addClass("fade"),placement="function"==typeof this.options.placement?this.options.placement.call(this,$tip[0],this.$element[0]):this.options.placement,inside=/in/.test(placement),$tip.detach().css({top:0,left:0,display:"block"}).insertAfter(this.$element),pos=this.getPosition(inside),actualWidth=$tip[0].offsetWidth,actualHeight=$tip[0].offsetHeight,inside?placement.split(" ")[1]:placement){case"bottom":tp={top:pos.top+pos.height,left:pos.left+pos.width/2-actualWidth/2};break;case"top":tp={top:pos.top-actualHeight,left:pos.left+pos.width/2-actualWidth/2};break;case"left":tp={top:pos.top+pos.height/2-actualHeight/2,left:pos.left-actualWidth};break;case"right":tp={top:pos.top+pos.height/2-actualHeight/2,left:pos.left+pos.width}}$tip.offset(tp).addClass(placement).addClass("in")}},setContent:function(){var $tip=this.tip(),title=this.getTitle();$tip.find(".tooltip-inner")[this.options.html?"html":"text"](title),$tip.removeClass("fade in top bottom left right")},hide:function(){function removeWithAnimation(){var timeout=setTimeout(function(){$tip.off($.support.transition.end).detach()},500);$tip.one($.support.transition.end,function(){clearTimeout(timeout),$tip.detach()})}var $tip=this.tip();return $tip.removeClass("in"),$.support.transition&&this.$tip.hasClass("fade")?removeWithAnimation():$tip.detach(),this},fixTitle:function(){var $e=this.$element;($e.attr("title")||"string"!=typeof $e.attr("data-original-title"))&&$e.attr("data-original-title",$e.attr("title")||"").removeAttr("title")},hasContent:function(){return this.getTitle()},getPosition:function(inside){return $.extend({},inside?{top:0,left:0}:this.$element.offset(),{width:this.$element[0].offsetWidth,height:this.$element[0].offsetHeight})},getTitle:function(){var title,$e=this.$element,o=this.options;return title=$e.attr("data-original-title")||("function"==typeof o.title?o.title.call($e[0]):o.title)},tip:function(){return this.$tip=this.$tip||$(this.options.template)},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(e){var self=$(e.currentTarget)[this.type](this._options).data(this.type);self[self.tip().hasClass("in")?"hide":"show"]()},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}};var old=$.fn.tooltip;$.fn.tooltip=function(option){return this.each(function(){var $this=$(this),data=$this.data("tooltip"),options="object"==typeof option&&option;data||$this.data("tooltip",data=new Tooltip(this,options)),"string"==typeof option&&data[option]()})},$.fn.tooltip.Constructor=Tooltip,$.fn.tooltip.defaults={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover",title:"",delay:0,html:!1},$.fn.tooltip.noConflict=function(){return $.fn.tooltip=old,this}}(window.jQuery),!function($){"use strict";var Popover=function(element,options){this.init("popover",element,options)};Popover.prototype=$.extend({},$.fn.tooltip.Constructor.prototype,{constructor:Popover,setContent:function(){var $tip=this.tip(),title=this.getTitle(),content=this.getContent();$tip.find(".popover-title")[this.options.html?"html":"text"](title),$tip.find(".popover-content")[this.options.html?"html":"text"](content),$tip.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var content,$e=this.$element,o=this.options;return content=$e.attr("data-content")||("function"==typeof o.content?o.content.call($e[0]):o.content)},tip:function(){return this.$tip||(this.$tip=$(this.options.template)),this.$tip},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}});var old=$.fn.popover;$.fn.popover=function(option){return this.each(function(){var $this=$(this),data=$this.data("popover"),options="object"==typeof option&&option;data||$this.data("popover",data=new Popover(this,options)),"string"==typeof option&&data[option]()})},$.fn.popover.Constructor=Popover,$.fn.popover.defaults=$.extend({},$.fn.tooltip.defaults,{placement:"right",trigger:"click",content:"",template:'<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"></div></div></div>'}),$.fn.popover.noConflict=function(){return $.fn.popover=old,this}}(window.jQuery),!function($){"use strict";function ScrollSpy(element,options){var href,process=$.proxy(this.process,this),$element=$(element).is("body")?$(window):$(element);this.options=$.extend({},$.fn.scrollspy.defaults,options),this.$scrollElement=$element.on("scroll.scroll-spy.data-api",process),this.selector=(this.options.target||(href=$(element).attr("href"))&&href.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=$("body"),this.refresh(),this.process()}ScrollSpy.prototype={constructor:ScrollSpy,refresh:function(){var $targets,self=this;this.offsets=$([]),this.targets=$([]),$targets=this.$body.find(this.selector).map(function(){var $el=$(this),href=$el.data("target")||$el.attr("href"),$href=/^#\w/.test(href)&&$(href);return $href&&$href.length&&[[$href.position().top+self.$scrollElement.scrollTop(),href]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){self.offsets.push(this[0]),self.targets.push(this[1])})},process:function(){var i,scrollTop=this.$scrollElement.scrollTop()+this.options.offset,scrollHeight=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,maxScroll=scrollHeight-this.$scrollElement.height(),offsets=this.offsets,targets=this.targets,activeTarget=this.activeTarget;if(scrollTop>=maxScroll)return activeTarget!=(i=targets.last()[0])&&this.activate(i);for(i=offsets.length;i--;)activeTarget!=targets[i]&&scrollTop>=offsets[i]&&(!offsets[i+1]||offsets[i+1]>=scrollTop)&&this.activate(targets[i])},activate:function(target){var active,selector;this.activeTarget=target,$(this.selector).parent(".active").removeClass("active"),selector=this.selector+'[data-target="'+target+'"],'+this.selector+'[href="'+target+'"]',active=$(selector).parent("li").addClass("active"),active.parent(".dropdown-menu").length&&(active=active.closest("li.dropdown").addClass("active")),active.trigger("activate")}};var old=$.fn.scrollspy;$.fn.scrollspy=function(option){return this.each(function(){var $this=$(this),data=$this.data("scrollspy"),options="object"==typeof option&&option;data||$this.data("scrollspy",data=new ScrollSpy(this,options)),"string"==typeof option&&data[option]()})},$.fn.scrollspy.Constructor=ScrollSpy,$.fn.scrollspy.defaults={offset:10},$.fn.scrollspy.noConflict=function(){return $.fn.scrollspy=old,this},$(window).on("load",function(){$('[data-spy="scroll"]').each(function(){var $spy=$(this);$spy.scrollspy($spy.data())})})}(window.jQuery),!function($){"use strict";var Tab=function(element){this.element=$(element)};Tab.prototype={constructor:Tab,show:function(){var previous,$target,e,$this=this.element,$ul=$this.closest("ul:not(.dropdown-menu)"),selector=$this.attr("data-target");selector||(selector=$this.attr("href"),selector=selector&&selector.replace(/.*(?=#[^\s]*$)/,"")),$this.parent("li").hasClass("active")||(previous=$ul.find(".active:last a")[0],e=$.Event("show",{relatedTarget:previous}),$this.trigger(e),e.isDefaultPrevented()||($target=$(selector),this.activate($this.parent("li"),$ul),this.activate($target,$target.parent(),function(){$this.trigger({type:"shown",relatedTarget:previous})})))},activate:function(element,container,callback){function next(){$active.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),element.addClass("active"),transition?(element[0].offsetWidth,element.addClass("in")):element.removeClass("fade"),element.parent(".dropdown-menu")&&element.closest("li.dropdown").addClass("active"),callback&&callback()}var $active=container.find("> .active"),transition=callback&&$.support.transition&&$active.hasClass("fade");transition?$active.one($.support.transition.end,next):next(),$active.removeClass("in")}};var old=$.fn.tab;$.fn.tab=function(option){return this.each(function(){var $this=$(this),data=$this.data("tab");data||$this.data("tab",data=new Tab(this)),"string"==typeof option&&data[option]()})},$.fn.tab.Constructor=Tab,$.fn.tab.noConflict=function(){return $.fn.tab=old,this},$(document).on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(e){e.preventDefault(),$(this).tab("show")})}(window.jQuery),!function($){"use strict";var Typeahead=function(element,options){this.$element=$(element),this.options=$.extend({},$.fn.typeahead.defaults,options),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.updater=this.options.updater||this.updater,this.source=this.options.source,this.$menu=$(this.options.menu),this.shown=!1,this.listen()};Typeahead.prototype={constructor:Typeahead,select:function(){var val=this.$menu.find(".active").attr("data-value");return this.$element.val(this.updater(val)).change(),this.hide()},updater:function(item){return item},show:function(){var pos=$.extend({},this.$element.position(),{height:this.$element[0].offsetHeight});return this.$menu.insertAfter(this.$element).css({top:pos.top+pos.height,left:pos.left}).show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(){var items;return this.query=this.$element.val(),!this.query||this.query.length<this.options.minLength?this.shown?this.hide():this:(items=$.isFunction(this.source)?this.source(this.query,$.proxy(this.process,this)):this.source,items?this.process(items):this)},process:function(items){var that=this;return items=$.grep(items,function(item){return that.matcher(item)}),items=this.sorter(items),items.length?this.render(items.slice(0,this.options.items)).show():this.shown?this.hide():this},matcher:function(item){return~item.toLowerCase().indexOf(this.query.toLowerCase())},sorter:function(items){for(var item,beginswith=[],caseSensitive=[],caseInsensitive=[];item=items.shift();)item.toLowerCase().indexOf(this.query.toLowerCase())?~item.indexOf(this.query)?caseSensitive.push(item):caseInsensitive.push(item):beginswith.push(item);return beginswith.concat(caseSensitive,caseInsensitive)},highlighter:function(item){var query=this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&");return item.replace(RegExp("("+query+")","ig"),function($1,match){return"<strong>"+match+"</strong>"})},render:function(items){var that=this;return items=$(items).map(function(i,item){return i=$(that.options.item).attr("data-value",item),i.find("a").html(that.highlighter(item)),i[0]}),items.first().addClass("active"),this.$menu.html(items),this},next:function(){var active=this.$menu.find(".active").removeClass("active"),next=active.next();next.length||(next=$(this.$menu.find("li")[0])),next.addClass("active")},prev:function(){var active=this.$menu.find(".active").removeClass("active"),prev=active.prev();prev.length||(prev=this.$menu.find("li").last()),prev.addClass("active")},listen:function(){this.$element.on("blur",$.proxy(this.blur,this)).on("keypress",$.proxy(this.keypress,this)).on("keyup",$.proxy(this.keyup,this)),this.eventSupported("keydown")&&this.$element.on("keydown",$.proxy(this.keydown,this)),this.$menu.on("click",$.proxy(this.click,this)).on("mouseenter","li",$.proxy(this.mouseenter,this))},eventSupported:function(eventName){var isSupported=eventName in this.$element;return isSupported||(this.$element.setAttribute(eventName,"return;"),isSupported="function"==typeof this.$element[eventName]),isSupported},move:function(e){if(this.shown){switch(e.keyCode){case 9:case 13:case 27:e.preventDefault();break;case 38:e.preventDefault(),this.prev();break;case 40:e.preventDefault(),this.next()}e.stopPropagation()}},keydown:function(e){this.suppressKeyPressRepeat=~$.inArray(e.keyCode,[40,38,9,13,27]),this.move(e)},keypress:function(e){this.suppressKeyPressRepeat||this.move(e)},keyup:function(e){switch(e.keyCode){case 40:case 38:case 16:case 17:case 18:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}e.stopPropagation(),e.preventDefault()},blur:function(){var that=this;setTimeout(function(){that.hide()},150)},click:function(e){e.stopPropagation(),e.preventDefault(),this.select()},mouseenter:function(e){this.$menu.find(".active").removeClass("active"),$(e.currentTarget).addClass("active")}};var old=$.fn.typeahead;$.fn.typeahead=function(option){return this.each(function(){var $this=$(this),data=$this.data("typeahead"),options="object"==typeof option&&option;data||$this.data("typeahead",data=new Typeahead(this,options)),"string"==typeof option&&data[option]()})},$.fn.typeahead.defaults={source:[],items:8,menu:'<ul class="typeahead dropdown-menu"></ul>',item:'<li><a href="#"></a></li>',minLength:1},$.fn.typeahead.Constructor=Typeahead,$.fn.typeahead.noConflict=function(){return $.fn.typeahead=old,this},$(document).on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(e){var $this=$(this);$this.data("typeahead")||(e.preventDefault(),$this.typeahead($this.data()))})}(window.jQuery),!function($){"use strict";var Affix=function(element,options){this.options=$.extend({},$.fn.affix.defaults,options),this.$window=$(window).on("scroll.affix.data-api",$.proxy(this.checkPosition,this)).on("click.affix.data-api",$.proxy(function(){setTimeout($.proxy(this.checkPosition,this),1)},this)),this.$element=$(element),this.checkPosition()};Affix.prototype.checkPosition=function(){if(this.$element.is(":visible")){var affix,scrollHeight=$(document).height(),scrollTop=this.$window.scrollTop(),position=this.$element.offset(),offset=this.options.offset,offsetBottom=offset.bottom,offsetTop=offset.top,reset="affix affix-top affix-bottom";"object"!=typeof offset&&(offsetBottom=offsetTop=offset),"function"==typeof offsetTop&&(offsetTop=offset.top()),"function"==typeof offsetBottom&&(offsetBottom=offset.bottom()),affix=null!=this.unpin&&scrollTop+this.unpin<=position.top?!1:null!=offsetBottom&&position.top+this.$element.height()>=scrollHeight-offsetBottom?"bottom":null!=offsetTop&&offsetTop>=scrollTop?"top":!1,this.affixed!==affix&&(this.affixed=affix,this.unpin="bottom"==affix?position.top-scrollTop:null,this.$element.removeClass(reset).addClass("affix"+(affix?"-"+affix:"")))}};var old=$.fn.affix;$.fn.affix=function(option){return this.each(function(){var $this=$(this),data=$this.data("affix"),options="object"==typeof option&&option;data||$this.data("affix",data=new Affix(this,options)),"string"==typeof option&&data[option]()})},$.fn.affix.Constructor=Affix,$.fn.affix.defaults={offset:0},$.fn.affix.noConflict=function(){return $.fn.affix=old,this},$(window).on("load",function(){$('[data-spy="affix"]').each(function(){var $spy=$(this),data=$spy.data();data.offset=data.offset||{},data.offsetBottom&&(data.offset.bottom=data.offsetBottom),data.offsetTop&&(data.offset.top=data.offsetTop),$spy.affix(data)})})}(window.jQuery);
\ No newline at end of file
diff --git a/openslides/static/javascript/jquery.js b/openslides/static/javascript/jquery.js
deleted file mode 100644
index 16ad06c5a..000000000
--- a/openslides/static/javascript/jquery.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/*! jQuery v1.7.2 jquery.com | jquery.org/license */
-(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cu(a){if(!cj[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){ck||(ck=c.createElement("iframe"),ck.frameBorder=ck.width=ck.height=0),b.appendChild(ck);if(!cl||!ck.createElement)cl=(ck.contentWindow||ck.contentDocument).document,cl.write((f.support.boxModel?"<!doctype html>":"")+"<html><body>"),cl.close();d=cl.createElement(a),cl.body.appendChild(d),e=f.css(d,"display"),b.removeChild(ck)}cj[a]=e}return cj[a]}function ct(a,b){var c={};f.each(cp.concat.apply([],cp.slice(0,b)),function(){c[this]=a});return c}function cs(){cq=b}function cr(){setTimeout(cs,0);return cq=f.now()}function ci(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ch(){try{return new a.XMLHttpRequest}catch(b){}}function cb(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function ca(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function b_(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bD.test(a)?d(a,e):b_(a+"["+(typeof e=="object"?b:"")+"]",e,c,d)});else if(!c&&f.type(b)==="object")for(var e in b)b_(a+"["+e+"]",b[e],c,d);else d(a,b)}function b$(a,c){var d,e,g=f.ajaxSettings.flatOptions||{};for(d in c)c[d]!==b&&((g[d]?a:e||(e={}))[d]=c[d]);e&&f.extend(!0,a,e)}function bZ(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bS,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=bZ(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=bZ(a,c,d,e,"*",g));return l}function bY(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bO),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bB(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=b==="width"?1:0,g=4;if(d>0){if(c!=="border")for(;e<g;e+=2)c||(d-=parseFloat(f.css(a,"padding"+bx[e]))||0),c==="margin"?d+=parseFloat(f.css(a,c+bx[e]))||0:d-=parseFloat(f.css(a,"border"+bx[e]+"Width"))||0;return d+"px"}d=by(a,b);if(d<0||d==null)d=a.style[b];if(bt.test(d))return d;d=parseFloat(d)||0;if(c)for(;e<g;e+=2)d+=parseFloat(f.css(a,"padding"+bx[e]))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+bx[e]+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+bx[e]))||0);return d+"px"}function bo(a){var b=c.createElement("div");bh.appendChild(b),b.innerHTML=a.outerHTML;return b.firstChild}function bn(a){var b=(a.nodeName||"").toLowerCase();b==="input"?bm(a):b!=="script"&&typeof a.getElementsByTagName!="undefined"&&f.grep(a.getElementsByTagName("input"),bm)}function bm(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bl(a){return typeof a.getElementsByTagName!="undefined"?a.getElementsByTagName("*"):typeof a.querySelectorAll!="undefined"?a.querySelectorAll("*"):[]}function bk(a,b){var c;b.nodeType===1&&(b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase(),c==="object"?b.outerHTML=a.outerHTML:c!=="input"||a.type!=="checkbox"&&a.type!=="radio"?c==="option"?b.selected=a.defaultSelected:c==="input"||c==="textarea"?b.defaultValue=a.defaultValue:c==="script"&&b.text!==a.text&&(b.text=a.text):(a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value)),b.removeAttribute(f.expando),b.removeAttribute("_submit_attached"),b.removeAttribute("_change_attached"))}function bj(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c,d,e,g=f._data(a),h=f._data(b,g),i=g.events;if(i){delete h.handle,h.events={};for(c in i)for(d=0,e=i[c].length;d<e;d++)f.event.add(b,c,i[c][d])}h.data&&(h.data=f.extend({},h.data))}}function bi(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function U(a){var b=V.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function T(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(O.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?+d:j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c<d;c++)b[a[c]]=!0;return b}var c=a.document,d=a.navigator,e=a.location,f=function(){function J(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(J,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.2",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQuery===e&&(a.jQuery=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a!=null&&a==a.window},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){if(typeof c!="string"||!c)return null;var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:G?function(a){return a==null?"":G.call(a)}:function(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?E.call(c,a):e.merge(c,a)}return c},inArray:function(a,b,c){var d;if(b){if(H)return H.call(b,a,c);d=b.length,c=c?c<0?Math.max(0,d+c):c:0;for(;c<d;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){var d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=F.call(arguments,2),g=function(){return a.apply(c,f.concat(F.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h,i){var j,k=d==null,l=0,m=a.length;if(d&&typeof d=="object"){for(l in d)e.access(a,c,l,d[l],1,h,f);g=1}else if(f!==b){j=i===b&&e.isFunction(f),k&&(j?(j=c,c=function(a,b,c){return j.call(e(a),c)}):(c.call(a,f),c=null));if(c)for(;l<m;l++)c(a[l],d,j?f.call(a[l],l,c(a[l],d)):f,i);g=1}return g?a:k?c.call(a):m?c(a[0],d):h},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=r.exec(a)||s.exec(a)||t.exec(a)||a.indexOf("compatible")<0&&u.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){I["[object "+b+"]"]=b.toLowerCase()}),z=e.uaMatch(y),z.browser&&(e.browser[z.browser]=!0,e.browser.version=z.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?B=function(){c.removeEventListener("DOMContentLoaded",B,!1),e.ready()}:c.attachEvent&&(B=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",B),e.ready())});return e}(),g={};f.Callbacks=function(a){a=a?g[a]||h(a):{};var c=[],d=[],e,i,j,k,l,m,n=function(b){var d,e,g,h,i;for(d=0,e=b.length;d<e;d++)g=b[d],h=f.type(g),h==="array"?n(g):h==="function"&&(!a.unique||!p.has(g))&&c.push(g)},o=function(b,f){f=f||[],e=!a.memory||[b,f],i=!0,j=!0,m=k||0,k=0,l=c.length;for(;c&&m<l;m++)if(c[m].apply(b,f)===!1&&a.stopOnFalse){e=!0;break}j=!1,c&&(a.once?e===!0?p.disable():c=[]:d&&d.length&&(e=d.shift(),p.fireWith(e[0],e[1])))},p={add:function(){if(c){var a=c.length;n(arguments),j?l=c.length:e&&e!==!0&&(k=a,o(e[0],e[1]))}return this},remove:function(){if(c){var b=arguments,d=0,e=b.length;for(;d<e;d++)for(var f=0;f<c.length;f++)if(b[d]===c[f]){j&&f<=l&&(l--,f<=m&&m--),c.splice(f--,1);if(a.unique)break}}return this},has:function(a){if(c){var b=0,d=c.length;for(;b<d;b++)if(a===c[b])return!0}return!1},empty:function(){c=[];return this},disable:function(){c=d=e=b;return this},disabled:function(){return!c},lock:function(){d=b,(!e||e===!0)&&p.disable();return this},locked:function(){return!d},fireWith:function(b,c){d&&(j?a.once||d.push([b,c]):(!a.once||!e)&&o(b,c));return this},fire:function(){p.fireWith(this,arguments);return this},fired:function(){return!!i}};return p};var i=[].slice;f.extend({Deferred:function(a){var b=f.Callbacks("once memory"),c=f.Callbacks("once memory"),d=f.Callbacks("memory"),e="pending",g={resolve:b,reject:c,notify:d},h={done:b.add,fail:c.add,progress:d.add,state:function(){return e},isResolved:b.fired,isRejected:c.fired,then:function(a,b,c){i.done(a).fail(b).progress(c);return this},always:function(){i.done.apply(i,arguments).fail.apply(i,arguments);return this},pipe:function(a,b,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[b,"reject"],progress:[c,"notify"]},function(a,b){var c=b[0],e=b[1],g;f.isFunction(c)?i[a](function(){g=c.apply(this,arguments),g&&f.isFunction(g.promise)?g.promise().then(d.resolve,d.reject,d.notify):d[e+"With"](this===i?d:this,[g])}):i[a](d[e])})}).promise()},promise:function(a){if(a==null)a=h;else for(var b in h)a[b]=h[b];return a}},i=h.promise({}),j;for(j in g)i[j]=g[j].fire,i[j+"With"]=g[j].fireWith;i.done(function(){e="resolved"},c.disable,d.lock).fail(function(){e="rejected"},b.disable,d.lock),a&&a.call(i,i);return i},when:function(a){function m(a){return function(b){e[a]=arguments.length>1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c<d;c++)b[c]&&b[c].promise&&f.isFunction(b[c].promise)?b[c].promise().then(l(c),j.reject,m(c)):--g;g||j.resolveWith(j,b)}else j!==a&&j.resolveWith(j,d?[a]:[]);return k}}),f.support=function(){var b,d,e,g,h,i,j,k,l,m,n,o,p=c.createElement("div"),q=c.documentElement;p.setAttribute("className","t"),p.innerHTML="   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>",d=p.getElementsByTagName("*"),e=p.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=p.getElementsByTagName("input")[0],b={leadingWhitespace:p.firstChild.nodeType===3,tbody:!p.getElementsByTagName("tbody").length,htmlSerialize:!!p.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:p.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,pixelMargin:!0},f.boxModel=b.boxModel=c.compatMode==="CSS1Compat",i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete p.test}catch(r){b.deleteExpando=!1}!p.addEventListener&&p.attachEvent&&p.fireEvent&&(p.attachEvent("onclick",function(){b.noCloneEvent=!1}),p.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),i.setAttribute("name","t"),p.appendChild(i),j=c.createDocumentFragment(),j.appendChild(p.lastChild),b.checkClone=j.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,j.removeChild(i),j.appendChild(p);if(p.attachEvent)for(n in{submit:1,change:1,focusin:1})m="on"+n,o=m in p,o||(p.setAttribute(m,"return;"),o=typeof p[m]=="function"),b[n+"Bubbles"]=o;j.removeChild(p),j=g=h=p=i=null,f(function(){var d,e,g,h,i,j,l,m,n,q,r,s,t,u=c.getElementsByTagName("body")[0];!u||(m=1,t="padding:0;margin:0;border:",r="position:absolute;top:0;left:0;width:1px;height:1px;",s=t+"0;visibility:hidden;",n="style='"+r+t+"5px solid #000;",q="<div "+n+"display:block;'><div style='"+t+"0;display:block;overflow:hidden;'></div></div>"+"<table "+n+"' cellpadding='0' cellspacing='0'>"+"<tr><td></td></tr></table>",d=c.createElement("div"),d.style.cssText=s+"width:0;height:0;position:static;top:0;margin-top:"+m+"px",u.insertBefore(d,u.firstChild),p=c.createElement("div"),d.appendChild(p),p.innerHTML="<table><tr><td style='"+t+"0;display:none'></td><td>t</td></tr></table>",k=p.getElementsByTagName("td"),o=k[0].offsetHeight===0,k[0].style.display="",k[1].style.display="none",b.reliableHiddenOffsets=o&&k[0].offsetHeight===0,a.getComputedStyle&&(p.innerHTML="",l=c.createElement("div"),l.style.width="0",l.style.marginRight="0",p.style.width="2px",p.appendChild(l),b.reliableMarginRight=(parseInt((a.getComputedStyle(l,null)||{marginRight:0}).marginRight,10)||0)===0),typeof p.style.zoom!="undefined"&&(p.innerHTML="",p.style.width=p.style.padding="1px",p.style.border=0,p.style.overflow="hidden",p.style.display="inline",p.style.zoom=1,b.inlineBlockNeedsLayout=p.offsetWidth===3,p.style.display="block",p.style.overflow="visible",p.innerHTML="<div style='width:5px;'></div>",b.shrinkWrapBlocks=p.offsetWidth!==3),p.style.cssText=r+s,p.innerHTML=q,e=p.firstChild,g=e.firstChild,i=e.nextSibling.firstChild.firstChild,j={doesNotAddBorder:g.offsetTop!==5,doesAddBorderForTableAndCells:i.offsetTop===5},g.style.position="fixed",g.style.top="20px",j.fixedPosition=g.offsetTop===20||g.offsetTop===15,g.style.position=g.style.top="",e.style.overflow="hidden",e.style.position="relative",j.subtractsBorderForOverflowNotVisible=g.offsetTop===-5,j.doesNotIncludeMarginInBodyOffset=u.offsetTop!==m,a.getComputedStyle&&(p.style.marginTop="1%",b.pixelMargin=(a.getComputedStyle(p,null)||{marginTop:0}).marginTop!=="1%"),typeof d.style.zoom!="undefined"&&(d.style.zoom=1),u.removeChild(d),l=p=d=null,f.extend(b,j))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e<g;e++)delete d[b[e]];if(!(c?m:f.isEmptyObject)(d))return}}if(!c){delete j[k].data;if(!m(j[k]))return}f.support.deleteExpando||!j.setInterval?delete j[k]:j[k]=null,i&&(f.support.deleteExpando?delete a[h]:a.removeAttribute?a.removeAttribute(h):a[h]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d,e,g,h,i,j=this[0],k=0,m=null;if(a===b){if(this.length){m=f.data(j);if(j.nodeType===1&&!f._data(j,"parsedAttrs")){g=j.attributes;for(i=g.length;k<i;k++)h=g[k].name,h.indexOf("data-")===0&&(h=f.camelCase(h.substring(5)),l(j,h,m[h]));f._data(j,"parsedAttrs",!0)}}return m}if(typeof a=="object")return this.each(function(){f.data(this,a)});d=a.split(".",2),d[1]=d[1]?"."+d[1]:"",e=d[1]+"!";return f.access(this,function(c){if(c===b){m=this.triggerHandler("getData"+e,[d[0]]),m===b&&j&&(m=f.data(j,a),m=l(j,a,m));return m===b&&d[1]?this.data(d[0]):m}d[1]=c,this.each(function(){var b=f(this);b.triggerHandler("setData"+e,d),f.data(this,a,c),b.triggerHandler("changeData"+e,d)})},null,c,arguments.length>1,null,!1)},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,b){a&&(b=(b||"fx")+"mark",f._data(a,b,(f._data(a,b)||0)+1))},_unmark:function(a,b,c){a!==!0&&(c=b,b=a,a=!1);if(b){c=c||"fx";var d=c+"mark",e=a?0:(f._data(b,d)||1)-1;e?f._data(b,d,e):(f.removeData(b,d,!0),n(b,c,"mark"))}},queue:function(a,b,c){var d;if(a){b=(b||"fx")+"queue",d=f._data(a,b),c&&(!d||f.isArray(c)?d=f._data(a,b,f.makeArray(c)):d.push(c));return d||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e={};d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),f._data(a,b+".run",e),d.call(a,function(){f.dequeue(a,b)},e)),c.length||(f.removeData(a,b+"queue "+b+".run",!0),n(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){var d=2;typeof a!="string"&&(c=a,a="fx",d--);if(arguments.length<d)return f.queue(this[0],a);return c===b?this:this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f.Callbacks("once memory"),!0))h++,l.add(m);m();return d.promise(c)}});var o=/[\n\t\r]/g,p=/\s+/,q=/\r/g,r=/^(?:button|input)$/i,s=/^(?:button|input|object|select|textarea)$/i,t=/^a(?:rea)?$/i,u=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,v=f.support.getSetAttribute,w,x,y;f.fn.extend({attr:function(a,b){return f.access(this,f.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,f.prop,a,b,arguments.length>1)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(p);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{g=" "+e.className+" ";for(h=0,i=b.length;h<i;h++)~g.indexOf(" "+b[h]+" ")||(g+=b[h]+" ");e.className=f.trim(g)}}}return this},removeClass:function(a){var c,d,e,g,h,i,j;if(f.isFunction(a))return this.each(function(b){f(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(p);for(d=0,e=this.length;d<e;d++){g=this[d];if(g.nodeType===1&&g.className)if(a){h=(" "+g.className+" ").replace(o," ");for(i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.each(function(c){f(this).toggleClass(a.call(this,c,this.className,b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(p);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c<d;c++)if(this[c].nodeType===1&&(" "+this[c].className+" ").replace(o," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.type]||f.valHooks[this.nodeName.toLowerCase()];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.type]||f.valHooks[g.nodeName.toLowerCase()];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c<d;c++){e=i[c];if(e.selected&&(f.support.optDisabled?!e.disabled:e.getAttribute("disabled")===null)&&(!e.parentNode.disabled||!f.nodeName(e.parentNode,"optgroup"))){b=f(e).val();if(j)return b;h.push(b)}}if(j&&!h.length&&i.length)return f(i[g]).val();return h},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h,i=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;i<g;i++)e=d[i],e&&(c=f.propFix[e]||e,h=u.test(e),h||f.attr(a,e,""),a.removeAttribute(v?e:c),h&&c in a&&(a[c]=!1))}},attrHooks:{type:{set:function(a,b){if(r.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},value:{get:function(a,b){if(w&&f.nodeName(a,"button"))return w.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(w&&f.nodeName(a,"button"))return w.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e,g,h,i=a.nodeType;if(!!a&&i!==3&&i!==8&&i!==2){h=i!==1||!f.isXMLDoc(a),h&&(c=f.propFix[c]||c,g=f.propHooks[c]);return d!==b?g&&"set"in g&&(e=g.set(a,d,c))!==b?e:a[c]=d:g&&"get"in g&&(e=g.get(a,c))!==null?e:a[c]}},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):s.test(a.nodeName)||t.test(a.nodeName)&&a.href?0:b}}}}),f.attrHooks.tabindex=f.propHooks.tabIndex,x={get:function(a,c){var d,e=f.prop(a,c);return e===!0||typeof e!="boolean"&&(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},v||(y={name:!0,id:!0,coords:!0},w=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&(y[c]?d.nodeValue!=="":d.specified)?d.nodeValue:b},set:function(a,b,d){var e=a.getAttributeNode(d);e||(e=c.createAttribute(d),a.setAttributeNode(e));return e.nodeValue=b+""}},f.attrHooks.tabindex.set=w.set,f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})}),f.attrHooks.contenteditable={get:w.get,set:function(a,b,c){b===""&&(b="false"),w.set(a,b,c)}}),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex);return null}})),f.support.enctype||(f.propFix.enctype="encoding"),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/(?:^|\s)hover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function(
-a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")};f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler,g=p.selector),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k<c.length;k++){l=A.exec(c[k])||[],m=l[1],n=(l[2]||"").split(".").sort(),s=f.event.special[m]||{},m=(g?s.delegateType:s.bindType)||m,s=f.event.special[m]||{},o=f.extend({type:m,origType:l[1],data:e,handler:d,guid:d.guid,selector:g,quick:g&&G(g),namespace:n.join(".")},p),r=j[m];if(!r){r=j[m]=[],r.delegateCount=0;if(!s.setup||s.setup.call(a,e,n,i)===!1)a.addEventListener?a.addEventListener(m,i,!1):a.attachEvent&&a.attachEvent("on"+m,i)}s.add&&(s.add.call(a,o),o.handler.guid||(o.handler.guid=d.guid)),g?r.splice(r.delegateCount++,0,o):r.push(o),f.event.global[m]=!0}a=null}},global:{},remove:function(a,b,c,d,e){var g=f.hasData(a)&&f._data(a),h,i,j,k,l,m,n,o,p,q,r,s;if(!!g&&!!(o=g.events)){b=f.trim(I(b||"")).split(" ");for(h=0;h<b.length;h++){i=A.exec(b[h])||[],j=k=i[1],l=i[2];if(!j){for(j in o)f.event.remove(a,j+b[h],c,d,!0);continue}p=f.event.special[j]||{},j=(d?p.delegateType:p.bindType)||j,r=o[j]||[],m=r.length,l=l?new RegExp("(^|\\.)"+l.split(".").sort().join("\\.(?:.*\\.)?")+"(\\.|$)"):null;for(n=0;n<r.length;n++)s=r[n],(e||k===s.origType)&&(!c||c.guid===s.guid)&&(!l||l.test(s.namespace))&&(!d||d===s.selector||d==="**"&&s.selector)&&(r.splice(n--,1),s.selector&&r.delegateCount--,p.remove&&p.remove.call(a,s));r.length===0&&m!==r.length&&((!p.teardown||p.teardown.call(a,l)===!1)&&f.removeEvent(a,j,g.handle),delete o[j])}f.isEmptyObject(o)&&(q=g.handle,q&&(q.elem=null),f.removeData(a,["events","handle"],!0))}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){if(!e||e.nodeType!==3&&e.nodeType!==8){var h=c.type||c,i=[],j,k,l,m,n,o,p,q,r,s;if(E.test(h+f.event.triggered))return;h.indexOf("!")>=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;l<r.length&&!c.isPropagationStopped();l++)m=r[l][0],c.type=r[l][1],q=(f._data(m,"events")||{})[c.type]&&f._data(m,"handle"),q&&q.apply(m,d),q=o&&m[o],q&&f.acceptData(m)&&q.apply(m,d)===!1&&c.preventDefault();c.type=h,!g&&!c.isDefaultPrevented()&&(!p._default||p._default.apply(e.ownerDocument,d)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)&&o&&e[h]&&(h!=="focus"&&h!=="blur"||c.target.offsetWidth!==0)&&!f.isWindow(e)&&(n=e[o],n&&(e[o]=null),f.event.triggered=h,e[h](),f.event.triggered=b,n&&(e[o]=n));return c.result}},dispatch:function(c){c=f.event.fix(c||a.event);var d=(f._data(this,"events")||{})[c.type]||[],e=d.delegateCount,g=[].slice.call(arguments,0),h=!c.exclusive&&!c.namespace,i=f.event.special[c.type]||{},j=[],k,l,m,n,o,p,q,r,s,t,u;g[0]=c,c.delegateTarget=this;if(!i.preDispatch||i.preDispatch.call(this,c)!==!1){if(e&&(!c.button||c.type!=="click")){n=f(this),n.context=this.ownerDocument||this;for(m=c.target;m!=this;m=m.parentNode||this)if(m.disabled!==!0){p={},r=[],n[0]=m;for(k=0;k<e;k++)s=d[k],t=s.selector,p[t]===b&&(p[t]=s.quick?H(m,s.quick):n.is(t)),p[t]&&r.push(s);r.length&&j.push({elem:m,matches:r})}}d.length>e&&j.push({elem:this,matches:d.slice(e)});for(k=0;k<j.length&&!c.isPropagationStopped();k++){q=j[k],c.currentTarget=q.elem;for(l=0;l<q.matches.length&&!c.isImmediatePropagationStopped();l++){s=q.matches[l];if(h||!c.namespace&&!s.namespace||c.namespace_re&&c.namespace_re.test(s.namespace))c.data=s.data,c.handleObj=s,o=((f.event.special[s.origType]||{}).handle||s.handler).apply(q.elem,g),o!==b&&(c.result=o,o===!1&&(c.preventDefault(),c.stopPropagation()))}}i.postDispatch&&i.postDispatch.call(this,c);return c.result}},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){a.which==null&&(a.which=b.charCode!=null?b.charCode:b.keyCode);return a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,d){var e,f,g,h=d.button,i=d.fromElement;a.pageX==null&&d.clientX!=null&&(e=a.target.ownerDocument||c,f=e.documentElement,g=e.body,a.pageX=d.clientX+(f&&f.scrollLeft||g&&g.scrollLeft||0)-(f&&f.clientLeft||g&&g.clientLeft||0),a.pageY=d.clientY+(f&&f.scrollTop||g&&g.scrollTop||0)-(f&&f.clientTop||g&&g.clientTop||0)),!a.relatedTarget&&i&&(a.relatedTarget=i===a.target?d.toElement:i),!a.which&&h!==b&&(a.which=h&1?1:h&2?3:h&4?2:0);return a}},fix:function(a){if(a[f.expando])return a;var d,e,g=a,h=f.event.fixHooks[a.type]||{},i=h.props?this.props.concat(h.props):this.props;a=f.Event(g);for(d=i.length;d;)e=i[--d],a[e]=g[e];a.target||(a.target=g.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),a.metaKey===b&&(a.metaKey=a.ctrlKey);return h.filter?h.filter(a,g):a},special:{ready:{setup:f.bindReady},load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}},simulate:function(a,b,c,d){var e=f.extend(new f.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?f.event.trigger(e,null,b):f.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},f.event.handle=f.event.dispatch,f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(!(this instanceof f.Event))return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?K:J):this.type=a,b&&f.extend(this,b),this.timeStamp=a&&a.timeStamp||f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=K;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=K;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=K,this.stopPropagation()},isDefaultPrevented:J,isPropagationStopped:J,isImmediatePropagationStopped:J},f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c=this,d=a.relatedTarget,e=a.handleObj,g=e.selector,h;if(!d||d!==c&&!f.contains(c,d))a.type=e.origType,h=e.handler.apply(this,arguments),a.type=b;return h}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(){if(f.nodeName(this,"form"))return!1;f.event.add(this,"click._submit keypress._submit",function(a){var c=a.target,d=f.nodeName(c,"input")||f.nodeName(c,"button")?c.form:b;d&&!d._submit_attached&&(f.event.add(d,"submit._submit",function(a){a._submit_bubble=!0}),d._submit_attached=!0)})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&f.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){if(f.nodeName(this,"form"))return!1;f.event.remove(this,"._submit")}}),f.support.changeBubbles||(f.event.special.change={setup:function(){if(z.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")f.event.add(this,"propertychange._change",function(a){a.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),f.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1,f.event.simulate("change",this,a,!0))});return!1}f.event.add(this,"beforeactivate._change",function(a){var b=a.target;z.test(b.nodeName)&&!b._change_attached&&(f.event.add(b,"change._change",function(a){this.parentNode&&!a.isSimulated&&!a.isTrigger&&f.event.simulate("change",this.parentNode,a,!0)}),b._change_attached=!0)})},handle:function(a){var b=a.target;if(this!==b||a.isSimulated||a.isTrigger||b.type!=="radio"&&b.type!=="checkbox")return a.handleObj.handler.apply(this,arguments)},teardown:function(){f.event.remove(this,"._change");return z.test(this.nodeName)}}),f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){var d=0,e=function(a){f.event.simulate(b,a.target,f.event.fix(a),!0)};f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.fn.extend({on:function(a,c,d,e,g){var h,i;if(typeof a=="object"){typeof c!="string"&&(d=d||c,c=b);for(i in a)this.on(i,c,d,a[i],g);return this}d==null&&e==null?(e=c,d=c=b):e==null&&(typeof c=="string"?(e=d,d=b):(e=d,d=c,c=b));if(e===!1)e=J;else if(!e)return this;g===1&&(h=e,e=function(a){f().off(a);return h.apply(this,arguments)},e.guid=h.guid||(h.guid=f.guid++));return this.each(function(){f.event.add(this,a,e,d,c)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,c,d){if(a&&a.preventDefault&&a.handleObj){var e=a.handleObj;f(a.delegateTarget).off(e.namespace?e.origType+"."+e.namespace:e.origType,e.selector,e.handler);return this}if(typeof a=="object"){for(var g in a)this.off(g,c,a[g]);return this}if(c===!1||typeof c=="function")d=c,c=b;d===!1&&(d=J);return this.each(function(){f.event.remove(this,a,d,c)})},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},live:function(a,b,c){f(this.context).on(a,this.selector,b,c);return this},die:function(a,b){f(this.context).off(a,this.selector||"**",b);return this},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return arguments.length==1?this.off(a,"**"):this.off(b,a,c)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f._data(this,"lastToggle"+a.guid)||0)%d;f._data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),f.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}if(j.nodeType===1){g||(j[d]=c,j.sizset=h);if(typeof b!="string"){if(j===b){k=!0;break}}else if(m.filter(b,[j]).length>0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}j.nodeType===1&&!g&&(j[d]=c,j.sizset=h);if(j.nodeName.toLowerCase()===b){k=j;break}j=j[a]}e[h]=k}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},m.matches=function(a,b){return m(a,null,null,b)},m.matchesSelector=function(a,b){return m(b,null,null,[a]).length>0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e<f;e++){h=o.order[e];if(g=o.leftMatch[h].exec(a)){i=g[1],g.splice(1,1);if(i.substr(i.length-1)!=="\\"){g[1]=(g[1]||"").replace(j,""),d=o.find[h](g,b,c);if(d!=null){a=a.replace(o.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},m.filter=function(a,c,d,e){var f,g,h,i,j,k,l,n,p,q=a,r=[],s=c,t=c&&c[0]&&m.isXML(c[0]);while(a&&c.length){for(h in o.filter)if((f=o.leftMatch[h].exec(a))!=null&&f[2]){k=o.filter[h],l=f[1],g=!1,f.splice(1,1);if(l.substr(l.length-1)==="\\")continue;s===r&&(r=[]);if(o.preFilter[h]){f=o.preFilter[h](f,s,d,r,e,t);if(!f)g=i=!0;else if(f===!0)continue}if(f)for(n=0;(j=s[n])!=null;n++)j&&(i=k(j,f,n,s),p=e^i,d&&i!=null?p?g=!0:s[n]=!1:p&&(r.push(j),g=!0));if(i!==b){d||(s=r),a=a.replace(o.match[h],"");if(!g)return[];break}}if(a===q)if(g==null)m.error(a);else break;q=a}return s},m.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)};var n=m.getText=function(a){var b,c,d=a.nodeType,e="";if(d){if(d===1||d===9||d===11){if(typeof a.textContent=="string")return a.textContent;if(typeof a.innerText=="string")return a.innerText.replace(k,"");for(a=a.firstChild;a;a=a.nextSibling)e+=n(a)}else if(d===3||d===4)return a.nodeValue}else for(b=0;c=a[b];b++)c.nodeType!==8&&(e+=n(c));return e},o=m.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!l.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&m.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&m.filter(b,a,!0)}},"":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("parentNode",b,f,a,d,c)},"~":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("previousSibling",b,f,a,d,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(j,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}m.error(e)},CHILD:function(a,b){var c,e,f,g,h,i,j,k=b[1],l=a;switch(k){case"only":case"first":while(l=l.previousSibling)if(l.nodeType===1)return!1;if(k==="first")return!0;l=a;case"last":while(l=l.nextSibling)if(l.nodeType===1)return!1;return!0;case"nth":c=b[2],e=b[3];if(c===1&&e===0)return!0;f=b[0],g=a.parentNode;if(g&&(g[d]!==f||!a.nodeIndex)){i=0;for(l=g.firstChild;l;l=l.nextSibling)l.nodeType===1&&(l.nodeIndex=++i);g[d]=f}j=a.nodeIndex-e;return c===0?j===0:j%c===0&&j/c>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));o.match.globalPOS=p;var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c<e;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var u,v;c.documentElement.compareDocumentPosition?u=function(a,b){if(a===b){h=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(u=function(a,b){if(a===b){h=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],g=a.parentNode,i=b.parentNode,j=g;if(g===i)return v(a,b);if(!g)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return v(e[k],f[k]);return k===c?v(a,f[k],-1):v(e[k],b,1)},v=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h<i;h++)m(a,g[h],e,c);return m.filter(f,e)};m.attr=f.attr,m.selectors.attrMap={},f.find=m,f.expr=m.selectors,f.expr[":"]=f.expr.filters,f.unique=m.uniqueSort,f.text=m.getText,f.isXMLDoc=m.isXML,f.contains=m.contains}();var L=/Until$/,M=/^(?:parents|prevUntil|prevAll)/,N=/,/,O=/^.[^:#\[\.,]*$/,P=Array.prototype.slice,Q=f.expr.match.globalPOS,R={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(T(this,a,!1),"not",a)},filter:function(a){return this.pushStack(T(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?Q.test(a)?f(a,this.context).index(this[0])>=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d<a.length;d++)f(g).is(a[d])&&c.push({selector:a[d],elem:g,level:h});g=g.parentNode,h++}return c}var i=Q.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d<e;d++){g=this[d];while(g){if(i?i.index(g)>-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/<tbody/i,_=/<|&#?\w+;/,ba=/<(?:script|style)/i,bb=/<(?:script|object|embed|option|style)/i,bc=new RegExp("<(?:"+V+")[\\s/>]","i"),bd=/checked\s*(?:[^=]|=\s*.checked.)/i,be=/\/(java|ecma)script/i,bf=/^\s*<!(?:\[CDATA\[|\-\-)/,bg={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div<div>","</div>"]),f.fn.extend({text:function(a){return f.access(this,function(a){return a===b?f.text(this):this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a))},null,a,arguments.length)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f
-.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){return f.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return c.nodeType===1?c.innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1></$2>");try{for(;d<e;d++)c=this[d]||{},c.nodeType===1&&(f.cleanData(c.getElementsByTagName("*")),c.innerHTML=a);c=0}catch(g){}}c&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(f.isFunction(a))return this.each(function(b){var c=f(this),d=c.html();c.replaceWith(a.call(this,b,d))});typeof a!="string"&&(a=f(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;f(this).remove(),b?f(b).before(a):f(c).append(a)})}return this.length?this.pushStack(f(f.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){var e,g,h,i,j=a[0],k=[];if(!f.support.checkClone&&arguments.length===3&&typeof j=="string"&&bd.test(j))return this.each(function(){f(this).domManip(a,c,d,!0)});if(f.isFunction(j))return this.each(function(e){var g=f(this);a[0]=j.call(this,e,c?g.html():b),g.domManip(a,c,d)});if(this[0]){i=j&&j.parentNode,f.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?e={fragment:i}:e=f.buildFragment(a,this,k),h=e.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&f.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)d.call(c?bi(this[l],g):this[l],e.cacheable||m>1&&l<n?f.clone(h,!0,!0):h)}k.length&&f.each(k,function(a,b){b.src?f.ajax({type:"GET",global:!1,url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(bf,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)})}return this}}),f.buildFragment=function(a,b,d){var e,g,h,i,j=a[0];b&&b[0]&&(i=b[0].ownerDocument||b[0]),i.createDocumentFragment||(i=c),a.length===1&&typeof j=="string"&&j.length<512&&i===c&&j.charAt(0)==="<"&&!bb.test(j)&&(f.support.checkClone||!bd.test(j))&&(f.support.html5Clone||!bc.test(j))&&(g=!0,h=f.fragments[j],h&&h!==1&&(e=h)),e||(e=i.createDocumentFragment(),f.clean(a,i,e,d)),g&&(f.fragments[j]=h?e:1);return{fragment:e,cacheable:g}},f.fragments={},f.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){f.fn[a]=function(c){var d=[],e=f(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1){e[b](this[0]);return this}for(var h=0,i=e.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||f.isXMLDoc(a)||!bc.test("<"+a.nodeName+">")?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g,h,i,j=[];b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);for(var k=0,l;(l=a[k])!=null;k++){typeof l=="number"&&(l+="");if(!l)continue;if(typeof l=="string")if(!_.test(l))l=b.createTextNode(l);else{l=l.replace(Y,"<$1></$2>");var m=(Z.exec(l)||["",""])[1].toLowerCase(),n=bg[m]||bg._default,o=n[0],p=b.createElement("div"),q=bh.childNodes,r;b===c?bh.appendChild(p):U(b).appendChild(p),p.innerHTML=n[1]+l+n[2];while(o--)p=p.lastChild;if(!f.support.tbody){var s=$.test(l),t=m==="table"&&!s?p.firstChild&&p.firstChild.childNodes:n[1]==="<table>"&&!s?p.childNodes:[];for(i=t.length-1;i>=0;--i)f.nodeName(t[i],"tbody")&&!t[i].childNodes.length&&t[i].parentNode.removeChild(t[i])}!f.support.leadingWhitespace&&X.test(l)&&p.insertBefore(b.createTextNode(X.exec(l)[0]),p.firstChild),l=p.childNodes,p&&(p.parentNode.removeChild(p),q.length>0&&(r=q[q.length-1],r&&r.parentNode&&r.parentNode.removeChild(r)))}var u;if(!f.support.appendChecked)if(l[0]&&typeof (u=l.length)=="number")for(i=0;i<u;i++)bn(l[i]);else bn(l);l.nodeType?j.push(l):j=f.merge(j,l)}if(d){g=function(a){return!a.type||be.test(a.type)};for(k=0;j[k];k++){h=j[k];if(e&&f.nodeName(h,"script")&&(!h.type||be.test(h.type)))e.push(h.parentNode?h.parentNode.removeChild(h):h);else{if(h.nodeType===1){var v=f.grep(h.getElementsByTagName("script"),g);j.splice.apply(j,[k+1,0].concat(v))}d.appendChild(h)}}}return j},cleanData:function(a){var b,c,d=f.cache,e=f.event.special,g=f.support.deleteExpando;for(var h=0,i;(i=a[h])!=null;h++){if(i.nodeName&&f.noData[i.nodeName.toLowerCase()])continue;c=i[f.expando];if(c){b=d[c];if(b&&b.events){for(var j in b.events)e[j]?f.event.remove(i,j):f.removeEvent(i,j,b.handle);b.handle&&(b.handle.elem=null)}g?delete i[f.expando]:i.removeAttribute&&i.removeAttribute(f.expando),delete d[c]}}}});var bp=/alpha\([^)]*\)/i,bq=/opacity=([^)]*)/,br=/([A-Z]|^ms)/g,bs=/^[\-+]?(?:\d*\.)?\d+$/i,bt=/^-?(?:\d*\.)?\d+(?!px)[^\d\s]+$/i,bu=/^([\-+])=([\-+.\de]+)/,bv=/^margin/,bw={position:"absolute",visibility:"hidden",display:"block"},bx=["Top","Right","Bottom","Left"],by,bz,bA;f.fn.css=function(a,c){return f.access(this,function(a,c,d){return d!==b?f.style(a,c,d):f.css(a,c)},a,c,arguments.length>1)},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=by(a,"opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d,h==="string"&&(g=bu.exec(d))&&(d=+(g[1]+1)*+g[2]+parseFloat(f.css(a,c)),h="number");if(d==null||h==="number"&&isNaN(d))return;h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(by)return by(a,c)},swap:function(a,b,c){var d={},e,f;for(f in b)d[f]=a.style[f],a.style[f]=b[f];e=c.call(a);for(f in b)a.style[f]=d[f];return e}}),f.curCSS=f.css,c.defaultView&&c.defaultView.getComputedStyle&&(bz=function(a,b){var c,d,e,g,h=a.style;b=b.replace(br,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b))),!f.support.pixelMargin&&e&&bv.test(b)&&bt.test(c)&&(g=h.width,h.width=c,c=e.width,h.width=g);return c}),c.documentElement.currentStyle&&(bA=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f==null&&g&&(e=g[b])&&(f=e),bt.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),by=bz||bA,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){if(c)return a.offsetWidth!==0?bB(a,b,d):f.swap(a,bw,function(){return bB(a,b,d)})},set:function(a,b){return bs.test(b)?b+"px":b}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bq.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bp,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bp.test(g)?g.replace(bp,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){return f.swap(a,{display:"inline-block"},function(){return b?by(a,"margin-right"):a.style.marginRight})}})}),f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)}),f.each({margin:"",padding:"",border:"Width"},function(a,b){f.cssHooks[a+b]={expand:function(c){var d,e=typeof c=="string"?c.split(" "):[c],f={};for(d=0;d<4;d++)f[a+bx[d]+b]=e[d]||e[d-2]||e[0];return f}}});var bC=/%20/g,bD=/\[\]$/,bE=/\r?\n/g,bF=/#.*$/,bG=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bH=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bI=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bJ=/^(?:GET|HEAD)$/,bK=/^\/\//,bL=/\?/,bM=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bN=/^(?:select|textarea)/i,bO=/\s+/,bP=/([?&])_=[^&]*/,bQ=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bR=f.fn.load,bS={},bT={},bU,bV,bW=["*/"]+["*"];try{bU=e.href}catch(bX){bU=c.createElement("a"),bU.href="",bU=bU.href}bV=bQ.exec(bU.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bR)return bR.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("<div>").append(c.replace(bM,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bN.test(this.nodeName)||bH.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bE,"\r\n")}}):{name:b.name,value:c.replace(bE,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b$(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b$(a,b);return a},ajaxSettings:{url:bU,isLocal:bI.test(bV[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bW},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bY(bS),ajaxTransport:bY(bT),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?ca(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cb(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bG.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bF,"").replace(bK,bV[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bO),d.crossDomain==null&&(r=bQ.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bV[1]&&r[2]==bV[2]&&(r[3]||(r[1]==="http:"?80:443))==(bV[3]||(bV[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),bZ(bS,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bJ.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bL.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bP,"$1_="+x);d.url=y+(y===d.url?(bL.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bW+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=bZ(bT,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)b_(g,a[g],c,e);return d.join("&").replace(bC,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cc=f.now(),cd=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cc++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=typeof b.data=="string"&&/^application\/x\-www\-form\-urlencoded/.test(b.contentType);if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(cd.test(b.url)||e&&cd.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(cd,l),b.url===j&&(e&&(k=k.replace(cd,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var ce=a.ActiveXObject?function(){for(var a in cg)cg[a](0,1)}:!1,cf=0,cg;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ch()||ci()}:ch,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,ce&&delete cg[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n);try{m.text=h.responseText}catch(a){}try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cf,ce&&(cg||(cg={},f(a).unload(ce)),cg[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cj={},ck,cl,cm=/^(?:toggle|show|hide)$/,cn=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,co,cp=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cq;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(ct("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)d=this[g],d.style&&(e=d.style.display,!f._data(d,"olddisplay")&&e==="none"&&(e=d.style.display=""),(e===""&&f.css(d,"display")==="none"||!f.contains(d.ownerDocument.documentElement,d))&&f._data(d,"olddisplay",cu(d.nodeName)));for(g=0;g<h;g++){d=this[g];if(d.style){e=d.style.display;if(e===""||e==="none")d.style.display=f._data(d,"olddisplay")||""}}return this},hide:function(a,b,c){if(a||a===0)return this.animate(ct("hide",3),a,b,c);var d,e,g=0,h=this.length;for(;g<h;g++)d=this[g],d.style&&(e=f.css(d,"display"),e!=="none"&&!f._data(d,"olddisplay")&&f._data(d,"olddisplay",e));for(g=0;g<h;g++)this[g].style&&(this[g].style.display="none");return this},_toggle:f.fn.toggle,toggle:function(a,b,c){var d=typeof a=="boolean";f.isFunction(a)&&f.isFunction(b)?this._toggle.apply(this,arguments):a==null||d?this.each(function(){var b=d?a:f(this).is(":hidden");f(this)[b?"show":"hide"]()}):this.animate(ct("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){function g(){e.queue===!1&&f._mark(this);var b=f.extend({},e),c=this.nodeType===1,d=c&&f(this).is(":hidden"),g,h,i,j,k,l,m,n,o,p,q;b.animatedProperties={};for(i in a){g=f.camelCase(i),i!==g&&(a[g]=a[i],delete a[i]);if((k=f.cssHooks[g])&&"expand"in k){l=k.expand(a[g]),delete a[g];for(i in l)i in a||(a[i]=l[i])}}for(g in a){h=a[g],f.isArray(h)?(b.animatedProperties[g]=h[1],h=a[g]=h[0]):b.animatedProperties[g]=b.specialEasing&&b.specialEasing[g]||b.easing||"swing";if(h==="hide"&&d||h==="show"&&!d)return b.complete.call(this);c&&(g==="height"||g==="width")&&(b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY],f.css(this,"display")==="inline"&&f.css(this,"float")==="none"&&(!f.support.inlineBlockNeedsLayout||cu(this.nodeName)==="inline"?this.style.display="inline-block":this.style.zoom=1))}b.overflow!=null&&(this.style.overflow="hidden");for(i in a)j=new f.fx(this,b,i),h=a[i],cm.test(h)?(q=f._data(this,"toggle"+i)||(h==="toggle"?d?"show":"hide":0),q?(f._data(this,"toggle"+i,q==="show"?"hide":"show"),j[q]()):j[h]()):(m=cn.exec(h),n=j.cur(),m?(o=parseFloat(m[2]),p=m[3]||(f.cssNumber[i]?"":"px"),p!=="px"&&(f.style(this,i,(o||1)+p),n=(o||1)/j.cur()*n,f.style(this,i,n+p)),m[1]&&(o=(m[1]==="-="?-1:1)*o+n),j.custom(n,o,p)):j.custom(n,h,""));return!0}var e=f.speed(b,c,d);if(f.isEmptyObject(a))return this.each(e.complete,[!1]);a=f.extend({},a);return e.queue===!1?this.each(g):this.queue(e.queue,g)},stop:function(a,c,d){typeof a!="string"&&(d=c,c=a,a=b),c&&a!==!1&&this.queue(a||"fx",[]);return this.each(function(){function h(a,b,c){var e=b[c];f.removeData(a,c,!0),e.stop(d)}var b,c=!1,e=f.timers,g=f._data(this);d||f._unmark(!0,this);if(a==null)for(b in g)g[b]&&g[b].stop&&b.indexOf(".run")===b.length-4&&h(this,g,b);else g[b=a+".run"]&&g[b].stop&&h(this,g,b);for(b=e.length;b--;)e[b].elem===this&&(a==null||e[b].queue===a)&&(d?e[b](!0):e[b].saveState(),c=!0,e.splice(b,1));(!d||!c)&&f.dequeue(this,a)})}}),f.each({slideDown:ct("show",1),slideUp:ct("hide",1),slideToggle:ct("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){f.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),f.extend({speed:function(a,b,c){var d=a&&typeof a=="object"?f.extend({},a):{complete:c||!c&&b||f.isFunction(a)&&a,duration:a,easing:c&&b||b&&!f.isFunction(b)&&b};d.duration=f.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in f.fx.speeds?f.fx.speeds[d.duration]:f.fx.speeds._default;if(d.queue==null||d.queue===!0)d.queue="fx";d.old=d.complete,d.complete=function(a){f.isFunction(d.old)&&d.old.call(this),d.queue?f.dequeue(this,d.queue):a!==!1&&f._unmark(this)};return d},easing:{linear:function(a){return a},swing:function(a){return-Math.cos(a*Math.PI)/2+.5}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig=b.orig||{}}}),f.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(f.fx.step[this.prop]||f.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=f.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,c,d){function h(a){return e.step(a)}var e=this,g=f.fx;this.startTime=cq||cr(),this.end=c,this.now=this.start=a,this.pos=this.state=0,this.unit=d||this.unit||(f.cssNumber[this.prop]?"":"px"),h.queue=this.options.queue,h.elem=this.elem,h.saveState=function(){f._data(e.elem,"fxshow"+e.prop)===b&&(e.options.hide?f._data(e.elem,"fxshow"+e.prop,e.start):e.options.show&&f._data(e.elem,"fxshow"+e.prop,e.end))},h()&&f.timers.push(h)&&!co&&(co=setInterval(g.tick,g.interval))},show:function(){var a=f._data(this.elem,"fxshow"+this.prop);this.options.orig[this.prop]=a||f.style(this.elem,this.prop),this.options.show=!0,a!==b?this.custom(this.cur(),a):this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),f(this.elem).show()},hide:function(){this.options.orig[this.prop]=f._data(this.elem,"fxshow"+this.prop)||f.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b,c,d,e=cq||cr(),g=!0,h=this.elem,i=this.options;if(a||e>=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c<b.length;c++)a=b[c],!a()&&b[c]===a&&b.splice(c--,1);b.length||f.fx.stop()},interval:13,stop:function(){clearInterval(co),co=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){f.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=a.now+a.unit:a.elem[a.prop]=a.now}}}),f.each(cp.concat.apply([],cp),function(a,b){b.indexOf("margin")&&(f.fx.step[b]=function(a){f.style(a.elem,b,Math.max(0,a.now)+a.unit)})}),f.expr&&f.expr.filters&&(f.expr.filters.animated=function(a){return f.grep(f.timers,function(b){return a===b.elem}).length});var cv,cw=/^t(?:able|d|h)$/i,cx=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?cv=function(a,b,c,d){try{d=a.getBoundingClientRect()}catch(e){}if(!d||!f.contains(c,a))return d?{top:d.top,left:d.left}:{top:0,left:0};var g=b.body,h=cy(b),i=c.clientTop||g.clientTop||0,j=c.clientLeft||g.clientLeft||0,k=h.pageYOffset||f.support.boxModel&&c.scrollTop||g.scrollTop,l=h.pageXOffset||f.support.boxModel&&c.scrollLeft||g.scrollLeft,m=d.top+k-i,n=d.left+l-j;return{top:m,left:n}}:cv=function(a,b,c){var d,e=a.offsetParent,g=a,h=b.body,i=b.defaultView,j=i?i.getComputedStyle(a,null):a.currentStyle,k=a.offsetTop,l=a.offsetLeft;while((a=a.parentNode)&&a!==h&&a!==c){if(f.support.fixedPosition&&j.position==="fixed")break;d=i?i.getComputedStyle(a,null):a.currentStyle,k-=a.scrollTop,l-=a.scrollLeft,a===e&&(k+=a.offsetTop,l+=a.offsetLeft,f.support.doesNotAddBorder&&(!f.support.doesAddBorderForTableAndCells||!cw.test(a.nodeName))&&(k+=parseFloat(d.borderTopWidth)||0,l+=parseFloat(d.borderLeftWidth)||0),g=e,e=a.offsetParent),f.support.subtractsBorderForOverflowNotVisible&&d.overflow!=="visible"&&(k+=parseFloat(d.borderTopWidth)||0,l+=parseFloat(d.borderLeftWidth)||0),j=d}if(j.position==="relative"||j.position==="static")k+=h.offsetTop,l+=h.offsetLeft;f.support.fixedPosition&&j.position==="fixed"&&(k+=Math.max(c.scrollTop,h.scrollTop),l+=Math.max(c.scrollLeft,h.scrollLeft));return{top:k,left:l}},f.fn.offset=function(a){if(arguments.length)return a===b?this:this.each(function(b){f.offset.setOffset(this,a,b)});var c=this[0],d=c&&c.ownerDocument;if(!d)return null;if(c===d.body)return f.offset.bodyOffset(c);return cv(c,d,d.documentElement)},f.offset={bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.support.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,c){var d=/Y/.test(c);f.fn[a]=function(e){return f.access(this,function(a,e,g){var h=cy(a);if(g===b)return h?c in h?h[c]:f.support.boxModel&&h.document.documentElement[e]||h.document.body[e]:a[e];h?h.scrollTo(d?f(h).scrollLeft():g,d?g:f(h).scrollTop()):a[e]=g},a,e,arguments.length,null)}}),f.each({Height:"height",Width:"width"},function(a,c){var d="client"+a,e="scroll"+a,g="offset"+a;f.fn["inner"+a]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,c,"padding")):this[c]():null},f.fn["outer"+a]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,c,a?"margin":"border")):this[c]():null},f.fn[c]=function(a){return f.access(this,function(a,c,h){var i,j,k,l;if(f.isWindow(a)){i=a.document,j=i.documentElement[d];return f.support.boxModel&&j||i.body&&i.body[d]||j}if(a.nodeType===9){i=a.documentElement;if(i[d]>=i[e])return i[d];return Math.max(a.body[e],i[e],a.body[g],i[g])}if(h===b){k=f.css(a,c),l=parseFloat(k);return f.isNumeric(l)?l:k}f(a).css(c,h)},c,a,arguments.length,null)}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window);
\ No newline at end of file
diff --git a/openslides/static/javascript/jquery.min.js b/openslides/static/javascript/jquery.min.js
new file mode 100644
index 000000000..50d1b22f2
--- /dev/null
+++ b/openslides/static/javascript/jquery.min.js
@@ -0,0 +1,4 @@
+/*! jQuery v1.9.0 | (c) 2005, 2012 jQuery Foundation, Inc. | jquery.org/license */(function(e,t){"use strict";function n(e){var t=e.length,n=st.type(e);return st.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}function r(e){var t=Tt[e]={};return st.each(e.match(lt)||[],function(e,n){t[n]=!0}),t}function i(e,n,r,i){if(st.acceptData(e)){var o,a,s=st.expando,u="string"==typeof n,l=e.nodeType,c=l?st.cache:e,f=l?e[s]:e[s]&&s;if(f&&c[f]&&(i||c[f].data)||!u||r!==t)return f||(l?e[s]=f=K.pop()||st.guid++:f=s),c[f]||(c[f]={},l||(c[f].toJSON=st.noop)),("object"==typeof n||"function"==typeof n)&&(i?c[f]=st.extend(c[f],n):c[f].data=st.extend(c[f].data,n)),o=c[f],i||(o.data||(o.data={}),o=o.data),r!==t&&(o[st.camelCase(n)]=r),u?(a=o[n],null==a&&(a=o[st.camelCase(n)])):a=o,a}}function o(e,t,n){if(st.acceptData(e)){var r,i,o,a=e.nodeType,u=a?st.cache:e,l=a?e[st.expando]:st.expando;if(u[l]){if(t&&(r=n?u[l]:u[l].data)){st.isArray(t)?t=t.concat(st.map(t,st.camelCase)):t in r?t=[t]:(t=st.camelCase(t),t=t in r?[t]:t.split(" "));for(i=0,o=t.length;o>i;i++)delete r[t[i]];if(!(n?s:st.isEmptyObject)(r))return}(n||(delete u[l].data,s(u[l])))&&(a?st.cleanData([e],!0):st.support.deleteExpando||u!=u.window?delete u[l]:u[l]=null)}}}function a(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(Nt,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:wt.test(r)?st.parseJSON(r):r}catch(o){}st.data(e,n,r)}else r=t}return r}function s(e){var t;for(t in e)if(("data"!==t||!st.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}function u(){return!0}function l(){return!1}function c(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}function f(e,t,n){if(t=t||0,st.isFunction(t))return st.grep(e,function(e,r){var i=!!t.call(e,r,e);return i===n});if(t.nodeType)return st.grep(e,function(e){return e===t===n});if("string"==typeof t){var r=st.grep(e,function(e){return 1===e.nodeType});if(Wt.test(t))return st.filter(t,r,!n);t=st.filter(t,r)}return st.grep(e,function(e){return st.inArray(e,t)>=0===n})}function p(e){var t=zt.split("|"),n=e.createDocumentFragment();if(n.createElement)for(;t.length;)n.createElement(t.pop());return n}function d(e,t){return e.getElementsByTagName(t)[0]||e.appendChild(e.ownerDocument.createElement(t))}function h(e){var t=e.getAttributeNode("type");return e.type=(t&&t.specified)+"/"+e.type,e}function g(e){var t=nn.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function m(e,t){for(var n,r=0;null!=(n=e[r]);r++)st._data(n,"globalEval",!t||st._data(t[r],"globalEval"))}function y(e,t){if(1===t.nodeType&&st.hasData(e)){var n,r,i,o=st._data(e),a=st._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)st.event.add(t,n,s[n][r])}a.data&&(a.data=st.extend({},a.data))}}function v(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!st.support.noCloneEvent&&t[st.expando]){r=st._data(t);for(i in r.events)st.removeEvent(t,i,r.handle);t.removeAttribute(st.expando)}"script"===n&&t.text!==e.text?(h(t).text=e.text,g(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),st.support.html5Clone&&e.innerHTML&&!st.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Zt.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}function b(e,n){var r,i,o=0,a=e.getElementsByTagName!==t?e.getElementsByTagName(n||"*"):e.querySelectorAll!==t?e.querySelectorAll(n||"*"):t;if(!a)for(a=[],r=e.childNodes||e;null!=(i=r[o]);o++)!n||st.nodeName(i,n)?a.push(i):st.merge(a,b(i,n));return n===t||n&&st.nodeName(e,n)?st.merge([e],a):a}function x(e){Zt.test(e.type)&&(e.defaultChecked=e.checked)}function T(e,t){if(t in e)return t;for(var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=Nn.length;i--;)if(t=Nn[i]+n,t in e)return t;return r}function w(e,t){return e=t||e,"none"===st.css(e,"display")||!st.contains(e.ownerDocument,e)}function N(e,t){for(var n,r=[],i=0,o=e.length;o>i;i++)n=e[i],n.style&&(r[i]=st._data(n,"olddisplay"),t?(r[i]||"none"!==n.style.display||(n.style.display=""),""===n.style.display&&w(n)&&(r[i]=st._data(n,"olddisplay",S(n.nodeName)))):r[i]||w(n)||st._data(n,"olddisplay",st.css(n,"display")));for(i=0;o>i;i++)n=e[i],n.style&&(t&&"none"!==n.style.display&&""!==n.style.display||(n.style.display=t?r[i]||"":"none"));return e}function C(e,t,n){var r=mn.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function k(e,t,n,r,i){for(var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;4>o;o+=2)"margin"===n&&(a+=st.css(e,n+wn[o],!0,i)),r?("content"===n&&(a-=st.css(e,"padding"+wn[o],!0,i)),"margin"!==n&&(a-=st.css(e,"border"+wn[o]+"Width",!0,i))):(a+=st.css(e,"padding"+wn[o],!0,i),"padding"!==n&&(a+=st.css(e,"border"+wn[o]+"Width",!0,i)));return a}function E(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=ln(e),a=st.support.boxSizing&&"border-box"===st.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=un(e,t,o),(0>i||null==i)&&(i=e.style[t]),yn.test(i))return i;r=a&&(st.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+k(e,t,n||(a?"border":"content"),r,o)+"px"}function S(e){var t=V,n=bn[e];return n||(n=A(e,t),"none"!==n&&n||(cn=(cn||st("<iframe frameborder='0' width='0' height='0'/>").css("cssText","display:block !important")).appendTo(t.documentElement),t=(cn[0].contentWindow||cn[0].contentDocument).document,t.write("<!doctype html><html><body>"),t.close(),n=A(e,t),cn.detach()),bn[e]=n),n}function A(e,t){var n=st(t.createElement(e)).appendTo(t.body),r=st.css(n[0],"display");return n.remove(),r}function j(e,t,n,r){var i;if(st.isArray(t))st.each(t,function(t,i){n||kn.test(e)?r(e,i):j(e+"["+("object"==typeof i?t:"")+"]",i,n,r)});else if(n||"object"!==st.type(t))r(e,t);else for(i in t)j(e+"["+i+"]",t[i],n,r)}function D(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(lt)||[];if(st.isFunction(n))for(;r=o[i++];)"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function L(e,n,r,i){function o(u){var l;return a[u]=!0,st.each(e[u]||[],function(e,u){var c=u(n,r,i);return"string"!=typeof c||s||a[c]?s?!(l=c):t:(n.dataTypes.unshift(c),o(c),!1)}),l}var a={},s=e===$n;return o(n.dataTypes[0])||!a["*"]&&o("*")}function H(e,n){var r,i,o=st.ajaxSettings.flatOptions||{};for(r in n)n[r]!==t&&((o[r]?e:i||(i={}))[r]=n[r]);return i&&st.extend(!0,e,i),e}function M(e,n,r){var i,o,a,s,u=e.contents,l=e.dataTypes,c=e.responseFields;for(o in c)o in r&&(n[c[o]]=r[o]);for(;"*"===l[0];)l.shift(),i===t&&(i=e.mimeType||n.getResponseHeader("Content-Type"));if(i)for(o in u)if(u[o]&&u[o].test(i)){l.unshift(o);break}if(l[0]in r)a=l[0];else{for(o in r){if(!l[0]||e.converters[o+" "+l[0]]){a=o;break}s||(s=o)}a=a||s}return a?(a!==l[0]&&l.unshift(a),r[a]):t}function q(e,t){var n,r,i,o,a={},s=0,u=e.dataTypes.slice(),l=u[0];if(e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u[1])for(n in e.converters)a[n.toLowerCase()]=e.converters[n];for(;i=u[++s];)if("*"!==i){if("*"!==l&&l!==i){if(n=a[l+" "+i]||a["* "+i],!n)for(r in a)if(o=r.split(" "),o[1]===i&&(n=a[l+" "+o[0]]||a["* "+o[0]])){n===!0?n=a[r]:a[r]!==!0&&(i=o[0],u.splice(s--,0,i));break}if(n!==!0)if(n&&e["throws"])t=n(t);else try{t=n(t)}catch(c){return{state:"parsererror",error:n?c:"No conversion from "+l+" to "+i}}}l=i}return{state:"success",data:t}}function _(){try{return new e.XMLHttpRequest}catch(t){}}function F(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}function O(){return setTimeout(function(){Qn=t}),Qn=st.now()}function B(e,t){st.each(t,function(t,n){for(var r=(rr[t]||[]).concat(rr["*"]),i=0,o=r.length;o>i;i++)if(r[i].call(e,t,n))return})}function P(e,t,n){var r,i,o=0,a=nr.length,s=st.Deferred().always(function(){delete u.elem}),u=function(){if(i)return!1;for(var t=Qn||O(),n=Math.max(0,l.startTime+l.duration-t),r=n/l.duration||0,o=1-r,a=0,u=l.tweens.length;u>a;a++)l.tweens[a].run(o);return s.notifyWith(e,[l,o,n]),1>o&&u?n:(s.resolveWith(e,[l]),!1)},l=s.promise({elem:e,props:st.extend({},t),opts:st.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:Qn||O(),duration:n.duration,tweens:[],createTween:function(t,n){var r=st.Tween(e,l.opts,t,n,l.opts.specialEasing[t]||l.opts.easing);return l.tweens.push(r),r},stop:function(t){var n=0,r=t?l.tweens.length:0;if(i)return this;for(i=!0;r>n;n++)l.tweens[n].run(1);return t?s.resolveWith(e,[l,t]):s.rejectWith(e,[l,t]),this}}),c=l.props;for(R(c,l.opts.specialEasing);a>o;o++)if(r=nr[o].call(l,e,c,l.opts))return r;return B(l,c),st.isFunction(l.opts.start)&&l.opts.start.call(e,l),st.fx.timer(st.extend(u,{elem:e,anim:l,queue:l.opts.queue})),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always)}function R(e,t){var n,r,i,o,a;for(n in e)if(r=st.camelCase(n),i=t[r],o=e[n],st.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),a=st.cssHooks[r],a&&"expand"in a){o=a.expand(o),delete e[r];for(n in o)n in e||(e[n]=o[n],t[n]=i)}else t[r]=i}function W(e,t,n){var r,i,o,a,s,u,l,c,f,p=this,d=e.style,h={},g=[],m=e.nodeType&&w(e);n.queue||(c=st._queueHooks(e,"fx"),null==c.unqueued&&(c.unqueued=0,f=c.empty.fire,c.empty.fire=function(){c.unqueued||f()}),c.unqueued++,p.always(function(){p.always(function(){c.unqueued--,st.queue(e,"fx").length||c.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[d.overflow,d.overflowX,d.overflowY],"inline"===st.css(e,"display")&&"none"===st.css(e,"float")&&(st.support.inlineBlockNeedsLayout&&"inline"!==S(e.nodeName)?d.zoom=1:d.display="inline-block")),n.overflow&&(d.overflow="hidden",st.support.shrinkWrapBlocks||p.done(function(){d.overflow=n.overflow[0],d.overflowX=n.overflow[1],d.overflowY=n.overflow[2]}));for(r in t)if(o=t[r],Zn.exec(o)){if(delete t[r],u=u||"toggle"===o,o===(m?"hide":"show"))continue;g.push(r)}if(a=g.length){s=st._data(e,"fxshow")||st._data(e,"fxshow",{}),"hidden"in s&&(m=s.hidden),u&&(s.hidden=!m),m?st(e).show():p.done(function(){st(e).hide()}),p.done(function(){var t;st._removeData(e,"fxshow");for(t in h)st.style(e,t,h[t])});for(r=0;a>r;r++)i=g[r],l=p.createTween(i,m?s[i]:0),h[i]=s[i]||st.style(e,i),i in s||(s[i]=l.start,m&&(l.end=l.start,l.start="width"===i||"height"===i?1:0))}}function $(e,t,n,r,i){return new $.prototype.init(e,t,n,r,i)}function I(e,t){var n,r={height:e},i=0;for(t=t?1:0;4>i;i+=2-t)n=wn[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}function z(e){return st.isWindow(e)?e:9===e.nodeType?e.defaultView||e.parentWindow:!1}var X,U,V=e.document,Y=e.location,J=e.jQuery,G=e.$,Q={},K=[],Z="1.9.0",et=K.concat,tt=K.push,nt=K.slice,rt=K.indexOf,it=Q.toString,ot=Q.hasOwnProperty,at=Z.trim,st=function(e,t){return new st.fn.init(e,t,X)},ut=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,lt=/\S+/g,ct=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,ft=/^(?:(<[\w\W]+>)[^>]*|#([\w-]*))$/,pt=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,dt=/^[\],:{}\s]*$/,ht=/(?:^|:|,)(?:\s*\[)+/g,gt=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,mt=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,yt=/^-ms-/,vt=/-([\da-z])/gi,bt=function(e,t){return t.toUpperCase()},xt=function(){V.addEventListener?(V.removeEventListener("DOMContentLoaded",xt,!1),st.ready()):"complete"===V.readyState&&(V.detachEvent("onreadystatechange",xt),st.ready())};st.fn=st.prototype={jquery:Z,constructor:st,init:function(e,n,r){var i,o;if(!e)return this;if("string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:ft.exec(e),!i||!i[1]&&n)return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e);if(i[1]){if(n=n instanceof st?n[0]:n,st.merge(this,st.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:V,!0)),pt.test(i[1])&&st.isPlainObject(n))for(i in n)st.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(o=V.getElementById(i[2]),o&&o.parentNode){if(o.id!==i[2])return r.find(e);this.length=1,this[0]=o}return this.context=V,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):st.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),st.makeArray(e,this))},selector:"",length:0,size:function(){return this.length},toArray:function(){return nt.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=st.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return st.each(this,e,t)},ready:function(e){return st.ready.promise().done(e),this},slice:function(){return this.pushStack(nt.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(st.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:tt,sort:[].sort,splice:[].splice},st.fn.init.prototype=st.fn,st.extend=st.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},u=1,l=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},u=2),"object"==typeof s||st.isFunction(s)||(s={}),l===u&&(s=this,--u);l>u;u++)if(null!=(e=arguments[u]))for(n in e)r=s[n],i=e[n],s!==i&&(c&&i&&(st.isPlainObject(i)||(o=st.isArray(i)))?(o?(o=!1,a=r&&st.isArray(r)?r:[]):a=r&&st.isPlainObject(r)?r:{},s[n]=st.extend(c,a,i)):i!==t&&(s[n]=i));return s},st.extend({noConflict:function(t){return e.$===st&&(e.$=G),t&&e.jQuery===st&&(e.jQuery=J),st},isReady:!1,readyWait:1,holdReady:function(e){e?st.readyWait++:st.ready(!0)},ready:function(e){if(e===!0?!--st.readyWait:!st.isReady){if(!V.body)return setTimeout(st.ready);st.isReady=!0,e!==!0&&--st.readyWait>0||(U.resolveWith(V,[st]),st.fn.trigger&&st(V).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===st.type(e)},isArray:Array.isArray||function(e){return"array"===st.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?Q[it.call(e)]||"object":typeof e},isPlainObject:function(e){if(!e||"object"!==st.type(e)||e.nodeType||st.isWindow(e))return!1;try{if(e.constructor&&!ot.call(e,"constructor")&&!ot.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}var r;for(r in e);return r===t||ot.call(e,r)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||V;var r=pt.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=st.buildFragment([e],t,i),i&&st(i).remove(),st.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=st.trim(n),n&&dt.test(n.replace(gt,"@").replace(mt,"]").replace(ht,"")))?Function("return "+n)():(st.error("Invalid JSON: "+n),t)},parseXML:function(n){var r,i;if(!n||"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return r&&r.documentElement&&!r.getElementsByTagName("parsererror").length||st.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&st.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(yt,"ms-").replace(vt,bt)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,r){var i,o=0,a=e.length,s=n(e);if(r){if(s)for(;a>o&&(i=t.apply(e[o],r),i!==!1);o++);else for(o in e)if(i=t.apply(e[o],r),i===!1)break}else if(s)for(;a>o&&(i=t.call(e[o],o,e[o]),i!==!1);o++);else for(o in e)if(i=t.call(e[o],o,e[o]),i===!1)break;return e},trim:at&&!at.call("\ufeff\u00a0")?function(e){return null==e?"":at.call(e)}:function(e){return null==e?"":(e+"").replace(ct,"")},makeArray:function(e,t){var r=t||[];return null!=e&&(n(Object(e))?st.merge(r,"string"==typeof e?[e]:e):tt.call(r,e)),r},inArray:function(e,t,n){var r;if(t){if(rt)return rt.call(t,e,n);for(r=t.length,n=n?0>n?Math.max(0,r+n):n:0;r>n;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,o=0;if("number"==typeof r)for(;r>o;o++)e[i++]=n[o];else for(;n[o]!==t;)e[i++]=n[o++];return e.length=i,e},grep:function(e,t,n){var r,i=[],o=0,a=e.length;for(n=!!n;a>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,r){var i,o=0,a=e.length,s=n(e),u=[];if(s)for(;a>o;o++)i=t(e[o],o,r),null!=i&&(u[u.length]=i);else for(o in e)i=t(e[o],o,r),null!=i&&(u[u.length]=i);return et.apply([],u)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(r=e[n],n=e,e=r),st.isFunction(e)?(i=nt.call(arguments,2),o=function(){return e.apply(n||this,i.concat(nt.call(arguments)))},o.guid=e.guid=e.guid||st.guid++,o):t},access:function(e,n,r,i,o,a,s){var u=0,l=e.length,c=null==r;if("object"===st.type(r)){o=!0;for(u in r)st.access(e,n,u,r[u],!0,a,s)}else if(i!==t&&(o=!0,st.isFunction(i)||(s=!0),c&&(s?(n.call(e,i),n=null):(c=n,n=function(e,t,n){return c.call(st(e),n)})),n))for(;l>u;u++)n(e[u],r,s?i:i.call(e[u],u,n(e[u],r)));return o?e:c?n.call(e):l?n(e[0],r):a},now:function(){return(new Date).getTime()}}),st.ready.promise=function(t){if(!U)if(U=st.Deferred(),"complete"===V.readyState)setTimeout(st.ready);else if(V.addEventListener)V.addEventListener("DOMContentLoaded",xt,!1),e.addEventListener("load",st.ready,!1);else{V.attachEvent("onreadystatechange",xt),e.attachEvent("onload",st.ready);var n=!1;try{n=null==e.frameElement&&V.documentElement}catch(r){}n&&n.doScroll&&function i(){if(!st.isReady){try{n.doScroll("left")}catch(e){return setTimeout(i,50)}st.ready()}}()}return U.promise(t)},st.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){Q["[object "+t+"]"]=t.toLowerCase()}),X=st(V);var Tt={};st.Callbacks=function(e){e="string"==typeof e?Tt[e]||r(e):st.extend({},e);var n,i,o,a,s,u,l=[],c=!e.once&&[],f=function(t){for(n=e.memory&&t,i=!0,u=a||0,a=0,s=l.length,o=!0;l&&s>u;u++)if(l[u].apply(t[0],t[1])===!1&&e.stopOnFalse){n=!1;break}o=!1,l&&(c?c.length&&f(c.shift()):n?l=[]:p.disable())},p={add:function(){if(l){var t=l.length;(function r(t){st.each(t,function(t,n){var i=st.type(n);"function"===i?e.unique&&p.has(n)||l.push(n):n&&n.length&&"string"!==i&&r(n)})})(arguments),o?s=l.length:n&&(a=t,f(n))}return this},remove:function(){return l&&st.each(arguments,function(e,t){for(var n;(n=st.inArray(t,l,n))>-1;)l.splice(n,1),o&&(s>=n&&s--,u>=n&&u--)}),this},has:function(e){return st.inArray(e,l)>-1},empty:function(){return l=[],this},disable:function(){return l=c=n=t,this},disabled:function(){return!l},lock:function(){return c=t,n||p.disable(),this},locked:function(){return!c},fireWith:function(e,t){return t=t||[],t=[e,t.slice?t.slice():t],!l||i&&!c||(o?c.push(t):f(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},st.extend({Deferred:function(e){var t=[["resolve","done",st.Callbacks("once memory"),"resolved"],["reject","fail",st.Callbacks("once memory"),"rejected"],["notify","progress",st.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return st.Deferred(function(n){st.each(t,function(t,o){var a=o[0],s=st.isFunction(e[t])&&e[t];i[o[1]](function(){var e=s&&s.apply(this,arguments);e&&st.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[a+"With"](this===r?n.promise():this,s?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?st.extend(e,r):r}},i={};return r.pipe=r.then,st.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t,n,r,i=0,o=nt.call(arguments),a=o.length,s=1!==a||e&&st.isFunction(e.promise)?a:0,u=1===s?e:st.Deferred(),l=function(e,n,r){return function(i){n[e]=this,r[e]=arguments.length>1?nt.call(arguments):i,r===t?u.notifyWith(n,r):--s||u.resolveWith(n,r)}};if(a>1)for(t=Array(a),n=Array(a),r=Array(a);a>i;i++)o[i]&&st.isFunction(o[i].promise)?o[i].promise().done(l(i,r,o)).fail(u.reject).progress(l(i,n,t)):--s;return s||u.resolveWith(r,o),u.promise()}}),st.support=function(){var n,r,i,o,a,s,u,l,c,f,p=V.createElement("div");if(p.setAttribute("className","t"),p.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",r=p.getElementsByTagName("*"),i=p.getElementsByTagName("a")[0],!r||!i||!r.length)return{};o=V.createElement("select"),a=o.appendChild(V.createElement("option")),s=p.getElementsByTagName("input")[0],i.style.cssText="top:1px;float:left;opacity:.5",n={getSetAttribute:"t"!==p.className,leadingWhitespace:3===p.firstChild.nodeType,tbody:!p.getElementsByTagName("tbody").length,htmlSerialize:!!p.getElementsByTagName("link").length,style:/top/.test(i.getAttribute("style")),hrefNormalized:"/a"===i.getAttribute("href"),opacity:/^0.5/.test(i.style.opacity),cssFloat:!!i.style.cssFloat,checkOn:!!s.value,optSelected:a.selected,enctype:!!V.createElement("form").enctype,html5Clone:"<:nav></:nav>"!==V.createElement("nav").cloneNode(!0).outerHTML,boxModel:"CSS1Compat"===V.compatMode,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},s.checked=!0,n.noCloneChecked=s.cloneNode(!0).checked,o.disabled=!0,n.optDisabled=!a.disabled;try{delete p.test}catch(d){n.deleteExpando=!1}s=V.createElement("input"),s.setAttribute("value",""),n.input=""===s.getAttribute("value"),s.value="t",s.setAttribute("type","radio"),n.radioValue="t"===s.value,s.setAttribute("checked","t"),s.setAttribute("name","t"),u=V.createDocumentFragment(),u.appendChild(s),n.appendChecked=s.checked,n.checkClone=u.cloneNode(!0).cloneNode(!0).lastChild.checked,p.attachEvent&&(p.attachEvent("onclick",function(){n.noCloneEvent=!1}),p.cloneNode(!0).click());for(f in{submit:!0,change:!0,focusin:!0})p.setAttribute(l="on"+f,"t"),n[f+"Bubbles"]=l in e||p.attributes[l].expando===!1;return p.style.backgroundClip="content-box",p.cloneNode(!0).style.backgroundClip="",n.clearCloneStyle="content-box"===p.style.backgroundClip,st(function(){var r,i,o,a="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",s=V.getElementsByTagName("body")[0];s&&(r=V.createElement("div"),r.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",s.appendChild(r).appendChild(p),p.innerHTML="<table><tr><td></td><td>t</td></tr></table>",o=p.getElementsByTagName("td"),o[0].style.cssText="padding:0;margin:0;border:0;display:none",c=0===o[0].offsetHeight,o[0].style.display="",o[1].style.display="none",n.reliableHiddenOffsets=c&&0===o[0].offsetHeight,p.innerHTML="",p.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",n.boxSizing=4===p.offsetWidth,n.doesNotIncludeMarginInBodyOffset=1!==s.offsetTop,e.getComputedStyle&&(n.pixelPosition="1%"!==(e.getComputedStyle(p,null)||{}).top,n.boxSizingReliable="4px"===(e.getComputedStyle(p,null)||{width:"4px"}).width,i=p.appendChild(V.createElement("div")),i.style.cssText=p.style.cssText=a,i.style.marginRight=i.style.width="0",p.style.width="1px",n.reliableMarginRight=!parseFloat((e.getComputedStyle(i,null)||{}).marginRight)),p.style.zoom!==t&&(p.innerHTML="",p.style.cssText=a+"width:1px;padding:1px;display:inline;zoom:1",n.inlineBlockNeedsLayout=3===p.offsetWidth,p.style.display="block",p.innerHTML="<div></div>",p.firstChild.style.width="5px",n.shrinkWrapBlocks=3!==p.offsetWidth,s.style.zoom=1),s.removeChild(r),r=p=o=i=null)}),r=o=u=a=i=s=null,n}();var wt=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,Nt=/([A-Z])/g;st.extend({cache:{},expando:"jQuery"+(Z+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(e){return e=e.nodeType?st.cache[e[st.expando]]:e[st.expando],!!e&&!s(e)},data:function(e,t,n){return i(e,t,n,!1)},removeData:function(e,t){return o(e,t,!1)},_data:function(e,t,n){return i(e,t,n,!0)},_removeData:function(e,t){return o(e,t,!0)},acceptData:function(e){var t=e.nodeName&&st.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),st.fn.extend({data:function(e,n){var r,i,o=this[0],s=0,u=null;if(e===t){if(this.length&&(u=st.data(o),1===o.nodeType&&!st._data(o,"parsedAttrs"))){for(r=o.attributes;r.length>s;s++)i=r[s].name,i.indexOf("data-")||(i=st.camelCase(i.substring(5)),a(o,i,u[i]));st._data(o,"parsedAttrs",!0)}return u}return"object"==typeof e?this.each(function(){st.data(this,e)}):st.access(this,function(n){return n===t?o?a(o,e,st.data(o,e)):null:(this.each(function(){st.data(this,e,n)}),t)},null,n,arguments.length>1,null,!0)},removeData:function(e){return this.each(function(){st.removeData(this,e)})}}),st.extend({queue:function(e,n,r){var i;return e?(n=(n||"fx")+"queue",i=st._data(e,n),r&&(!i||st.isArray(r)?i=st._data(e,n,st.makeArray(r)):i.push(r)),i||[]):t},dequeue:function(e,t){t=t||"fx";var n=st.queue(e,t),r=n.length,i=n.shift(),o=st._queueHooks(e,t),a=function(){st.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),o.cur=i,i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return st._data(e,n)||st._data(e,n,{empty:st.Callbacks("once memory").add(function(){st._removeData(e,t+"queue"),st._removeData(e,n)})})}}),st.fn.extend({queue:function(e,n){var r=2;return"string"!=typeof e&&(n=e,e="fx",r--),r>arguments.length?st.queue(this[0],e):n===t?this:this.each(function(){var t=st.queue(this,e,n);st._queueHooks(this,e),"fx"===e&&"inprogress"!==t[0]&&st.dequeue(this,e)})},dequeue:function(e){return this.each(function(){st.dequeue(this,e)})},delay:function(e,t){return e=st.fx?st.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,o=st.Deferred(),a=this,s=this.length,u=function(){--i||o.resolveWith(a,[a])};for("string"!=typeof e&&(n=e,e=t),e=e||"fx";s--;)r=st._data(a[s],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(u));return u(),o.promise(n)}});var Ct,kt,Et=/[\t\r\n]/g,St=/\r/g,At=/^(?:input|select|textarea|button|object)$/i,jt=/^(?:a|area)$/i,Dt=/^(?:checked|selected|autofocus|autoplay|async|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped)$/i,Lt=/^(?:checked|selected)$/i,Ht=st.support.getSetAttribute,Mt=st.support.input;st.fn.extend({attr:function(e,t){return st.access(this,st.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){st.removeAttr(this,e)})},prop:function(e,t){return st.access(this,st.prop,e,t,arguments.length>1)},removeProp:function(e){return e=st.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,o,a=0,s=this.length,u="string"==typeof e&&e;if(st.isFunction(e))return this.each(function(t){st(this).addClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(lt)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(Et," "):" ")){for(o=0;i=t[o++];)0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=st.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,a=0,s=this.length,u=0===arguments.length||"string"==typeof e&&e;if(st.isFunction(e))return this.each(function(t){st(this).removeClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(lt)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(Et," "):"")){for(o=0;i=t[o++];)for(;r.indexOf(" "+i+" ")>=0;)r=r.replace(" "+i+" "," ");n.className=e?st.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e,r="boolean"==typeof t;return st.isFunction(e)?this.each(function(n){st(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n)for(var i,o=0,a=st(this),s=t,u=e.match(lt)||[];i=u[o++];)s=r?s:!a.hasClass(i),a[s?"addClass":"removeClass"](i);else("undefined"===n||"boolean"===n)&&(this.className&&st._data(this,"__className__",this.className),this.className=this.className||e===!1?"":st._data(this,"__className__")||"")})},hasClass:function(e){for(var t=" "+e+" ",n=0,r=this.length;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(Et," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,o=this[0];{if(arguments.length)return i=st.isFunction(e),this.each(function(r){var o,a=st(this);1===this.nodeType&&(o=i?e.call(this,r,a.val()):e,null==o?o="":"number"==typeof o?o+="":st.isArray(o)&&(o=st.map(o,function(e){return null==e?"":e+""})),n=st.valHooks[this.type]||st.valHooks[this.nodeName.toLowerCase()],n&&"set"in n&&n.set(this,o,"value")!==t||(this.value=o))});if(o)return n=st.valHooks[o.type]||st.valHooks[o.nodeName.toLowerCase()],n&&"get"in n&&(r=n.get(o,"value"))!==t?r:(r=o.value,"string"==typeof r?r.replace(St,""):null==r?"":r)}}}),st.extend({valHooks:{option:{get:function(e){var t=e.attributes.value;return!t||t.specified?e.value:e.text}},select:{get:function(e){for(var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,a=o?null:[],s=o?i+1:r.length,u=0>i?s:o?i:0;s>u;u++)if(n=r[u],!(!n.selected&&u!==i||(st.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&st.nodeName(n.parentNode,"optgroup"))){if(t=st(n).val(),o)return t;a.push(t)}return a},set:function(e,t){var n=st.makeArray(t);return st(e).find("option").each(function(){this.selected=st.inArray(st(this).val(),n)>=0}),n.length||(e.selectedIndex=-1),n}}},attr:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return e.getAttribute===t?st.prop(e,n,r):(a=1!==s||!st.isXMLDoc(e),a&&(n=n.toLowerCase(),o=st.attrHooks[n]||(Dt.test(n)?kt:Ct)),r===t?o&&a&&"get"in o&&null!==(i=o.get(e,n))?i:(e.getAttribute!==t&&(i=e.getAttribute(n)),null==i?t:i):null!==r?o&&a&&"set"in o&&(i=o.set(e,r,n))!==t?i:(e.setAttribute(n,r+""),r):(st.removeAttr(e,n),t))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(lt);if(o&&1===e.nodeType)for(;n=o[i++];)r=st.propFix[n]||n,Dt.test(n)?!Ht&&Lt.test(n)?e[st.camelCase("default-"+n)]=e[r]=!1:e[r]=!1:st.attr(e,n,""),e.removeAttribute(Ht?n:r)},attrHooks:{type:{set:function(e,t){if(!st.support.radioValue&&"radio"===t&&st.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return a=1!==s||!st.isXMLDoc(e),a&&(n=st.propFix[n]||n,o=st.propHooks[n]),r!==t?o&&"set"in o&&(i=o.set(e,r,n))!==t?i:e[n]=r:o&&"get"in o&&null!==(i=o.get(e,n))?i:e[n]},propHooks:{tabIndex:{get:function(e){var n=e.getAttributeNode("tabindex");return n&&n.specified?parseInt(n.value,10):At.test(e.nodeName)||jt.test(e.nodeName)&&e.href?0:t}}}}),kt={get:function(e,n){var r=st.prop(e,n),i="boolean"==typeof r&&e.getAttribute(n),o="boolean"==typeof r?Mt&&Ht?null!=i:Lt.test(n)?e[st.camelCase("default-"+n)]:!!i:e.getAttributeNode(n);return o&&o.value!==!1?n.toLowerCase():t},set:function(e,t,n){return t===!1?st.removeAttr(e,n):Mt&&Ht||!Lt.test(n)?e.setAttribute(!Ht&&st.propFix[n]||n,n):e[st.camelCase("default-"+n)]=e[n]=!0,n}},Mt&&Ht||(st.attrHooks.value={get:function(e,n){var r=e.getAttributeNode(n);return st.nodeName(e,"input")?e.defaultValue:r&&r.specified?r.value:t
+},set:function(e,n,r){return st.nodeName(e,"input")?(e.defaultValue=n,t):Ct&&Ct.set(e,n,r)}}),Ht||(Ct=st.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&("id"===n||"name"===n||"coords"===n?""!==r.value:r.specified)?r.value:t},set:function(e,n,r){var i=e.getAttributeNode(r);return i||e.setAttributeNode(i=e.ownerDocument.createAttribute(r)),i.value=n+="","value"===r||n===e.getAttribute(r)?n:t}},st.attrHooks.contenteditable={get:Ct.get,set:function(e,t,n){Ct.set(e,""===t?!1:t,n)}},st.each(["width","height"],function(e,n){st.attrHooks[n]=st.extend(st.attrHooks[n],{set:function(e,r){return""===r?(e.setAttribute(n,"auto"),r):t}})})),st.support.hrefNormalized||(st.each(["href","src","width","height"],function(e,n){st.attrHooks[n]=st.extend(st.attrHooks[n],{get:function(e){var r=e.getAttribute(n,2);return null==r?t:r}})}),st.each(["href","src"],function(e,t){st.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}})),st.support.style||(st.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}),st.support.optSelected||(st.propHooks.selected=st.extend(st.propHooks.selected,{get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}})),st.support.enctype||(st.propFix.enctype="encoding"),st.support.checkOn||st.each(["radio","checkbox"],function(){st.valHooks[this]={get:function(e){return null===e.getAttribute("value")?"on":e.value}}}),st.each(["radio","checkbox"],function(){st.valHooks[this]=st.extend(st.valHooks[this],{set:function(e,n){return st.isArray(n)?e.checked=st.inArray(st(e).val(),n)>=0:t}})});var qt=/^(?:input|select|textarea)$/i,_t=/^key/,Ft=/^(?:mouse|contextmenu)|click/,Ot=/^(?:focusinfocus|focusoutblur)$/,Bt=/^([^.]*)(?:\.(.+)|)$/;st.event={global:{},add:function(e,n,r,i,o){var a,s,u,l,c,f,p,d,h,g,m,y=3!==e.nodeType&&8!==e.nodeType&&st._data(e);if(y){for(r.handler&&(a=r,r=a.handler,o=a.selector),r.guid||(r.guid=st.guid++),(l=y.events)||(l=y.events={}),(s=y.handle)||(s=y.handle=function(e){return st===t||e&&st.event.triggered===e.type?t:st.event.dispatch.apply(s.elem,arguments)},s.elem=e),n=(n||"").match(lt)||[""],c=n.length;c--;)u=Bt.exec(n[c])||[],h=m=u[1],g=(u[2]||"").split(".").sort(),p=st.event.special[h]||{},h=(o?p.delegateType:p.bindType)||h,p=st.event.special[h]||{},f=st.extend({type:h,origType:m,data:i,handler:r,guid:r.guid,selector:o,needsContext:o&&st.expr.match.needsContext.test(o),namespace:g.join(".")},a),(d=l[h])||(d=l[h]=[],d.delegateCount=0,p.setup&&p.setup.call(e,i,g,s)!==!1||(e.addEventListener?e.addEventListener(h,s,!1):e.attachEvent&&e.attachEvent("on"+h,s))),p.add&&(p.add.call(e,f),f.handler.guid||(f.handler.guid=r.guid)),o?d.splice(d.delegateCount++,0,f):d.push(f),st.event.global[h]=!0;e=null}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,m=st.hasData(e)&&st._data(e);if(m&&(u=m.events)){for(t=(t||"").match(lt)||[""],l=t.length;l--;)if(s=Bt.exec(t[l])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){for(f=st.event.special[d]||{},d=(r?f.delegateType:f.bindType)||d,p=u[d]||[],s=s[2]&&RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;o--;)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&f.teardown.call(e,h,m.handle)!==!1||st.removeEvent(e,d,m.handle),delete u[d])}else for(d in u)st.event.remove(e,d+t[l],n,r,!0);st.isEmptyObject(u)&&(delete m.handle,st._removeData(e,"events"))}},trigger:function(n,r,i,o){var a,s,u,l,c,f,p,d=[i||V],h=n.type||n,g=n.namespace?n.namespace.split("."):[];if(s=u=i=i||V,3!==i.nodeType&&8!==i.nodeType&&!Ot.test(h+st.event.triggered)&&(h.indexOf(".")>=0&&(g=h.split("."),h=g.shift(),g.sort()),c=0>h.indexOf(":")&&"on"+h,n=n[st.expando]?n:new st.Event(h,"object"==typeof n&&n),n.isTrigger=!0,n.namespace=g.join("."),n.namespace_re=n.namespace?RegExp("(^|\\.)"+g.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,n.result=t,n.target||(n.target=i),r=null==r?[n]:st.makeArray(r,[n]),p=st.event.special[h]||{},o||!p.trigger||p.trigger.apply(i,r)!==!1)){if(!o&&!p.noBubble&&!st.isWindow(i)){for(l=p.delegateType||h,Ot.test(l+h)||(s=s.parentNode);s;s=s.parentNode)d.push(s),u=s;u===(i.ownerDocument||V)&&d.push(u.defaultView||u.parentWindow||e)}for(a=0;(s=d[a++])&&!n.isPropagationStopped();)n.type=a>1?l:p.bindType||h,f=(st._data(s,"events")||{})[n.type]&&st._data(s,"handle"),f&&f.apply(s,r),f=c&&s[c],f&&st.acceptData(s)&&f.apply&&f.apply(s,r)===!1&&n.preventDefault();if(n.type=h,!(o||n.isDefaultPrevented()||p._default&&p._default.apply(i.ownerDocument,r)!==!1||"click"===h&&st.nodeName(i,"a")||!st.acceptData(i)||!c||!i[h]||st.isWindow(i))){u=i[c],u&&(i[c]=null),st.event.triggered=h;try{i[h]()}catch(m){}st.event.triggered=t,u&&(i[c]=u)}return n.result}},dispatch:function(e){e=st.event.fix(e);var n,r,i,o,a,s=[],u=nt.call(arguments),l=(st._data(this,"events")||{})[e.type]||[],c=st.event.special[e.type]||{};if(u[0]=e,e.delegateTarget=this,!c.preDispatch||c.preDispatch.call(this,e)!==!1){for(s=st.event.handlers.call(this,e,l),n=0;(o=s[n++])&&!e.isPropagationStopped();)for(e.currentTarget=o.elem,r=0;(a=o.handlers[r++])&&!e.isImmediatePropagationStopped();)(!e.namespace_re||e.namespace_re.test(a.namespace))&&(e.handleObj=a,e.data=a.data,i=((st.event.special[a.origType]||{}).handle||a.handler).apply(o.elem,u),i!==t&&(e.result=i)===!1&&(e.preventDefault(),e.stopPropagation()));return c.postDispatch&&c.postDispatch.call(this,e),e.result}},handlers:function(e,n){var r,i,o,a,s=[],u=n.delegateCount,l=e.target;if(u&&l.nodeType&&(!e.button||"click"!==e.type))for(;l!=this;l=l.parentNode||this)if(l.disabled!==!0||"click"!==e.type){for(i=[],r=0;u>r;r++)a=n[r],o=a.selector+" ",i[o]===t&&(i[o]=a.needsContext?st(o,this).index(l)>=0:st.find(o,this,null,[l]).length),i[o]&&i.push(a);i.length&&s.push({elem:l,handlers:i})}return n.length>u&&s.push({elem:this,handlers:n.slice(u)}),s},fix:function(e){if(e[st.expando])return e;var t,n,r=e,i=st.event.fixHooks[e.type]||{},o=i.props?this.props.concat(i.props):this.props;for(e=new st.Event(r),t=o.length;t--;)n=o[t],e[n]=r[n];return e.target||(e.target=r.srcElement||V),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,i.filter?i.filter(e,r):e},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,i,o,a=n.button,s=n.fromElement;return null==e.pageX&&null!=n.clientX&&(r=e.target.ownerDocument||V,i=r.documentElement,o=r.body,e.pageX=n.clientX+(i&&i.scrollLeft||o&&o.scrollLeft||0)-(i&&i.clientLeft||o&&o.clientLeft||0),e.pageY=n.clientY+(i&&i.scrollTop||o&&o.scrollTop||0)-(i&&i.clientTop||o&&o.clientTop||0)),!e.relatedTarget&&s&&(e.relatedTarget=s===e.target?n.toElement:s),e.which||a===t||(e.which=1&a?1:2&a?3:4&a?2:0),e}},special:{load:{noBubble:!0},click:{trigger:function(){return st.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):t}},focus:{trigger:function(){if(this!==V.activeElement&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){return this===V.activeElement&&this.blur?(this.blur(),!1):t},delegateType:"focusout"},beforeunload:{postDispatch:function(e){e.result!==t&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=st.extend(new st.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?st.event.trigger(i,null,t):st.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},st.removeEvent=V.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,n,r){var i="on"+n;e.detachEvent&&(e[i]===t&&(e[i]=null),e.detachEvent(i,r))},st.Event=function(e,n){return this instanceof st.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?u:l):this.type=e,n&&st.extend(this,n),this.timeStamp=e&&e.timeStamp||st.now(),this[st.expando]=!0,t):new st.Event(e,n)},st.Event.prototype={isDefaultPrevented:l,isPropagationStopped:l,isImmediatePropagationStopped:l,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=u,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=u,e&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=u,this.stopPropagation()}},st.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){st.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return(!i||i!==r&&!st.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),st.support.submitBubbles||(st.event.special.submit={setup:function(){return st.nodeName(this,"form")?!1:(st.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=st.nodeName(n,"input")||st.nodeName(n,"button")?n.form:t;r&&!st._data(r,"submitBubbles")&&(st.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),st._data(r,"submitBubbles",!0))}),t)},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&st.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){return st.nodeName(this,"form")?!1:(st.event.remove(this,"._submit"),t)}}),st.support.changeBubbles||(st.event.special.change={setup:function(){return qt.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(st.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._just_changed=!0)}),st.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),st.event.simulate("change",this,e,!0)})),!1):(st.event.add(this,"beforeactivate._change",function(e){var t=e.target;qt.test(t.nodeName)&&!st._data(t,"changeBubbles")&&(st.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||st.event.simulate("change",this.parentNode,e,!0)}),st._data(t,"changeBubbles",!0))}),t)},handle:function(e){var n=e.target;return this!==n||e.isSimulated||e.isTrigger||"radio"!==n.type&&"checkbox"!==n.type?e.handleObj.handler.apply(this,arguments):t},teardown:function(){return st.event.remove(this,"._change"),!qt.test(this.nodeName)}}),st.support.focusinBubbles||st.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){st.event.simulate(t,e.target,st.event.fix(e),!0)};st.event.special[t]={setup:function(){0===n++&&V.addEventListener(e,r,!0)},teardown:function(){0===--n&&V.removeEventListener(e,r,!0)}}}),st.fn.extend({on:function(e,n,r,i,o){var a,s;if("object"==typeof e){"string"!=typeof n&&(r=r||n,n=t);for(s in e)this.on(s,n,r,e[s],o);return this}if(null==r&&null==i?(i=n,r=n=t):null==i&&("string"==typeof n?(i=r,r=t):(i=r,r=n,n=t)),i===!1)i=l;else if(!i)return this;return 1===o&&(a=i,i=function(e){return st().off(e),a.apply(this,arguments)},i.guid=a.guid||(a.guid=st.guid++)),this.each(function(){st.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,o;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,st(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if("object"==typeof e){for(o in e)this.off(o,n,e[o]);return this}return(n===!1||"function"==typeof n)&&(r=n,n=t),r===!1&&(r=l),this.each(function(){st.event.remove(this,e,r,n)})},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},trigger:function(e,t){return this.each(function(){st.event.trigger(e,t,this)})},triggerHandler:function(e,n){var r=this[0];return r?st.event.trigger(e,n,r,!0):t},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),st.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){st.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)},_t.test(t)&&(st.event.fixHooks[t]=st.event.keyHooks),Ft.test(t)&&(st.event.fixHooks[t]=st.event.mouseHooks)}),function(e,t){function n(e){return ht.test(e+"")}function r(){var e,t=[];return e=function(n,r){return t.push(n+=" ")>C.cacheLength&&delete e[t.shift()],e[n]=r}}function i(e){return e[P]=!0,e}function o(e){var t=L.createElement("div");try{return e(t)}catch(n){return!1}finally{t=null}}function a(e,t,n,r){var i,o,a,s,u,l,c,d,h,g;if((t?t.ownerDocument||t:R)!==L&&D(t),t=t||L,n=n||[],!e||"string"!=typeof e)return n;if(1!==(s=t.nodeType)&&9!==s)return[];if(!M&&!r){if(i=gt.exec(e))if(a=i[1]){if(9===s){if(o=t.getElementById(a),!o||!o.parentNode)return n;if(o.id===a)return n.push(o),n}else if(t.ownerDocument&&(o=t.ownerDocument.getElementById(a))&&O(t,o)&&o.id===a)return n.push(o),n}else{if(i[2])return Q.apply(n,K.call(t.getElementsByTagName(e),0)),n;if((a=i[3])&&W.getByClassName&&t.getElementsByClassName)return Q.apply(n,K.call(t.getElementsByClassName(a),0)),n}if(W.qsa&&!q.test(e)){if(c=!0,d=P,h=t,g=9===s&&e,1===s&&"object"!==t.nodeName.toLowerCase()){for(l=f(e),(c=t.getAttribute("id"))?d=c.replace(vt,"\\$&"):t.setAttribute("id",d),d="[id='"+d+"'] ",u=l.length;u--;)l[u]=d+p(l[u]);h=dt.test(e)&&t.parentNode||t,g=l.join(",")}if(g)try{return Q.apply(n,K.call(h.querySelectorAll(g),0)),n}catch(m){}finally{c||t.removeAttribute("id")}}}return x(e.replace(at,"$1"),t,n,r)}function s(e,t){for(var n=e&&t&&e.nextSibling;n;n=n.nextSibling)if(n===t)return-1;return e?1:-1}function u(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function l(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function c(e){return i(function(t){return t=+t,i(function(n,r){for(var i,o=e([],n.length,t),a=o.length;a--;)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}function f(e,t){var n,r,i,o,s,u,l,c=X[e+" "];if(c)return t?0:c.slice(0);for(s=e,u=[],l=C.preFilter;s;){(!n||(r=ut.exec(s)))&&(r&&(s=s.slice(r[0].length)||s),u.push(i=[])),n=!1,(r=lt.exec(s))&&(n=r.shift(),i.push({value:n,type:r[0].replace(at," ")}),s=s.slice(n.length));for(o in C.filter)!(r=pt[o].exec(s))||l[o]&&!(r=l[o](r))||(n=r.shift(),i.push({value:n,type:o,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?a.error(e):X(e,u).slice(0)}function p(e){for(var t=0,n=e.length,r="";n>t;t++)r+=e[t].value;return r}function d(e,t,n){var r=t.dir,i=n&&"parentNode"===t.dir,o=I++;return t.first?function(t,n,o){for(;t=t[r];)if(1===t.nodeType||i)return e(t,n,o)}:function(t,n,a){var s,u,l,c=$+" "+o;if(a){for(;t=t[r];)if((1===t.nodeType||i)&&e(t,n,a))return!0}else for(;t=t[r];)if(1===t.nodeType||i)if(l=t[P]||(t[P]={}),(u=l[r])&&u[0]===c){if((s=u[1])===!0||s===N)return s===!0}else if(u=l[r]=[c],u[1]=e(t,n,a)||N,u[1]===!0)return!0}}function h(e){return e.length>1?function(t,n,r){for(var i=e.length;i--;)if(!e[i](t,n,r))return!1;return!0}:e[0]}function g(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;u>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),l&&t.push(s));return a}function m(e,t,n,r,o,a){return r&&!r[P]&&(r=m(r)),o&&!o[P]&&(o=m(o,a)),i(function(i,a,s,u){var l,c,f,p=[],d=[],h=a.length,m=i||b(t||"*",s.nodeType?[s]:s,[]),y=!e||!i&&t?m:g(m,p,e,s,u),v=n?o||(i?e:h||r)?[]:a:y;if(n&&n(y,v,s,u),r)for(l=g(v,d),r(l,[],s,u),c=l.length;c--;)(f=l[c])&&(v[d[c]]=!(y[d[c]]=f));if(i){if(o||e){if(o){for(l=[],c=v.length;c--;)(f=v[c])&&l.push(y[c]=f);o(null,v=[],l,u)}for(c=v.length;c--;)(f=v[c])&&(l=o?Z.call(i,f):p[c])>-1&&(i[l]=!(a[l]=f))}}else v=g(v===a?v.splice(h,v.length):v),o?o(null,a,v,u):Q.apply(a,v)})}function y(e){for(var t,n,r,i=e.length,o=C.relative[e[0].type],a=o||C.relative[" "],s=o?1:0,u=d(function(e){return e===t},a,!0),l=d(function(e){return Z.call(t,e)>-1},a,!0),c=[function(e,n,r){return!o&&(r||n!==j)||((t=n).nodeType?u(e,n,r):l(e,n,r))}];i>s;s++)if(n=C.relative[e[s].type])c=[d(h(c),n)];else{if(n=C.filter[e[s].type].apply(null,e[s].matches),n[P]){for(r=++s;i>r&&!C.relative[e[r].type];r++);return m(s>1&&h(c),s>1&&p(e.slice(0,s-1)).replace(at,"$1"),n,r>s&&y(e.slice(s,r)),i>r&&y(e=e.slice(r)),i>r&&p(e))}c.push(n)}return h(c)}function v(e,t){var n=0,r=t.length>0,o=e.length>0,s=function(i,s,u,l,c){var f,p,d,h=[],m=0,y="0",v=i&&[],b=null!=c,x=j,T=i||o&&C.find.TAG("*",c&&s.parentNode||s),w=$+=null==x?1:Math.E;for(b&&(j=s!==L&&s,N=n);null!=(f=T[y]);y++){if(o&&f){for(p=0;d=e[p];p++)if(d(f,s,u)){l.push(f);break}b&&($=w,N=++n)}r&&((f=!d&&f)&&m--,i&&v.push(f))}if(m+=y,r&&y!==m){for(p=0;d=t[p];p++)d(v,h,s,u);if(i){if(m>0)for(;y--;)v[y]||h[y]||(h[y]=G.call(l));h=g(h)}Q.apply(l,h),b&&!i&&h.length>0&&m+t.length>1&&a.uniqueSort(l)}return b&&($=w,j=x),v};return r?i(s):s}function b(e,t,n){for(var r=0,i=t.length;i>r;r++)a(e,t[r],n);return n}function x(e,t,n,r){var i,o,a,s,u,l=f(e);if(!r&&1===l.length){if(o=l[0]=l[0].slice(0),o.length>2&&"ID"===(a=o[0]).type&&9===t.nodeType&&!M&&C.relative[o[1].type]){if(t=C.find.ID(a.matches[0].replace(xt,Tt),t)[0],!t)return n;e=e.slice(o.shift().value.length)}for(i=pt.needsContext.test(e)?-1:o.length-1;i>=0&&(a=o[i],!C.relative[s=a.type]);i--)if((u=C.find[s])&&(r=u(a.matches[0].replace(xt,Tt),dt.test(o[0].type)&&t.parentNode||t))){if(o.splice(i,1),e=r.length&&p(o),!e)return Q.apply(n,K.call(r,0)),n;break}}return S(e,l)(r,t,M,n,dt.test(e)),n}function T(){}var w,N,C,k,E,S,A,j,D,L,H,M,q,_,F,O,B,P="sizzle"+-new Date,R=e.document,W={},$=0,I=0,z=r(),X=r(),U=r(),V=typeof t,Y=1<<31,J=[],G=J.pop,Q=J.push,K=J.slice,Z=J.indexOf||function(e){for(var t=0,n=this.length;n>t;t++)if(this[t]===e)return t;return-1},et="[\\x20\\t\\r\\n\\f]",tt="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",nt=tt.replace("w","w#"),rt="([*^$|!~]?=)",it="\\["+et+"*("+tt+")"+et+"*(?:"+rt+et+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+nt+")|)|)"+et+"*\\]",ot=":("+tt+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+it.replace(3,8)+")*)|.*)\\)|)",at=RegExp("^"+et+"+|((?:^|[^\\\\])(?:\\\\.)*)"+et+"+$","g"),ut=RegExp("^"+et+"*,"+et+"*"),lt=RegExp("^"+et+"*([\\x20\\t\\r\\n\\f>+~])"+et+"*"),ct=RegExp(ot),ft=RegExp("^"+nt+"$"),pt={ID:RegExp("^#("+tt+")"),CLASS:RegExp("^\\.("+tt+")"),NAME:RegExp("^\\[name=['\"]?("+tt+")['\"]?\\]"),TAG:RegExp("^("+tt.replace("w","w*")+")"),ATTR:RegExp("^"+it),PSEUDO:RegExp("^"+ot),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+et+"*(even|odd|(([+-]|)(\\d*)n|)"+et+"*(?:([+-]|)"+et+"*(\\d+)|))"+et+"*\\)|)","i"),needsContext:RegExp("^"+et+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+et+"*((?:-\\d)?\\d*)"+et+"*\\)|)(?=[^-]|$)","i")},dt=/[\x20\t\r\n\f]*[+~]/,ht=/\{\s*\[native code\]\s*\}/,gt=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,mt=/^(?:input|select|textarea|button)$/i,yt=/^h\d$/i,vt=/'|\\/g,bt=/\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,xt=/\\([\da-fA-F]{1,6}[\x20\t\r\n\f]?|.)/g,Tt=function(e,t){var n="0x"+t-65536;return n!==n?t:0>n?String.fromCharCode(n+65536):String.fromCharCode(55296|n>>10,56320|1023&n)};try{K.call(H.childNodes,0)[0].nodeType}catch(wt){K=function(e){for(var t,n=[];t=this[e];e++)n.push(t);return n}}E=a.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},D=a.setDocument=function(e){var r=e?e.ownerDocument||e:R;return r!==L&&9===r.nodeType&&r.documentElement?(L=r,H=r.documentElement,M=E(r),W.tagNameNoComments=o(function(e){return e.appendChild(r.createComment("")),!e.getElementsByTagName("*").length}),W.attributes=o(function(e){e.innerHTML="<select></select>";var t=typeof e.lastChild.getAttribute("multiple");return"boolean"!==t&&"string"!==t}),W.getByClassName=o(function(e){return e.innerHTML="<div class='hidden e'></div><div class='hidden'></div>",e.getElementsByClassName&&e.getElementsByClassName("e").length?(e.lastChild.className="e",2===e.getElementsByClassName("e").length):!1}),W.getByName=o(function(e){e.id=P+0,e.innerHTML="<a name='"+P+"'></a><div name='"+P+"'></div>",H.insertBefore(e,H.firstChild);var t=r.getElementsByName&&r.getElementsByName(P).length===2+r.getElementsByName(P+0).length;return W.getIdNotName=!r.getElementById(P),H.removeChild(e),t}),C.attrHandle=o(function(e){return e.innerHTML="<a href='#'></a>",e.firstChild&&typeof e.firstChild.getAttribute!==V&&"#"===e.firstChild.getAttribute("href")})?{}:{href:function(e){return e.getAttribute("href",2)},type:function(e){return e.getAttribute("type")}},W.getIdNotName?(C.find.ID=function(e,t){if(typeof t.getElementById!==V&&!M){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},C.filter.ID=function(e){var t=e.replace(xt,Tt);return function(e){return e.getAttribute("id")===t}}):(C.find.ID=function(e,n){if(typeof n.getElementById!==V&&!M){var r=n.getElementById(e);return r?r.id===e||typeof r.getAttributeNode!==V&&r.getAttributeNode("id").value===e?[r]:t:[]}},C.filter.ID=function(e){var t=e.replace(xt,Tt);return function(e){var n=typeof e.getAttributeNode!==V&&e.getAttributeNode("id");return n&&n.value===t}}),C.find.TAG=W.tagNameNoComments?function(e,n){return typeof n.getElementsByTagName!==V?n.getElementsByTagName(e):t}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){for(;n=o[i];i++)1===n.nodeType&&r.push(n);return r}return o},C.find.NAME=W.getByName&&function(e,n){return typeof n.getElementsByName!==V?n.getElementsByName(name):t},C.find.CLASS=W.getByClassName&&function(e,n){return typeof n.getElementsByClassName===V||M?t:n.getElementsByClassName(e)},_=[],q=[":focus"],(W.qsa=n(r.querySelectorAll))&&(o(function(e){e.innerHTML="<select><option selected=''></option></select>",e.querySelectorAll("[selected]").length||q.push("\\["+et+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),e.querySelectorAll(":checked").length||q.push(":checked")}),o(function(e){e.innerHTML="<input type='hidden' i=''/>",e.querySelectorAll("[i^='']").length&&q.push("[*^$]="+et+"*(?:\"\"|'')"),e.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),q.push(",.*:")})),(W.matchesSelector=n(F=H.matchesSelector||H.mozMatchesSelector||H.webkitMatchesSelector||H.oMatchesSelector||H.msMatchesSelector))&&o(function(e){W.disconnectedMatch=F.call(e,"div"),F.call(e,"[s!='']:x"),_.push("!=",ot)}),q=RegExp(q.join("|")),_=RegExp(_.join("|")),O=n(H.contains)||H.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)for(;t=t.parentNode;)if(t===e)return!0;return!1},B=H.compareDocumentPosition?function(e,t){var n;return e===t?(A=!0,0):(n=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t))?1&n||e.parentNode&&11===e.parentNode.nodeType?e===r||O(R,e)?-1:t===r||O(R,t)?1:0:4&n?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var n,i=0,o=e.parentNode,a=t.parentNode,u=[e],l=[t];if(e===t)return A=!0,0;if(e.sourceIndex&&t.sourceIndex)return(~t.sourceIndex||Y)-(O(R,e)&&~e.sourceIndex||Y);if(!o||!a)return e===r?-1:t===r?1:o?-1:a?1:0;if(o===a)return s(e,t);for(n=e;n=n.parentNode;)u.unshift(n);for(n=t;n=n.parentNode;)l.unshift(n);for(;u[i]===l[i];)i++;return i?s(u[i],l[i]):u[i]===R?-1:l[i]===R?1:0},A=!1,[0,0].sort(B),W.detectDuplicates=A,L):L},a.matches=function(e,t){return a(e,null,null,t)},a.matchesSelector=function(e,t){if((e.ownerDocument||e)!==L&&D(e),t=t.replace(bt,"='$1']"),!(!W.matchesSelector||M||_&&_.test(t)||q.test(t)))try{var n=F.call(e,t);if(n||W.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(r){}return a(t,L,null,[e]).length>0},a.contains=function(e,t){return(e.ownerDocument||e)!==L&&D(e),O(e,t)},a.attr=function(e,t){var n;return(e.ownerDocument||e)!==L&&D(e),M||(t=t.toLowerCase()),(n=C.attrHandle[t])?n(e):M||W.attributes?e.getAttribute(t):((n=e.getAttributeNode(t))||e.getAttribute(t))&&e[t]===!0?t:n&&n.specified?n.value:null},a.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},a.uniqueSort=function(e){var t,n=[],r=1,i=0;if(A=!W.detectDuplicates,e.sort(B),A){for(;t=e[r];r++)t===e[r-1]&&(i=n.push(r));for(;i--;)e.splice(n[i],1)}return e},k=a.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=k(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=k(t);return n},C=a.selectors={cacheLength:50,createPseudo:i,match:pt,find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(xt,Tt),e[3]=(e[4]||e[5]||"").replace(xt,Tt),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||a.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&a.error(e[0]),e},PSEUDO:function(e){var t,n=!e[5]&&e[2];return pt.CHILD.test(e[0])?null:(e[4]?e[2]=e[4]:n&&ct.test(n)&&(t=f(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){return"*"===e?function(){return!0}:(e=e.replace(xt,Tt).toLowerCase(),function(t){return t.nodeName&&t.nodeName.toLowerCase()===e})},CLASS:function(e){var t=z[e+" "];return t||(t=RegExp("(^|"+et+")"+e+"("+et+"|$)"))&&z(e,function(e){return t.test(e.className||typeof e.getAttribute!==V&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=a.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.substr(i.length-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.substr(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,f,p,d,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!u&&!s;if(m){if(o){for(;g;){for(f=t;f=f[g];)if(s?f.nodeName.toLowerCase()===y:1===f.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){for(c=m[P]||(m[P]={}),l=c[e]||[],d=l[0]===$&&l[1],p=l[0]===$&&l[2],f=d&&m.childNodes[d];f=++d&&f&&f[g]||(p=d=0)||h.pop();)if(1===f.nodeType&&++p&&f===t){c[e]=[$,d,p];break}}else if(v&&(l=(t[P]||(t[P]={}))[e])&&l[0]===$)p=l[1];else for(;(f=++d&&f&&f[g]||(p=d=0)||h.pop())&&((s?f.nodeName.toLowerCase()!==y:1!==f.nodeType)||!++p||(v&&((f[P]||(f[P]={}))[e]=[$,p]),f!==t)););return p-=i,p===r||0===p%r&&p/r>=0}}},PSEUDO:function(e,t){var n,r=C.pseudos[e]||C.setFilters[e.toLowerCase()]||a.error("unsupported pseudo: "+e);return r[P]?r(t):r.length>1?(n=[e,e,"",t],C.setFilters.hasOwnProperty(e.toLowerCase())?i(function(e,n){for(var i,o=r(e,t),a=o.length;a--;)i=Z.call(e,o[a]),e[i]=!(n[i]=o[a])}):function(e){return r(e,0,n)}):r}},pseudos:{not:i(function(e){var t=[],n=[],r=S(e.replace(at,"$1"));return r[P]?i(function(e,t,n,i){for(var o,a=r(e,null,i,[]),s=e.length;s--;)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:i(function(e){return function(t){return a(e,t).length>0}}),contains:i(function(e){return function(t){return(t.textContent||t.innerText||k(t)).indexOf(e)>-1}}),lang:i(function(e){return ft.test(e||"")||a.error("unsupported lang: "+e),e=e.replace(xt,Tt).toLowerCase(),function(t){var n;do if(n=M?t.getAttribute("xml:lang")||t.getAttribute("lang"):t.lang)return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===H},focus:function(e){return e===L.activeElement&&(!L.hasFocus||L.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!C.pseudos.empty(e)},header:function(e){return yt.test(e.nodeName)},input:function(e){return mt.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:c(function(){return[0]}),last:c(function(e,t){return[t-1]}),eq:c(function(e,t,n){return[0>n?n+t:n]}),even:c(function(e,t){for(var n=0;t>n;n+=2)e.push(n);return e}),odd:c(function(e,t){for(var n=1;t>n;n+=2)e.push(n);return e}),lt:c(function(e,t,n){for(var r=0>n?n+t:n;--r>=0;)e.push(r);return e}),gt:c(function(e,t,n){for(var r=0>n?n+t:n;t>++r;)e.push(r);return e})}};for(w in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})C.pseudos[w]=u(w);for(w in{submit:!0,reset:!0})C.pseudos[w]=l(w);S=a.compile=function(e,t){var n,r=[],i=[],o=U[e+" "];if(!o){for(t||(t=f(e)),n=t.length;n--;)o=y(t[n]),o[P]?r.push(o):i.push(o);o=U(e,v(i,r))}return o},C.pseudos.nth=C.pseudos.eq,C.filters=T.prototype=C.pseudos,C.setFilters=new T,D(),a.attr=st.attr,st.find=a,st.expr=a.selectors,st.expr[":"]=st.expr.pseudos,st.unique=a.uniqueSort,st.text=a.getText,st.isXMLDoc=a.isXML,st.contains=a.contains}(e);var Pt=/Until$/,Rt=/^(?:parents|prev(?:Until|All))/,Wt=/^.[^:#\[\.,]*$/,$t=st.expr.match.needsContext,It={children:!0,contents:!0,next:!0,prev:!0};st.fn.extend({find:function(e){var t,n,r;if("string"!=typeof e)return r=this,this.pushStack(st(e).filter(function(){for(t=0;r.length>t;t++)if(st.contains(r[t],this))return!0}));for(n=[],t=0;this.length>t;t++)st.find(e,this[t],n);return n=this.pushStack(st.unique(n)),n.selector=(this.selector?this.selector+" ":"")+e,n},has:function(e){var t,n=st(e,this),r=n.length;return this.filter(function(){for(t=0;r>t;t++)if(st.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(f(this,e,!1))},filter:function(e){return this.pushStack(f(this,e,!0))},is:function(e){return!!e&&("string"==typeof e?$t.test(e)?st(e,this.context).index(this[0])>=0:st.filter(e,this).length>0:this.filter(e).length>0)},closest:function(e,t){for(var n,r=0,i=this.length,o=[],a=$t.test(e)||"string"!=typeof e?st(e,t||this.context):0;i>r;r++)for(n=this[r];n&&n.ownerDocument&&n!==t&&11!==n.nodeType;){if(a?a.index(n)>-1:st.find.matchesSelector(n,e)){o.push(n);break}n=n.parentNode}return this.pushStack(o.length>1?st.unique(o):o)},index:function(e){return e?"string"==typeof e?st.inArray(this[0],st(e)):st.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?st(e,t):st.makeArray(e&&e.nodeType?[e]:e),r=st.merge(this.get(),n);return this.pushStack(st.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),st.fn.andSelf=st.fn.addBack,st.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return st.dir(e,"parentNode")},parentsUntil:function(e,t,n){return st.dir(e,"parentNode",n)},next:function(e){return c(e,"nextSibling")},prev:function(e){return c(e,"previousSibling")
+},nextAll:function(e){return st.dir(e,"nextSibling")},prevAll:function(e){return st.dir(e,"previousSibling")},nextUntil:function(e,t,n){return st.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return st.dir(e,"previousSibling",n)},siblings:function(e){return st.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return st.sibling(e.firstChild)},contents:function(e){return st.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:st.merge([],e.childNodes)}},function(e,t){st.fn[e]=function(n,r){var i=st.map(this,t,n);return Pt.test(e)||(r=n),r&&"string"==typeof r&&(i=st.filter(r,i)),i=this.length>1&&!It[e]?st.unique(i):i,this.length>1&&Rt.test(e)&&(i=i.reverse()),this.pushStack(i)}}),st.extend({filter:function(e,t,n){return n&&(e=":not("+e+")"),1===t.length?st.find.matchesSelector(t[0],e)?[t[0]]:[]:st.find.matches(e,t)},dir:function(e,n,r){for(var i=[],o=e[n];o&&9!==o.nodeType&&(r===t||1!==o.nodeType||!st(o).is(r));)1===o.nodeType&&i.push(o),o=o[n];return i},sibling:function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});var zt="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",Xt=/ jQuery\d+="(?:null|\d+)"/g,Ut=RegExp("<(?:"+zt+")[\\s/>]","i"),Vt=/^\s+/,Yt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,Jt=/<([\w:]+)/,Gt=/<tbody/i,Qt=/<|&#?\w+;/,Kt=/<(?:script|style|link)/i,Zt=/^(?:checkbox|radio)$/i,en=/checked\s*(?:[^=]|=\s*.checked.)/i,tn=/^$|\/(?:java|ecma)script/i,nn=/^true\/(.*)/,rn=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,on={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:st.support.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},an=p(V),sn=an.appendChild(V.createElement("div"));on.optgroup=on.option,on.tbody=on.tfoot=on.colgroup=on.caption=on.thead,on.th=on.td,st.fn.extend({text:function(e){return st.access(this,function(e){return e===t?st.text(this):this.empty().append((this[0]&&this[0].ownerDocument||V).createTextNode(e))},null,e,arguments.length)},wrapAll:function(e){if(st.isFunction(e))return this.each(function(t){st(this).wrapAll(e.call(this,t))});if(this[0]){var t=st(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){for(var e=this;e.firstChild&&1===e.firstChild.nodeType;)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return st.isFunction(e)?this.each(function(t){st(this).wrapInner(e.call(this,t))}):this.each(function(){var t=st(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=st.isFunction(e);return this.each(function(n){st(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){st.nodeName(this,"body")||st(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(e){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&this.appendChild(e)})},prepend:function(){return this.domManip(arguments,!0,function(e){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&this.insertBefore(e,this.firstChild)})},before:function(){return this.domManip(arguments,!1,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,!1,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){for(var n,r=0;null!=(n=this[r]);r++)(!e||st.filter(e,[n]).length>0)&&(t||1!==n.nodeType||st.cleanData(b(n)),n.parentNode&&(t&&st.contains(n.ownerDocument,n)&&m(b(n,"script")),n.parentNode.removeChild(n)));return this},empty:function(){for(var e,t=0;null!=(e=this[t]);t++){for(1===e.nodeType&&st.cleanData(b(e,!1));e.firstChild;)e.removeChild(e.firstChild);e.options&&st.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return st.clone(this,e,t)})},html:function(e){return st.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return 1===n.nodeType?n.innerHTML.replace(Xt,""):t;if(!("string"!=typeof e||Kt.test(e)||!st.support.htmlSerialize&&Ut.test(e)||!st.support.leadingWhitespace&&Vt.test(e)||on[(Jt.exec(e)||["",""])[1].toLowerCase()])){e=e.replace(Yt,"<$1></$2>");try{for(;i>r;r++)n=this[r]||{},1===n.nodeType&&(st.cleanData(b(n,!1)),n.innerHTML=e);n=0}catch(o){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(e){var t=st.isFunction(e);return t||"string"==typeof e||(e=st(e).not(this).detach()),this.domManip([e],!0,function(e){var t=this.nextSibling,n=this.parentNode;(n&&1===this.nodeType||11===this.nodeType)&&(st(this).remove(),t?t.parentNode.insertBefore(e,t):n.appendChild(e))})},detach:function(e){return this.remove(e,!0)},domManip:function(e,n,r){e=et.apply([],e);var i,o,a,s,u,l,c=0,f=this.length,p=this,m=f-1,y=e[0],v=st.isFunction(y);if(v||!(1>=f||"string"!=typeof y||st.support.checkClone)&&en.test(y))return this.each(function(i){var o=p.eq(i);v&&(e[0]=y.call(this,i,n?o.html():t)),o.domManip(e,n,r)});if(f&&(i=st.buildFragment(e,this[0].ownerDocument,!1,this),o=i.firstChild,1===i.childNodes.length&&(i=o),o)){for(n=n&&st.nodeName(o,"tr"),a=st.map(b(i,"script"),h),s=a.length;f>c;c++)u=i,c!==m&&(u=st.clone(u,!0,!0),s&&st.merge(a,b(u,"script"))),r.call(n&&st.nodeName(this[c],"table")?d(this[c],"tbody"):this[c],u,c);if(s)for(l=a[a.length-1].ownerDocument,st.map(a,g),c=0;s>c;c++)u=a[c],tn.test(u.type||"")&&!st._data(u,"globalEval")&&st.contains(l,u)&&(u.src?st.ajax({url:u.src,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0}):st.globalEval((u.text||u.textContent||u.innerHTML||"").replace(rn,"")));i=o=null}return this}}),st.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){st.fn[e]=function(e){for(var n,r=0,i=[],o=st(e),a=o.length-1;a>=r;r++)n=r===a?this:this.clone(!0),st(o[r])[t](n),tt.apply(i,n.get());return this.pushStack(i)}}),st.extend({clone:function(e,t,n){var r,i,o,a,s,u=st.contains(e.ownerDocument,e);if(st.support.html5Clone||st.isXMLDoc(e)||!Ut.test("<"+e.nodeName+">")?s=e.cloneNode(!0):(sn.innerHTML=e.outerHTML,sn.removeChild(s=sn.firstChild)),!(st.support.noCloneEvent&&st.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||st.isXMLDoc(e)))for(r=b(s),i=b(e),a=0;null!=(o=i[a]);++a)r[a]&&v(o,r[a]);if(t)if(n)for(i=i||b(e),r=r||b(s),a=0;null!=(o=i[a]);a++)y(o,r[a]);else y(e,s);return r=b(s,"script"),r.length>0&&m(r,!u&&b(e,"script")),r=i=o=null,s},buildFragment:function(e,t,n,r){for(var i,o,a,s,u,l,c,f=e.length,d=p(t),h=[],g=0;f>g;g++)if(o=e[g],o||0===o)if("object"===st.type(o))st.merge(h,o.nodeType?[o]:o);else if(Qt.test(o)){for(s=s||d.appendChild(t.createElement("div")),a=(Jt.exec(o)||["",""])[1].toLowerCase(),u=on[a]||on._default,s.innerHTML=u[1]+o.replace(Yt,"<$1></$2>")+u[2],c=u[0];c--;)s=s.lastChild;if(!st.support.leadingWhitespace&&Vt.test(o)&&h.push(t.createTextNode(Vt.exec(o)[0])),!st.support.tbody)for(o="table"!==a||Gt.test(o)?"<table>"!==u[1]||Gt.test(o)?0:s:s.firstChild,c=o&&o.childNodes.length;c--;)st.nodeName(l=o.childNodes[c],"tbody")&&!l.childNodes.length&&o.removeChild(l);for(st.merge(h,s.childNodes),s.textContent="";s.firstChild;)s.removeChild(s.firstChild);s=d.lastChild}else h.push(t.createTextNode(o));for(s&&d.removeChild(s),st.support.appendChecked||st.grep(b(h,"input"),x),g=0;o=h[g++];)if((!r||-1===st.inArray(o,r))&&(i=st.contains(o.ownerDocument,o),s=b(d.appendChild(o),"script"),i&&m(s),n))for(c=0;o=s[c++];)tn.test(o.type||"")&&n.push(o);return s=null,d},cleanData:function(e,n){for(var r,i,o,a,s=0,u=st.expando,l=st.cache,c=st.support.deleteExpando,f=st.event.special;null!=(o=e[s]);s++)if((n||st.acceptData(o))&&(i=o[u],r=i&&l[i])){if(r.events)for(a in r.events)f[a]?st.event.remove(o,a):st.removeEvent(o,a,r.handle);l[i]&&(delete l[i],c?delete o[u]:o.removeAttribute!==t?o.removeAttribute(u):o[u]=null,K.push(i))}}});var un,ln,cn,fn=/alpha\([^)]*\)/i,pn=/opacity\s*=\s*([^)]*)/,dn=/^(top|right|bottom|left)$/,hn=/^(none|table(?!-c[ea]).+)/,gn=/^margin/,mn=RegExp("^("+ut+")(.*)$","i"),yn=RegExp("^("+ut+")(?!px)[a-z%]+$","i"),vn=RegExp("^([+-])=("+ut+")","i"),bn={BODY:"block"},xn={position:"absolute",visibility:"hidden",display:"block"},Tn={letterSpacing:0,fontWeight:400},wn=["Top","Right","Bottom","Left"],Nn=["Webkit","O","Moz","ms"];st.fn.extend({css:function(e,n){return st.access(this,function(e,n,r){var i,o,a={},s=0;if(st.isArray(n)){for(i=ln(e),o=n.length;o>s;s++)a[n[s]]=st.css(e,n[s],!1,i);return a}return r!==t?st.style(e,n,r):st.css(e,n)},e,n,arguments.length>1)},show:function(){return N(this,!0)},hide:function(){return N(this)},toggle:function(e){var t="boolean"==typeof e;return this.each(function(){(t?e:w(this))?st(this).show():st(this).hide()})}}),st.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=un(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":st.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var o,a,s,u=st.camelCase(n),l=e.style;if(n=st.cssProps[u]||(st.cssProps[u]=T(l,u)),s=st.cssHooks[n]||st.cssHooks[u],r===t)return s&&"get"in s&&(o=s.get(e,!1,i))!==t?o:l[n];if(a=typeof r,"string"===a&&(o=vn.exec(r))&&(r=(o[1]+1)*o[2]+parseFloat(st.css(e,n)),a="number"),!(null==r||"number"===a&&isNaN(r)||("number"!==a||st.cssNumber[u]||(r+="px"),st.support.clearCloneStyle||""!==r||0!==n.indexOf("background")||(l[n]="inherit"),s&&"set"in s&&(r=s.set(e,r,i))===t)))try{l[n]=r}catch(c){}}},css:function(e,n,r,i){var o,a,s,u=st.camelCase(n);return n=st.cssProps[u]||(st.cssProps[u]=T(e.style,u)),s=st.cssHooks[n]||st.cssHooks[u],s&&"get"in s&&(o=s.get(e,!0,r)),o===t&&(o=un(e,n,i)),"normal"===o&&n in Tn&&(o=Tn[n]),r?(a=parseFloat(o),r===!0||st.isNumeric(a)?a||0:o):o},swap:function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i}}),e.getComputedStyle?(ln=function(t){return e.getComputedStyle(t,null)},un=function(e,n,r){var i,o,a,s=r||ln(e),u=s?s.getPropertyValue(n)||s[n]:t,l=e.style;return s&&(""!==u||st.contains(e.ownerDocument,e)||(u=st.style(e,n)),yn.test(u)&&gn.test(n)&&(i=l.width,o=l.minWidth,a=l.maxWidth,l.minWidth=l.maxWidth=l.width=u,u=s.width,l.width=i,l.minWidth=o,l.maxWidth=a)),u}):V.documentElement.currentStyle&&(ln=function(e){return e.currentStyle},un=function(e,n,r){var i,o,a,s=r||ln(e),u=s?s[n]:t,l=e.style;return null==u&&l&&l[n]&&(u=l[n]),yn.test(u)&&!dn.test(n)&&(i=l.left,o=e.runtimeStyle,a=o&&o.left,a&&(o.left=e.currentStyle.left),l.left="fontSize"===n?"1em":u,u=l.pixelLeft+"px",l.left=i,a&&(o.left=a)),""===u?"auto":u}),st.each(["height","width"],function(e,n){st.cssHooks[n]={get:function(e,r,i){return r?0===e.offsetWidth&&hn.test(st.css(e,"display"))?st.swap(e,xn,function(){return E(e,n,i)}):E(e,n,i):t},set:function(e,t,r){var i=r&&ln(e);return C(e,t,r?k(e,n,r,st.support.boxSizing&&"border-box"===st.css(e,"boxSizing",!1,i),i):0)}}}),st.support.opacity||(st.cssHooks.opacity={get:function(e,t){return pn.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=st.isNumeric(t)?"alpha(opacity="+100*t+")":"",o=r&&r.filter||n.filter||"";n.zoom=1,(t>=1||""===t)&&""===st.trim(o.replace(fn,""))&&n.removeAttribute&&(n.removeAttribute("filter"),""===t||r&&!r.filter)||(n.filter=fn.test(o)?o.replace(fn,i):o+" "+i)}}),st(function(){st.support.reliableMarginRight||(st.cssHooks.marginRight={get:function(e,n){return n?st.swap(e,{display:"inline-block"},un,[e,"marginRight"]):t}}),!st.support.pixelPosition&&st.fn.position&&st.each(["top","left"],function(e,n){st.cssHooks[n]={get:function(e,r){return r?(r=un(e,n),yn.test(r)?st(e).position()[n]+"px":r):t}}})}),st.expr&&st.expr.filters&&(st.expr.filters.hidden=function(e){return 0===e.offsetWidth&&0===e.offsetHeight||!st.support.reliableHiddenOffsets&&"none"===(e.style&&e.style.display||st.css(e,"display"))},st.expr.filters.visible=function(e){return!st.expr.filters.hidden(e)}),st.each({margin:"",padding:"",border:"Width"},function(e,t){st.cssHooks[e+t]={expand:function(n){for(var r=0,i={},o="string"==typeof n?n.split(" "):[n];4>r;r++)i[e+wn[r]+t]=o[r]||o[r-2]||o[0];return i}},gn.test(e)||(st.cssHooks[e+t].set=C)});var Cn=/%20/g,kn=/\[\]$/,En=/\r?\n/g,Sn=/^(?:submit|button|image|reset)$/i,An=/^(?:input|select|textarea|keygen)/i;st.fn.extend({serialize:function(){return st.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=st.prop(this,"elements");return e?st.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!st(this).is(":disabled")&&An.test(this.nodeName)&&!Sn.test(e)&&(this.checked||!Zt.test(e))}).map(function(e,t){var n=st(this).val();return null==n?null:st.isArray(n)?st.map(n,function(e){return{name:t.name,value:e.replace(En,"\r\n")}}):{name:t.name,value:n.replace(En,"\r\n")}}).get()}}),st.param=function(e,n){var r,i=[],o=function(e,t){t=st.isFunction(t)?t():null==t?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(n===t&&(n=st.ajaxSettings&&st.ajaxSettings.traditional),st.isArray(e)||e.jquery&&!st.isPlainObject(e))st.each(e,function(){o(this.name,this.value)});else for(r in e)j(r,e[r],n,o);return i.join("&").replace(Cn,"+")};var jn,Dn,Ln=st.now(),Hn=/\?/,Mn=/#.*$/,qn=/([?&])_=[^&]*/,_n=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Fn=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,On=/^(?:GET|HEAD)$/,Bn=/^\/\//,Pn=/^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,Rn=st.fn.load,Wn={},$n={},In="*/".concat("*");try{Dn=Y.href}catch(zn){Dn=V.createElement("a"),Dn.href="",Dn=Dn.href}jn=Pn.exec(Dn.toLowerCase())||[],st.fn.load=function(e,n,r){if("string"!=typeof e&&Rn)return Rn.apply(this,arguments);var i,o,a,s=this,u=e.indexOf(" ");return u>=0&&(i=e.slice(u,e.length),e=e.slice(0,u)),st.isFunction(n)?(r=n,n=t):n&&"object"==typeof n&&(o="POST"),s.length>0&&st.ajax({url:e,type:o,dataType:"html",data:n}).done(function(e){a=arguments,s.html(i?st("<div>").append(st.parseHTML(e)).find(i):e)}).complete(r&&function(e,t){s.each(r,a||[e.responseText,t,e])}),this},st.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){st.fn[t]=function(e){return this.on(t,e)}}),st.each(["get","post"],function(e,n){st[n]=function(e,r,i,o){return st.isFunction(r)&&(o=o||i,i=r,r=t),st.ajax({url:e,type:n,dataType:o,data:r,success:i})}}),st.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Dn,type:"GET",isLocal:Fn.test(jn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":In,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":e.String,"text html":!0,"text json":st.parseJSON,"text xml":st.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?H(H(e,st.ajaxSettings),t):H(st.ajaxSettings,e)},ajaxPrefilter:D(Wn),ajaxTransport:D($n),ajax:function(e,n){function r(e,n,r,s){var l,f,v,b,T,N=n;2!==x&&(x=2,u&&clearTimeout(u),i=t,a=s||"",w.readyState=e>0?4:0,r&&(b=M(p,w,r)),e>=200&&300>e||304===e?(p.ifModified&&(T=w.getResponseHeader("Last-Modified"),T&&(st.lastModified[o]=T),T=w.getResponseHeader("etag"),T&&(st.etag[o]=T)),304===e?(l=!0,N="notmodified"):(l=q(p,b),N=l.state,f=l.data,v=l.error,l=!v)):(v=N,(e||!N)&&(N="error",0>e&&(e=0))),w.status=e,w.statusText=(n||N)+"",l?g.resolveWith(d,[f,N,w]):g.rejectWith(d,[w,N,v]),w.statusCode(y),y=t,c&&h.trigger(l?"ajaxSuccess":"ajaxError",[w,p,l?f:v]),m.fireWith(d,[w,N]),c&&(h.trigger("ajaxComplete",[w,p]),--st.active||st.event.trigger("ajaxStop")))}"object"==typeof e&&(n=e,e=t),n=n||{};var i,o,a,s,u,l,c,f,p=st.ajaxSetup({},n),d=p.context||p,h=p.context&&(d.nodeType||d.jquery)?st(d):st.event,g=st.Deferred(),m=st.Callbacks("once memory"),y=p.statusCode||{},v={},b={},x=0,T="canceled",w={readyState:0,getResponseHeader:function(e){var t;if(2===x){if(!s)for(s={};t=_n.exec(a);)s[t[1].toLowerCase()]=t[2];t=s[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===x?a:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return x||(e=b[n]=b[n]||e,v[e]=t),this},overrideMimeType:function(e){return x||(p.mimeType=e),this},statusCode:function(e){var t;if(e)if(2>x)for(t in e)y[t]=[y[t],e[t]];else w.always(e[w.status]);return this},abort:function(e){var t=e||T;return i&&i.abort(t),r(0,t),this}};if(g.promise(w).complete=m.add,w.success=w.done,w.error=w.fail,p.url=((e||p.url||Dn)+"").replace(Mn,"").replace(Bn,jn[1]+"//"),p.type=n.method||n.type||p.method||p.type,p.dataTypes=st.trim(p.dataType||"*").toLowerCase().match(lt)||[""],null==p.crossDomain&&(l=Pn.exec(p.url.toLowerCase()),p.crossDomain=!(!l||l[1]===jn[1]&&l[2]===jn[2]&&(l[3]||("http:"===l[1]?80:443))==(jn[3]||("http:"===jn[1]?80:443)))),p.data&&p.processData&&"string"!=typeof p.data&&(p.data=st.param(p.data,p.traditional)),L(Wn,p,n,w),2===x)return w;c=p.global,c&&0===st.active++&&st.event.trigger("ajaxStart"),p.type=p.type.toUpperCase(),p.hasContent=!On.test(p.type),o=p.url,p.hasContent||(p.data&&(o=p.url+=(Hn.test(o)?"&":"?")+p.data,delete p.data),p.cache===!1&&(p.url=qn.test(o)?o.replace(qn,"$1_="+Ln++):o+(Hn.test(o)?"&":"?")+"_="+Ln++)),p.ifModified&&(st.lastModified[o]&&w.setRequestHeader("If-Modified-Since",st.lastModified[o]),st.etag[o]&&w.setRequestHeader("If-None-Match",st.etag[o])),(p.data&&p.hasContent&&p.contentType!==!1||n.contentType)&&w.setRequestHeader("Content-Type",p.contentType),w.setRequestHeader("Accept",p.dataTypes[0]&&p.accepts[p.dataTypes[0]]?p.accepts[p.dataTypes[0]]+("*"!==p.dataTypes[0]?", "+In+"; q=0.01":""):p.accepts["*"]);for(f in p.headers)w.setRequestHeader(f,p.headers[f]);if(p.beforeSend&&(p.beforeSend.call(d,w,p)===!1||2===x))return w.abort();T="abort";for(f in{success:1,error:1,complete:1})w[f](p[f]);if(i=L($n,p,n,w)){w.readyState=1,c&&h.trigger("ajaxSend",[w,p]),p.async&&p.timeout>0&&(u=setTimeout(function(){w.abort("timeout")},p.timeout));try{x=1,i.send(v,r)}catch(N){if(!(2>x))throw N;r(-1,N)}}else r(-1,"No Transport");return w},getScript:function(e,n){return st.get(e,t,n,"script")},getJSON:function(e,t,n){return st.get(e,t,n,"json")}}),st.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(e){return st.globalEval(e),e}}}),st.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),st.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=V.head||st("head")[0]||V.documentElement;return{send:function(t,i){n=V.createElement("script"),n.async=!0,e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,t){(t||!n.readyState||/loaded|complete/.test(n.readyState))&&(n.onload=n.onreadystatechange=null,n.parentNode&&n.parentNode.removeChild(n),n=null,t||i(200,"success"))},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(t,!0)}}}});var Xn=[],Un=/(=)\?(?=&|$)|\?\?/;st.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Xn.pop()||st.expando+"_"+Ln++;return this[e]=!0,e}}),st.ajaxPrefilter("json jsonp",function(n,r,i){var o,a,s,u=n.jsonp!==!1&&(Un.test(n.url)?"url":"string"==typeof n.data&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Un.test(n.data)&&"data");return u||"jsonp"===n.dataTypes[0]?(o=n.jsonpCallback=st.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,u?n[u]=n[u].replace(Un,"$1"+o):n.jsonp!==!1&&(n.url+=(Hn.test(n.url)?"&":"?")+n.jsonp+"="+o),n.converters["script json"]=function(){return s||st.error(o+" was not called"),s[0]},n.dataTypes[0]="json",a=e[o],e[o]=function(){s=arguments},i.always(function(){e[o]=a,n[o]&&(n.jsonpCallback=r.jsonpCallback,Xn.push(o)),s&&st.isFunction(a)&&a(s[0]),s=a=t}),"script"):t});var Vn,Yn,Jn=0,Gn=e.ActiveXObject&&function(){var e;for(e in Vn)Vn[e](t,!0)};st.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&_()||F()}:_,Yn=st.ajaxSettings.xhr(),st.support.cors=!!Yn&&"withCredentials"in Yn,Yn=st.support.ajax=!!Yn,Yn&&st.ajaxTransport(function(n){if(!n.crossDomain||st.support.cors){var r;return{send:function(i,o){var a,s,u=n.xhr();if(n.username?u.open(n.type,n.url,n.async,n.username,n.password):u.open(n.type,n.url,n.async),n.xhrFields)for(s in n.xhrFields)u[s]=n.xhrFields[s];n.mimeType&&u.overrideMimeType&&u.overrideMimeType(n.mimeType),n.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");try{for(s in i)u.setRequestHeader(s,i[s])}catch(l){}u.send(n.hasContent&&n.data||null),r=function(e,i){var s,l,c,f,p;try{if(r&&(i||4===u.readyState))if(r=t,a&&(u.onreadystatechange=st.noop,Gn&&delete Vn[a]),i)4!==u.readyState&&u.abort();else{f={},s=u.status,p=u.responseXML,c=u.getAllResponseHeaders(),p&&p.documentElement&&(f.xml=p),"string"==typeof u.responseText&&(f.text=u.responseText);try{l=u.statusText}catch(d){l=""}s||!n.isLocal||n.crossDomain?1223===s&&(s=204):s=f.text?200:404}}catch(h){i||o(-1,h)}f&&o(s,l,f,c)},n.async?4===u.readyState?setTimeout(r):(a=++Jn,Gn&&(Vn||(Vn={},st(e).unload(Gn)),Vn[a]=r),u.onreadystatechange=r):r()},abort:function(){r&&r(t,!0)}}}});var Qn,Kn,Zn=/^(?:toggle|show|hide)$/,er=RegExp("^(?:([+-])=|)("+ut+")([a-z%]*)$","i"),tr=/queueHooks$/,nr=[W],rr={"*":[function(e,t){var n,r,i=this.createTween(e,t),o=er.exec(t),a=i.cur(),s=+a||0,u=1,l=20;if(o){if(n=+o[2],r=o[3]||(st.cssNumber[e]?"":"px"),"px"!==r&&s){s=st.css(i.elem,e,!0)||n||1;do u=u||".5",s/=u,st.style(i.elem,e,s+r);while(u!==(u=i.cur()/a)&&1!==u&&--l)}i.unit=r,i.start=s,i.end=o[1]?s+(o[1]+1)*n:n}return i}]};st.Animation=st.extend(P,{tweener:function(e,t){st.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");for(var n,r=0,i=e.length;i>r;r++)n=e[r],rr[n]=rr[n]||[],rr[n].unshift(t)},prefilter:function(e,t){t?nr.unshift(e):nr.push(e)}}),st.Tween=$,$.prototype={constructor:$,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(st.cssNumber[n]?"":"px")},cur:function(){var e=$.propHooks[this.prop];return e&&e.get?e.get(this):$.propHooks._default.get(this)},run:function(e){var t,n=$.propHooks[this.prop];return this.pos=t=this.options.duration?st.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):$.propHooks._default.set(this),this}},$.prototype.init.prototype=$.prototype,$.propHooks={_default:{get:function(e){var t;return null==e.elem[e.prop]||e.elem.style&&null!=e.elem.style[e.prop]?(t=st.css(e.elem,e.prop,"auto"),t&&"auto"!==t?t:0):e.elem[e.prop]},set:function(e){st.fx.step[e.prop]?st.fx.step[e.prop](e):e.elem.style&&(null!=e.elem.style[st.cssProps[e.prop]]||st.cssHooks[e.prop])?st.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},$.propHooks.scrollTop=$.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},st.each(["toggle","show","hide"],function(e,t){var n=st.fn[t];st.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(I(t,!0),e,r,i)}}),st.fn.extend({fadeTo:function(e,t,n,r){return this.filter(w).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=st.isEmptyObject(e),o=st.speed(t,n,r),a=function(){var t=P(this,st.extend({},e),o);a.finish=function(){t.stop(!0)},(i||st._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,n,r){var i=function(e){var t=e.stop;delete e.stop,t(r)};return"string"!=typeof e&&(r=n,n=e,e=t),n&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,n=null!=e&&e+"queueHooks",o=st.timers,a=st._data(this);if(n)a[n]&&a[n].stop&&i(a[n]);else for(n in a)a[n]&&a[n].stop&&tr.test(n)&&i(a[n]);for(n=o.length;n--;)o[n].elem!==this||null!=e&&o[n].queue!==e||(o[n].anim.stop(r),t=!1,o.splice(n,1));(t||!r)&&st.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=st._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=st.timers,a=r?r.length:0;for(n.finish=!0,st.queue(this,e,[]),i&&i.cur&&i.cur.finish&&i.cur.finish.call(this),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;a>t;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}}),st.each({slideDown:I("show"),slideUp:I("hide"),slideToggle:I("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){st.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),st.speed=function(e,t,n){var r=e&&"object"==typeof e?st.extend({},e):{complete:n||!n&&t||st.isFunction(e)&&e,duration:e,easing:n&&t||t&&!st.isFunction(t)&&t};return r.duration=st.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in st.fx.speeds?st.fx.speeds[r.duration]:st.fx.speeds._default,(null==r.queue||r.queue===!0)&&(r.queue="fx"),r.old=r.complete,r.complete=function(){st.isFunction(r.old)&&r.old.call(this),r.queue&&st.dequeue(this,r.queue)},r},st.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2}},st.timers=[],st.fx=$.prototype.init,st.fx.tick=function(){var e,n=st.timers,r=0;for(Qn=st.now();n.length>r;r++)e=n[r],e()||n[r]!==e||n.splice(r--,1);n.length||st.fx.stop(),Qn=t},st.fx.timer=function(e){e()&&st.timers.push(e)&&st.fx.start()},st.fx.interval=13,st.fx.start=function(){Kn||(Kn=setInterval(st.fx.tick,st.fx.interval))},st.fx.stop=function(){clearInterval(Kn),Kn=null},st.fx.speeds={slow:600,fast:200,_default:400},st.fx.step={},st.expr&&st.expr.filters&&(st.expr.filters.animated=function(e){return st.grep(st.timers,function(t){return e===t.elem}).length}),st.fn.offset=function(e){if(arguments.length)return e===t?this:this.each(function(t){st.offset.setOffset(this,e,t)});var n,r,i={top:0,left:0},o=this[0],a=o&&o.ownerDocument;if(a)return n=a.documentElement,st.contains(n,o)?(o.getBoundingClientRect!==t&&(i=o.getBoundingClientRect()),r=z(a),{top:i.top+(r.pageYOffset||n.scrollTop)-(n.clientTop||0),left:i.left+(r.pageXOffset||n.scrollLeft)-(n.clientLeft||0)}):i},st.offset={setOffset:function(e,t,n){var r=st.css(e,"position");"static"===r&&(e.style.position="relative");var i,o,a=st(e),s=a.offset(),u=st.css(e,"top"),l=st.css(e,"left"),c=("absolute"===r||"fixed"===r)&&st.inArray("auto",[u,l])>-1,f={},p={};c?(p=a.position(),i=p.top,o=p.left):(i=parseFloat(u)||0,o=parseFloat(l)||0),st.isFunction(t)&&(t=t.call(e,n,s)),null!=t.top&&(f.top=t.top-s.top+i),null!=t.left&&(f.left=t.left-s.left+o),"using"in t?t.using.call(e,f):a.css(f)}},st.fn.extend({position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===st.css(r,"position")?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),st.nodeName(e[0],"html")||(n=e.offset()),n.top+=st.css(e[0],"borderTopWidth",!0),n.left+=st.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-st.css(r,"marginTop",!0),left:t.left-n.left-st.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){for(var e=this.offsetParent||V.documentElement;e&&!st.nodeName(e,"html")&&"static"===st.css(e,"position");)e=e.offsetParent;return e||V.documentElement})}}),st.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);st.fn[e]=function(i){return st.access(this,function(e,i,o){var a=z(e);return o===t?a?n in a?a[n]:a.document.documentElement[i]:e[i]:(a?a.scrollTo(r?st(a).scrollLeft():o,r?o:st(a).scrollTop()):e[i]=o,t)},e,i,arguments.length,null)}}),st.each({Height:"height",Width:"width"},function(e,n){st.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){st.fn[i]=function(i,o){var a=arguments.length&&(r||"boolean"!=typeof i),s=r||(i===!0||o===!0?"margin":"border");return st.access(this,function(n,r,i){var o;return st.isWindow(n)?n.document.documentElement["client"+e]:9===n.nodeType?(o=n.documentElement,Math.max(n.body["scroll"+e],o["scroll"+e],n.body["offset"+e],o["offset"+e],o["client"+e])):i===t?st.css(n,r,s):st.style(n,r,i,s)},n,a?i:t,a,null)}})}),e.jQuery=e.$=st,"function"==typeof define&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return st})})(window);
+//@ sourceMappingURL=jquery.min.map
\ No newline at end of file
diff --git a/openslides/static/styles/bootstrap-responsive.css b/openslides/static/styles/bootstrap-responsive.css
deleted file mode 100644
index daafa9180..000000000
--- a/openslides/static/styles/bootstrap-responsive.css
+++ /dev/null
@@ -1,1040 +0,0 @@
-/*!
- * Bootstrap Responsive v2.1.0
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- */
-
-.clearfix {
-  *zoom: 1;
-}
-
-.clearfix:before,
-.clearfix:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.clearfix:after {
-  clear: both;
-}
-
-.hide-text {
-  font: 0/0 a;
-  color: transparent;
-  text-shadow: none;
-  background-color: transparent;
-  border: 0;
-}
-
-.input-block-level {
-  display: block;
-  width: 100%;
-  min-height: 30px;
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
-}
-
-.hidden {
-  display: none;
-  visibility: hidden;
-}
-
-.visible-phone {
-  display: none !important;
-}
-
-.visible-tablet {
-  display: none !important;
-}
-
-.hidden-desktop {
-  display: none !important;
-}
-
-.visible-desktop {
-  display: inherit !important;
-}
-
-@media (min-width: 768px) and (max-width: 979px) {
-  .hidden-desktop {
-    display: inherit !important;
-  }
-  .visible-desktop {
-    display: none !important ;
-  }
-  .visible-tablet {
-    display: inherit !important;
-  }
-  .hidden-tablet {
-    display: none !important;
-  }
-}
-
-@media (max-width: 767px) {
-  .hidden-desktop {
-    display: inherit !important;
-  }
-  .visible-desktop {
-    display: none !important;
-  }
-  .visible-phone {
-    display: inherit !important;
-  }
-  .hidden-phone {
-    display: none !important;
-  }
-}
-
-@media (min-width: 1200px) {
-  .row {
-    margin-left: -30px;
-    *zoom: 1;
-  }
-  .row:before,
-  .row:after {
-    display: table;
-    line-height: 0;
-    content: "";
-  }
-  .row:after {
-    clear: both;
-  }
-  [class*="span"] {
-    float: left;
-    margin-left: 30px;
-  }
-  .container,
-  .navbar-static-top .container,
-  .navbar-fixed-top .container,
-  .navbar-fixed-bottom .container {
-    width: 1170px;
-  }
-  .span12 {
-    width: 1170px;
-  }
-  .span11 {
-    width: 1070px;
-  }
-  .span10 {
-    width: 970px;
-  }
-  .span9 {
-    width: 870px;
-  }
-  .span8 {
-    width: 770px;
-  }
-  .span7 {
-    width: 670px;
-  }
-  .span6 {
-    width: 570px;
-  }
-  .span5 {
-    width: 470px;
-  }
-  .span4 {
-    width: 370px;
-  }
-  .span3 {
-    width: 270px;
-  }
-  .span2 {
-    width: 170px;
-  }
-  .span1 {
-    width: 70px;
-  }
-  .offset12 {
-    margin-left: 1230px;
-  }
-  .offset11 {
-    margin-left: 1130px;
-  }
-  .offset10 {
-    margin-left: 1030px;
-  }
-  .offset9 {
-    margin-left: 930px;
-  }
-  .offset8 {
-    margin-left: 830px;
-  }
-  .offset7 {
-    margin-left: 730px;
-  }
-  .offset6 {
-    margin-left: 630px;
-  }
-  .offset5 {
-    margin-left: 530px;
-  }
-  .offset4 {
-    margin-left: 430px;
-  }
-  .offset3 {
-    margin-left: 330px;
-  }
-  .offset2 {
-    margin-left: 230px;
-  }
-  .offset1 {
-    margin-left: 130px;
-  }
-  .row-fluid {
-    width: 100%;
-    *zoom: 1;
-  }
-  .row-fluid:before,
-  .row-fluid:after {
-    display: table;
-    line-height: 0;
-    content: "";
-  }
-  .row-fluid:after {
-    clear: both;
-  }
-  .row-fluid [class*="span"] {
-    display: block;
-    float: left;
-    width: 100%;
-    min-height: 30px;
-    margin-left: 2.564102564102564%;
-    *margin-left: 2.5109110747408616%;
-    -webkit-box-sizing: border-box;
-       -moz-box-sizing: border-box;
-            box-sizing: border-box;
-  }
-  .row-fluid [class*="span"]:first-child {
-    margin-left: 0;
-  }
-  .row-fluid .span12 {
-    width: 100%;
-    *width: 99.94680851063829%;
-  }
-  .row-fluid .span11 {
-    width: 91.45299145299145%;
-    *width: 91.39979996362975%;
-  }
-  .row-fluid .span10 {
-    width: 82.90598290598291%;
-    *width: 82.8527914166212%;
-  }
-  .row-fluid .span9 {
-    width: 74.35897435897436%;
-    *width: 74.30578286961266%;
-  }
-  .row-fluid .span8 {
-    width: 65.81196581196582%;
-    *width: 65.75877432260411%;
-  }
-  .row-fluid .span7 {
-    width: 57.26495726495726%;
-    *width: 57.21176577559556%;
-  }
-  .row-fluid .span6 {
-    width: 48.717948717948715%;
-    *width: 48.664757228587014%;
-  }
-  .row-fluid .span5 {
-    width: 40.17094017094017%;
-    *width: 40.11774868157847%;
-  }
-  .row-fluid .span4 {
-    width: 31.623931623931625%;
-    *width: 31.570740134569924%;
-  }
-  .row-fluid .span3 {
-    width: 23.076923076923077%;
-    *width: 23.023731587561375%;
-  }
-  .row-fluid .span2 {
-    width: 14.52991452991453%;
-    *width: 14.476723040552828%;
-  }
-  .row-fluid .span1 {
-    width: 5.982905982905983%;
-    *width: 5.929714493544281%;
-  }
-  .row-fluid .offset12 {
-    margin-left: 105.12820512820512%;
-    *margin-left: 105.02182214948171%;
-  }
-  .row-fluid .offset12:first-child {
-    margin-left: 102.56410256410257%;
-    *margin-left: 102.45771958537915%;
-  }
-  .row-fluid .offset11 {
-    margin-left: 96.58119658119658%;
-    *margin-left: 96.47481360247316%;
-  }
-  .row-fluid .offset11:first-child {
-    margin-left: 94.01709401709402%;
-    *margin-left: 93.91071103837061%;
-  }
-  .row-fluid .offset10 {
-    margin-left: 88.03418803418803%;
-    *margin-left: 87.92780505546462%;
-  }
-  .row-fluid .offset10:first-child {
-    margin-left: 85.47008547008548%;
-    *margin-left: 85.36370249136206%;
-  }
-  .row-fluid .offset9 {
-    margin-left: 79.48717948717949%;
-    *margin-left: 79.38079650845607%;
-  }
-  .row-fluid .offset9:first-child {
-    margin-left: 76.92307692307693%;
-    *margin-left: 76.81669394435352%;
-  }
-  .row-fluid .offset8 {
-    margin-left: 70.94017094017094%;
-    *margin-left: 70.83378796144753%;
-  }
-  .row-fluid .offset8:first-child {
-    margin-left: 68.37606837606839%;
-    *margin-left: 68.26968539734497%;
-  }
-  .row-fluid .offset7 {
-    margin-left: 62.393162393162385%;
-    *margin-left: 62.28677941443899%;
-  }
-  .row-fluid .offset7:first-child {
-    margin-left: 59.82905982905982%;
-    *margin-left: 59.72267685033642%;
-  }
-  .row-fluid .offset6 {
-    margin-left: 53.84615384615384%;
-    *margin-left: 53.739770867430444%;
-  }
-  .row-fluid .offset6:first-child {
-    margin-left: 51.28205128205128%;
-    *margin-left: 51.175668303327875%;
-  }
-  .row-fluid .offset5 {
-    margin-left: 45.299145299145295%;
-    *margin-left: 45.1927623204219%;
-  }
-  .row-fluid .offset5:first-child {
-    margin-left: 42.73504273504273%;
-    *margin-left: 42.62865975631933%;
-  }
-  .row-fluid .offset4 {
-    margin-left: 36.75213675213675%;
-    *margin-left: 36.645753773413354%;
-  }
-  .row-fluid .offset4:first-child {
-    margin-left: 34.18803418803419%;
-    *margin-left: 34.081651209310785%;
-  }
-  .row-fluid .offset3 {
-    margin-left: 28.205128205128204%;
-    *margin-left: 28.0987452264048%;
-  }
-  .row-fluid .offset3:first-child {
-    margin-left: 25.641025641025642%;
-    *margin-left: 25.53464266230224%;
-  }
-  .row-fluid .offset2 {
-    margin-left: 19.65811965811966%;
-    *margin-left: 19.551736679396257%;
-  }
-  .row-fluid .offset2:first-child {
-    margin-left: 17.094017094017094%;
-    *margin-left: 16.98763411529369%;
-  }
-  .row-fluid .offset1 {
-    margin-left: 11.11111111111111%;
-    *margin-left: 11.004728132387708%;
-  }
-  .row-fluid .offset1:first-child {
-    margin-left: 8.547008547008547%;
-    *margin-left: 8.440625568285142%;
-  }
-  input,
-  textarea,
-  .uneditable-input {
-    margin-left: 0;
-  }
-  .controls-row [class*="span"] + [class*="span"] {
-    margin-left: 30px;
-  }
-  input.span12,
-  textarea.span12,
-  .uneditable-input.span12 {
-    width: 1156px;
-  }
-  input.span11,
-  textarea.span11,
-  .uneditable-input.span11 {
-    width: 1056px;
-  }
-  input.span10,
-  textarea.span10,
-  .uneditable-input.span10 {
-    width: 956px;
-  }
-  input.span9,
-  textarea.span9,
-  .uneditable-input.span9 {
-    width: 856px;
-  }
-  input.span8,
-  textarea.span8,
-  .uneditable-input.span8 {
-    width: 756px;
-  }
-  input.span7,
-  textarea.span7,
-  .uneditable-input.span7 {
-    width: 656px;
-  }
-  input.span6,
-  textarea.span6,
-  .uneditable-input.span6 {
-    width: 556px;
-  }
-  input.span5,
-  textarea.span5,
-  .uneditable-input.span5 {
-    width: 456px;
-  }
-  input.span4,
-  textarea.span4,
-  .uneditable-input.span4 {
-    width: 356px;
-  }
-  input.span3,
-  textarea.span3,
-  .uneditable-input.span3 {
-    width: 256px;
-  }
-  input.span2,
-  textarea.span2,
-  .uneditable-input.span2 {
-    width: 156px;
-  }
-  input.span1,
-  textarea.span1,
-  .uneditable-input.span1 {
-    width: 56px;
-  }
-  .thumbnails {
-    margin-left: -30px;
-  }
-  .thumbnails > li {
-    margin-left: 30px;
-  }
-  .row-fluid .thumbnails {
-    margin-left: 0;
-  }
-}
-
-@media (min-width: 768px) and (max-width: 979px) {
-  .row {
-    margin-left: -20px;
-    *zoom: 1;
-  }
-  .row:before,
-  .row:after {
-    display: table;
-    line-height: 0;
-    content: "";
-  }
-  .row:after {
-    clear: both;
-  }
-  [class*="span"] {
-    float: left;
-    margin-left: 20px;
-  }
-  .container,
-  .navbar-static-top .container,
-  .navbar-fixed-top .container,
-  .navbar-fixed-bottom .container {
-    width: 724px;
-  }
-  .span12 {
-    width: 724px;
-  }
-  .span11 {
-    width: 662px;
-  }
-  .span10 {
-    width: 600px;
-  }
-  .span9 {
-    width: 538px;
-  }
-  .span8 {
-    width: 476px;
-  }
-  .span7 {
-    width: 414px;
-  }
-  .span6 {
-    width: 352px;
-  }
-  .span5 {
-    width: 290px;
-  }
-  .span4 {
-    width: 228px;
-  }
-  .span3 {
-    width: 166px;
-  }
-  .span2 {
-    width: 104px;
-  }
-  .span1 {
-    width: 42px;
-  }
-  .offset12 {
-    margin-left: 764px;
-  }
-  .offset11 {
-    margin-left: 702px;
-  }
-  .offset10 {
-    margin-left: 640px;
-  }
-  .offset9 {
-    margin-left: 578px;
-  }
-  .offset8 {
-    margin-left: 516px;
-  }
-  .offset7 {
-    margin-left: 454px;
-  }
-  .offset6 {
-    margin-left: 392px;
-  }
-  .offset5 {
-    margin-left: 330px;
-  }
-  .offset4 {
-    margin-left: 268px;
-  }
-  .offset3 {
-    margin-left: 206px;
-  }
-  .offset2 {
-    margin-left: 144px;
-  }
-  .offset1 {
-    margin-left: 82px;
-  }
-  .row-fluid {
-    width: 100%;
-    *zoom: 1;
-  }
-  .row-fluid:before,
-  .row-fluid:after {
-    display: table;
-    line-height: 0;
-    content: "";
-  }
-  .row-fluid:after {
-    clear: both;
-  }
-  .row-fluid [class*="span"] {
-    display: block;
-    float: left;
-    width: 100%;
-    min-height: 30px;
-    margin-left: 2.7624309392265194%;
-    *margin-left: 2.709239449864817%;
-    -webkit-box-sizing: border-box;
-       -moz-box-sizing: border-box;
-            box-sizing: border-box;
-  }
-  .row-fluid [class*="span"]:first-child {
-    margin-left: 0;
-  }
-  .row-fluid .span12 {
-    width: 100%;
-    *width: 99.94680851063829%;
-  }
-  .row-fluid .span11 {
-    width: 91.43646408839778%;
-    *width: 91.38327259903608%;
-  }
-  .row-fluid .span10 {
-    width: 82.87292817679558%;
-    *width: 82.81973668743387%;
-  }
-  .row-fluid .span9 {
-    width: 74.30939226519337%;
-    *width: 74.25620077583166%;
-  }
-  .row-fluid .span8 {
-    width: 65.74585635359117%;
-    *width: 65.69266486422946%;
-  }
-  .row-fluid .span7 {
-    width: 57.18232044198895%;
-    *width: 57.12912895262725%;
-  }
-  .row-fluid .span6 {
-    width: 48.61878453038674%;
-    *width: 48.56559304102504%;
-  }
-  .row-fluid .span5 {
-    width: 40.05524861878453%;
-    *width: 40.00205712942283%;
-  }
-  .row-fluid .span4 {
-    width: 31.491712707182323%;
-    *width: 31.43852121782062%;
-  }
-  .row-fluid .span3 {
-    width: 22.92817679558011%;
-    *width: 22.87498530621841%;
-  }
-  .row-fluid .span2 {
-    width: 14.3646408839779%;
-    *width: 14.311449394616199%;
-  }
-  .row-fluid .span1 {
-    width: 5.801104972375691%;
-    *width: 5.747913483013988%;
-  }
-  .row-fluid .offset12 {
-    margin-left: 105.52486187845304%;
-    *margin-left: 105.41847889972962%;
-  }
-  .row-fluid .offset12:first-child {
-    margin-left: 102.76243093922652%;
-    *margin-left: 102.6560479605031%;
-  }
-  .row-fluid .offset11 {
-    margin-left: 96.96132596685082%;
-    *margin-left: 96.8549429881274%;
-  }
-  .row-fluid .offset11:first-child {
-    margin-left: 94.1988950276243%;
-    *margin-left: 94.09251204890089%;
-  }
-  .row-fluid .offset10 {
-    margin-left: 88.39779005524862%;
-    *margin-left: 88.2914070765252%;
-  }
-  .row-fluid .offset10:first-child {
-    margin-left: 85.6353591160221%;
-    *margin-left: 85.52897613729868%;
-  }
-  .row-fluid .offset9 {
-    margin-left: 79.8342541436464%;
-    *margin-left: 79.72787116492299%;
-  }
-  .row-fluid .offset9:first-child {
-    margin-left: 77.07182320441989%;
-    *margin-left: 76.96544022569647%;
-  }
-  .row-fluid .offset8 {
-    margin-left: 71.2707182320442%;
-    *margin-left: 71.16433525332079%;
-  }
-  .row-fluid .offset8:first-child {
-    margin-left: 68.50828729281768%;
-    *margin-left: 68.40190431409427%;
-  }
-  .row-fluid .offset7 {
-    margin-left: 62.70718232044199%;
-    *margin-left: 62.600799341718584%;
-  }
-  .row-fluid .offset7:first-child {
-    margin-left: 59.94475138121547%;
-    *margin-left: 59.838368402492065%;
-  }
-  .row-fluid .offset6 {
-    margin-left: 54.14364640883978%;
-    *margin-left: 54.037263430116376%;
-  }
-  .row-fluid .offset6:first-child {
-    margin-left: 51.38121546961326%;
-    *margin-left: 51.27483249088986%;
-  }
-  .row-fluid .offset5 {
-    margin-left: 45.58011049723757%;
-    *margin-left: 45.47372751851417%;
-  }
-  .row-fluid .offset5:first-child {
-    margin-left: 42.81767955801105%;
-    *margin-left: 42.71129657928765%;
-  }
-  .row-fluid .offset4 {
-    margin-left: 37.01657458563536%;
-    *margin-left: 36.91019160691196%;
-  }
-  .row-fluid .offset4:first-child {
-    margin-left: 34.25414364640884%;
-    *margin-left: 34.14776066768544%;
-  }
-  .row-fluid .offset3 {
-    margin-left: 28.45303867403315%;
-    *margin-left: 28.346655695309746%;
-  }
-  .row-fluid .offset3:first-child {
-    margin-left: 25.69060773480663%;
-    *margin-left: 25.584224756083227%;
-  }
-  .row-fluid .offset2 {
-    margin-left: 19.88950276243094%;
-    *margin-left: 19.783119783707537%;
-  }
-  .row-fluid .offset2:first-child {
-    margin-left: 17.12707182320442%;
-    *margin-left: 17.02068884448102%;
-  }
-  .row-fluid .offset1 {
-    margin-left: 11.32596685082873%;
-    *margin-left: 11.219583872105325%;
-  }
-  .row-fluid .offset1:first-child {
-    margin-left: 8.56353591160221%;
-    *margin-left: 8.457152932878806%;
-  }
-  input,
-  textarea,
-  .uneditable-input {
-    margin-left: 0;
-  }
-  .controls-row [class*="span"] + [class*="span"] {
-    margin-left: 20px;
-  }
-  input.span12,
-  textarea.span12,
-  .uneditable-input.span12 {
-    width: 710px;
-  }
-  input.span11,
-  textarea.span11,
-  .uneditable-input.span11 {
-    width: 648px;
-  }
-  input.span10,
-  textarea.span10,
-  .uneditable-input.span10 {
-    width: 586px;
-  }
-  input.span9,
-  textarea.span9,
-  .uneditable-input.span9 {
-    width: 524px;
-  }
-  input.span8,
-  textarea.span8,
-  .uneditable-input.span8 {
-    width: 462px;
-  }
-  input.span7,
-  textarea.span7,
-  .uneditable-input.span7 {
-    width: 400px;
-  }
-  input.span6,
-  textarea.span6,
-  .uneditable-input.span6 {
-    width: 338px;
-  }
-  input.span5,
-  textarea.span5,
-  .uneditable-input.span5 {
-    width: 276px;
-  }
-  input.span4,
-  textarea.span4,
-  .uneditable-input.span4 {
-    width: 214px;
-  }
-  input.span3,
-  textarea.span3,
-  .uneditable-input.span3 {
-    width: 152px;
-  }
-  input.span2,
-  textarea.span2,
-  .uneditable-input.span2 {
-    width: 90px;
-  }
-  input.span1,
-  textarea.span1,
-  .uneditable-input.span1 {
-    width: 28px;
-  }
-}
-
-@media (max-width: 767px) {
-  body {
-    padding-right: 20px;
-    padding-left: 20px;
-  }
-  .navbar-fixed-top,
-  .navbar-fixed-bottom {
-    margin-right: -20px;
-    margin-left: -20px;
-  }
-  .container-fluid {
-    padding: 0;
-  }
-  .dl-horizontal dt {
-    float: none;
-    width: auto;
-    clear: none;
-    text-align: left;
-  }
-  .dl-horizontal dd {
-    margin-left: 0;
-  }
-  .container {
-    width: auto;
-  }
-  .row-fluid {
-    width: 100%;
-  }
-  .row,
-  .thumbnails {
-    margin-left: 0;
-  }
-  .thumbnails > li {
-    float: none;
-    margin-left: 0;
-  }
-  [class*="span"],
-  .row-fluid [class*="span"] {
-    display: block;
-    float: none;
-    width: auto;
-    margin-left: 0;
-  }
-  .span12,
-  .row-fluid .span12 {
-    width: 100%;
-    -webkit-box-sizing: border-box;
-       -moz-box-sizing: border-box;
-            box-sizing: border-box;
-  }
-  .input-large,
-  .input-xlarge,
-  .input-xxlarge,
-  input[class*="span"],
-  select[class*="span"],
-  textarea[class*="span"],
-  .uneditable-input {
-    display: block;
-    width: 100%;
-    min-height: 30px;
-    -webkit-box-sizing: border-box;
-       -moz-box-sizing: border-box;
-            box-sizing: border-box;
-  }
-  .input-prepend input,
-  .input-append input,
-  .input-prepend input[class*="span"],
-  .input-append input[class*="span"] {
-    display: inline-block;
-    width: auto;
-  }
-  .modal {
-    position: fixed;
-    top: 20px;
-    right: 20px;
-    left: 20px;
-    width: auto;
-    margin: 0;
-  }
-  .modal.fade.in {
-    top: auto;
-  }
-}
-
-@media (max-width: 480px) {
-  .nav-collapse {
-    -webkit-transform: translate3d(0, 0, 0);
-  }
-  .page-header h1 small {
-    display: block;
-    line-height: 20px;
-  }
-  input[type="checkbox"],
-  input[type="radio"] {
-    border: 1px solid #ccc;
-  }
-  .form-horizontal .control-group > label {
-    float: none;
-    width: auto;
-    padding-top: 0;
-    text-align: left;
-  }
-  .form-horizontal .controls {
-    margin-left: 0;
-  }
-  .form-horizontal .control-list {
-    padding-top: 0;
-  }
-  .form-horizontal .form-actions {
-    padding-right: 10px;
-    padding-left: 10px;
-  }
-  .modal {
-    top: 10px;
-    right: 10px;
-    left: 10px;
-  }
-  .modal-header .close {
-    padding: 10px;
-    margin: -10px;
-  }
-  .carousel-caption {
-    position: static;
-  }
-}
-
-@media (max-width: 979px) {
-  body {
-    padding-top: 0;
-  }
-  .navbar-fixed-top,
-  .navbar-fixed-bottom {
-    position: static;
-  }
-  .navbar-fixed-top {
-    margin-bottom: 20px;
-  }
-  .navbar-fixed-bottom {
-    margin-top: 20px;
-  }
-  .navbar-fixed-top .navbar-inner,
-  .navbar-fixed-bottom .navbar-inner {
-    padding: 5px;
-  }
-  .navbar .container {
-    width: auto;
-    padding: 0;
-  }
-  .navbar .brand {
-    padding-right: 10px;
-    padding-left: 10px;
-    margin: 0 0 0 -5px;
-  }
-  .nav-collapse {
-    clear: both;
-  }
-  .nav-collapse .nav {
-    float: none;
-    margin: 0 0 10px;
-  }
-  .nav-collapse .nav > li {
-    float: none;
-  }
-  .nav-collapse .nav > li > a {
-    margin-bottom: 2px;
-  }
-  .nav-collapse .nav > .divider-vertical {
-    display: none;
-  }
-  .nav-collapse .nav .nav-header {
-    color: #555555;
-    text-shadow: none;
-  }
-  .nav-collapse .nav > li > a,
-  .nav-collapse .dropdown-menu a {
-    padding: 9px 15px;
-    font-weight: bold;
-    color: #555555;
-    -webkit-border-radius: 3px;
-       -moz-border-radius: 3px;
-            border-radius: 3px;
-  }
-  .nav-collapse .btn {
-    padding: 4px 10px 4px;
-    font-weight: normal;
-    -webkit-border-radius: 4px;
-       -moz-border-radius: 4px;
-            border-radius: 4px;
-  }
-  .nav-collapse .dropdown-menu li + li a {
-    margin-bottom: 2px;
-  }
-  .nav-collapse .nav > li > a:hover,
-  .nav-collapse .dropdown-menu a:hover {
-    background-color: #f2f2f2;
-  }
-  .navbar-inverse .nav-collapse .nav > li > a:hover,
-  .navbar-inverse .nav-collapse .dropdown-menu a:hover {
-    background-color: #111111;
-  }
-  .nav-collapse.in .btn-group {
-    padding: 0;
-    margin-top: 5px;
-  }
-  .nav-collapse .dropdown-menu {
-    position: static;
-    top: auto;
-    left: auto;
-    display: block;
-    float: none;
-    max-width: none;
-    padding: 0;
-    margin: 0 15px;
-    background-color: transparent;
-    border: none;
-    -webkit-border-radius: 0;
-       -moz-border-radius: 0;
-            border-radius: 0;
-    -webkit-box-shadow: none;
-       -moz-box-shadow: none;
-            box-shadow: none;
-  }
-  .nav-collapse .dropdown-menu:before,
-  .nav-collapse .dropdown-menu:after {
-    display: none;
-  }
-  .nav-collapse .dropdown-menu .divider {
-    display: none;
-  }
-  .nav-collapse .navbar-form,
-  .nav-collapse .navbar-search {
-    float: none;
-    padding: 10px 15px;
-    margin: 10px 0;
-    border-top: 1px solid #f2f2f2;
-    border-bottom: 1px solid #f2f2f2;
-    -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
-       -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
-            box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
-  }
-  .navbar .nav-collapse .nav.pull-right {
-    float: none;
-    margin-left: 0;
-  }
-  .nav-collapse,
-  .nav-collapse.collapse {
-    height: 0;
-    overflow: hidden;
-  }
-  .navbar .btn-navbar {
-    display: block;
-  }
-  .navbar-static .navbar-inner {
-    padding-right: 10px;
-    padding-left: 10px;
-  }
-}
-
-@media (min-width: 980px) {
-  .nav-collapse.collapse {
-    height: auto !important;
-    overflow: visible !important;
-  }
-}
diff --git a/openslides/static/styles/bootstrap-responsive.min.css b/openslides/static/styles/bootstrap-responsive.min.css
new file mode 100644
index 000000000..5cb833ff0
--- /dev/null
+++ b/openslides/static/styles/bootstrap-responsive.min.css
@@ -0,0 +1,9 @@
+/*!
+ * Bootstrap Responsive v2.2.2
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */@-ms-viewport{width:device-width}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;line-height:0;content:""}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.hidden{display:none;visibility:hidden}.visible-phone{display:none!important}.visible-tablet{display:none!important}.hidden-desktop{display:none!important}.visible-desktop{display:inherit!important}@media(min-width:768px) and (max-width:979px){.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}.visible-tablet{display:inherit!important}.hidden-tablet{display:none!important}}@media(max-width:767px){.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}.visible-phone{display:inherit!important}.hidden-phone{display:none!important}}@media(min-width:1200px){.row{margin-left:-30px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:30px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:1170px}.span12{width:1170px}.span11{width:1070px}.span10{width:970px}.span9{width:870px}.span8{width:770px}.span7{width:670px}.span6{width:570px}.span5{width:470px}.span4{width:370px}.span3{width:270px}.span2{width:170px}.span1{width:70px}.offset12{margin-left:1230px}.offset11{margin-left:1130px}.offset10{margin-left:1030px}.offset9{margin-left:930px}.offset8{margin-left:830px}.offset7{margin-left:730px}.offset6{margin-left:630px}.offset5{margin-left:530px}.offset4{margin-left:430px}.offset3{margin-left:330px}.offset2{margin-left:230px}.offset1{margin-left:130px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.564102564102564%;*margin-left:2.5109110747408616%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.564102564102564%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.45299145299145%;*width:91.39979996362975%}.row-fluid .span10{width:82.90598290598291%;*width:82.8527914166212%}.row-fluid .span9{width:74.35897435897436%;*width:74.30578286961266%}.row-fluid .span8{width:65.81196581196582%;*width:65.75877432260411%}.row-fluid .span7{width:57.26495726495726%;*width:57.21176577559556%}.row-fluid .span6{width:48.717948717948715%;*width:48.664757228587014%}.row-fluid .span5{width:40.17094017094017%;*width:40.11774868157847%}.row-fluid .span4{width:31.623931623931625%;*width:31.570740134569924%}.row-fluid .span3{width:23.076923076923077%;*width:23.023731587561375%}.row-fluid .span2{width:14.52991452991453%;*width:14.476723040552828%}.row-fluid .span1{width:5.982905982905983%;*width:5.929714493544281%}.row-fluid .offset12{margin-left:105.12820512820512%;*margin-left:105.02182214948171%}.row-fluid .offset12:first-child{margin-left:102.56410256410257%;*margin-left:102.45771958537915%}.row-fluid .offset11{margin-left:96.58119658119658%;*margin-left:96.47481360247316%}.row-fluid .offset11:first-child{margin-left:94.01709401709402%;*margin-left:93.91071103837061%}.row-fluid .offset10{margin-left:88.03418803418803%;*margin-left:87.92780505546462%}.row-fluid .offset10:first-child{margin-left:85.47008547008548%;*margin-left:85.36370249136206%}.row-fluid .offset9{margin-left:79.48717948717949%;*margin-left:79.38079650845607%}.row-fluid .offset9:first-child{margin-left:76.92307692307693%;*margin-left:76.81669394435352%}.row-fluid .offset8{margin-left:70.94017094017094%;*margin-left:70.83378796144753%}.row-fluid .offset8:first-child{margin-left:68.37606837606839%;*margin-left:68.26968539734497%}.row-fluid .offset7{margin-left:62.393162393162385%;*margin-left:62.28677941443899%}.row-fluid .offset7:first-child{margin-left:59.82905982905982%;*margin-left:59.72267685033642%}.row-fluid .offset6{margin-left:53.84615384615384%;*margin-left:53.739770867430444%}.row-fluid .offset6:first-child{margin-left:51.28205128205128%;*margin-left:51.175668303327875%}.row-fluid .offset5{margin-left:45.299145299145295%;*margin-left:45.1927623204219%}.row-fluid .offset5:first-child{margin-left:42.73504273504273%;*margin-left:42.62865975631933%}.row-fluid .offset4{margin-left:36.75213675213675%;*margin-left:36.645753773413354%}.row-fluid .offset4:first-child{margin-left:34.18803418803419%;*margin-left:34.081651209310785%}.row-fluid .offset3{margin-left:28.205128205128204%;*margin-left:28.0987452264048%}.row-fluid .offset3:first-child{margin-left:25.641025641025642%;*margin-left:25.53464266230224%}.row-fluid .offset2{margin-left:19.65811965811966%;*margin-left:19.551736679396257%}.row-fluid .offset2:first-child{margin-left:17.094017094017094%;*margin-left:16.98763411529369%}.row-fluid .offset1{margin-left:11.11111111111111%;*margin-left:11.004728132387708%}.row-fluid .offset1:first-child{margin-left:8.547008547008547%;*margin-left:8.440625568285142%}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:30px}input.span12,textarea.span12,.uneditable-input.span12{width:1156px}input.span11,textarea.span11,.uneditable-input.span11{width:1056px}input.span10,textarea.span10,.uneditable-input.span10{width:956px}input.span9,textarea.span9,.uneditable-input.span9{width:856px}input.span8,textarea.span8,.uneditable-input.span8{width:756px}input.span7,textarea.span7,.uneditable-input.span7{width:656px}input.span6,textarea.span6,.uneditable-input.span6{width:556px}input.span5,textarea.span5,.uneditable-input.span5{width:456px}input.span4,textarea.span4,.uneditable-input.span4{width:356px}input.span3,textarea.span3,.uneditable-input.span3{width:256px}input.span2,textarea.span2,.uneditable-input.span2{width:156px}input.span1,textarea.span1,.uneditable-input.span1{width:56px}.thumbnails{margin-left:-30px}.thumbnails>li{margin-left:30px}.row-fluid .thumbnails{margin-left:0}}@media(min-width:768px) and (max-width:979px){.row{margin-left:-20px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:20px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:724px}.span12{width:724px}.span11{width:662px}.span10{width:600px}.span9{width:538px}.span8{width:476px}.span7{width:414px}.span6{width:352px}.span5{width:290px}.span4{width:228px}.span3{width:166px}.span2{width:104px}.span1{width:42px}.offset12{margin-left:764px}.offset11{margin-left:702px}.offset10{margin-left:640px}.offset9{margin-left:578px}.offset8{margin-left:516px}.offset7{margin-left:454px}.offset6{margin-left:392px}.offset5{margin-left:330px}.offset4{margin-left:268px}.offset3{margin-left:206px}.offset2{margin-left:144px}.offset1{margin-left:82px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.7624309392265194%;*margin-left:2.709239449864817%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.7624309392265194%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.43646408839778%;*width:91.38327259903608%}.row-fluid .span10{width:82.87292817679558%;*width:82.81973668743387%}.row-fluid .span9{width:74.30939226519337%;*width:74.25620077583166%}.row-fluid .span8{width:65.74585635359117%;*width:65.69266486422946%}.row-fluid .span7{width:57.18232044198895%;*width:57.12912895262725%}.row-fluid .span6{width:48.61878453038674%;*width:48.56559304102504%}.row-fluid .span5{width:40.05524861878453%;*width:40.00205712942283%}.row-fluid .span4{width:31.491712707182323%;*width:31.43852121782062%}.row-fluid .span3{width:22.92817679558011%;*width:22.87498530621841%}.row-fluid .span2{width:14.3646408839779%;*width:14.311449394616199%}.row-fluid .span1{width:5.801104972375691%;*width:5.747913483013988%}.row-fluid .offset12{margin-left:105.52486187845304%;*margin-left:105.41847889972962%}.row-fluid .offset12:first-child{margin-left:102.76243093922652%;*margin-left:102.6560479605031%}.row-fluid .offset11{margin-left:96.96132596685082%;*margin-left:96.8549429881274%}.row-fluid .offset11:first-child{margin-left:94.1988950276243%;*margin-left:94.09251204890089%}.row-fluid .offset10{margin-left:88.39779005524862%;*margin-left:88.2914070765252%}.row-fluid .offset10:first-child{margin-left:85.6353591160221%;*margin-left:85.52897613729868%}.row-fluid .offset9{margin-left:79.8342541436464%;*margin-left:79.72787116492299%}.row-fluid .offset9:first-child{margin-left:77.07182320441989%;*margin-left:76.96544022569647%}.row-fluid .offset8{margin-left:71.2707182320442%;*margin-left:71.16433525332079%}.row-fluid .offset8:first-child{margin-left:68.50828729281768%;*margin-left:68.40190431409427%}.row-fluid .offset7{margin-left:62.70718232044199%;*margin-left:62.600799341718584%}.row-fluid .offset7:first-child{margin-left:59.94475138121547%;*margin-left:59.838368402492065%}.row-fluid .offset6{margin-left:54.14364640883978%;*margin-left:54.037263430116376%}.row-fluid .offset6:first-child{margin-left:51.38121546961326%;*margin-left:51.27483249088986%}.row-fluid .offset5{margin-left:45.58011049723757%;*margin-left:45.47372751851417%}.row-fluid .offset5:first-child{margin-left:42.81767955801105%;*margin-left:42.71129657928765%}.row-fluid .offset4{margin-left:37.01657458563536%;*margin-left:36.91019160691196%}.row-fluid .offset4:first-child{margin-left:34.25414364640884%;*margin-left:34.14776066768544%}.row-fluid .offset3{margin-left:28.45303867403315%;*margin-left:28.346655695309746%}.row-fluid .offset3:first-child{margin-left:25.69060773480663%;*margin-left:25.584224756083227%}.row-fluid .offset2{margin-left:19.88950276243094%;*margin-left:19.783119783707537%}.row-fluid .offset2:first-child{margin-left:17.12707182320442%;*margin-left:17.02068884448102%}.row-fluid .offset1{margin-left:11.32596685082873%;*margin-left:11.219583872105325%}.row-fluid .offset1:first-child{margin-left:8.56353591160221%;*margin-left:8.457152932878806%}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:20px}input.span12,textarea.span12,.uneditable-input.span12{width:710px}input.span11,textarea.span11,.uneditable-input.span11{width:648px}input.span10,textarea.span10,.uneditable-input.span10{width:586px}input.span9,textarea.span9,.uneditable-input.span9{width:524px}input.span8,textarea.span8,.uneditable-input.span8{width:462px}input.span7,textarea.span7,.uneditable-input.span7{width:400px}input.span6,textarea.span6,.uneditable-input.span6{width:338px}input.span5,textarea.span5,.uneditable-input.span5{width:276px}input.span4,textarea.span4,.uneditable-input.span4{width:214px}input.span3,textarea.span3,.uneditable-input.span3{width:152px}input.span2,textarea.span2,.uneditable-input.span2{width:90px}input.span1,textarea.span1,.uneditable-input.span1{width:28px}}@media(max-width:767px){body{padding-right:20px;padding-left:20px}.navbar-fixed-top,.navbar-fixed-bottom,.navbar-static-top{margin-right:-20px;margin-left:-20px}.container-fluid{padding:0}.dl-horizontal dt{float:none;width:auto;clear:none;text-align:left}.dl-horizontal dd{margin-left:0}.container{width:auto}.row-fluid{width:100%}.row,.thumbnails{margin-left:0}.thumbnails>li{float:none;margin-left:0}[class*="span"],.uneditable-input[class*="span"],.row-fluid [class*="span"]{display:block;float:none;width:100%;margin-left:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.span12,.row-fluid .span12{width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="offset"]:first-child{margin-left:0}.input-large,.input-xlarge,.input-xxlarge,input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.input-prepend input,.input-append input,.input-prepend input[class*="span"],.input-append input[class*="span"]{display:inline-block;width:auto}.controls-row [class*="span"]+[class*="span"]{margin-left:0}.modal{position:fixed;top:20px;right:20px;left:20px;width:auto;margin:0}.modal.fade{top:-100px}.modal.fade.in{top:20px}}@media(max-width:480px){.nav-collapse{-webkit-transform:translate3d(0,0,0)}.page-header h1 small{display:block;line-height:20px}input[type="checkbox"],input[type="radio"]{border:1px solid #ccc}.form-horizontal .control-label{float:none;width:auto;padding-top:0;text-align:left}.form-horizontal .controls{margin-left:0}.form-horizontal .control-list{padding-top:0}.form-horizontal .form-actions{padding-right:10px;padding-left:10px}.media .pull-left,.media .pull-right{display:block;float:none;margin-bottom:10px}.media-object{margin-right:0;margin-left:0}.modal{top:10px;right:10px;left:10px}.modal-header .close{padding:10px;margin:-10px}.carousel-caption{position:static}}@media(max-width:979px){body{padding-top:0}.navbar-fixed-top,.navbar-fixed-bottom{position:static}.navbar-fixed-top{margin-bottom:20px}.navbar-fixed-bottom{margin-top:20px}.navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding:5px}.navbar .container{width:auto;padding:0}.navbar .brand{padding-right:10px;padding-left:10px;margin:0 0 0 -5px}.nav-collapse{clear:both}.nav-collapse .nav{float:none;margin:0 0 10px}.nav-collapse .nav>li{float:none}.nav-collapse .nav>li>a{margin-bottom:2px}.nav-collapse .nav>.divider-vertical{display:none}.nav-collapse .nav .nav-header{color:#777;text-shadow:none}.nav-collapse .nav>li>a,.nav-collapse .dropdown-menu a{padding:9px 15px;font-weight:bold;color:#777;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.nav-collapse .btn{padding:4px 10px 4px;font-weight:normal;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.nav-collapse .dropdown-menu li+li a{margin-bottom:2px}.nav-collapse .nav>li>a:hover,.nav-collapse .dropdown-menu a:hover{background-color:#f2f2f2}.navbar-inverse .nav-collapse .nav>li>a,.navbar-inverse .nav-collapse .dropdown-menu a{color:#999}.navbar-inverse .nav-collapse .nav>li>a:hover,.navbar-inverse .nav-collapse .dropdown-menu a:hover{background-color:#111}.nav-collapse.in .btn-group{padding:0;margin-top:5px}.nav-collapse .dropdown-menu{position:static;top:auto;left:auto;display:none;float:none;max-width:none;padding:0;margin:0 15px;background-color:transparent;border:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.nav-collapse .open>.dropdown-menu{display:block}.nav-collapse .dropdown-menu:before,.nav-collapse .dropdown-menu:after{display:none}.nav-collapse .dropdown-menu .divider{display:none}.nav-collapse .nav>li>.dropdown-menu:before,.nav-collapse .nav>li>.dropdown-menu:after{display:none}.nav-collapse .navbar-form,.nav-collapse .navbar-search{float:none;padding:10px 15px;margin:10px 0;border-top:1px solid #f2f2f2;border-bottom:1px solid #f2f2f2;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1)}.navbar-inverse .nav-collapse .navbar-form,.navbar-inverse .nav-collapse .navbar-search{border-top-color:#111;border-bottom-color:#111}.navbar .nav-collapse .nav.pull-right{float:none;margin-left:0}.nav-collapse,.nav-collapse.collapse{height:0;overflow:hidden}.navbar .btn-navbar{display:block}.navbar-static .navbar-inner{padding-right:10px;padding-left:10px}}@media(min-width:980px){.nav-collapse.collapse{height:auto!important;overflow:visible!important}}
diff --git a/openslides/static/styles/bootstrap.css b/openslides/static/styles/bootstrap.css
deleted file mode 100644
index 0664207ae..000000000
--- a/openslides/static/styles/bootstrap.css
+++ /dev/null
@@ -1,5624 +0,0 @@
-/*!
- * Bootstrap v2.1.0
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- */
-
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-nav,
-section {
-  display: block;
-}
-
-audio,
-canvas,
-video {
-  display: inline-block;
-  *display: inline;
-  *zoom: 1;
-}
-
-audio:not([controls]) {
-  display: none;
-}
-
-html {
-  font-size: 100%;
-  -webkit-text-size-adjust: 100%;
-      -ms-text-size-adjust: 100%;
-}
-
-a:focus {
-  outline: thin dotted #333;
-  outline: 5px auto -webkit-focus-ring-color;
-  outline-offset: -2px;
-}
-
-a:hover,
-a:active {
-  outline: 0;
-}
-
-sub,
-sup {
-  position: relative;
-  font-size: 75%;
-  line-height: 0;
-  vertical-align: baseline;
-}
-
-sup {
-  top: -0.5em;
-}
-
-sub {
-  bottom: -0.25em;
-}
-
-img {
-  height: auto;
-  max-width: 100%;
-  vertical-align: middle;
-  border: 0;
-  -ms-interpolation-mode: bicubic;
-}
-
-#map_canvas img {
-  max-width: none;
-}
-
-button,
-input,
-select,
-textarea {
-  margin: 0;
-  font-size: 100%;
-  vertical-align: middle;
-}
-
-button,
-input {
-  *overflow: visible;
-  line-height: normal;
-}
-
-button::-moz-focus-inner,
-input::-moz-focus-inner {
-  padding: 0;
-  border: 0;
-}
-
-button,
-input[type="button"],
-input[type="reset"],
-input[type="submit"] {
-  cursor: pointer;
-  -webkit-appearance: button;
-}
-
-input[type="search"] {
-  -webkit-box-sizing: content-box;
-     -moz-box-sizing: content-box;
-          box-sizing: content-box;
-  -webkit-appearance: textfield;
-}
-
-input[type="search"]::-webkit-search-decoration,
-input[type="search"]::-webkit-search-cancel-button {
-  -webkit-appearance: none;
-}
-
-textarea {
-  overflow: auto;
-  vertical-align: top;
-}
-
-.clearfix {
-  *zoom: 1;
-}
-
-.clearfix:before,
-.clearfix:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.clearfix:after {
-  clear: both;
-}
-
-.hide-text {
-  font: 0/0 a;
-  color: transparent;
-  text-shadow: none;
-  background-color: transparent;
-  border: 0;
-}
-
-.input-block-level {
-  display: block;
-  width: 100%;
-  min-height: 30px;
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
-}
-
-body {
-  margin: 0;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 14px;
-  line-height: 20px;
-  color: #333333;
-  background-color: #ffffff;
-}
-
-a {
-  color: #0088cc;
-  text-decoration: none;
-}
-
-a:hover {
-  color: #005580;
-  text-decoration: underline;
-}
-
-.img-rounded {
-  -webkit-border-radius: 6px;
-     -moz-border-radius: 6px;
-          border-radius: 6px;
-}
-
-.img-polaroid {
-  padding: 4px;
-  background-color: #fff;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0, 0, 0, 0.2);
-  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
-     -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
-          box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
-}
-
-.img-circle {
-  -webkit-border-radius: 500px;
-     -moz-border-radius: 500px;
-          border-radius: 500px;
-}
-
-.row {
-  margin-left: -20px;
-  *zoom: 1;
-}
-
-.row:before,
-.row:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.row:after {
-  clear: both;
-}
-
-[class*="span"] {
-  float: left;
-  margin-left: 20px;
-}
-
-.container,
-.navbar-static-top .container,
-.navbar-fixed-top .container,
-.navbar-fixed-bottom .container {
-  width: 940px;
-}
-
-.span12 {
-  width: 940px;
-}
-
-.span11 {
-  width: 860px;
-}
-
-.span10 {
-  width: 780px;
-}
-
-.span9 {
-  width: 700px;
-}
-
-.span8 {
-  width: 620px;
-}
-
-.span7 {
-  width: 540px;
-}
-
-.span6 {
-  width: 460px;
-}
-
-.span5 {
-  width: 380px;
-}
-
-.span4 {
-  width: 300px;
-}
-
-.span3 {
-  width: 220px;
-}
-
-.span2 {
-  width: 140px;
-}
-
-.span1 {
-  width: 60px;
-}
-
-.offset12 {
-  margin-left: 980px;
-}
-
-.offset11 {
-  margin-left: 900px;
-}
-
-.offset10 {
-  margin-left: 820px;
-}
-
-.offset9 {
-  margin-left: 740px;
-}
-
-.offset8 {
-  margin-left: 660px;
-}
-
-.offset7 {
-  margin-left: 580px;
-}
-
-.offset6 {
-  margin-left: 500px;
-}
-
-.offset5 {
-  margin-left: 420px;
-}
-
-.offset4 {
-  margin-left: 340px;
-}
-
-.offset3 {
-  margin-left: 260px;
-}
-
-.offset2 {
-  margin-left: 180px;
-}
-
-.offset1 {
-  margin-left: 100px;
-}
-
-.row-fluid {
-  width: 100%;
-  *zoom: 1;
-}
-
-.row-fluid:before,
-.row-fluid:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.row-fluid:after {
-  clear: both;
-}
-
-.row-fluid [class*="span"] {
-  display: block;
-  float: left;
-  width: 100%;
-  min-height: 30px;
-  margin-left: 2.127659574468085%;
-  *margin-left: 2.074468085106383%;
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
-}
-
-.row-fluid [class*="span"]:first-child {
-  margin-left: 0;
-}
-
-.row-fluid .span12 {
-  width: 100%;
-  *width: 99.94680851063829%;
-}
-
-.row-fluid .span11 {
-  width: 91.48936170212765%;
-  *width: 91.43617021276594%;
-}
-
-.row-fluid .span10 {
-  width: 82.97872340425532%;
-  *width: 82.92553191489361%;
-}
-
-.row-fluid .span9 {
-  width: 74.46808510638297%;
-  *width: 74.41489361702126%;
-}
-
-.row-fluid .span8 {
-  width: 65.95744680851064%;
-  *width: 65.90425531914893%;
-}
-
-.row-fluid .span7 {
-  width: 57.44680851063829%;
-  *width: 57.39361702127659%;
-}
-
-.row-fluid .span6 {
-  width: 48.93617021276595%;
-  *width: 48.88297872340425%;
-}
-
-.row-fluid .span5 {
-  width: 40.42553191489362%;
-  *width: 40.37234042553192%;
-}
-
-.row-fluid .span4 {
-  width: 31.914893617021278%;
-  *width: 31.861702127659576%;
-}
-
-.row-fluid .span3 {
-  width: 23.404255319148934%;
-  *width: 23.351063829787233%;
-}
-
-.row-fluid .span2 {
-  width: 14.893617021276595%;
-  *width: 14.840425531914894%;
-}
-
-.row-fluid .span1 {
-  width: 6.382978723404255%;
-  *width: 6.329787234042553%;
-}
-
-.row-fluid .offset12 {
-  margin-left: 104.25531914893617%;
-  *margin-left: 104.14893617021275%;
-}
-
-.row-fluid .offset12:first-child {
-  margin-left: 102.12765957446808%;
-  *margin-left: 102.02127659574467%;
-}
-
-.row-fluid .offset11 {
-  margin-left: 95.74468085106382%;
-  *margin-left: 95.6382978723404%;
-}
-
-.row-fluid .offset11:first-child {
-  margin-left: 93.61702127659574%;
-  *margin-left: 93.51063829787232%;
-}
-
-.row-fluid .offset10 {
-  margin-left: 87.23404255319149%;
-  *margin-left: 87.12765957446807%;
-}
-
-.row-fluid .offset10:first-child {
-  margin-left: 85.1063829787234%;
-  *margin-left: 84.99999999999999%;
-}
-
-.row-fluid .offset9 {
-  margin-left: 78.72340425531914%;
-  *margin-left: 78.61702127659572%;
-}
-
-.row-fluid .offset9:first-child {
-  margin-left: 76.59574468085106%;
-  *margin-left: 76.48936170212764%;
-}
-
-.row-fluid .offset8 {
-  margin-left: 70.2127659574468%;
-  *margin-left: 70.10638297872339%;
-}
-
-.row-fluid .offset8:first-child {
-  margin-left: 68.08510638297872%;
-  *margin-left: 67.9787234042553%;
-}
-
-.row-fluid .offset7 {
-  margin-left: 61.70212765957446%;
-  *margin-left: 61.59574468085106%;
-}
-
-.row-fluid .offset7:first-child {
-  margin-left: 59.574468085106375%;
-  *margin-left: 59.46808510638297%;
-}
-
-.row-fluid .offset6 {
-  margin-left: 53.191489361702125%;
-  *margin-left: 53.085106382978715%;
-}
-
-.row-fluid .offset6:first-child {
-  margin-left: 51.063829787234035%;
-  *margin-left: 50.95744680851063%;
-}
-
-.row-fluid .offset5 {
-  margin-left: 44.68085106382979%;
-  *margin-left: 44.57446808510638%;
-}
-
-.row-fluid .offset5:first-child {
-  margin-left: 42.5531914893617%;
-  *margin-left: 42.4468085106383%;
-}
-
-.row-fluid .offset4 {
-  margin-left: 36.170212765957444%;
-  *margin-left: 36.06382978723405%;
-}
-
-.row-fluid .offset4:first-child {
-  margin-left: 34.04255319148936%;
-  *margin-left: 33.93617021276596%;
-}
-
-.row-fluid .offset3 {
-  margin-left: 27.659574468085104%;
-  *margin-left: 27.5531914893617%;
-}
-
-.row-fluid .offset3:first-child {
-  margin-left: 25.53191489361702%;
-  *margin-left: 25.425531914893618%;
-}
-
-.row-fluid .offset2 {
-  margin-left: 19.148936170212764%;
-  *margin-left: 19.04255319148936%;
-}
-
-.row-fluid .offset2:first-child {
-  margin-left: 17.02127659574468%;
-  *margin-left: 16.914893617021278%;
-}
-
-.row-fluid .offset1 {
-  margin-left: 10.638297872340425%;
-  *margin-left: 10.53191489361702%;
-}
-
-.row-fluid .offset1:first-child {
-  margin-left: 8.51063829787234%;
-  *margin-left: 8.404255319148938%;
-}
-
-[class*="span"].hide,
-.row-fluid [class*="span"].hide {
-  display: none;
-}
-
-[class*="span"].pull-right,
-.row-fluid [class*="span"].pull-right {
-  float: right;
-}
-
-.container {
-  margin-right: auto;
-  margin-left: auto;
-  *zoom: 1;
-}
-
-.container:before,
-.container:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.container:after {
-  clear: both;
-}
-
-.container-fluid {
-  padding-right: 20px;
-  padding-left: 20px;
-  *zoom: 1;
-}
-
-.container-fluid:before,
-.container-fluid:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.container-fluid:after {
-  clear: both;
-}
-
-p {
-  margin: 0 0 10px;
-}
-
-.lead {
-  margin-bottom: 20px;
-  font-size: 20px;
-  font-weight: 200;
-  line-height: 30px;
-}
-
-small {
-  font-size: 85%;
-}
-
-strong {
-  font-weight: bold;
-}
-
-em {
-  font-style: italic;
-}
-
-cite {
-  font-style: normal;
-}
-
-.muted {
-  color: #999999;
-}
-
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  margin: 10px 0;
-  font-family: inherit;
-  font-weight: bold;
-  line-height: 1;
-  color: inherit;
-  text-rendering: optimizelegibility;
-}
-
-h1 small,
-h2 small,
-h3 small,
-h4 small,
-h5 small,
-h6 small {
-  font-weight: normal;
-  line-height: 1;
-  color: #999999;
-}
-
-h1 {
-  font-size: 36px;
-  line-height: 40px;
-}
-
-h2 {
-  font-size: 30px;
-  line-height: 40px;
-}
-
-h3 {
-  font-size: 24px;
-  line-height: 40px;
-}
-
-h4 {
-  font-size: 18px;
-  line-height: 20px;
-}
-
-h5 {
-  font-size: 14px;
-  line-height: 20px;
-}
-
-h6 {
-  font-size: 12px;
-  line-height: 20px;
-}
-
-h1 small {
-  font-size: 24px;
-}
-
-h2 small {
-  font-size: 18px;
-}
-
-h3 small {
-  font-size: 14px;
-}
-
-h4 small {
-  font-size: 14px;
-}
-
-.page-header {
-  padding-bottom: 9px;
-  margin: 20px 0 30px;
-  border-bottom: 1px solid #eeeeee;
-}
-
-ul,
-ol {
-  padding: 0;
-  margin: 0 0 10px 25px;
-}
-
-ul ul,
-ul ol,
-ol ol,
-ol ul {
-  margin-bottom: 0;
-}
-
-li {
-  line-height: 20px;
-}
-
-ul.unstyled,
-ol.unstyled {
-  margin-left: 0;
-  list-style: none;
-}
-
-dl {
-  margin-bottom: 20px;
-}
-
-dt,
-dd {
-  line-height: 20px;
-}
-
-dt {
-  font-weight: bold;
-}
-
-dd {
-  margin-left: 10px;
-}
-
-.dl-horizontal dt {
-  float: left;
-  width: 120px;
-  overflow: hidden;
-  clear: left;
-  text-align: right;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.dl-horizontal dd {
-  margin-left: 130px;
-}
-
-hr {
-  margin: 20px 0;
-  border: 0;
-  border-top: 1px solid #eeeeee;
-  border-bottom: 1px solid #ffffff;
-}
-
-abbr[title] {
-  cursor: help;
-  border-bottom: 1px dotted #999999;
-}
-
-abbr.initialism {
-  font-size: 90%;
-  text-transform: uppercase;
-}
-
-blockquote {
-  padding: 0 0 0 15px;
-  margin: 0 0 20px;
-  border-left: 5px solid #eeeeee;
-}
-
-blockquote p {
-  margin-bottom: 0;
-  font-size: 16px;
-  font-weight: 300;
-  line-height: 25px;
-}
-
-blockquote small {
-  display: block;
-  line-height: 20px;
-  color: #999999;
-}
-
-blockquote small:before {
-  content: '\2014 \00A0';
-}
-
-blockquote.pull-right {
-  float: right;
-  padding-right: 15px;
-  padding-left: 0;
-  border-right: 5px solid #eeeeee;
-  border-left: 0;
-}
-
-blockquote.pull-right p,
-blockquote.pull-right small {
-  text-align: right;
-}
-
-blockquote.pull-right small:before {
-  content: '';
-}
-
-blockquote.pull-right small:after {
-  content: '\00A0 \2014';
-}
-
-q:before,
-q:after,
-blockquote:before,
-blockquote:after {
-  content: "";
-}
-
-address {
-  display: block;
-  margin-bottom: 20px;
-  font-style: normal;
-  line-height: 20px;
-}
-
-code,
-pre {
-  padding: 0 3px 2px;
-  font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
-  font-size: 12px;
-  color: #333333;
-  -webkit-border-radius: 3px;
-     -moz-border-radius: 3px;
-          border-radius: 3px;
-}
-
-code {
-  padding: 2px 4px;
-  color: #d14;
-  background-color: #f7f7f9;
-  border: 1px solid #e1e1e8;
-}
-
-pre {
-  display: block;
-  padding: 9.5px;
-  margin: 0 0 10px;
-  font-size: 13px;
-  line-height: 20px;
-  word-break: break-all;
-  word-wrap: break-word;
-  white-space: pre;
-  white-space: pre-wrap;
-  background-color: #f5f5f5;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0, 0, 0, 0.15);
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-}
-
-pre.prettyprint {
-  margin-bottom: 20px;
-}
-
-pre code {
-  padding: 0;
-  color: inherit;
-  background-color: transparent;
-  border: 0;
-}
-
-.pre-scrollable {
-  max-height: 340px;
-  overflow-y: scroll;
-}
-
-form {
-  margin: 0 0 20px;
-}
-
-fieldset {
-  padding: 0;
-  margin: 0;
-  border: 0;
-}
-
-legend {
-  display: block;
-  width: 100%;
-  padding: 0;
-  margin-bottom: 20px;
-  font-size: 21px;
-  line-height: 40px;
-  color: #333333;
-  border: 0;
-  border-bottom: 1px solid #e5e5e5;
-}
-
-legend small {
-  font-size: 15px;
-  color: #999999;
-}
-
-label,
-input,
-button,
-select,
-textarea {
-  font-size: 14px;
-  font-weight: normal;
-  line-height: 20px;
-}
-
-input,
-button,
-select,
-textarea {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-}
-
-label {
-  display: block;
-  margin-bottom: 5px;
-}
-
-select,
-textarea,
-input[type="text"],
-input[type="password"],
-input[type="datetime"],
-input[type="datetime-local"],
-input[type="date"],
-input[type="month"],
-input[type="time"],
-input[type="week"],
-input[type="number"],
-input[type="email"],
-input[type="url"],
-input[type="search"],
-input[type="tel"],
-input[type="color"],
-.uneditable-input {
-  display: inline-block;
-  height: 20px;
-  padding: 4px 6px;
-  margin-bottom: 9px;
-  font-size: 14px;
-  line-height: 20px;
-  color: #555555;
-  -webkit-border-radius: 3px;
-     -moz-border-radius: 3px;
-          border-radius: 3px;
-}
-
-input,
-textarea {
-  width: 210px;
-}
-
-textarea {
-  height: auto;
-}
-
-textarea,
-input[type="text"],
-input[type="password"],
-input[type="datetime"],
-input[type="datetime-local"],
-input[type="date"],
-input[type="month"],
-input[type="time"],
-input[type="week"],
-input[type="number"],
-input[type="email"],
-input[type="url"],
-input[type="search"],
-input[type="tel"],
-input[type="color"],
-.uneditable-input {
-  background-color: #ffffff;
-  border: 1px solid #cccccc;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
-     -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
-       -o-transition: border linear 0.2s, box-shadow linear 0.2s;
-          transition: border linear 0.2s, box-shadow linear 0.2s;
-}
-
-textarea:focus,
-input[type="text"]:focus,
-input[type="password"]:focus,
-input[type="datetime"]:focus,
-input[type="datetime-local"]:focus,
-input[type="date"]:focus,
-input[type="month"]:focus,
-input[type="time"]:focus,
-input[type="week"]:focus,
-input[type="number"]:focus,
-input[type="email"]:focus,
-input[type="url"]:focus,
-input[type="search"]:focus,
-input[type="tel"]:focus,
-input[type="color"]:focus,
-.uneditable-input:focus {
-  border-color: rgba(82, 168, 236, 0.8);
-  outline: 0;
-  outline: thin dotted \9;
-  /* IE6-9 */
-
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
-}
-
-input[type="radio"],
-input[type="checkbox"] {
-  margin: 4px 0 0;
-  margin-top: 1px \9;
-  *margin-top: 0;
-  line-height: normal;
-  cursor: pointer;
-}
-
-input[type="file"],
-input[type="image"],
-input[type="submit"],
-input[type="reset"],
-input[type="button"],
-input[type="radio"],
-input[type="checkbox"] {
-  width: auto;
-}
-
-select,
-input[type="file"] {
-  height: 30px;
-  /* In IE7, the height of the select element cannot be changed by height, only font-size */
-
-  *margin-top: 4px;
-  /* For IE7, add top margin to align select with labels */
-
-  line-height: 30px;
-}
-
-select {
-  width: 220px;
-  background-color: #ffffff;
-  border: 1px solid #bbb;
-}
-
-select[multiple],
-select[size] {
-  height: auto;
-}
-
-select:focus,
-input[type="file"]:focus,
-input[type="radio"]:focus,
-input[type="checkbox"]:focus {
-  outline: thin dotted #333;
-  outline: 5px auto -webkit-focus-ring-color;
-  outline-offset: -2px;
-}
-
-.uneditable-input,
-.uneditable-textarea {
-  color: #999999;
-  cursor: not-allowed;
-  background-color: #fcfcfc;
-  border-color: #cccccc;
-  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
-     -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
-          box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
-}
-
-.uneditable-input {
-  overflow: hidden;
-  white-space: nowrap;
-}
-
-.uneditable-textarea {
-  width: auto;
-  height: auto;
-}
-
-input:-moz-placeholder,
-textarea:-moz-placeholder {
-  color: #999999;
-}
-
-input:-ms-input-placeholder,
-textarea:-ms-input-placeholder {
-  color: #999999;
-}
-
-input::-webkit-input-placeholder,
-textarea::-webkit-input-placeholder {
-  color: #999999;
-}
-
-.radio,
-.checkbox {
-  min-height: 18px;
-  padding-left: 18px;
-}
-
-.radio input[type="radio"],
-.checkbox input[type="checkbox"] {
-  float: left;
-  margin-left: -18px;
-}
-
-.controls > .radio:first-child,
-.controls > .checkbox:first-child {
-  padding-top: 5px;
-}
-
-.radio.inline,
-.checkbox.inline {
-  display: inline-block;
-  padding-top: 5px;
-  margin-bottom: 0;
-  vertical-align: middle;
-}
-
-.radio.inline + .radio.inline,
-.checkbox.inline + .checkbox.inline {
-  margin-left: 10px;
-}
-
-.input-mini {
-  width: 60px;
-}
-
-.input-small {
-  width: 90px;
-}
-
-.input-medium {
-  width: 150px;
-}
-
-.input-large {
-  width: 210px;
-}
-
-.input-xlarge {
-  width: 270px;
-}
-
-.input-xxlarge {
-  width: 530px;
-}
-
-input[class*="span"],
-select[class*="span"],
-textarea[class*="span"],
-.uneditable-input[class*="span"],
-.row-fluid input[class*="span"],
-.row-fluid select[class*="span"],
-.row-fluid textarea[class*="span"],
-.row-fluid .uneditable-input[class*="span"] {
-  float: none;
-  margin-left: 0;
-}
-
-.input-append input[class*="span"],
-.input-append .uneditable-input[class*="span"],
-.input-prepend input[class*="span"],
-.input-prepend .uneditable-input[class*="span"],
-.row-fluid input[class*="span"],
-.row-fluid select[class*="span"],
-.row-fluid textarea[class*="span"],
-.row-fluid .uneditable-input[class*="span"],
-.row-fluid .input-prepend [class*="span"],
-.row-fluid .input-append [class*="span"] {
-  display: inline-block;
-}
-
-input,
-textarea,
-.uneditable-input {
-  margin-left: 0;
-}
-
-.controls-row [class*="span"] + [class*="span"] {
-  margin-left: 20px;
-}
-
-input.span12,
-textarea.span12,
-.uneditable-input.span12 {
-  width: 926px;
-}
-
-input.span11,
-textarea.span11,
-.uneditable-input.span11 {
-  width: 846px;
-}
-
-input.span10,
-textarea.span10,
-.uneditable-input.span10 {
-  width: 766px;
-}
-
-input.span9,
-textarea.span9,
-.uneditable-input.span9 {
-  width: 686px;
-}
-
-input.span8,
-textarea.span8,
-.uneditable-input.span8 {
-  width: 606px;
-}
-
-input.span7,
-textarea.span7,
-.uneditable-input.span7 {
-  width: 526px;
-}
-
-input.span6,
-textarea.span6,
-.uneditable-input.span6 {
-  width: 446px;
-}
-
-input.span5,
-textarea.span5,
-.uneditable-input.span5 {
-  width: 366px;
-}
-
-input.span4,
-textarea.span4,
-.uneditable-input.span4 {
-  width: 286px;
-}
-
-input.span3,
-textarea.span3,
-.uneditable-input.span3 {
-  width: 206px;
-}
-
-input.span2,
-textarea.span2,
-.uneditable-input.span2 {
-  width: 126px;
-}
-
-input.span1,
-textarea.span1,
-.uneditable-input.span1 {
-  width: 46px;
-}
-
-.controls-row {
-  *zoom: 1;
-}
-
-.controls-row:before,
-.controls-row:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.controls-row:after {
-  clear: both;
-}
-
-.controls-row [class*="span"] {
-  float: left;
-}
-
-input[disabled],
-select[disabled],
-textarea[disabled],
-input[readonly],
-select[readonly],
-textarea[readonly] {
-  cursor: not-allowed;
-  background-color: #eeeeee;
-}
-
-input[type="radio"][disabled],
-input[type="checkbox"][disabled],
-input[type="radio"][readonly],
-input[type="checkbox"][readonly] {
-  background-color: transparent;
-}
-
-.control-group.warning > label,
-.control-group.warning .help-block,
-.control-group.warning .help-inline {
-  color: #c09853;
-}
-
-.control-group.warning .checkbox,
-.control-group.warning .radio,
-.control-group.warning input,
-.control-group.warning select,
-.control-group.warning textarea {
-  color: #c09853;
-  border-color: #c09853;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-}
-
-.control-group.warning .checkbox:focus,
-.control-group.warning .radio:focus,
-.control-group.warning input:focus,
-.control-group.warning select:focus,
-.control-group.warning textarea:focus {
-  border-color: #a47e3c;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
-}
-
-.control-group.warning .input-prepend .add-on,
-.control-group.warning .input-append .add-on {
-  color: #c09853;
-  background-color: #fcf8e3;
-  border-color: #c09853;
-}
-
-.control-group.error > label,
-.control-group.error .help-block,
-.control-group.error .help-inline {
-  color: #b94a48;
-}
-
-.control-group.error .checkbox,
-.control-group.error .radio,
-.control-group.error input,
-.control-group.error select,
-.control-group.error textarea {
-  color: #b94a48;
-  border-color: #b94a48;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-}
-
-.control-group.error .checkbox:focus,
-.control-group.error .radio:focus,
-.control-group.error input:focus,
-.control-group.error select:focus,
-.control-group.error textarea:focus {
-  border-color: #953b39;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
-}
-
-.control-group.error .input-prepend .add-on,
-.control-group.error .input-append .add-on {
-  color: #b94a48;
-  background-color: #f2dede;
-  border-color: #b94a48;
-}
-
-.control-group.success > label,
-.control-group.success .help-block,
-.control-group.success .help-inline {
-  color: #468847;
-}
-
-.control-group.success .checkbox,
-.control-group.success .radio,
-.control-group.success input,
-.control-group.success select,
-.control-group.success textarea {
-  color: #468847;
-  border-color: #468847;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-}
-
-.control-group.success .checkbox:focus,
-.control-group.success .radio:focus,
-.control-group.success input:focus,
-.control-group.success select:focus,
-.control-group.success textarea:focus {
-  border-color: #356635;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
-}
-
-.control-group.success .input-prepend .add-on,
-.control-group.success .input-append .add-on {
-  color: #468847;
-  background-color: #dff0d8;
-  border-color: #468847;
-}
-
-input:focus:required:invalid,
-textarea:focus:required:invalid,
-select:focus:required:invalid {
-  color: #b94a48;
-  border-color: #ee5f5b;
-}
-
-input:focus:required:invalid:focus,
-textarea:focus:required:invalid:focus,
-select:focus:required:invalid:focus {
-  border-color: #e9322d;
-  -webkit-box-shadow: 0 0 6px #f8b9b7;
-     -moz-box-shadow: 0 0 6px #f8b9b7;
-          box-shadow: 0 0 6px #f8b9b7;
-}
-
-.form-actions {
-  padding: 19px 20px 20px;
-  margin-top: 20px;
-  margin-bottom: 20px;
-  background-color: #f5f5f5;
-  border-top: 1px solid #e5e5e5;
-  *zoom: 1;
-}
-
-.form-actions:before,
-.form-actions:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.form-actions:after {
-  clear: both;
-}
-
-.help-block,
-.help-inline {
-  color: #595959;
-}
-
-.help-block {
-  display: block;
-  margin-bottom: 10px;
-}
-
-.help-inline {
-  display: inline-block;
-  *display: inline;
-  padding-left: 5px;
-  vertical-align: middle;
-  *zoom: 1;
-}
-
-.input-append,
-.input-prepend {
-  margin-bottom: 5px;
-  font-size: 0;
-  white-space: nowrap;
-}
-
-.input-append input,
-.input-prepend input,
-.input-append select,
-.input-prepend select,
-.input-append .uneditable-input,
-.input-prepend .uneditable-input {
-  position: relative;
-  margin-bottom: 0;
-  *margin-left: 0;
-  font-size: 14px;
-  vertical-align: top;
-  -webkit-border-radius: 0 3px 3px 0;
-     -moz-border-radius: 0 3px 3px 0;
-          border-radius: 0 3px 3px 0;
-}
-
-.input-append input:focus,
-.input-prepend input:focus,
-.input-append select:focus,
-.input-prepend select:focus,
-.input-append .uneditable-input:focus,
-.input-prepend .uneditable-input:focus {
-  z-index: 2;
-}
-
-.input-append .add-on,
-.input-prepend .add-on {
-  display: inline-block;
-  width: auto;
-  height: 20px;
-  min-width: 16px;
-  padding: 4px 5px;
-  font-size: 14px;
-  font-weight: normal;
-  line-height: 20px;
-  text-align: center;
-  text-shadow: 0 1px 0 #ffffff;
-  background-color: #eeeeee;
-  border: 1px solid #ccc;
-}
-
-.input-append .add-on,
-.input-prepend .add-on,
-.input-append .btn,
-.input-prepend .btn {
-  margin-left: -1px;
-  vertical-align: top;
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
-}
-
-.input-append .active,
-.input-prepend .active {
-  background-color: #a9dba9;
-  border-color: #46a546;
-}
-
-.input-prepend .add-on,
-.input-prepend .btn {
-  margin-right: -1px;
-}
-
-.input-prepend .add-on:first-child,
-.input-prepend .btn:first-child {
-  -webkit-border-radius: 3px 0 0 3px;
-     -moz-border-radius: 3px 0 0 3px;
-          border-radius: 3px 0 0 3px;
-}
-
-.input-append input,
-.input-append select,
-.input-append .uneditable-input {
-  -webkit-border-radius: 3px 0 0 3px;
-     -moz-border-radius: 3px 0 0 3px;
-          border-radius: 3px 0 0 3px;
-}
-
-.input-append .add-on:last-child,
-.input-append .btn:last-child {
-  -webkit-border-radius: 0 3px 3px 0;
-     -moz-border-radius: 0 3px 3px 0;
-          border-radius: 0 3px 3px 0;
-}
-
-.input-prepend.input-append input,
-.input-prepend.input-append select,
-.input-prepend.input-append .uneditable-input {
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
-}
-
-.input-prepend.input-append .add-on:first-child,
-.input-prepend.input-append .btn:first-child {
-  margin-right: -1px;
-  -webkit-border-radius: 3px 0 0 3px;
-     -moz-border-radius: 3px 0 0 3px;
-          border-radius: 3px 0 0 3px;
-}
-
-.input-prepend.input-append .add-on:last-child,
-.input-prepend.input-append .btn:last-child {
-  margin-left: -1px;
-  -webkit-border-radius: 0 3px 3px 0;
-     -moz-border-radius: 0 3px 3px 0;
-          border-radius: 0 3px 3px 0;
-}
-
-input.search-query {
-  padding-right: 14px;
-  padding-right: 4px \9;
-  padding-left: 14px;
-  padding-left: 4px \9;
-  /* IE7-8 doesn't have border-radius, so don't indent the padding */
-
-  margin-bottom: 0;
-  -webkit-border-radius: 15px;
-     -moz-border-radius: 15px;
-          border-radius: 15px;
-}
-
-/* Allow for input prepend/append in search forms */
-
-.form-search .input-append .search-query,
-.form-search .input-prepend .search-query {
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
-}
-
-.form-search .input-append .search-query {
-  -webkit-border-radius: 14px 0 0 14px;
-     -moz-border-radius: 14px 0 0 14px;
-          border-radius: 14px 0 0 14px;
-}
-
-.form-search .input-append .btn {
-  -webkit-border-radius: 0 14px 14px 0;
-     -moz-border-radius: 0 14px 14px 0;
-          border-radius: 0 14px 14px 0;
-}
-
-.form-search .input-prepend .search-query {
-  -webkit-border-radius: 0 14px 14px 0;
-     -moz-border-radius: 0 14px 14px 0;
-          border-radius: 0 14px 14px 0;
-}
-
-.form-search .input-prepend .btn {
-  -webkit-border-radius: 14px 0 0 14px;
-     -moz-border-radius: 14px 0 0 14px;
-          border-radius: 14px 0 0 14px;
-}
-
-.form-search input,
-.form-inline input,
-.form-horizontal input,
-.form-search textarea,
-.form-inline textarea,
-.form-horizontal textarea,
-.form-search select,
-.form-inline select,
-.form-horizontal select,
-.form-search .help-inline,
-.form-inline .help-inline,
-.form-horizontal .help-inline,
-.form-search .uneditable-input,
-.form-inline .uneditable-input,
-.form-horizontal .uneditable-input,
-.form-search .input-prepend,
-.form-inline .input-prepend,
-.form-horizontal .input-prepend,
-.form-search .input-append,
-.form-inline .input-append,
-.form-horizontal .input-append {
-  display: inline-block;
-  *display: inline;
-  margin-bottom: 0;
-  vertical-align: middle;
-  *zoom: 1;
-}
-
-.form-search .hide,
-.form-inline .hide,
-.form-horizontal .hide {
-  display: none;
-}
-
-.form-search label,
-.form-inline label,
-.form-search .btn-group,
-.form-inline .btn-group {
-  display: inline-block;
-}
-
-.form-search .input-append,
-.form-inline .input-append,
-.form-search .input-prepend,
-.form-inline .input-prepend {
-  margin-bottom: 0;
-}
-
-.form-search .radio,
-.form-search .checkbox,
-.form-inline .radio,
-.form-inline .checkbox {
-  padding-left: 0;
-  margin-bottom: 0;
-  vertical-align: middle;
-}
-
-.form-search .radio input[type="radio"],
-.form-search .checkbox input[type="checkbox"],
-.form-inline .radio input[type="radio"],
-.form-inline .checkbox input[type="checkbox"] {
-  float: left;
-  margin-right: 3px;
-  margin-left: 0;
-}
-
-.control-group {
-  margin-bottom: 10px;
-}
-
-legend + .control-group {
-  margin-top: 20px;
-  -webkit-margin-top-collapse: separate;
-}
-
-.form-horizontal .control-group {
-  margin-bottom: 20px;
-  *zoom: 1;
-}
-
-.form-horizontal .control-group:before,
-.form-horizontal .control-group:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.form-horizontal .control-group:after {
-  clear: both;
-}
-
-.form-horizontal .control-label {
-  float: left;
-  width: 140px;
-  padding-top: 5px;
-  text-align: right;
-}
-
-.form-horizontal .controls {
-  *display: inline-block;
-  *padding-left: 20px;
-  margin-left: 160px;
-  *margin-left: 0;
-}
-
-.form-horizontal .controls:first-child {
-  *padding-left: 160px;
-}
-
-.form-horizontal .help-block {
-  margin-top: 10px;
-  margin-bottom: 0;
-}
-
-.form-horizontal .form-actions {
-  padding-left: 160px;
-}
-
-table {
-  max-width: 100%;
-  background-color: transparent;
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-
-.table {
-  width: 100%;
-  margin-bottom: 20px;
-}
-
-.table th,
-.table td {
-  padding: 8px;
-  line-height: 20px;
-  text-align: left;
-  vertical-align: top;
-  border-top: 1px solid #dddddd;
-}
-
-.table th {
-  font-weight: bold;
-}
-
-.table thead th {
-  vertical-align: bottom;
-}
-
-.table caption + thead tr:first-child th,
-.table caption + thead tr:first-child td,
-.table colgroup + thead tr:first-child th,
-.table colgroup + thead tr:first-child td,
-.table thead:first-child tr:first-child th,
-.table thead:first-child tr:first-child td {
-  border-top: 0;
-}
-
-.table tbody + tbody {
-  border-top: 2px solid #dddddd;
-}
-
-.table-condensed th,
-.table-condensed td {
-  padding: 4px 5px;
-}
-
-.table-bordered {
-  border: 1px solid #dddddd;
-  border-collapse: separate;
-  *border-collapse: collapse;
-  border-left: 0;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-}
-
-.table-bordered th,
-.table-bordered td {
-  border-left: 1px solid #dddddd;
-}
-
-.table-bordered caption + thead tr:first-child th,
-.table-bordered caption + tbody tr:first-child th,
-.table-bordered caption + tbody tr:first-child td,
-.table-bordered colgroup + thead tr:first-child th,
-.table-bordered colgroup + tbody tr:first-child th,
-.table-bordered colgroup + tbody tr:first-child td,
-.table-bordered thead:first-child tr:first-child th,
-.table-bordered tbody:first-child tr:first-child th,
-.table-bordered tbody:first-child tr:first-child td {
-  border-top: 0;
-}
-
-.table-bordered thead:first-child tr:first-child th:first-child,
-.table-bordered tbody:first-child tr:first-child td:first-child {
-  -webkit-border-top-left-radius: 4px;
-          border-top-left-radius: 4px;
-  -moz-border-radius-topleft: 4px;
-}
-
-.table-bordered thead:first-child tr:first-child th:last-child,
-.table-bordered tbody:first-child tr:first-child td:last-child {
-  -webkit-border-top-right-radius: 4px;
-          border-top-right-radius: 4px;
-  -moz-border-radius-topright: 4px;
-}
-
-.table-bordered thead:last-child tr:last-child th:first-child,
-.table-bordered tbody:last-child tr:last-child td:first-child,
-.table-bordered tfoot:last-child tr:last-child td:first-child {
-  -webkit-border-radius: 0 0 0 4px;
-     -moz-border-radius: 0 0 0 4px;
-          border-radius: 0 0 0 4px;
-  -webkit-border-bottom-left-radius: 4px;
-          border-bottom-left-radius: 4px;
-  -moz-border-radius-bottomleft: 4px;
-}
-
-.table-bordered thead:last-child tr:last-child th:last-child,
-.table-bordered tbody:last-child tr:last-child td:last-child,
-.table-bordered tfoot:last-child tr:last-child td:last-child {
-  -webkit-border-bottom-right-radius: 4px;
-          border-bottom-right-radius: 4px;
-  -moz-border-radius-bottomright: 4px;
-}
-
-.table-bordered caption + thead tr:first-child th:first-child,
-.table-bordered caption + tbody tr:first-child td:first-child,
-.table-bordered colgroup + thead tr:first-child th:first-child,
-.table-bordered colgroup + tbody tr:first-child td:first-child {
-  -webkit-border-top-left-radius: 4px;
-          border-top-left-radius: 4px;
-  -moz-border-radius-topleft: 4px;
-}
-
-.table-bordered caption + thead tr:first-child th:last-child,
-.table-bordered caption + tbody tr:first-child td:last-child,
-.table-bordered colgroup + thead tr:first-child th:last-child,
-.table-bordered colgroup + tbody tr:first-child td:last-child {
-  -webkit-border-top-right-radius: 4px;
-          border-top-right-radius: 4px;
-  -moz-border-right-topleft: 4px;
-}
-
-.table-striped tbody tr:nth-child(odd) td,
-.table-striped tbody tr:nth-child(odd) th {
-  background-color: #f9f9f9;
-}
-
-.table-hover tbody tr:hover td,
-.table-hover tbody tr:hover th {
-  background-color: #f5f5f5;
-}
-
-table [class*=span],
-.row-fluid table [class*=span] {
-  display: table-cell;
-  float: none;
-  margin-left: 0;
-}
-
-table .span1 {
-  float: none;
-  width: 44px;
-  margin-left: 0;
-}
-
-table .span2 {
-  float: none;
-  width: 124px;
-  margin-left: 0;
-}
-
-table .span3 {
-  float: none;
-  width: 204px;
-  margin-left: 0;
-}
-
-table .span4 {
-  float: none;
-  width: 284px;
-  margin-left: 0;
-}
-
-table .span5 {
-  float: none;
-  width: 364px;
-  margin-left: 0;
-}
-
-table .span6 {
-  float: none;
-  width: 444px;
-  margin-left: 0;
-}
-
-table .span7 {
-  float: none;
-  width: 524px;
-  margin-left: 0;
-}
-
-table .span8 {
-  float: none;
-  width: 604px;
-  margin-left: 0;
-}
-
-table .span9 {
-  float: none;
-  width: 684px;
-  margin-left: 0;
-}
-
-table .span10 {
-  float: none;
-  width: 764px;
-  margin-left: 0;
-}
-
-table .span11 {
-  float: none;
-  width: 844px;
-  margin-left: 0;
-}
-
-table .span12 {
-  float: none;
-  width: 924px;
-  margin-left: 0;
-}
-
-table .span13 {
-  float: none;
-  width: 1004px;
-  margin-left: 0;
-}
-
-table .span14 {
-  float: none;
-  width: 1084px;
-  margin-left: 0;
-}
-
-table .span15 {
-  float: none;
-  width: 1164px;
-  margin-left: 0;
-}
-
-table .span16 {
-  float: none;
-  width: 1244px;
-  margin-left: 0;
-}
-
-table .span17 {
-  float: none;
-  width: 1324px;
-  margin-left: 0;
-}
-
-table .span18 {
-  float: none;
-  width: 1404px;
-  margin-left: 0;
-}
-
-table .span19 {
-  float: none;
-  width: 1484px;
-  margin-left: 0;
-}
-
-table .span20 {
-  float: none;
-  width: 1564px;
-  margin-left: 0;
-}
-
-table .span21 {
-  float: none;
-  width: 1644px;
-  margin-left: 0;
-}
-
-table .span22 {
-  float: none;
-  width: 1724px;
-  margin-left: 0;
-}
-
-table .span23 {
-  float: none;
-  width: 1804px;
-  margin-left: 0;
-}
-
-table .span24 {
-  float: none;
-  width: 1884px;
-  margin-left: 0;
-}
-
-.table tbody tr.success td {
-  background-color: #dff0d8;
-}
-
-.table tbody tr.error td {
-  background-color: #f2dede;
-}
-
-.table tbody tr.info td {
-  background-color: #d9edf7;
-}
-
-[class^="icon-"],
-[class*=" icon-"] {
-  display: inline-block;
-  width: 14px;
-  height: 14px;
-  margin-top: 1px;
-  *margin-right: .3em;
-  line-height: 14px;
-  vertical-align: text-top;
-  background-image: url("../img/glyphicons-halflings.png");
-  background-position: 14px 14px;
-  background-repeat: no-repeat;
-}
-
-/* White icons with optional class, or on hover/active states of certain elements */
-
-.icon-white,
-.nav > .active > a > [class^="icon-"],
-.nav > .active > a > [class*=" icon-"],
-.dropdown-menu > li > a:hover > [class^="icon-"],
-.dropdown-menu > li > a:hover > [class*=" icon-"],
-.dropdown-menu > .active > a > [class^="icon-"],
-.dropdown-menu > .active > a > [class*=" icon-"] {
-  background-image: url("../img/glyphicons-halflings-white.png");
-}
-
-.icon-glass {
-  background-position: 0      0;
-}
-
-.icon-music {
-  background-position: -24px 0;
-}
-
-.icon-search {
-  background-position: -48px 0;
-}
-
-.icon-envelope {
-  background-position: -72px 0;
-}
-
-.icon-heart {
-  background-position: -96px 0;
-}
-
-.icon-star {
-  background-position: -120px 0;
-}
-
-.icon-star-empty {
-  background-position: -144px 0;
-}
-
-.icon-user {
-  background-position: -168px 0;
-}
-
-.icon-film {
-  background-position: -192px 0;
-}
-
-.icon-th-large {
-  background-position: -216px 0;
-}
-
-.icon-th {
-  background-position: -240px 0;
-}
-
-.icon-th-list {
-  background-position: -264px 0;
-}
-
-.icon-ok {
-  background-position: -288px 0;
-}
-
-.icon-remove {
-  background-position: -312px 0;
-}
-
-.icon-zoom-in {
-  background-position: -336px 0;
-}
-
-.icon-zoom-out {
-  background-position: -360px 0;
-}
-
-.icon-off {
-  background-position: -384px 0;
-}
-
-.icon-signal {
-  background-position: -408px 0;
-}
-
-.icon-cog {
-  background-position: -432px 0;
-}
-
-.icon-trash {
-  background-position: -456px 0;
-}
-
-.icon-home {
-  background-position: 0 -24px;
-}
-
-.icon-file {
-  background-position: -24px -24px;
-}
-
-.icon-time {
-  background-position: -48px -24px;
-}
-
-.icon-road {
-  background-position: -72px -24px;
-}
-
-.icon-download-alt {
-  background-position: -96px -24px;
-}
-
-.icon-download {
-  background-position: -120px -24px;
-}
-
-.icon-upload {
-  background-position: -144px -24px;
-}
-
-.icon-inbox {
-  background-position: -168px -24px;
-}
-
-.icon-play-circle {
-  background-position: -192px -24px;
-}
-
-.icon-repeat {
-  background-position: -216px -24px;
-}
-
-.icon-refresh {
-  background-position: -240px -24px;
-}
-
-.icon-list-alt {
-  background-position: -264px -24px;
-}
-
-.icon-lock {
-  background-position: -287px -24px;
-}
-
-.icon-flag {
-  background-position: -312px -24px;
-}
-
-.icon-headphones {
-  background-position: -336px -24px;
-}
-
-.icon-volume-off {
-  background-position: -360px -24px;
-}
-
-.icon-volume-down {
-  background-position: -384px -24px;
-}
-
-.icon-volume-up {
-  background-position: -408px -24px;
-}
-
-.icon-qrcode {
-  background-position: -432px -24px;
-}
-
-.icon-barcode {
-  background-position: -456px -24px;
-}
-
-.icon-tag {
-  background-position: 0 -48px;
-}
-
-.icon-tags {
-  background-position: -25px -48px;
-}
-
-.icon-book {
-  background-position: -48px -48px;
-}
-
-.icon-bookmark {
-  background-position: -72px -48px;
-}
-
-.icon-print {
-  background-position: -96px -48px;
-}
-
-.icon-camera {
-  background-position: -120px -48px;
-}
-
-.icon-font {
-  background-position: -144px -48px;
-}
-
-.icon-bold {
-  background-position: -167px -48px;
-}
-
-.icon-italic {
-  background-position: -192px -48px;
-}
-
-.icon-text-height {
-  background-position: -216px -48px;
-}
-
-.icon-text-width {
-  background-position: -240px -48px;
-}
-
-.icon-align-left {
-  background-position: -264px -48px;
-}
-
-.icon-align-center {
-  background-position: -288px -48px;
-}
-
-.icon-align-right {
-  background-position: -312px -48px;
-}
-
-.icon-align-justify {
-  background-position: -336px -48px;
-}
-
-.icon-list {
-  background-position: -360px -48px;
-}
-
-.icon-indent-left {
-  background-position: -384px -48px;
-}
-
-.icon-indent-right {
-  background-position: -408px -48px;
-}
-
-.icon-facetime-video {
-  background-position: -432px -48px;
-}
-
-.icon-picture {
-  background-position: -456px -48px;
-}
-
-.icon-pencil {
-  background-position: 0 -72px;
-}
-
-.icon-map-marker {
-  background-position: -24px -72px;
-}
-
-.icon-adjust {
-  background-position: -48px -72px;
-}
-
-.icon-tint {
-  background-position: -72px -72px;
-}
-
-.icon-edit {
-  background-position: -96px -72px;
-}
-
-.icon-share {
-  background-position: -120px -72px;
-}
-
-.icon-check {
-  background-position: -144px -72px;
-}
-
-.icon-move {
-  background-position: -168px -72px;
-}
-
-.icon-step-backward {
-  background-position: -192px -72px;
-}
-
-.icon-fast-backward {
-  background-position: -216px -72px;
-}
-
-.icon-backward {
-  background-position: -240px -72px;
-}
-
-.icon-play {
-  background-position: -264px -72px;
-}
-
-.icon-pause {
-  background-position: -288px -72px;
-}
-
-.icon-stop {
-  background-position: -312px -72px;
-}
-
-.icon-forward {
-  background-position: -336px -72px;
-}
-
-.icon-fast-forward {
-  background-position: -360px -72px;
-}
-
-.icon-step-forward {
-  background-position: -384px -72px;
-}
-
-.icon-eject {
-  background-position: -408px -72px;
-}
-
-.icon-chevron-left {
-  background-position: -432px -72px;
-}
-
-.icon-chevron-right {
-  background-position: -456px -72px;
-}
-
-.icon-plus-sign {
-  background-position: 0 -96px;
-}
-
-.icon-minus-sign {
-  background-position: -24px -96px;
-}
-
-.icon-remove-sign {
-  background-position: -48px -96px;
-}
-
-.icon-ok-sign {
-  background-position: -72px -96px;
-}
-
-.icon-question-sign {
-  background-position: -96px -96px;
-}
-
-.icon-info-sign {
-  background-position: -120px -96px;
-}
-
-.icon-screenshot {
-  background-position: -144px -96px;
-}
-
-.icon-remove-circle {
-  background-position: -168px -96px;
-}
-
-.icon-ok-circle {
-  background-position: -192px -96px;
-}
-
-.icon-ban-circle {
-  background-position: -216px -96px;
-}
-
-.icon-arrow-left {
-  background-position: -240px -96px;
-}
-
-.icon-arrow-right {
-  background-position: -264px -96px;
-}
-
-.icon-arrow-up {
-  background-position: -289px -96px;
-}
-
-.icon-arrow-down {
-  background-position: -312px -96px;
-}
-
-.icon-share-alt {
-  background-position: -336px -96px;
-}
-
-.icon-resize-full {
-  background-position: -360px -96px;
-}
-
-.icon-resize-small {
-  background-position: -384px -96px;
-}
-
-.icon-plus {
-  background-position: -408px -96px;
-}
-
-.icon-minus {
-  background-position: -433px -96px;
-}
-
-.icon-asterisk {
-  background-position: -456px -96px;
-}
-
-.icon-exclamation-sign {
-  background-position: 0 -120px;
-}
-
-.icon-gift {
-  background-position: -24px -120px;
-}
-
-.icon-leaf {
-  background-position: -48px -120px;
-}
-
-.icon-fire {
-  background-position: -72px -120px;
-}
-
-.icon-eye-open {
-  background-position: -96px -120px;
-}
-
-.icon-eye-close {
-  background-position: -120px -120px;
-}
-
-.icon-warning-sign {
-  background-position: -144px -120px;
-}
-
-.icon-plane {
-  background-position: -168px -120px;
-}
-
-.icon-calendar {
-  background-position: -192px -120px;
-}
-
-.icon-random {
-  width: 16px;
-  background-position: -216px -120px;
-}
-
-.icon-comment {
-  background-position: -240px -120px;
-}
-
-.icon-magnet {
-  background-position: -264px -120px;
-}
-
-.icon-chevron-up {
-  background-position: -288px -120px;
-}
-
-.icon-chevron-down {
-  background-position: -313px -119px;
-}
-
-.icon-retweet {
-  background-position: -336px -120px;
-}
-
-.icon-shopping-cart {
-  background-position: -360px -120px;
-}
-
-.icon-folder-close {
-  background-position: -384px -120px;
-}
-
-.icon-folder-open {
-  width: 16px;
-  background-position: -408px -120px;
-}
-
-.icon-resize-vertical {
-  background-position: -432px -119px;
-}
-
-.icon-resize-horizontal {
-  background-position: -456px -118px;
-}
-
-.icon-hdd {
-  background-position: 0 -144px;
-}
-
-.icon-bullhorn {
-  background-position: -24px -144px;
-}
-
-.icon-bell {
-  background-position: -48px -144px;
-}
-
-.icon-certificate {
-  background-position: -72px -144px;
-}
-
-.icon-thumbs-up {
-  background-position: -96px -144px;
-}
-
-.icon-thumbs-down {
-  background-position: -120px -144px;
-}
-
-.icon-hand-right {
-  background-position: -144px -144px;
-}
-
-.icon-hand-left {
-  background-position: -168px -144px;
-}
-
-.icon-hand-up {
-  background-position: -192px -144px;
-}
-
-.icon-hand-down {
-  background-position: -216px -144px;
-}
-
-.icon-circle-arrow-right {
-  background-position: -240px -144px;
-}
-
-.icon-circle-arrow-left {
-  background-position: -264px -144px;
-}
-
-.icon-circle-arrow-up {
-  background-position: -288px -144px;
-}
-
-.icon-circle-arrow-down {
-  background-position: -312px -144px;
-}
-
-.icon-globe {
-  background-position: -336px -144px;
-}
-
-.icon-wrench {
-  background-position: -360px -144px;
-}
-
-.icon-tasks {
-  background-position: -384px -144px;
-}
-
-.icon-filter {
-  background-position: -408px -144px;
-}
-
-.icon-briefcase {
-  background-position: -432px -144px;
-}
-
-.icon-fullscreen {
-  background-position: -456px -144px;
-}
-
-.dropup,
-.dropdown {
-  position: relative;
-}
-
-.dropdown-toggle {
-  *margin-bottom: -3px;
-}
-
-.dropdown-toggle:active,
-.open .dropdown-toggle {
-  outline: 0;
-}
-
-.caret {
-  display: inline-block;
-  width: 0;
-  height: 0;
-  vertical-align: top;
-  border-top: 4px solid #000000;
-  border-right: 4px solid transparent;
-  border-left: 4px solid transparent;
-  content: "";
-}
-
-.dropdown .caret {
-  margin-top: 8px;
-  margin-left: 2px;
-}
-
-.dropdown-menu {
-  position: absolute;
-  top: 100%;
-  left: 0;
-  z-index: 1000;
-  display: none;
-  float: left;
-  min-width: 160px;
-  padding: 5px 0;
-  margin: 2px 0 0;
-  list-style: none;
-  background-color: #ffffff;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0, 0, 0, 0.2);
-  *border-right-width: 2px;
-  *border-bottom-width: 2px;
-  -webkit-border-radius: 6px;
-     -moz-border-radius: 6px;
-          border-radius: 6px;
-  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-     -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-          box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-  -webkit-background-clip: padding-box;
-     -moz-background-clip: padding;
-          background-clip: padding-box;
-}
-
-.dropdown-menu.pull-right {
-  right: 0;
-  left: auto;
-}
-
-.dropdown-menu .divider {
-  *width: 100%;
-  height: 1px;
-  margin: 9px 1px;
-  *margin: -5px 0 5px;
-  overflow: hidden;
-  background-color: #e5e5e5;
-  border-bottom: 1px solid #ffffff;
-}
-
-.dropdown-menu a {
-  display: block;
-  padding: 3px 20px;
-  clear: both;
-  font-weight: normal;
-  line-height: 20px;
-  color: #333333;
-  white-space: nowrap;
-}
-
-.dropdown-menu li > a:hover,
-.dropdown-menu li > a:focus,
-.dropdown-submenu:hover > a {
-  color: #ffffff;
-  text-decoration: none;
-  background-color: #0088cc;
-  background-color: #0081c2;
-  background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));
-  background-image: -webkit-linear-gradient(top, #0088cc, #0077b3);
-  background-image: -o-linear-gradient(top, #0088cc, #0077b3);
-  background-image: linear-gradient(to bottom, #0088cc, #0077b3);
-  background-repeat: repeat-x;
-  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);
-}
-
-.dropdown-menu .active > a,
-.dropdown-menu .active > a:hover {
-  color: #ffffff;
-  text-decoration: none;
-  background-color: #0088cc;
-  background-color: #0081c2;
-  background-image: linear-gradient(to bottom, #0088cc, #0077b3);
-  background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));
-  background-image: -webkit-linear-gradient(top, #0088cc, #0077b3);
-  background-image: -o-linear-gradient(top, #0088cc, #0077b3);
-  background-repeat: repeat-x;
-  outline: 0;
-  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);
-}
-
-.dropdown-menu .disabled > a,
-.dropdown-menu .disabled > a:hover {
-  color: #999999;
-}
-
-.dropdown-menu .disabled > a:hover {
-  text-decoration: none;
-  cursor: default;
-  background-color: transparent;
-}
-
-.open {
-  *z-index: 1000;
-}
-
-.open > .dropdown-menu {
-  display: block;
-}
-
-.pull-right > .dropdown-menu {
-  right: 0;
-  left: auto;
-}
-
-.dropup .caret,
-.navbar-fixed-bottom .dropdown .caret {
-  border-top: 0;
-  border-bottom: 4px solid #000000;
-  content: "\2191";
-}
-
-.dropup .dropdown-menu,
-.navbar-fixed-bottom .dropdown .dropdown-menu {
-  top: auto;
-  bottom: 100%;
-  margin-bottom: 1px;
-}
-
-.dropdown-submenu {
-  position: relative;
-}
-
-.dropdown-submenu > .dropdown-menu {
-  top: 0;
-  left: 100%;
-  margin-top: -6px;
-  margin-left: -1px;
-  -webkit-border-radius: 0 6px 6px 6px;
-     -moz-border-radius: 0 6px 6px 6px;
-          border-radius: 0 6px 6px 6px;
-}
-
-.dropdown-submenu:hover .dropdown-menu {
-  display: block;
-}
-
-.dropdown-submenu > a:after {
-  display: block;
-  float: right;
-  width: 0;
-  height: 0;
-  margin-top: 5px;
-  margin-right: -10px;
-  border-color: transparent;
-  border-left-color: #cccccc;
-  border-style: solid;
-  border-width: 5px 0 5px 5px;
-  content: " ";
-}
-
-.dropdown-submenu:hover > a:after {
-  border-left-color: #ffffff;
-}
-
-.dropdown .dropdown-menu .nav-header {
-  padding-right: 20px;
-  padding-left: 20px;
-}
-
-.typeahead {
-  margin-top: 2px;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-}
-
-.well {
-  min-height: 20px;
-  padding: 19px;
-  margin-bottom: 20px;
-  background-color: #f5f5f5;
-  border: 1px solid #e3e3e3;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
-}
-
-.well blockquote {
-  border-color: #ddd;
-  border-color: rgba(0, 0, 0, 0.15);
-}
-
-.well-large {
-  padding: 24px;
-  -webkit-border-radius: 6px;
-     -moz-border-radius: 6px;
-          border-radius: 6px;
-}
-
-.well-small {
-  padding: 9px;
-  -webkit-border-radius: 3px;
-     -moz-border-radius: 3px;
-          border-radius: 3px;
-}
-
-.fade {
-  opacity: 0;
-  -webkit-transition: opacity 0.15s linear;
-     -moz-transition: opacity 0.15s linear;
-       -o-transition: opacity 0.15s linear;
-          transition: opacity 0.15s linear;
-}
-
-.fade.in {
-  opacity: 1;
-}
-
-.collapse {
-  position: relative;
-  height: 0;
-  overflow: hidden;
-  overflow: visible \9;
-  -webkit-transition: height 0.35s ease;
-     -moz-transition: height 0.35s ease;
-       -o-transition: height 0.35s ease;
-          transition: height 0.35s ease;
-}
-
-.collapse.in {
-  height: auto;
-}
-
-.close {
-  float: right;
-  font-size: 20px;
-  font-weight: bold;
-  line-height: 20px;
-  color: #000000;
-  text-shadow: 0 1px 0 #ffffff;
-  opacity: 0.2;
-  filter: alpha(opacity=20);
-}
-
-.close:hover {
-  color: #000000;
-  text-decoration: none;
-  cursor: pointer;
-  opacity: 0.4;
-  filter: alpha(opacity=40);
-}
-
-button.close {
-  padding: 0;
-  cursor: pointer;
-  background: transparent;
-  border: 0;
-  -webkit-appearance: none;
-}
-
-.btn {
-  display: inline-block;
-  *display: inline;
-  padding: 4px 14px;
-  margin-bottom: 0;
-  *margin-left: .3em;
-  font-size: 14px;
-  line-height: 20px;
-  *line-height: 20px;
-  color: #333333;
-  text-align: center;
-  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
-  vertical-align: middle;
-  cursor: pointer;
-  background-color: #f5f5f5;
-  *background-color: #e6e6e6;
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
-  background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
-  background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
-  background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
-  background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
-  background-repeat: repeat-x;
-  border: 1px solid #bbbbbb;
-  *border: 0;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  border-color: #e6e6e6 #e6e6e6 #bfbfbf;
-  border-bottom-color: #a2a2a2;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);
-  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
-  *zoom: 1;
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-     -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-}
-
-.btn:hover,
-.btn:active,
-.btn.active,
-.btn.disabled,
-.btn[disabled] {
-  color: #333333;
-  background-color: #e6e6e6;
-  *background-color: #d9d9d9;
-}
-
-.btn:active,
-.btn.active {
-  background-color: #cccccc \9;
-}
-
-.btn:first-child {
-  *margin-left: 0;
-}
-
-.btn:hover {
-  color: #333333;
-  text-decoration: none;
-  background-color: #e6e6e6;
-  *background-color: #d9d9d9;
-  /* Buttons in IE7 don't get borders, so darken on hover */
-
-  background-position: 0 -15px;
-  -webkit-transition: background-position 0.1s linear;
-     -moz-transition: background-position 0.1s linear;
-       -o-transition: background-position 0.1s linear;
-          transition: background-position 0.1s linear;
-}
-
-.btn:focus {
-  outline: thin dotted #333;
-  outline: 5px auto -webkit-focus-ring-color;
-  outline-offset: -2px;
-}
-
-.btn.active,
-.btn:active {
-  background-color: #e6e6e6;
-  background-color: #d9d9d9 \9;
-  background-image: none;
-  outline: 0;
-  -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-     -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-          box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-}
-
-.btn.disabled,
-.btn[disabled] {
-  cursor: default;
-  background-color: #e6e6e6;
-  background-image: none;
-  opacity: 0.65;
-  filter: alpha(opacity=65);
-  -webkit-box-shadow: none;
-     -moz-box-shadow: none;
-          box-shadow: none;
-}
-
-.btn-large {
-  padding: 9px 14px;
-  font-size: 16px;
-  line-height: normal;
-  -webkit-border-radius: 5px;
-     -moz-border-radius: 5px;
-          border-radius: 5px;
-}
-
-.btn-large [class^="icon-"] {
-  margin-top: 2px;
-}
-
-.btn-small {
-  padding: 3px 9px;
-  font-size: 12px;
-  line-height: 18px;
-}
-
-.btn-small [class^="icon-"] {
-  margin-top: 0;
-}
-
-.btn-mini {
-  padding: 2px 6px;
-  font-size: 11px;
-  line-height: 16px;
-}
-
-.btn-block {
-  display: block;
-  width: 100%;
-  padding-right: 0;
-  padding-left: 0;
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
-}
-
-.btn-block + .btn-block {
-  margin-top: 5px;
-}
-
-.btn-primary.active,
-.btn-warning.active,
-.btn-danger.active,
-.btn-success.active,
-.btn-info.active,
-.btn-inverse.active {
-  color: rgba(255, 255, 255, 0.75);
-}
-
-.btn {
-  border-color: #c5c5c5;
-  border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);
-}
-
-.btn-primary {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #006dcc;
-  *background-color: #0044cc;
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
-  background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
-  background-image: -o-linear-gradient(top, #0088cc, #0044cc);
-  background-image: linear-gradient(to bottom, #0088cc, #0044cc);
-  background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
-  background-repeat: repeat-x;
-  border-color: #0044cc #0044cc #002a80;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0);
-  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
-}
-
-.btn-primary:hover,
-.btn-primary:active,
-.btn-primary.active,
-.btn-primary.disabled,
-.btn-primary[disabled] {
-  color: #ffffff;
-  background-color: #0044cc;
-  *background-color: #003bb3;
-}
-
-.btn-primary:active,
-.btn-primary.active {
-  background-color: #003399 \9;
-}
-
-.btn-warning {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #faa732;
-  *background-color: #f89406;
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));
-  background-image: -webkit-linear-gradient(top, #fbb450, #f89406);
-  background-image: -o-linear-gradient(top, #fbb450, #f89406);
-  background-image: linear-gradient(to bottom, #fbb450, #f89406);
-  background-image: -moz-linear-gradient(top, #fbb450, #f89406);
-  background-repeat: repeat-x;
-  border-color: #f89406 #f89406 #ad6704;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);
-  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
-}
-
-.btn-warning:hover,
-.btn-warning:active,
-.btn-warning.active,
-.btn-warning.disabled,
-.btn-warning[disabled] {
-  color: #ffffff;
-  background-color: #f89406;
-  *background-color: #df8505;
-}
-
-.btn-warning:active,
-.btn-warning.active {
-  background-color: #c67605 \9;
-}
-
-.btn-danger {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #da4f49;
-  *background-color: #bd362f;
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));
-  background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f);
-  background-image: -o-linear-gradient(top, #ee5f5b, #bd362f);
-  background-image: linear-gradient(to bottom, #ee5f5b, #bd362f);
-  background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f);
-  background-repeat: repeat-x;
-  border-color: #bd362f #bd362f #802420;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0);
-  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
-}
-
-.btn-danger:hover,
-.btn-danger:active,
-.btn-danger.active,
-.btn-danger.disabled,
-.btn-danger[disabled] {
-  color: #ffffff;
-  background-color: #bd362f;
-  *background-color: #a9302a;
-}
-
-.btn-danger:active,
-.btn-danger.active {
-  background-color: #942a25 \9;
-}
-
-.btn-success {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #5bb75b;
-  *background-color: #51a351;
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));
-  background-image: -webkit-linear-gradient(top, #62c462, #51a351);
-  background-image: -o-linear-gradient(top, #62c462, #51a351);
-  background-image: linear-gradient(to bottom, #62c462, #51a351);
-  background-image: -moz-linear-gradient(top, #62c462, #51a351);
-  background-repeat: repeat-x;
-  border-color: #51a351 #51a351 #387038;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0);
-  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
-}
-
-.btn-success:hover,
-.btn-success:active,
-.btn-success.active,
-.btn-success.disabled,
-.btn-success[disabled] {
-  color: #ffffff;
-  background-color: #51a351;
-  *background-color: #499249;
-}
-
-.btn-success:active,
-.btn-success.active {
-  background-color: #408140 \9;
-}
-
-.btn-info {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #49afcd;
-  *background-color: #2f96b4;
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));
-  background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4);
-  background-image: -o-linear-gradient(top, #5bc0de, #2f96b4);
-  background-image: linear-gradient(to bottom, #5bc0de, #2f96b4);
-  background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4);
-  background-repeat: repeat-x;
-  border-color: #2f96b4 #2f96b4 #1f6377;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0);
-  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
-}
-
-.btn-info:hover,
-.btn-info:active,
-.btn-info.active,
-.btn-info.disabled,
-.btn-info[disabled] {
-  color: #ffffff;
-  background-color: #2f96b4;
-  *background-color: #2a85a0;
-}
-
-.btn-info:active,
-.btn-info.active {
-  background-color: #24748c \9;
-}
-
-.btn-inverse {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #363636;
-  *background-color: #222222;
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222));
-  background-image: -webkit-linear-gradient(top, #444444, #222222);
-  background-image: -o-linear-gradient(top, #444444, #222222);
-  background-image: linear-gradient(to bottom, #444444, #222222);
-  background-image: -moz-linear-gradient(top, #444444, #222222);
-  background-repeat: repeat-x;
-  border-color: #222222 #222222 #000000;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0);
-  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
-}
-
-.btn-inverse:hover,
-.btn-inverse:active,
-.btn-inverse.active,
-.btn-inverse.disabled,
-.btn-inverse[disabled] {
-  color: #ffffff;
-  background-color: #222222;
-  *background-color: #151515;
-}
-
-.btn-inverse:active,
-.btn-inverse.active {
-  background-color: #080808 \9;
-}
-
-button.btn,
-input[type="submit"].btn {
-  *padding-top: 3px;
-  *padding-bottom: 3px;
-}
-
-button.btn::-moz-focus-inner,
-input[type="submit"].btn::-moz-focus-inner {
-  padding: 0;
-  border: 0;
-}
-
-button.btn.btn-large,
-input[type="submit"].btn.btn-large {
-  *padding-top: 7px;
-  *padding-bottom: 7px;
-}
-
-button.btn.btn-small,
-input[type="submit"].btn.btn-small {
-  *padding-top: 3px;
-  *padding-bottom: 3px;
-}
-
-button.btn.btn-mini,
-input[type="submit"].btn.btn-mini {
-  *padding-top: 1px;
-  *padding-bottom: 1px;
-}
-
-.btn-link,
-.btn-link:active {
-  background-color: transparent;
-  background-image: none;
-  -webkit-box-shadow: none;
-     -moz-box-shadow: none;
-          box-shadow: none;
-}
-
-.btn-link {
-  color: #0088cc;
-  cursor: pointer;
-  border-color: transparent;
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
-}
-
-.btn-link:hover {
-  color: #005580;
-  text-decoration: underline;
-  background-color: transparent;
-}
-
-.btn-group {
-  position: relative;
-  *margin-left: .3em;
-  font-size: 0;
-  white-space: nowrap;
-}
-
-.btn-group:first-child {
-  *margin-left: 0;
-}
-
-.btn-group + .btn-group {
-  margin-left: 5px;
-}
-
-.btn-toolbar {
-  margin-top: 10px;
-  margin-bottom: 10px;
-  font-size: 0;
-}
-
-.btn-toolbar .btn-group {
-  display: inline-block;
-  *display: inline;
-  /* IE7 inline-block hack */
-
-  *zoom: 1;
-}
-
-.btn-toolbar .btn + .btn,
-.btn-toolbar .btn-group + .btn,
-.btn-toolbar .btn + .btn-group {
-  margin-left: 5px;
-}
-
-.btn-group > .btn {
-  position: relative;
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
-}
-
-.btn-group > .btn + .btn {
-  margin-left: -1px;
-}
-
-.btn-group > .btn,
-.btn-group > .dropdown-menu {
-  font-size: 14px;
-}
-
-.btn-group > .btn-mini {
-  font-size: 11px;
-}
-
-.btn-group > .btn-small {
-  font-size: 12px;
-}
-
-.btn-group > .btn-large {
-  font-size: 16px;
-}
-
-.btn-group > .btn:first-child {
-  margin-left: 0;
-  -webkit-border-bottom-left-radius: 4px;
-          border-bottom-left-radius: 4px;
-  -webkit-border-top-left-radius: 4px;
-          border-top-left-radius: 4px;
-  -moz-border-radius-bottomleft: 4px;
-  -moz-border-radius-topleft: 4px;
-}
-
-.btn-group > .btn:last-child,
-.btn-group > .dropdown-toggle {
-  -webkit-border-top-right-radius: 4px;
-          border-top-right-radius: 4px;
-  -webkit-border-bottom-right-radius: 4px;
-          border-bottom-right-radius: 4px;
-  -moz-border-radius-topright: 4px;
-  -moz-border-radius-bottomright: 4px;
-}
-
-.btn-group > .btn.large:first-child {
-  margin-left: 0;
-  -webkit-border-bottom-left-radius: 6px;
-          border-bottom-left-radius: 6px;
-  -webkit-border-top-left-radius: 6px;
-          border-top-left-radius: 6px;
-  -moz-border-radius-bottomleft: 6px;
-  -moz-border-radius-topleft: 6px;
-}
-
-.btn-group > .btn.large:last-child,
-.btn-group > .large.dropdown-toggle {
-  -webkit-border-top-right-radius: 6px;
-          border-top-right-radius: 6px;
-  -webkit-border-bottom-right-radius: 6px;
-          border-bottom-right-radius: 6px;
-  -moz-border-radius-topright: 6px;
-  -moz-border-radius-bottomright: 6px;
-}
-
-.btn-group > .btn:hover,
-.btn-group > .btn:focus,
-.btn-group > .btn:active,
-.btn-group > .btn.active {
-  z-index: 2;
-}
-
-.btn-group .dropdown-toggle:active,
-.btn-group.open .dropdown-toggle {
-  outline: 0;
-}
-
-.btn-group > .btn + .dropdown-toggle {
-  *padding-top: 5px;
-  padding-right: 8px;
-  *padding-bottom: 5px;
-  padding-left: 8px;
-  -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-     -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-          box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-}
-
-.btn-group > .btn-mini + .dropdown-toggle {
-  *padding-top: 2px;
-  padding-right: 5px;
-  *padding-bottom: 2px;
-  padding-left: 5px;
-}
-
-.btn-group > .btn-small + .dropdown-toggle {
-  *padding-top: 5px;
-  *padding-bottom: 4px;
-}
-
-.btn-group > .btn-large + .dropdown-toggle {
-  *padding-top: 7px;
-  padding-right: 12px;
-  *padding-bottom: 7px;
-  padding-left: 12px;
-}
-
-.btn-group.open .dropdown-toggle {
-  background-image: none;
-  -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-     -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-          box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-}
-
-.btn-group.open .btn.dropdown-toggle {
-  background-color: #e6e6e6;
-}
-
-.btn-group.open .btn-primary.dropdown-toggle {
-  background-color: #0044cc;
-}
-
-.btn-group.open .btn-warning.dropdown-toggle {
-  background-color: #f89406;
-}
-
-.btn-group.open .btn-danger.dropdown-toggle {
-  background-color: #bd362f;
-}
-
-.btn-group.open .btn-success.dropdown-toggle {
-  background-color: #51a351;
-}
-
-.btn-group.open .btn-info.dropdown-toggle {
-  background-color: #2f96b4;
-}
-
-.btn-group.open .btn-inverse.dropdown-toggle {
-  background-color: #222222;
-}
-
-.btn .caret {
-  margin-top: 8px;
-  margin-left: 0;
-}
-
-.btn-mini .caret,
-.btn-small .caret,
-.btn-large .caret {
-  margin-top: 6px;
-}
-
-.btn-large .caret {
-  border-top-width: 5px;
-  border-right-width: 5px;
-  border-left-width: 5px;
-}
-
-.dropup .btn-large .caret {
-  border-top: 0;
-  border-bottom: 5px solid #000000;
-}
-
-.btn-primary .caret,
-.btn-warning .caret,
-.btn-danger .caret,
-.btn-info .caret,
-.btn-success .caret,
-.btn-inverse .caret {
-  border-top-color: #ffffff;
-  border-bottom-color: #ffffff;
-}
-
-.btn-group-vertical {
-  display: inline-block;
-  *display: inline;
-  /* IE7 inline-block hack */
-
-  *zoom: 1;
-}
-
-.btn-group-vertical .btn {
-  display: block;
-  float: none;
-  width: 100%;
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
-}
-
-.btn-group-vertical .btn + .btn {
-  margin-top: -1px;
-  margin-left: 0;
-}
-
-.btn-group-vertical .btn:first-child {
-  -webkit-border-radius: 4px 4px 0 0;
-     -moz-border-radius: 4px 4px 0 0;
-          border-radius: 4px 4px 0 0;
-}
-
-.btn-group-vertical .btn:last-child {
-  -webkit-border-radius: 0 0 4px 4px;
-     -moz-border-radius: 0 0 4px 4px;
-          border-radius: 0 0 4px 4px;
-}
-
-.btn-group-vertical .btn-large:first-child {
-  -webkit-border-radius: 6px 6px 0 0;
-     -moz-border-radius: 6px 6px 0 0;
-          border-radius: 6px 6px 0 0;
-}
-
-.btn-group-vertical .btn-large:last-child {
-  -webkit-border-radius: 0 0 6px 6px;
-     -moz-border-radius: 0 0 6px 6px;
-          border-radius: 0 0 6px 6px;
-}
-
-.alert {
-  padding: 8px 35px 8px 14px;
-  margin-bottom: 20px;
-  color: #c09853;
-  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
-  background-color: #fcf8e3;
-  border: 1px solid #fbeed5;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-}
-
-.alert h4 {
-  margin: 0;
-}
-
-.alert .close {
-  position: relative;
-  top: -2px;
-  right: -21px;
-  line-height: 20px;
-}
-
-.alert-success {
-  color: #468847;
-  background-color: #dff0d8;
-  border-color: #d6e9c6;
-}
-
-.alert-danger,
-.alert-error {
-  color: #b94a48;
-  background-color: #f2dede;
-  border-color: #eed3d7;
-}
-
-.alert-info {
-  color: #3a87ad;
-  background-color: #d9edf7;
-  border-color: #bce8f1;
-}
-
-.alert-block {
-  padding-top: 14px;
-  padding-bottom: 14px;
-}
-
-.alert-block > p,
-.alert-block > ul {
-  margin-bottom: 0;
-}
-
-.alert-block p + p {
-  margin-top: 5px;
-}
-
-.nav {
-  margin-bottom: 20px;
-  margin-left: 0;
-  list-style: none;
-}
-
-.nav > li > a {
-  display: block;
-}
-
-.nav > li > a:hover {
-  text-decoration: none;
-  background-color: #eeeeee;
-}
-
-.nav > .pull-right {
-  float: right;
-}
-
-.nav-header {
-  display: block;
-  padding: 3px 15px;
-  font-size: 11px;
-  font-weight: bold;
-  line-height: 20px;
-  color: #999999;
-  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
-  text-transform: uppercase;
-}
-
-.nav li + .nav-header {
-  margin-top: 9px;
-}
-
-.nav-list {
-  padding-right: 15px;
-  padding-left: 15px;
-  margin-bottom: 0;
-}
-
-.nav-list > li > a,
-.nav-list .nav-header {
-  margin-right: -15px;
-  margin-left: -15px;
-  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
-}
-
-.nav-list > li > a {
-  padding: 3px 15px;
-}
-
-.nav-list > .active > a,
-.nav-list > .active > a:hover {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
-  background-color: #0088cc;
-}
-
-.nav-list [class^="icon-"] {
-  margin-right: 2px;
-}
-
-.nav-list .divider {
-  *width: 100%;
-  height: 1px;
-  margin: 9px 1px;
-  *margin: -5px 0 5px;
-  overflow: hidden;
-  background-color: #e5e5e5;
-  border-bottom: 1px solid #ffffff;
-}
-
-.nav-tabs,
-.nav-pills {
-  *zoom: 1;
-}
-
-.nav-tabs:before,
-.nav-pills:before,
-.nav-tabs:after,
-.nav-pills:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.nav-tabs:after,
-.nav-pills:after {
-  clear: both;
-}
-
-.nav-tabs > li,
-.nav-pills > li {
-  float: left;
-}
-
-.nav-tabs > li > a,
-.nav-pills > li > a {
-  padding-right: 12px;
-  padding-left: 12px;
-  margin-right: 2px;
-  line-height: 14px;
-}
-
-.nav-tabs {
-  border-bottom: 1px solid #ddd;
-}
-
-.nav-tabs > li {
-  margin-bottom: -1px;
-}
-
-.nav-tabs > li > a {
-  padding-top: 8px;
-  padding-bottom: 8px;
-  line-height: 20px;
-  border: 1px solid transparent;
-  -webkit-border-radius: 4px 4px 0 0;
-     -moz-border-radius: 4px 4px 0 0;
-          border-radius: 4px 4px 0 0;
-}
-
-.nav-tabs > li > a:hover {
-  border-color: #eeeeee #eeeeee #dddddd;
-}
-
-.nav-tabs > .active > a,
-.nav-tabs > .active > a:hover {
-  color: #555555;
-  cursor: default;
-  background-color: #ffffff;
-  border: 1px solid #ddd;
-  border-bottom-color: transparent;
-}
-
-.nav-pills > li > a {
-  padding-top: 8px;
-  padding-bottom: 8px;
-  margin-top: 2px;
-  margin-bottom: 2px;
-  -webkit-border-radius: 5px;
-     -moz-border-radius: 5px;
-          border-radius: 5px;
-}
-
-.nav-pills > .active > a,
-.nav-pills > .active > a:hover {
-  color: #ffffff;
-  background-color: #0088cc;
-}
-
-.nav-stacked > li {
-  float: none;
-}
-
-.nav-stacked > li > a {
-  margin-right: 0;
-}
-
-.nav-tabs.nav-stacked {
-  border-bottom: 0;
-}
-
-.nav-tabs.nav-stacked > li > a {
-  border: 1px solid #ddd;
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
-}
-
-.nav-tabs.nav-stacked > li:first-child > a {
-  -webkit-border-top-right-radius: 4px;
-          border-top-right-radius: 4px;
-  -webkit-border-top-left-radius: 4px;
-          border-top-left-radius: 4px;
-  -moz-border-radius-topright: 4px;
-  -moz-border-radius-topleft: 4px;
-}
-
-.nav-tabs.nav-stacked > li:last-child > a {
-  -webkit-border-bottom-right-radius: 4px;
-          border-bottom-right-radius: 4px;
-  -webkit-border-bottom-left-radius: 4px;
-          border-bottom-left-radius: 4px;
-  -moz-border-radius-bottomright: 4px;
-  -moz-border-radius-bottomleft: 4px;
-}
-
-.nav-tabs.nav-stacked > li > a:hover {
-  z-index: 2;
-  border-color: #ddd;
-}
-
-.nav-pills.nav-stacked > li > a {
-  margin-bottom: 3px;
-}
-
-.nav-pills.nav-stacked > li:last-child > a {
-  margin-bottom: 1px;
-}
-
-.nav-tabs .dropdown-menu {
-  -webkit-border-radius: 0 0 6px 6px;
-     -moz-border-radius: 0 0 6px 6px;
-          border-radius: 0 0 6px 6px;
-}
-
-.nav-pills .dropdown-menu {
-  -webkit-border-radius: 6px;
-     -moz-border-radius: 6px;
-          border-radius: 6px;
-}
-
-.nav .dropdown-toggle .caret {
-  margin-top: 6px;
-  border-top-color: #0088cc;
-  border-bottom-color: #0088cc;
-}
-
-.nav .dropdown-toggle:hover .caret {
-  border-top-color: #005580;
-  border-bottom-color: #005580;
-}
-
-/* move down carets for tabs */
-
-.nav-tabs .dropdown-toggle .caret {
-  margin-top: 8px;
-}
-
-.nav .active .dropdown-toggle .caret {
-  border-top-color: #fff;
-  border-bottom-color: #fff;
-}
-
-.nav-tabs .active .dropdown-toggle .caret {
-  border-top-color: #555555;
-  border-bottom-color: #555555;
-}
-
-.nav > .dropdown.active > a:hover {
-  cursor: pointer;
-}
-
-.nav-tabs .open .dropdown-toggle,
-.nav-pills .open .dropdown-toggle,
-.nav > li.dropdown.open.active > a:hover {
-  color: #ffffff;
-  background-color: #999999;
-  border-color: #999999;
-}
-
-.nav li.dropdown.open .caret,
-.nav li.dropdown.open.active .caret,
-.nav li.dropdown.open a:hover .caret {
-  border-top-color: #ffffff;
-  border-bottom-color: #ffffff;
-  opacity: 1;
-  filter: alpha(opacity=100);
-}
-
-.tabs-stacked .open > a:hover {
-  border-color: #999999;
-}
-
-.tabbable {
-  *zoom: 1;
-}
-
-.tabbable:before,
-.tabbable:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.tabbable:after {
-  clear: both;
-}
-
-.tab-content {
-  overflow: auto;
-}
-
-.tabs-below > .nav-tabs,
-.tabs-right > .nav-tabs,
-.tabs-left > .nav-tabs {
-  border-bottom: 0;
-}
-
-.tab-content > .tab-pane,
-.pill-content > .pill-pane {
-  display: none;
-}
-
-.tab-content > .active,
-.pill-content > .active {
-  display: block;
-}
-
-.tabs-below > .nav-tabs {
-  border-top: 1px solid #ddd;
-}
-
-.tabs-below > .nav-tabs > li {
-  margin-top: -1px;
-  margin-bottom: 0;
-}
-
-.tabs-below > .nav-tabs > li > a {
-  -webkit-border-radius: 0 0 4px 4px;
-     -moz-border-radius: 0 0 4px 4px;
-          border-radius: 0 0 4px 4px;
-}
-
-.tabs-below > .nav-tabs > li > a:hover {
-  border-top-color: #ddd;
-  border-bottom-color: transparent;
-}
-
-.tabs-below > .nav-tabs > .active > a,
-.tabs-below > .nav-tabs > .active > a:hover {
-  border-color: transparent #ddd #ddd #ddd;
-}
-
-.tabs-left > .nav-tabs > li,
-.tabs-right > .nav-tabs > li {
-  float: none;
-}
-
-.tabs-left > .nav-tabs > li > a,
-.tabs-right > .nav-tabs > li > a {
-  min-width: 74px;
-  margin-right: 0;
-  margin-bottom: 3px;
-}
-
-.tabs-left > .nav-tabs {
-  float: left;
-  margin-right: 19px;
-  border-right: 1px solid #ddd;
-}
-
-.tabs-left > .nav-tabs > li > a {
-  margin-right: -1px;
-  -webkit-border-radius: 4px 0 0 4px;
-     -moz-border-radius: 4px 0 0 4px;
-          border-radius: 4px 0 0 4px;
-}
-
-.tabs-left > .nav-tabs > li > a:hover {
-  border-color: #eeeeee #dddddd #eeeeee #eeeeee;
-}
-
-.tabs-left > .nav-tabs .active > a,
-.tabs-left > .nav-tabs .active > a:hover {
-  border-color: #ddd transparent #ddd #ddd;
-  *border-right-color: #ffffff;
-}
-
-.tabs-right > .nav-tabs {
-  float: right;
-  margin-left: 19px;
-  border-left: 1px solid #ddd;
-}
-
-.tabs-right > .nav-tabs > li > a {
-  margin-left: -1px;
-  -webkit-border-radius: 0 4px 4px 0;
-     -moz-border-radius: 0 4px 4px 0;
-          border-radius: 0 4px 4px 0;
-}
-
-.tabs-right > .nav-tabs > li > a:hover {
-  border-color: #eeeeee #eeeeee #eeeeee #dddddd;
-}
-
-.tabs-right > .nav-tabs .active > a,
-.tabs-right > .nav-tabs .active > a:hover {
-  border-color: #ddd #ddd #ddd transparent;
-  *border-left-color: #ffffff;
-}
-
-.nav > .disabled > a {
-  color: #999999;
-}
-
-.nav > .disabled > a:hover {
-  text-decoration: none;
-  cursor: default;
-  background-color: transparent;
-}
-
-.navbar {
-  *position: relative;
-  *z-index: 2;
-  margin-bottom: 20px;
-  overflow: visible;
-  color: #555555;
-}
-
-.navbar-inner {
-  min-height: 40px;
-  padding-right: 20px;
-  padding-left: 20px;
-  background-color: #fafafa;
-  background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2));
-  background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2);
-  background-image: -o-linear-gradient(top, #ffffff, #f2f2f2);
-  background-image: linear-gradient(to bottom, #ffffff, #f2f2f2);
-  background-repeat: repeat-x;
-  border: 1px solid #d4d4d4;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0);
-  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
-     -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
-          box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
-}
-
-.navbar .container {
-  width: auto;
-}
-
-.nav-collapse.collapse {
-  height: auto;
-}
-
-.navbar .brand {
-  display: block;
-  float: left;
-  padding: 10px 20px 10px;
-  margin-left: -20px;
-  font-size: 20px;
-  font-weight: 200;
-  color: #555555;
-  text-shadow: 0 1px 0 #ffffff;
-}
-
-.navbar .brand:hover {
-  text-decoration: none;
-}
-
-.navbar-text {
-  margin-bottom: 0;
-  line-height: 40px;
-}
-
-.navbar-link {
-  color: #555555;
-}
-
-.navbar-link:hover {
-  color: #333333;
-}
-
-.navbar .divider-vertical {
-  height: 40px;
-  margin: 0 9px;
-  border-right: 1px solid #ffffff;
-  border-left: 1px solid #f2f2f2;
-}
-
-.navbar .btn,
-.navbar .btn-group {
-  margin-top: 6px;
-}
-
-.navbar .btn-group .btn {
-  margin: 0;
-}
-
-.navbar-form {
-  margin-bottom: 0;
-  *zoom: 1;
-}
-
-.navbar-form:before,
-.navbar-form:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.navbar-form:after {
-  clear: both;
-}
-
-.navbar-form input,
-.navbar-form select,
-.navbar-form .radio,
-.navbar-form .checkbox {
-  margin-top: 5px;
-}
-
-.navbar-form input,
-.navbar-form select,
-.navbar-form .btn {
-  display: inline-block;
-  margin-bottom: 0;
-}
-
-.navbar-form input[type="image"],
-.navbar-form input[type="checkbox"],
-.navbar-form input[type="radio"] {
-  margin-top: 3px;
-}
-
-.navbar-form .input-append,
-.navbar-form .input-prepend {
-  margin-top: 6px;
-  white-space: nowrap;
-}
-
-.navbar-form .input-append input,
-.navbar-form .input-prepend input {
-  margin-top: 0;
-}
-
-.navbar-search {
-  position: relative;
-  float: left;
-  margin-top: 5px;
-  margin-bottom: 0;
-}
-
-.navbar-search .search-query {
-  padding: 4px 14px;
-  margin-bottom: 0;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 13px;
-  font-weight: normal;
-  line-height: 1;
-  -webkit-border-radius: 15px;
-     -moz-border-radius: 15px;
-          border-radius: 15px;
-}
-
-.navbar-static-top {
-  position: static;
-  width: 100%;
-  margin-bottom: 0;
-}
-
-.navbar-static-top .navbar-inner {
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
-}
-
-.navbar-fixed-top,
-.navbar-fixed-bottom {
-  position: fixed;
-  right: 0;
-  left: 0;
-  z-index: 1030;
-  margin-bottom: 0;
-}
-
-.navbar-fixed-top .navbar-inner,
-.navbar-fixed-bottom .navbar-inner,
-.navbar-static-top .navbar-inner {
-  border: 0;
-}
-
-.navbar-fixed-top .navbar-inner,
-.navbar-fixed-bottom .navbar-inner {
-  padding-right: 0;
-  padding-left: 0;
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
-}
-
-.navbar-static-top .container,
-.navbar-fixed-top .container,
-.navbar-fixed-bottom .container {
-  width: 940px;
-}
-
-.navbar-fixed-top {
-  top: 0;
-}
-
-.navbar-fixed-top .navbar-inner,
-.navbar-static-top .navbar-inner {
-  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1);
-     -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1);
-          box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1);
-}
-
-.navbar-fixed-bottom {
-  bottom: 0;
-}
-
-.navbar-fixed-bottom .navbar-inner {
-  -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 10px rgba(0, 0, 0, 0.1);
-     -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 10px rgba(0, 0, 0, 0.1);
-          box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 10px rgba(0, 0, 0, 0.1);
-}
-
-.navbar .nav {
-  position: relative;
-  left: 0;
-  display: block;
-  float: left;
-  margin: 0 10px 0 0;
-}
-
-.navbar .nav.pull-right {
-  float: right;
-}
-
-.navbar .nav > li {
-  float: left;
-}
-
-.navbar .nav > li > a {
-  float: none;
-  padding: 10px 15px 10px;
-  color: #555555;
-  text-decoration: none;
-  text-shadow: 0 1px 0 #ffffff;
-}
-
-.navbar .nav .dropdown-toggle .caret {
-  margin-top: 8px;
-}
-
-.navbar .nav > li > a:focus,
-.navbar .nav > li > a:hover {
-  color: #333333;
-  text-decoration: none;
-  background-color: transparent;
-}
-
-.navbar .nav > .active > a,
-.navbar .nav > .active > a:hover,
-.navbar .nav > .active > a:focus {
-  color: #555555;
-  text-decoration: none;
-  background-color: #e5e5e5;
-  -webkit-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
-     -moz-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
-          box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
-}
-
-.navbar .btn-navbar {
-  display: none;
-  float: right;
-  padding: 7px 10px;
-  margin-right: 5px;
-  margin-left: 5px;
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #ededed;
-  *background-color: #e5e5e5;
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#e5e5e5));
-  background-image: -webkit-linear-gradient(top, #f2f2f2, #e5e5e5);
-  background-image: -o-linear-gradient(top, #f2f2f2, #e5e5e5);
-  background-image: linear-gradient(to bottom, #f2f2f2, #e5e5e5);
-  background-image: -moz-linear-gradient(top, #f2f2f2, #e5e5e5);
-  background-repeat: repeat-x;
-  border-color: #e5e5e5 #e5e5e5 #bfbfbf;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0);
-  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
-     -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
-          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
-}
-
-.navbar .btn-navbar:hover,
-.navbar .btn-navbar:active,
-.navbar .btn-navbar.active,
-.navbar .btn-navbar.disabled,
-.navbar .btn-navbar[disabled] {
-  color: #ffffff;
-  background-color: #e5e5e5;
-  *background-color: #d9d9d9;
-}
-
-.navbar .btn-navbar:active,
-.navbar .btn-navbar.active {
-  background-color: #cccccc \9;
-}
-
-.navbar .btn-navbar .icon-bar {
-  display: block;
-  width: 18px;
-  height: 2px;
-  background-color: #f5f5f5;
-  -webkit-border-radius: 1px;
-     -moz-border-radius: 1px;
-          border-radius: 1px;
-  -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
-     -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
-          box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
-}
-
-.btn-navbar .icon-bar + .icon-bar {
-  margin-top: 3px;
-}
-
-.navbar .nav > li > .dropdown-menu:before {
-  position: absolute;
-  top: -7px;
-  left: 9px;
-  display: inline-block;
-  border-right: 7px solid transparent;
-  border-bottom: 7px solid #ccc;
-  border-left: 7px solid transparent;
-  border-bottom-color: rgba(0, 0, 0, 0.2);
-  content: '';
-}
-
-.navbar .nav > li > .dropdown-menu:after {
-  position: absolute;
-  top: -6px;
-  left: 10px;
-  display: inline-block;
-  border-right: 6px solid transparent;
-  border-bottom: 6px solid #ffffff;
-  border-left: 6px solid transparent;
-  content: '';
-}
-
-.navbar-fixed-bottom .nav > li > .dropdown-menu:before {
-  top: auto;
-  bottom: -7px;
-  border-top: 7px solid #ccc;
-  border-bottom: 0;
-  border-top-color: rgba(0, 0, 0, 0.2);
-}
-
-.navbar-fixed-bottom .nav > li > .dropdown-menu:after {
-  top: auto;
-  bottom: -6px;
-  border-top: 6px solid #ffffff;
-  border-bottom: 0;
-}
-
-.navbar .nav li.dropdown.open > .dropdown-toggle,
-.navbar .nav li.dropdown.active > .dropdown-toggle,
-.navbar .nav li.dropdown.open.active > .dropdown-toggle {
-  color: #555555;
-  background-color: #e5e5e5;
-}
-
-.navbar .nav li.dropdown > .dropdown-toggle .caret {
-  border-top-color: #555555;
-  border-bottom-color: #555555;
-}
-
-.navbar .nav li.dropdown.open > .dropdown-toggle .caret,
-.navbar .nav li.dropdown.active > .dropdown-toggle .caret,
-.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret {
-  border-top-color: #555555;
-  border-bottom-color: #555555;
-}
-
-.navbar .pull-right > li > .dropdown-menu,
-.navbar .nav > li > .dropdown-menu.pull-right {
-  right: 0;
-  left: auto;
-}
-
-.navbar .pull-right > li > .dropdown-menu:before,
-.navbar .nav > li > .dropdown-menu.pull-right:before {
-  right: 12px;
-  left: auto;
-}
-
-.navbar .pull-right > li > .dropdown-menu:after,
-.navbar .nav > li > .dropdown-menu.pull-right:after {
-  right: 13px;
-  left: auto;
-}
-
-.navbar .pull-right > li > .dropdown-menu .dropdown-menu,
-.navbar .nav > li > .dropdown-menu.pull-right .dropdown-menu {
-  right: 100%;
-  left: auto;
-  margin-right: -1px;
-  margin-left: 0;
-  -webkit-border-radius: 6px 0 6px 6px;
-     -moz-border-radius: 6px 0 6px 6px;
-          border-radius: 6px 0 6px 6px;
-}
-
-.navbar-inverse {
-  color: #999999;
-}
-
-.navbar-inverse .navbar-inner {
-  background-color: #1b1b1b;
-  background-image: -moz-linear-gradient(top, #222222, #111111);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111));
-  background-image: -webkit-linear-gradient(top, #222222, #111111);
-  background-image: -o-linear-gradient(top, #222222, #111111);
-  background-image: linear-gradient(to bottom, #222222, #111111);
-  background-repeat: repeat-x;
-  border-color: #252525;
-  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0);
-}
-
-.navbar-inverse .brand,
-.navbar-inverse .nav > li > a {
-  color: #999999;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-}
-
-.navbar-inverse .brand:hover,
-.navbar-inverse .nav > li > a:hover {
-  color: #ffffff;
-}
-
-.navbar-inverse .nav > li > a:focus,
-.navbar-inverse .nav > li > a:hover {
-  color: #ffffff;
-  background-color: transparent;
-}
-
-.navbar-inverse .nav .active > a,
-.navbar-inverse .nav .active > a:hover,
-.navbar-inverse .nav .active > a:focus {
-  color: #ffffff;
-  background-color: #111111;
-}
-
-.navbar-inverse .navbar-link {
-  color: #999999;
-}
-
-.navbar-inverse .navbar-link:hover {
-  color: #ffffff;
-}
-
-.navbar-inverse .divider-vertical {
-  border-right-color: #222222;
-  border-left-color: #111111;
-}
-
-.navbar-inverse .nav li.dropdown.open > .dropdown-toggle,
-.navbar-inverse .nav li.dropdown.active > .dropdown-toggle,
-.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle {
-  color: #ffffff;
-  background-color: #111111;
-}
-
-.navbar-inverse .nav li.dropdown > .dropdown-toggle .caret {
-  border-top-color: #999999;
-  border-bottom-color: #999999;
-}
-
-.navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret,
-.navbar-inverse .nav li.dropdown.active > .dropdown-toggle .caret,
-.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle .caret {
-  border-top-color: #ffffff;
-  border-bottom-color: #ffffff;
-}
-
-.navbar-inverse .navbar-search .search-query {
-  color: #ffffff;
-  background-color: #515151;
-  border-color: #111111;
-  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
-     -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
-          box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
-  -webkit-transition: none;
-     -moz-transition: none;
-       -o-transition: none;
-          transition: none;
-}
-
-.navbar-inverse .navbar-search .search-query:-moz-placeholder {
-  color: #cccccc;
-}
-
-.navbar-inverse .navbar-search .search-query:-ms-input-placeholder {
-  color: #cccccc;
-}
-
-.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder {
-  color: #cccccc;
-}
-
-.navbar-inverse .navbar-search .search-query:focus,
-.navbar-inverse .navbar-search .search-query.focused {
-  padding: 5px 15px;
-  color: #333333;
-  text-shadow: 0 1px 0 #ffffff;
-  background-color: #ffffff;
-  border: 0;
-  outline: 0;
-  -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
-     -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
-          box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
-}
-
-.navbar-inverse .btn-navbar {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #0e0e0e;
-  *background-color: #040404;
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404));
-  background-image: -webkit-linear-gradient(top, #151515, #040404);
-  background-image: -o-linear-gradient(top, #151515, #040404);
-  background-image: linear-gradient(to bottom, #151515, #040404);
-  background-image: -moz-linear-gradient(top, #151515, #040404);
-  background-repeat: repeat-x;
-  border-color: #040404 #040404 #000000;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0);
-  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
-}
-
-.navbar-inverse .btn-navbar:hover,
-.navbar-inverse .btn-navbar:active,
-.navbar-inverse .btn-navbar.active,
-.navbar-inverse .btn-navbar.disabled,
-.navbar-inverse .btn-navbar[disabled] {
-  color: #ffffff;
-  background-color: #040404;
-  *background-color: #000000;
-}
-
-.navbar-inverse .btn-navbar:active,
-.navbar-inverse .btn-navbar.active {
-  background-color: #000000 \9;
-}
-
-.breadcrumb {
-  padding: 8px 15px;
-  margin: 0 0 20px;
-  list-style: none;
-  background-color: #f5f5f5;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-}
-
-.breadcrumb li {
-  display: inline-block;
-  *display: inline;
-  text-shadow: 0 1px 0 #ffffff;
-  *zoom: 1;
-}
-
-.breadcrumb .divider {
-  padding: 0 5px;
-  color: #ccc;
-}
-
-.breadcrumb .active {
-  color: #999999;
-}
-
-.pagination {
-  height: 40px;
-  margin: 20px 0;
-}
-
-.pagination ul {
-  display: inline-block;
-  *display: inline;
-  margin-bottom: 0;
-  margin-left: 0;
-  -webkit-border-radius: 3px;
-     -moz-border-radius: 3px;
-          border-radius: 3px;
-  *zoom: 1;
-  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-     -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-          box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-}
-
-.pagination li {
-  display: inline;
-}
-
-.pagination a,
-.pagination span {
-  float: left;
-  padding: 0 14px;
-  line-height: 38px;
-  text-decoration: none;
-  background-color: #ffffff;
-  border: 1px solid #dddddd;
-  border-left-width: 0;
-}
-
-.pagination a:hover,
-.pagination .active a,
-.pagination .active span {
-  background-color: #f5f5f5;
-}
-
-.pagination .active a,
-.pagination .active span {
-  color: #999999;
-  cursor: default;
-}
-
-.pagination .disabled span,
-.pagination .disabled a,
-.pagination .disabled a:hover {
-  color: #999999;
-  cursor: default;
-  background-color: transparent;
-}
-
-.pagination li:first-child a,
-.pagination li:first-child span {
-  border-left-width: 1px;
-  -webkit-border-radius: 3px 0 0 3px;
-     -moz-border-radius: 3px 0 0 3px;
-          border-radius: 3px 0 0 3px;
-}
-
-.pagination li:last-child a,
-.pagination li:last-child span {
-  -webkit-border-radius: 0 3px 3px 0;
-     -moz-border-radius: 0 3px 3px 0;
-          border-radius: 0 3px 3px 0;
-}
-
-.pagination-centered {
-  text-align: center;
-}
-
-.pagination-right {
-  text-align: right;
-}
-
-.pager {
-  margin: 20px 0;
-  text-align: center;
-  list-style: none;
-  *zoom: 1;
-}
-
-.pager:before,
-.pager:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.pager:after {
-  clear: both;
-}
-
-.pager li {
-  display: inline;
-}
-
-.pager a {
-  display: inline-block;
-  padding: 5px 14px;
-  background-color: #fff;
-  border: 1px solid #ddd;
-  -webkit-border-radius: 15px;
-     -moz-border-radius: 15px;
-          border-radius: 15px;
-}
-
-.pager a:hover {
-  text-decoration: none;
-  background-color: #f5f5f5;
-}
-
-.pager .next a {
-  float: right;
-}
-
-.pager .previous a {
-  float: left;
-}
-
-.pager .disabled a,
-.pager .disabled a:hover {
-  color: #999999;
-  cursor: default;
-  background-color: #fff;
-}
-
-.modal-open .dropdown-menu {
-  z-index: 2050;
-}
-
-.modal-open .dropdown.open {
-  *z-index: 2050;
-}
-
-.modal-open .popover {
-  z-index: 2060;
-}
-
-.modal-open .tooltip {
-  z-index: 2080;
-}
-
-.modal-backdrop {
-  position: fixed;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 1040;
-  background-color: #000000;
-}
-
-.modal-backdrop.fade {
-  opacity: 0;
-}
-
-.modal-backdrop,
-.modal-backdrop.fade.in {
-  opacity: 0.8;
-  filter: alpha(opacity=80);
-}
-
-.modal {
-  position: fixed;
-  top: 50%;
-  left: 50%;
-  z-index: 1050;
-  width: 560px;
-  margin: -250px 0 0 -280px;
-  overflow: auto;
-  background-color: #ffffff;
-  border: 1px solid #999;
-  border: 1px solid rgba(0, 0, 0, 0.3);
-  *border: 1px solid #999;
-  -webkit-border-radius: 6px;
-     -moz-border-radius: 6px;
-          border-radius: 6px;
-  -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
-     -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
-          box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
-  -webkit-background-clip: padding-box;
-     -moz-background-clip: padding-box;
-          background-clip: padding-box;
-}
-
-.modal.fade {
-  top: -25%;
-  -webkit-transition: opacity 0.3s linear, top 0.3s ease-out;
-     -moz-transition: opacity 0.3s linear, top 0.3s ease-out;
-       -o-transition: opacity 0.3s linear, top 0.3s ease-out;
-          transition: opacity 0.3s linear, top 0.3s ease-out;
-}
-
-.modal.fade.in {
-  top: 50%;
-}
-
-.modal-header {
-  padding: 9px 15px;
-  border-bottom: 1px solid #eee;
-}
-
-.modal-header .close {
-  margin-top: 2px;
-}
-
-.modal-header h3 {
-  margin: 0;
-  line-height: 30px;
-}
-
-.modal-body {
-  max-height: 400px;
-  padding: 15px;
-  overflow-y: auto;
-}
-
-.modal-form {
-  margin-bottom: 0;
-}
-
-.modal-footer {
-  padding: 14px 15px 15px;
-  margin-bottom: 0;
-  text-align: right;
-  background-color: #f5f5f5;
-  border-top: 1px solid #ddd;
-  -webkit-border-radius: 0 0 6px 6px;
-     -moz-border-radius: 0 0 6px 6px;
-          border-radius: 0 0 6px 6px;
-  *zoom: 1;
-  -webkit-box-shadow: inset 0 1px 0 #ffffff;
-     -moz-box-shadow: inset 0 1px 0 #ffffff;
-          box-shadow: inset 0 1px 0 #ffffff;
-}
-
-.modal-footer:before,
-.modal-footer:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.modal-footer:after {
-  clear: both;
-}
-
-.modal-footer .btn + .btn {
-  margin-bottom: 0;
-  margin-left: 5px;
-}
-
-.modal-footer .btn-group .btn + .btn {
-  margin-left: -1px;
-}
-
-.tooltip {
-  position: absolute;
-  z-index: 1030;
-  display: block;
-  padding: 5px;
-  font-size: 11px;
-  opacity: 0;
-  filter: alpha(opacity=0);
-  visibility: visible;
-}
-
-.tooltip.in {
-  opacity: 0.8;
-  filter: alpha(opacity=80);
-}
-
-.tooltip.top {
-  margin-top: -3px;
-}
-
-.tooltip.right {
-  margin-left: 3px;
-}
-
-.tooltip.bottom {
-  margin-top: 3px;
-}
-
-.tooltip.left {
-  margin-left: -3px;
-}
-
-.tooltip-inner {
-  max-width: 200px;
-  padding: 3px 8px;
-  color: #ffffff;
-  text-align: center;
-  text-decoration: none;
-  background-color: #000000;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-}
-
-.tooltip-arrow {
-  position: absolute;
-  width: 0;
-  height: 0;
-  border-color: transparent;
-  border-style: solid;
-}
-
-.tooltip.top .tooltip-arrow {
-  bottom: 0;
-  left: 50%;
-  margin-left: -5px;
-  border-top-color: #000000;
-  border-width: 5px 5px 0;
-}
-
-.tooltip.right .tooltip-arrow {
-  top: 50%;
-  left: 0;
-  margin-top: -5px;
-  border-right-color: #000000;
-  border-width: 5px 5px 5px 0;
-}
-
-.tooltip.left .tooltip-arrow {
-  top: 50%;
-  right: 0;
-  margin-top: -5px;
-  border-left-color: #000000;
-  border-width: 5px 0 5px 5px;
-}
-
-.tooltip.bottom .tooltip-arrow {
-  top: 0;
-  left: 50%;
-  margin-left: -5px;
-  border-bottom-color: #000000;
-  border-width: 0 5px 5px;
-}
-
-.popover {
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: 1010;
-  display: none;
-  width: 236px;
-  padding: 1px;
-  background-color: #ffffff;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0, 0, 0, 0.2);
-  -webkit-border-radius: 6px;
-     -moz-border-radius: 6px;
-          border-radius: 6px;
-  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-     -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-          box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-  -webkit-background-clip: padding-box;
-     -moz-background-clip: padding;
-          background-clip: padding-box;
-}
-
-.popover.top {
-  margin-bottom: 10px;
-}
-
-.popover.right {
-  margin-left: 10px;
-}
-
-.popover.bottom {
-  margin-top: 10px;
-}
-
-.popover.left {
-  margin-right: 10px;
-}
-
-.popover-title {
-  padding: 8px 14px;
-  margin: 0;
-  font-size: 14px;
-  font-weight: normal;
-  line-height: 18px;
-  background-color: #f7f7f7;
-  border-bottom: 1px solid #ebebeb;
-  -webkit-border-radius: 5px 5px 0 0;
-     -moz-border-radius: 5px 5px 0 0;
-          border-radius: 5px 5px 0 0;
-}
-
-.popover-content {
-  padding: 9px 14px;
-}
-
-.popover-content p,
-.popover-content ul,
-.popover-content ol {
-  margin-bottom: 0;
-}
-
-.popover .arrow,
-.popover .arrow:after {
-  position: absolute;
-  display: inline-block;
-  width: 0;
-  height: 0;
-  border-color: transparent;
-  border-style: solid;
-}
-
-.popover .arrow:after {
-  z-index: -1;
-  content: "";
-}
-
-.popover.top .arrow {
-  bottom: -10px;
-  left: 50%;
-  margin-left: -10px;
-  border-top-color: #ffffff;
-  border-width: 10px 10px 0;
-}
-
-.popover.top .arrow:after {
-  bottom: -1px;
-  left: -11px;
-  border-top-color: rgba(0, 0, 0, 0.25);
-  border-width: 11px 11px 0;
-}
-
-.popover.right .arrow {
-  top: 50%;
-  left: -10px;
-  margin-top: -10px;
-  border-right-color: #ffffff;
-  border-width: 10px 10px 10px 0;
-}
-
-.popover.right .arrow:after {
-  bottom: -11px;
-  left: -1px;
-  border-right-color: rgba(0, 0, 0, 0.25);
-  border-width: 11px 11px 11px 0;
-}
-
-.popover.bottom .arrow {
-  top: -10px;
-  left: 50%;
-  margin-left: -10px;
-  border-bottom-color: #ffffff;
-  border-width: 0 10px 10px;
-}
-
-.popover.bottom .arrow:after {
-  top: -1px;
-  left: -11px;
-  border-bottom-color: rgba(0, 0, 0, 0.25);
-  border-width: 0 11px 11px;
-}
-
-.popover.left .arrow {
-  top: 50%;
-  right: -10px;
-  margin-top: -10px;
-  border-left-color: #ffffff;
-  border-width: 10px 0 10px 10px;
-}
-
-.popover.left .arrow:after {
-  right: -1px;
-  bottom: -11px;
-  border-left-color: rgba(0, 0, 0, 0.25);
-  border-width: 11px 0 11px 11px;
-}
-
-.thumbnails {
-  margin-left: -20px;
-  list-style: none;
-  *zoom: 1;
-}
-
-.thumbnails:before,
-.thumbnails:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.thumbnails:after {
-  clear: both;
-}
-
-.row-fluid .thumbnails {
-  margin-left: 0;
-}
-
-.thumbnails > li {
-  float: left;
-  margin-bottom: 20px;
-  margin-left: 20px;
-}
-
-.thumbnail {
-  display: block;
-  padding: 4px;
-  line-height: 20px;
-  border: 1px solid #ddd;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055);
-     -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055);
-          box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055);
-  -webkit-transition: all 0.2s ease-in-out;
-     -moz-transition: all 0.2s ease-in-out;
-       -o-transition: all 0.2s ease-in-out;
-          transition: all 0.2s ease-in-out;
-}
-
-a.thumbnail:hover {
-  border-color: #0088cc;
-  -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
-     -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
-          box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
-}
-
-.thumbnail > img {
-  display: block;
-  max-width: 100%;
-  margin-right: auto;
-  margin-left: auto;
-}
-
-.thumbnail .caption {
-  padding: 9px;
-  color: #555555;
-}
-
-.label,
-.badge {
-  font-size: 11.844px;
-  font-weight: bold;
-  line-height: 14px;
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  white-space: nowrap;
-  vertical-align: baseline;
-  background-color: #999999;
-}
-
-.label {
-  padding: 1px 4px 2px;
-  -webkit-border-radius: 3px;
-     -moz-border-radius: 3px;
-          border-radius: 3px;
-}
-
-.badge {
-  padding: 1px 9px 2px;
-  -webkit-border-radius: 9px;
-     -moz-border-radius: 9px;
-          border-radius: 9px;
-}
-
-a.label:hover,
-a.badge:hover {
-  color: #ffffff;
-  text-decoration: none;
-  cursor: pointer;
-}
-
-.label-important,
-.badge-important {
-  background-color: #b94a48;
-}
-
-.label-important[href],
-.badge-important[href] {
-  background-color: #953b39;
-}
-
-.label-warning,
-.badge-warning {
-  background-color: #f89406;
-}
-
-.label-warning[href],
-.badge-warning[href] {
-  background-color: #c67605;
-}
-
-.label-success,
-.badge-success {
-  background-color: #468847;
-}
-
-.label-success[href],
-.badge-success[href] {
-  background-color: #356635;
-}
-
-.label-info,
-.badge-info {
-  background-color: #3a87ad;
-}
-
-.label-info[href],
-.badge-info[href] {
-  background-color: #2d6987;
-}
-
-.label-inverse,
-.badge-inverse {
-  background-color: #333333;
-}
-
-.label-inverse[href],
-.badge-inverse[href] {
-  background-color: #1a1a1a;
-}
-
-.btn .label,
-.btn .badge {
-  position: relative;
-  top: -1px;
-}
-
-.btn-mini .label,
-.btn-mini .badge {
-  top: 0;
-}
-
-@-webkit-keyframes progress-bar-stripes {
-  from {
-    background-position: 40px 0;
-  }
-  to {
-    background-position: 0 0;
-  }
-}
-
-@-moz-keyframes progress-bar-stripes {
-  from {
-    background-position: 40px 0;
-  }
-  to {
-    background-position: 0 0;
-  }
-}
-
-@-ms-keyframes progress-bar-stripes {
-  from {
-    background-position: 40px 0;
-  }
-  to {
-    background-position: 0 0;
-  }
-}
-
-@-o-keyframes progress-bar-stripes {
-  from {
-    background-position: 0 0;
-  }
-  to {
-    background-position: 40px 0;
-  }
-}
-
-@keyframes progress-bar-stripes {
-  from {
-    background-position: 40px 0;
-  }
-  to {
-    background-position: 0 0;
-  }
-}
-
-.progress {
-  height: 20px;
-  margin-bottom: 20px;
-  overflow: hidden;
-  background-color: #f7f7f7;
-  background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));
-  background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9);
-  background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9);
-  background-image: linear-gradient(to bottom, #f5f5f5, #f9f9f9);
-  background-repeat: repeat-x;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0);
-  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-     -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-          box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-}
-
-.progress .bar {
-  float: left;
-  width: 0;
-  height: 100%;
-  font-size: 12px;
-  color: #ffffff;
-  text-align: center;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #0e90d2;
-  background-image: -moz-linear-gradient(top, #149bdf, #0480be);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));
-  background-image: -webkit-linear-gradient(top, #149bdf, #0480be);
-  background-image: -o-linear-gradient(top, #149bdf, #0480be);
-  background-image: linear-gradient(to bottom, #149bdf, #0480be);
-  background-repeat: repeat-x;
-  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0);
-  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-     -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-          box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
-  -webkit-transition: width 0.6s ease;
-     -moz-transition: width 0.6s ease;
-       -o-transition: width 0.6s ease;
-          transition: width 0.6s ease;
-}
-
-.progress .bar + .bar {
-  -webkit-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-     -moz-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-          box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-}
-
-.progress-striped .bar {
-  background-color: #149bdf;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  -webkit-background-size: 40px 40px;
-     -moz-background-size: 40px 40px;
-       -o-background-size: 40px 40px;
-          background-size: 40px 40px;
-}
-
-.progress.active .bar {
-  -webkit-animation: progress-bar-stripes 2s linear infinite;
-     -moz-animation: progress-bar-stripes 2s linear infinite;
-      -ms-animation: progress-bar-stripes 2s linear infinite;
-       -o-animation: progress-bar-stripes 2s linear infinite;
-          animation: progress-bar-stripes 2s linear infinite;
-}
-
-.progress-danger .bar,
-.progress .bar-danger {
-  background-color: #dd514c;
-  background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));
-  background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);
-  background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
-  background-image: linear-gradient(to bottom, #ee5f5b, #c43c35);
-  background-repeat: repeat-x;
-  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0);
-}
-
-.progress-danger.progress-striped .bar,
-.progress-striped .bar-danger {
-  background-color: #ee5f5b;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-}
-
-.progress-success .bar,
-.progress .bar-success {
-  background-color: #5eb95e;
-  background-image: -moz-linear-gradient(top, #62c462, #57a957);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));
-  background-image: -webkit-linear-gradient(top, #62c462, #57a957);
-  background-image: -o-linear-gradient(top, #62c462, #57a957);
-  background-image: linear-gradient(to bottom, #62c462, #57a957);
-  background-repeat: repeat-x;
-  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0);
-}
-
-.progress-success.progress-striped .bar,
-.progress-striped .bar-success {
-  background-color: #62c462;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-}
-
-.progress-info .bar,
-.progress .bar-info {
-  background-color: #4bb1cf;
-  background-image: -moz-linear-gradient(top, #5bc0de, #339bb9);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));
-  background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9);
-  background-image: -o-linear-gradient(top, #5bc0de, #339bb9);
-  background-image: linear-gradient(to bottom, #5bc0de, #339bb9);
-  background-repeat: repeat-x;
-  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0);
-}
-
-.progress-info.progress-striped .bar,
-.progress-striped .bar-info {
-  background-color: #5bc0de;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-}
-
-.progress-warning .bar,
-.progress .bar-warning {
-  background-color: #faa732;
-  background-image: -moz-linear-gradient(top, #fbb450, #f89406);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));
-  background-image: -webkit-linear-gradient(top, #fbb450, #f89406);
-  background-image: -o-linear-gradient(top, #fbb450, #f89406);
-  background-image: linear-gradient(to bottom, #fbb450, #f89406);
-  background-repeat: repeat-x;
-  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);
-}
-
-.progress-warning.progress-striped .bar,
-.progress-striped .bar-warning {
-  background-color: #fbb450;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-}
-
-.accordion {
-  margin-bottom: 20px;
-}
-
-.accordion-group {
-  margin-bottom: 2px;
-  border: 1px solid #e5e5e5;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-}
-
-.accordion-heading {
-  border-bottom: 0;
-}
-
-.accordion-heading .accordion-toggle {
-  display: block;
-  padding: 8px 15px;
-}
-
-.accordion-toggle {
-  cursor: pointer;
-}
-
-.accordion-inner {
-  padding: 9px 15px;
-  border-top: 1px solid #e5e5e5;
-}
-
-.carousel {
-  position: relative;
-  margin-bottom: 20px;
-  line-height: 1;
-}
-
-.carousel-inner {
-  position: relative;
-  width: 100%;
-  overflow: hidden;
-}
-
-.carousel .item {
-  position: relative;
-  display: none;
-  -webkit-transition: 0.6s ease-in-out left;
-     -moz-transition: 0.6s ease-in-out left;
-       -o-transition: 0.6s ease-in-out left;
-          transition: 0.6s ease-in-out left;
-}
-
-.carousel .item > img {
-  display: block;
-  line-height: 1;
-}
-
-.carousel .active,
-.carousel .next,
-.carousel .prev {
-  display: block;
-}
-
-.carousel .active {
-  left: 0;
-}
-
-.carousel .next,
-.carousel .prev {
-  position: absolute;
-  top: 0;
-  width: 100%;
-}
-
-.carousel .next {
-  left: 100%;
-}
-
-.carousel .prev {
-  left: -100%;
-}
-
-.carousel .next.left,
-.carousel .prev.right {
-  left: 0;
-}
-
-.carousel .active.left {
-  left: -100%;
-}
-
-.carousel .active.right {
-  left: 100%;
-}
-
-.carousel-control {
-  position: absolute;
-  top: 40%;
-  left: 15px;
-  width: 40px;
-  height: 40px;
-  margin-top: -20px;
-  font-size: 60px;
-  font-weight: 100;
-  line-height: 30px;
-  color: #ffffff;
-  text-align: center;
-  background: #222222;
-  border: 3px solid #ffffff;
-  -webkit-border-radius: 23px;
-     -moz-border-radius: 23px;
-          border-radius: 23px;
-  opacity: 0.5;
-  filter: alpha(opacity=50);
-}
-
-.carousel-control.right {
-  right: 15px;
-  left: auto;
-}
-
-.carousel-control:hover {
-  color: #ffffff;
-  text-decoration: none;
-  opacity: 0.9;
-  filter: alpha(opacity=90);
-}
-
-.carousel-caption {
-  position: absolute;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  padding: 15px;
-  background: #333333;
-  background: rgba(0, 0, 0, 0.75);
-}
-
-.carousel-caption h4,
-.carousel-caption p {
-  line-height: 20px;
-  color: #ffffff;
-}
-
-.carousel-caption h4 {
-  margin: 0 0 5px;
-}
-
-.carousel-caption p {
-  margin-bottom: 0;
-}
-
-.hero-unit {
-  padding: 60px;
-  margin-bottom: 30px;
-  background-color: #eeeeee;
-  -webkit-border-radius: 6px;
-     -moz-border-radius: 6px;
-          border-radius: 6px;
-}
-
-.hero-unit h1 {
-  margin-bottom: 0;
-  font-size: 60px;
-  line-height: 1;
-  letter-spacing: -1px;
-  color: inherit;
-}
-
-.hero-unit p {
-  font-size: 18px;
-  font-weight: 200;
-  line-height: 30px;
-  color: inherit;
-}
-
-.pull-right {
-  float: right;
-}
-
-.pull-left {
-  float: left;
-}
-
-.hide {
-  display: none;
-}
-
-.show {
-  display: block;
-}
-
-.invisible {
-  visibility: hidden;
-}
-
-.affix {
-  position: fixed;
-}
diff --git a/openslides/static/styles/bootstrap.min.css b/openslides/static/styles/bootstrap.min.css
new file mode 100644
index 000000000..140f731df
--- /dev/null
+++ b/openslides/static/styles/bootstrap.min.css
@@ -0,0 +1,9 @@
+/*!
+ * Bootstrap v2.2.2
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio,canvas,video{display:inline-block;*display:inline;*zoom:1}audio:not([controls]){display:none}html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}a:hover,a:active{outline:0}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{width:auto\9;height:auto;max-width:100%;vertical-align:middle;border:0;-ms-interpolation-mode:bicubic}#map_canvas img,.google-maps img{max-width:none}button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle}button,input{*overflow:visible;line-height:normal}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}button,html input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button}label,select,button,input[type="button"],input[type="reset"],input[type="submit"],input[type="radio"],input[type="checkbox"]{cursor:pointer}input[type="search"]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none}textarea{overflow:auto;vertical-align:top}@media print{*{color:#000!important;text-shadow:none!important;background:transparent!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}.ir a:after,a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100%!important}@page{margin:.5cm}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;line-height:0;content:""}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:20px;color:#333;background-color:#fff}a{color:#08c;text-decoration:none}a:hover{color:#005580;text-decoration:underline}.img-rounded{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.img-polaroid{padding:4px;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);-webkit-box-shadow:0 1px 3px rgba(0,0,0,0.1);-moz-box-shadow:0 1px 3px rgba(0,0,0,0.1);box-shadow:0 1px 3px rgba(0,0,0,0.1)}.img-circle{-webkit-border-radius:500px;-moz-border-radius:500px;border-radius:500px}.row{margin-left:-20px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:20px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px}.span12{width:940px}.span11{width:860px}.span10{width:780px}.span9{width:700px}.span8{width:620px}.span7{width:540px}.span6{width:460px}.span5{width:380px}.span4{width:300px}.span3{width:220px}.span2{width:140px}.span1{width:60px}.offset12{margin-left:980px}.offset11{margin-left:900px}.offset10{margin-left:820px}.offset9{margin-left:740px}.offset8{margin-left:660px}.offset7{margin-left:580px}.offset6{margin-left:500px}.offset5{margin-left:420px}.offset4{margin-left:340px}.offset3{margin-left:260px}.offset2{margin-left:180px}.offset1{margin-left:100px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.127659574468085%;*margin-left:2.074468085106383%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.127659574468085%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.48936170212765%;*width:91.43617021276594%}.row-fluid .span10{width:82.97872340425532%;*width:82.92553191489361%}.row-fluid .span9{width:74.46808510638297%;*width:74.41489361702126%}.row-fluid .span8{width:65.95744680851064%;*width:65.90425531914893%}.row-fluid .span7{width:57.44680851063829%;*width:57.39361702127659%}.row-fluid .span6{width:48.93617021276595%;*width:48.88297872340425%}.row-fluid .span5{width:40.42553191489362%;*width:40.37234042553192%}.row-fluid .span4{width:31.914893617021278%;*width:31.861702127659576%}.row-fluid .span3{width:23.404255319148934%;*width:23.351063829787233%}.row-fluid .span2{width:14.893617021276595%;*width:14.840425531914894%}.row-fluid .span1{width:6.382978723404255%;*width:6.329787234042553%}.row-fluid .offset12{margin-left:104.25531914893617%;*margin-left:104.14893617021275%}.row-fluid .offset12:first-child{margin-left:102.12765957446808%;*margin-left:102.02127659574467%}.row-fluid .offset11{margin-left:95.74468085106382%;*margin-left:95.6382978723404%}.row-fluid .offset11:first-child{margin-left:93.61702127659574%;*margin-left:93.51063829787232%}.row-fluid .offset10{margin-left:87.23404255319149%;*margin-left:87.12765957446807%}.row-fluid .offset10:first-child{margin-left:85.1063829787234%;*margin-left:84.99999999999999%}.row-fluid .offset9{margin-left:78.72340425531914%;*margin-left:78.61702127659572%}.row-fluid .offset9:first-child{margin-left:76.59574468085106%;*margin-left:76.48936170212764%}.row-fluid .offset8{margin-left:70.2127659574468%;*margin-left:70.10638297872339%}.row-fluid .offset8:first-child{margin-left:68.08510638297872%;*margin-left:67.9787234042553%}.row-fluid .offset7{margin-left:61.70212765957446%;*margin-left:61.59574468085106%}.row-fluid .offset7:first-child{margin-left:59.574468085106375%;*margin-left:59.46808510638297%}.row-fluid .offset6{margin-left:53.191489361702125%;*margin-left:53.085106382978715%}.row-fluid .offset6:first-child{margin-left:51.063829787234035%;*margin-left:50.95744680851063%}.row-fluid .offset5{margin-left:44.68085106382979%;*margin-left:44.57446808510638%}.row-fluid .offset5:first-child{margin-left:42.5531914893617%;*margin-left:42.4468085106383%}.row-fluid .offset4{margin-left:36.170212765957444%;*margin-left:36.06382978723405%}.row-fluid .offset4:first-child{margin-left:34.04255319148936%;*margin-left:33.93617021276596%}.row-fluid .offset3{margin-left:27.659574468085104%;*margin-left:27.5531914893617%}.row-fluid .offset3:first-child{margin-left:25.53191489361702%;*margin-left:25.425531914893618%}.row-fluid .offset2{margin-left:19.148936170212764%;*margin-left:19.04255319148936%}.row-fluid .offset2:first-child{margin-left:17.02127659574468%;*margin-left:16.914893617021278%}.row-fluid .offset1{margin-left:10.638297872340425%;*margin-left:10.53191489361702%}.row-fluid .offset1:first-child{margin-left:8.51063829787234%;*margin-left:8.404255319148938%}[class*="span"].hide,.row-fluid [class*="span"].hide{display:none}[class*="span"].pull-right,.row-fluid [class*="span"].pull-right{float:right}.container{margin-right:auto;margin-left:auto;*zoom:1}.container:before,.container:after{display:table;line-height:0;content:""}.container:after{clear:both}.container-fluid{padding-right:20px;padding-left:20px;*zoom:1}.container-fluid:before,.container-fluid:after{display:table;line-height:0;content:""}.container-fluid:after{clear:both}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:21px;font-weight:200;line-height:30px}small{font-size:85%}strong{font-weight:bold}em{font-style:italic}cite{font-style:normal}.muted{color:#999}a.muted:hover{color:#808080}.text-warning{color:#c09853}a.text-warning:hover{color:#a47e3c}.text-error{color:#b94a48}a.text-error:hover{color:#953b39}.text-info{color:#3a87ad}a.text-info:hover{color:#2d6987}.text-success{color:#468847}a.text-success:hover{color:#356635}h1,h2,h3,h4,h5,h6{margin:10px 0;font-family:inherit;font-weight:bold;line-height:20px;color:inherit;text-rendering:optimizelegibility}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;line-height:1;color:#999}h1,h2,h3{line-height:40px}h1{font-size:38.5px}h2{font-size:31.5px}h3{font-size:24.5px}h4{font-size:17.5px}h5{font-size:14px}h6{font-size:11.9px}h1 small{font-size:24.5px}h2 small{font-size:17.5px}h3 small{font-size:14px}h4 small{font-size:14px}.page-header{padding-bottom:9px;margin:20px 0 30px;border-bottom:1px solid #eee}ul,ol{padding:0;margin:0 0 10px 25px}ul ul,ul ol,ol ol,ol ul{margin-bottom:0}li{line-height:20px}ul.unstyled,ol.unstyled{margin-left:0;list-style:none}ul.inline,ol.inline{margin-left:0;list-style:none}ul.inline>li,ol.inline>li{display:inline-block;padding-right:5px;padding-left:5px}dl{margin-bottom:20px}dt,dd{line-height:20px}dt{font-weight:bold}dd{margin-left:10px}.dl-horizontal{*zoom:1}.dl-horizontal:before,.dl-horizontal:after{display:table;line-height:0;content:""}.dl-horizontal:after{clear:both}.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}hr{margin:20px 0;border:0;border-top:1px solid #eee;border-bottom:1px solid #fff}abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #999}abbr.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:0 0 0 15px;margin:0 0 20px;border-left:5px solid #eee}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:25px}blockquote small{display:block;line-height:20px;color:#999}blockquote small:before{content:'\2014 \00A0'}blockquote.pull-right{float:right;padding-right:15px;padding-left:0;border-right:5px solid #eee;border-left:0}blockquote.pull-right p,blockquote.pull-right small{text-align:right}blockquote.pull-right small:before{content:''}blockquote.pull-right small:after{content:'\00A0 \2014'}q:before,q:after,blockquote:before,blockquote:after{content:""}address{display:block;margin-bottom:20px;font-style:normal;line-height:20px}code,pre{padding:0 3px 2px;font-family:Monaco,Menlo,Consolas,"Courier New",monospace;font-size:12px;color:#333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}code{padding:2px 4px;color:#d14;white-space:nowrap;background-color:#f7f7f9;border:1px solid #e1e1e8}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:20px;word-break:break-all;word-wrap:break-word;white-space:pre;white-space:pre-wrap;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}pre.prettyprint{margin-bottom:20px}pre code{padding:0;color:inherit;white-space:pre;white-space:pre-wrap;background-color:transparent;border:0}.pre-scrollable{max-height:340px;overflow-y:scroll}form{margin:0 0 20px}fieldset{padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:40px;color:#333;border:0;border-bottom:1px solid #e5e5e5}legend small{font-size:15px;color:#999}label,input,button,select,textarea{font-size:14px;font-weight:normal;line-height:20px}input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif}label{display:block;margin-bottom:5px}select,textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{display:inline-block;height:20px;padding:4px 6px;margin-bottom:10px;font-size:14px;line-height:20px;color:#555;vertical-align:middle;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}input,textarea,.uneditable-input{width:206px}textarea{height:auto}textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{background-color:#fff;border:1px solid #ccc;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-webkit-transition:border linear .2s,box-shadow linear .2s;-moz-transition:border linear .2s,box-shadow linear .2s;-o-transition:border linear .2s,box-shadow linear .2s;transition:border linear .2s,box-shadow linear .2s}textarea:focus,input[type="text"]:focus,input[type="password"]:focus,input[type="datetime"]:focus,input[type="datetime-local"]:focus,input[type="date"]:focus,input[type="month"]:focus,input[type="time"]:focus,input[type="week"]:focus,input[type="number"]:focus,input[type="email"]:focus,input[type="url"]:focus,input[type="search"]:focus,input[type="tel"]:focus,input[type="color"]:focus,.uneditable-input:focus{border-color:rgba(82,168,236,0.8);outline:0;outline:thin dotted \9;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6)}input[type="radio"],input[type="checkbox"]{margin:4px 0 0;margin-top:1px \9;*margin-top:0;line-height:normal}input[type="file"],input[type="image"],input[type="submit"],input[type="reset"],input[type="button"],input[type="radio"],input[type="checkbox"]{width:auto}select,input[type="file"]{height:30px;*margin-top:4px;line-height:30px}select{width:220px;background-color:#fff;border:1px solid #ccc}select[multiple],select[size]{height:auto}select:focus,input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.uneditable-input,.uneditable-textarea{color:#999;cursor:not-allowed;background-color:#fcfcfc;border-color:#ccc;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.025);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.025);box-shadow:inset 0 1px 2px rgba(0,0,0,0.025)}.uneditable-input{overflow:hidden;white-space:nowrap}.uneditable-textarea{width:auto;height:auto}input:-moz-placeholder,textarea:-moz-placeholder{color:#999}input:-ms-input-placeholder,textarea:-ms-input-placeholder{color:#999}input::-webkit-input-placeholder,textarea::-webkit-input-placeholder{color:#999}.radio,.checkbox{min-height:20px;padding-left:20px}.radio input[type="radio"],.checkbox input[type="checkbox"]{float:left;margin-left:-20px}.controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:5px}.radio.inline,.checkbox.inline{display:inline-block;padding-top:5px;margin-bottom:0;vertical-align:middle}.radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px}.input-mini{width:60px}.input-small{width:90px}.input-medium{width:150px}.input-large{width:210px}.input-xlarge{width:270px}.input-xxlarge{width:530px}input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input[class*="span"],.row-fluid input[class*="span"],.row-fluid select[class*="span"],.row-fluid textarea[class*="span"],.row-fluid .uneditable-input[class*="span"]{float:none;margin-left:0}.input-append input[class*="span"],.input-append .uneditable-input[class*="span"],.input-prepend input[class*="span"],.input-prepend .uneditable-input[class*="span"],.row-fluid input[class*="span"],.row-fluid select[class*="span"],.row-fluid textarea[class*="span"],.row-fluid .uneditable-input[class*="span"],.row-fluid .input-prepend [class*="span"],.row-fluid .input-append [class*="span"]{display:inline-block}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:20px}input.span12,textarea.span12,.uneditable-input.span12{width:926px}input.span11,textarea.span11,.uneditable-input.span11{width:846px}input.span10,textarea.span10,.uneditable-input.span10{width:766px}input.span9,textarea.span9,.uneditable-input.span9{width:686px}input.span8,textarea.span8,.uneditable-input.span8{width:606px}input.span7,textarea.span7,.uneditable-input.span7{width:526px}input.span6,textarea.span6,.uneditable-input.span6{width:446px}input.span5,textarea.span5,.uneditable-input.span5{width:366px}input.span4,textarea.span4,.uneditable-input.span4{width:286px}input.span3,textarea.span3,.uneditable-input.span3{width:206px}input.span2,textarea.span2,.uneditable-input.span2{width:126px}input.span1,textarea.span1,.uneditable-input.span1{width:46px}.controls-row{*zoom:1}.controls-row:before,.controls-row:after{display:table;line-height:0;content:""}.controls-row:after{clear:both}.controls-row [class*="span"],.row-fluid .controls-row [class*="span"]{float:left}.controls-row .checkbox[class*="span"],.controls-row .radio[class*="span"]{padding-top:5px}input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{cursor:not-allowed;background-color:#eee}input[type="radio"][disabled],input[type="checkbox"][disabled],input[type="radio"][readonly],input[type="checkbox"][readonly]{background-color:transparent}.control-group.warning .control-label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#c09853}.control-group.warning .checkbox,.control-group.warning .radio,.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#c09853}.control-group.warning input,.control-group.warning select,.control-group.warning textarea{border-color:#c09853;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e}.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#c09853;background-color:#fcf8e3;border-color:#c09853}.control-group.error .control-label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48}.control-group.error .checkbox,.control-group.error .radio,.control-group.error input,.control-group.error select,.control-group.error textarea{color:#b94a48}.control-group.error input,.control-group.error select,.control-group.error textarea{border-color:#b94a48;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392}.control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#b94a48;background-color:#f2dede;border-color:#b94a48}.control-group.success .control-label,.control-group.success .help-block,.control-group.success .help-inline{color:#468847}.control-group.success .checkbox,.control-group.success .radio,.control-group.success input,.control-group.success select,.control-group.success textarea{color:#468847}.control-group.success input,.control-group.success select,.control-group.success textarea{border-color:#468847;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b}.control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#dff0d8;border-color:#468847}.control-group.info .control-label,.control-group.info .help-block,.control-group.info .help-inline{color:#3a87ad}.control-group.info .checkbox,.control-group.info .radio,.control-group.info input,.control-group.info select,.control-group.info textarea{color:#3a87ad}.control-group.info input,.control-group.info select,.control-group.info textarea{border-color:#3a87ad;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.info input:focus,.control-group.info select:focus,.control-group.info textarea:focus{border-color:#2d6987;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7ab5d3;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7ab5d3;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7ab5d3}.control-group.info .input-prepend .add-on,.control-group.info .input-append .add-on{color:#3a87ad;background-color:#d9edf7;border-color:#3a87ad}input:focus:invalid,textarea:focus:invalid,select:focus:invalid{color:#b94a48;border-color:#ee5f5b}input:focus:invalid:focus,textarea:focus:invalid:focus,select:focus:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7}.form-actions{padding:19px 20px 20px;margin-top:20px;margin-bottom:20px;background-color:#f5f5f5;border-top:1px solid #e5e5e5;*zoom:1}.form-actions:before,.form-actions:after{display:table;line-height:0;content:""}.form-actions:after{clear:both}.help-block,.help-inline{color:#595959}.help-block{display:block;margin-bottom:10px}.help-inline{display:inline-block;*display:inline;padding-left:5px;vertical-align:middle;*zoom:1}.input-append,.input-prepend{margin-bottom:5px;font-size:0;white-space:nowrap}.input-append input,.input-prepend input,.input-append select,.input-prepend select,.input-append .uneditable-input,.input-prepend .uneditable-input,.input-append .dropdown-menu,.input-prepend .dropdown-menu{font-size:14px}.input-append input,.input-prepend input,.input-append select,.input-prepend select,.input-append .uneditable-input,.input-prepend .uneditable-input{position:relative;margin-bottom:0;*margin-left:0;vertical-align:top;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-append input:focus,.input-prepend input:focus,.input-append select:focus,.input-prepend select:focus,.input-append .uneditable-input:focus,.input-prepend .uneditable-input:focus{z-index:2}.input-append .add-on,.input-prepend .add-on{display:inline-block;width:auto;height:20px;min-width:16px;padding:4px 5px;font-size:14px;font-weight:normal;line-height:20px;text-align:center;text-shadow:0 1px 0 #fff;background-color:#eee;border:1px solid #ccc}.input-append .add-on,.input-prepend .add-on,.input-append .btn,.input-prepend .btn,.input-append .btn-group>.dropdown-toggle,.input-prepend .btn-group>.dropdown-toggle{vertical-align:top;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.input-append .active,.input-prepend .active{background-color:#a9dba9;border-color:#46a546}.input-prepend .add-on,.input-prepend .btn{margin-right:-1px}.input-prepend .add-on:first-child,.input-prepend .btn:first-child{-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.input-append input,.input-append select,.input-append .uneditable-input{-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.input-append input+.btn-group .btn:last-child,.input-append select+.btn-group .btn:last-child,.input-append .uneditable-input+.btn-group .btn:last-child{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-append .add-on,.input-append .btn,.input-append .btn-group{margin-left:-1px}.input-append .add-on:last-child,.input-append .btn:last-child,.input-append .btn-group:last-child>.dropdown-toggle{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-prepend.input-append input,.input-prepend.input-append select,.input-prepend.input-append .uneditable-input{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.input-prepend.input-append input+.btn-group .btn,.input-prepend.input-append select+.btn-group .btn,.input-prepend.input-append .uneditable-input+.btn-group .btn{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-prepend.input-append .add-on:first-child,.input-prepend.input-append .btn:first-child{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.input-prepend.input-append .add-on:last-child,.input-prepend.input-append .btn:last-child{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-prepend.input-append .btn-group:first-child{margin-left:0}input.search-query{padding-right:14px;padding-right:4px \9;padding-left:14px;padding-left:4px \9;margin-bottom:0;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px}.form-search .input-append .search-query,.form-search .input-prepend .search-query{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.form-search .input-append .search-query{-webkit-border-radius:14px 0 0 14px;-moz-border-radius:14px 0 0 14px;border-radius:14px 0 0 14px}.form-search .input-append .btn{-webkit-border-radius:0 14px 14px 0;-moz-border-radius:0 14px 14px 0;border-radius:0 14px 14px 0}.form-search .input-prepend .search-query{-webkit-border-radius:0 14px 14px 0;-moz-border-radius:0 14px 14px 0;border-radius:0 14px 14px 0}.form-search .input-prepend .btn{-webkit-border-radius:14px 0 0 14px;-moz-border-radius:14px 0 0 14px;border-radius:14px 0 0 14px}.form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .help-inline,.form-inline .help-inline,.form-horizontal .help-inline,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input,.form-search .input-prepend,.form-inline .input-prepend,.form-horizontal .input-prepend,.form-search .input-append,.form-inline .input-append,.form-horizontal .input-append{display:inline-block;*display:inline;margin-bottom:0;vertical-align:middle;*zoom:1}.form-search .hide,.form-inline .hide,.form-horizontal .hide{display:none}.form-search label,.form-inline label,.form-search .btn-group,.form-inline .btn-group{display:inline-block}.form-search .input-append,.form-inline .input-append,.form-search .input-prepend,.form-inline .input-prepend{margin-bottom:0}.form-search .radio,.form-search .checkbox,.form-inline .radio,.form-inline .checkbox{padding-left:0;margin-bottom:0;vertical-align:middle}.form-search .radio input[type="radio"],.form-search .checkbox input[type="checkbox"],.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:left;margin-right:3px;margin-left:0}.control-group{margin-bottom:10px}legend+.control-group{margin-top:20px;-webkit-margin-top-collapse:separate}.form-horizontal .control-group{margin-bottom:20px;*zoom:1}.form-horizontal .control-group:before,.form-horizontal .control-group:after{display:table;line-height:0;content:""}.form-horizontal .control-group:after{clear:both}.form-horizontal .control-label{float:left;width:160px;padding-top:5px;text-align:right}.form-horizontal .controls{*display:inline-block;*padding-left:20px;margin-left:180px;*margin-left:0}.form-horizontal .controls:first-child{*padding-left:180px}.form-horizontal .help-block{margin-bottom:0}.form-horizontal input+.help-block,.form-horizontal select+.help-block,.form-horizontal textarea+.help-block,.form-horizontal .uneditable-input+.help-block,.form-horizontal .input-prepend+.help-block,.form-horizontal .input-append+.help-block{margin-top:10px}.form-horizontal .form-actions{padding-left:180px}table{max-width:100%;background-color:transparent;border-collapse:collapse;border-spacing:0}.table{width:100%;margin-bottom:20px}.table th,.table td{padding:8px;line-height:20px;text-align:left;vertical-align:top;border-top:1px solid #ddd}.table th{font-weight:bold}.table thead th{vertical-align:bottom}.table caption+thead tr:first-child th,.table caption+thead tr:first-child td,.table colgroup+thead tr:first-child th,.table colgroup+thead tr:first-child td,.table thead:first-child tr:first-child th,.table thead:first-child tr:first-child td{border-top:0}.table tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed th,.table-condensed td{padding:4px 5px}.table-bordered{border:1px solid #ddd;border-collapse:separate;*border-collapse:collapse;border-left:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.table-bordered th,.table-bordered td{border-left:1px solid #ddd}.table-bordered caption+thead tr:first-child th,.table-bordered caption+tbody tr:first-child th,.table-bordered caption+tbody tr:first-child td,.table-bordered colgroup+thead tr:first-child th,.table-bordered colgroup+tbody tr:first-child th,.table-bordered colgroup+tbody tr:first-child td,.table-bordered thead:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child td{border-top:0}.table-bordered thead:first-child tr:first-child>th:first-child,.table-bordered tbody:first-child tr:first-child>td:first-child{-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topleft:4px}.table-bordered thead:first-child tr:first-child>th:last-child,.table-bordered tbody:first-child tr:first-child>td:last-child{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-moz-border-radius-topright:4px}.table-bordered thead:last-child tr:last-child>th:first-child,.table-bordered tbody:last-child tr:last-child>td:first-child,.table-bordered tfoot:last-child tr:last-child>td:first-child{-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px}.table-bordered thead:last-child tr:last-child>th:last-child,.table-bordered tbody:last-child tr:last-child>td:last-child,.table-bordered tfoot:last-child tr:last-child>td:last-child{-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px}.table-bordered tfoot+tbody:last-child tr:last-child td:first-child{-webkit-border-bottom-left-radius:0;border-bottom-left-radius:0;-moz-border-radius-bottomleft:0}.table-bordered tfoot+tbody:last-child tr:last-child td:last-child{-webkit-border-bottom-right-radius:0;border-bottom-right-radius:0;-moz-border-radius-bottomright:0}.table-bordered caption+thead tr:first-child th:first-child,.table-bordered caption+tbody tr:first-child td:first-child,.table-bordered colgroup+thead tr:first-child th:first-child,.table-bordered colgroup+tbody tr:first-child td:first-child{-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topleft:4px}.table-bordered caption+thead tr:first-child th:last-child,.table-bordered caption+tbody tr:first-child td:last-child,.table-bordered colgroup+thead tr:first-child th:last-child,.table-bordered colgroup+tbody tr:first-child td:last-child{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-moz-border-radius-topright:4px}.table-striped tbody>tr:nth-child(odd)>td,.table-striped tbody>tr:nth-child(odd)>th{background-color:#f9f9f9}.table-hover tbody tr:hover td,.table-hover tbody tr:hover th{background-color:#f5f5f5}table td[class*="span"],table th[class*="span"],.row-fluid table td[class*="span"],.row-fluid table th[class*="span"]{display:table-cell;float:none;margin-left:0}.table td.span1,.table th.span1{float:none;width:44px;margin-left:0}.table td.span2,.table th.span2{float:none;width:124px;margin-left:0}.table td.span3,.table th.span3{float:none;width:204px;margin-left:0}.table td.span4,.table th.span4{float:none;width:284px;margin-left:0}.table td.span5,.table th.span5{float:none;width:364px;margin-left:0}.table td.span6,.table th.span6{float:none;width:444px;margin-left:0}.table td.span7,.table th.span7{float:none;width:524px;margin-left:0}.table td.span8,.table th.span8{float:none;width:604px;margin-left:0}.table td.span9,.table th.span9{float:none;width:684px;margin-left:0}.table td.span10,.table th.span10{float:none;width:764px;margin-left:0}.table td.span11,.table th.span11{float:none;width:844px;margin-left:0}.table td.span12,.table th.span12{float:none;width:924px;margin-left:0}.table tbody tr.success td{background-color:#dff0d8}.table tbody tr.error td{background-color:#f2dede}.table tbody tr.warning td{background-color:#fcf8e3}.table tbody tr.info td{background-color:#d9edf7}.table-hover tbody tr.success:hover td{background-color:#d0e9c6}.table-hover tbody tr.error:hover td{background-color:#ebcccc}.table-hover tbody tr.warning:hover td{background-color:#faf2cc}.table-hover tbody tr.info:hover td{background-color:#c4e3f3}[class^="icon-"],[class*=" icon-"]{display:inline-block;width:14px;height:14px;margin-top:1px;*margin-right:.3em;line-height:14px;vertical-align:text-top;background-image:url("../img/glyphicons-halflings.png");background-position:14px 14px;background-repeat:no-repeat}.icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"]{background-image:url("../img/glyphicons-halflings-white.png")}.icon-glass{background-position:0 0}.icon-music{background-position:-24px 0}.icon-search{background-position:-48px 0}.icon-envelope{background-position:-72px 0}.icon-heart{background-position:-96px 0}.icon-star{background-position:-120px 0}.icon-star-empty{background-position:-144px 0}.icon-user{background-position:-168px 0}.icon-film{background-position:-192px 0}.icon-th-large{background-position:-216px 0}.icon-th{background-position:-240px 0}.icon-th-list{background-position:-264px 0}.icon-ok{background-position:-288px 0}.icon-remove{background-position:-312px 0}.icon-zoom-in{background-position:-336px 0}.icon-zoom-out{background-position:-360px 0}.icon-off{background-position:-384px 0}.icon-signal{background-position:-408px 0}.icon-cog{background-position:-432px 0}.icon-trash{background-position:-456px 0}.icon-home{background-position:0 -24px}.icon-file{background-position:-24px -24px}.icon-time{background-position:-48px -24px}.icon-road{background-position:-72px -24px}.icon-download-alt{background-position:-96px -24px}.icon-download{background-position:-120px -24px}.icon-upload{background-position:-144px -24px}.icon-inbox{background-position:-168px -24px}.icon-play-circle{background-position:-192px -24px}.icon-repeat{background-position:-216px -24px}.icon-refresh{background-position:-240px -24px}.icon-list-alt{background-position:-264px -24px}.icon-lock{background-position:-287px -24px}.icon-flag{background-position:-312px -24px}.icon-headphones{background-position:-336px -24px}.icon-volume-off{background-position:-360px -24px}.icon-volume-down{background-position:-384px -24px}.icon-volume-up{background-position:-408px -24px}.icon-qrcode{background-position:-432px -24px}.icon-barcode{background-position:-456px -24px}.icon-tag{background-position:0 -48px}.icon-tags{background-position:-25px -48px}.icon-book{background-position:-48px -48px}.icon-bookmark{background-position:-72px -48px}.icon-print{background-position:-96px -48px}.icon-camera{background-position:-120px -48px}.icon-font{background-position:-144px -48px}.icon-bold{background-position:-167px -48px}.icon-italic{background-position:-192px -48px}.icon-text-height{background-position:-216px -48px}.icon-text-width{background-position:-240px -48px}.icon-align-left{background-position:-264px -48px}.icon-align-center{background-position:-288px -48px}.icon-align-right{background-position:-312px -48px}.icon-align-justify{background-position:-336px -48px}.icon-list{background-position:-360px -48px}.icon-indent-left{background-position:-384px -48px}.icon-indent-right{background-position:-408px -48px}.icon-facetime-video{background-position:-432px -48px}.icon-picture{background-position:-456px -48px}.icon-pencil{background-position:0 -72px}.icon-map-marker{background-position:-24px -72px}.icon-adjust{background-position:-48px -72px}.icon-tint{background-position:-72px -72px}.icon-edit{background-position:-96px -72px}.icon-share{background-position:-120px -72px}.icon-check{background-position:-144px -72px}.icon-move{background-position:-168px -72px}.icon-step-backward{background-position:-192px -72px}.icon-fast-backward{background-position:-216px -72px}.icon-backward{background-position:-240px -72px}.icon-play{background-position:-264px -72px}.icon-pause{background-position:-288px -72px}.icon-stop{background-position:-312px -72px}.icon-forward{background-position:-336px -72px}.icon-fast-forward{background-position:-360px -72px}.icon-step-forward{background-position:-384px -72px}.icon-eject{background-position:-408px -72px}.icon-chevron-left{background-position:-432px -72px}.icon-chevron-right{background-position:-456px -72px}.icon-plus-sign{background-position:0 -96px}.icon-minus-sign{background-position:-24px -96px}.icon-remove-sign{background-position:-48px -96px}.icon-ok-sign{background-position:-72px -96px}.icon-question-sign{background-position:-96px -96px}.icon-info-sign{background-position:-120px -96px}.icon-screenshot{background-position:-144px -96px}.icon-remove-circle{background-position:-168px -96px}.icon-ok-circle{background-position:-192px -96px}.icon-ban-circle{background-position:-216px -96px}.icon-arrow-left{background-position:-240px -96px}.icon-arrow-right{background-position:-264px -96px}.icon-arrow-up{background-position:-289px -96px}.icon-arrow-down{background-position:-312px -96px}.icon-share-alt{background-position:-336px -96px}.icon-resize-full{background-position:-360px -96px}.icon-resize-small{background-position:-384px -96px}.icon-plus{background-position:-408px -96px}.icon-minus{background-position:-433px -96px}.icon-asterisk{background-position:-456px -96px}.icon-exclamation-sign{background-position:0 -120px}.icon-gift{background-position:-24px -120px}.icon-leaf{background-position:-48px -120px}.icon-fire{background-position:-72px -120px}.icon-eye-open{background-position:-96px -120px}.icon-eye-close{background-position:-120px -120px}.icon-warning-sign{background-position:-144px -120px}.icon-plane{background-position:-168px -120px}.icon-calendar{background-position:-192px -120px}.icon-random{width:16px;background-position:-216px -120px}.icon-comment{background-position:-240px -120px}.icon-magnet{background-position:-264px -120px}.icon-chevron-up{background-position:-288px -120px}.icon-chevron-down{background-position:-313px -119px}.icon-retweet{background-position:-336px -120px}.icon-shopping-cart{background-position:-360px -120px}.icon-folder-close{background-position:-384px -120px}.icon-folder-open{width:16px;background-position:-408px -120px}.icon-resize-vertical{background-position:-432px -119px}.icon-resize-horizontal{background-position:-456px -118px}.icon-hdd{background-position:0 -144px}.icon-bullhorn{background-position:-24px -144px}.icon-bell{background-position:-48px -144px}.icon-certificate{background-position:-72px -144px}.icon-thumbs-up{background-position:-96px -144px}.icon-thumbs-down{background-position:-120px -144px}.icon-hand-right{background-position:-144px -144px}.icon-hand-left{background-position:-168px -144px}.icon-hand-up{background-position:-192px -144px}.icon-hand-down{background-position:-216px -144px}.icon-circle-arrow-right{background-position:-240px -144px}.icon-circle-arrow-left{background-position:-264px -144px}.icon-circle-arrow-up{background-position:-288px -144px}.icon-circle-arrow-down{background-position:-312px -144px}.icon-globe{background-position:-336px -144px}.icon-wrench{background-position:-360px -144px}.icon-tasks{background-position:-384px -144px}.icon-filter{background-position:-408px -144px}.icon-briefcase{background-position:-432px -144px}.icon-fullscreen{background-position:-456px -144px}.dropup,.dropdown{position:relative}.dropdown-toggle{*margin-bottom:-3px}.dropdown-toggle:active,.open .dropdown-toggle{outline:0}.caret{display:inline-block;width:0;height:0;vertical-align:top;border-top:4px solid #000;border-right:4px solid transparent;border-left:4px solid transparent;content:""}.dropdown .caret{margin-top:8px;margin-left:2px}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);*border-right-width:2px;*border-bottom-width:2px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{*width:100%;height:1px;margin:9px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #fff}.dropdown-menu li>a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:20px;color:#333;white-space:nowrap}.dropdown-menu li>a:hover,.dropdown-menu li>a:focus,.dropdown-submenu:hover>a{color:#fff;text-decoration:none;background-color:#0081c2;background-image:-moz-linear-gradient(top,#08c,#0077b3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0077b3));background-image:-webkit-linear-gradient(top,#08c,#0077b3);background-image:-o-linear-gradient(top,#08c,#0077b3);background-image:linear-gradient(to bottom,#08c,#0077b3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0077b3',GradientType=0)}.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#fff;text-decoration:none;background-color:#0081c2;background-image:-moz-linear-gradient(top,#08c,#0077b3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0077b3));background-image:-webkit-linear-gradient(top,#08c,#0077b3);background-image:-o-linear-gradient(top,#08c,#0077b3);background-image:linear-gradient(to bottom,#08c,#0077b3);background-repeat:repeat-x;outline:0;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0077b3',GradientType=0)}.dropdown-menu .disabled>a,.dropdown-menu .disabled>a:hover{color:#999}.dropdown-menu .disabled>a:hover{text-decoration:none;cursor:default;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open{*z-index:1000}.open>.dropdown-menu{display:block}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px solid #000;content:""}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px}.dropdown-submenu{position:relative}.dropdown-submenu>.dropdown-menu{top:0;left:100%;margin-top:-6px;margin-left:-1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px}.dropdown-submenu:hover>.dropdown-menu{display:block}.dropup .dropdown-submenu>.dropdown-menu{top:auto;bottom:0;margin-top:0;margin-bottom:-2px;-webkit-border-radius:5px 5px 5px 0;-moz-border-radius:5px 5px 5px 0;border-radius:5px 5px 5px 0}.dropdown-submenu>a:after{display:block;float:right;width:0;height:0;margin-top:5px;margin-right:-10px;border-color:transparent;border-left-color:#ccc;border-style:solid;border-width:5px 0 5px 5px;content:" "}.dropdown-submenu:hover>a:after{border-left-color:#fff}.dropdown-submenu.pull-left{float:none}.dropdown-submenu.pull-left>.dropdown-menu{left:-100%;margin-left:10px;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px}.dropdown .dropdown-menu .nav-header{padding-right:20px;padding-left:20px}.typeahead{z-index:1051;margin-top:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,0.15)}.well-large{padding:24px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.well-small{padding:9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.fade{opacity:0;-webkit-transition:opacity .15s linear;-moz-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{position:relative;height:0;overflow:hidden;-webkit-transition:height .35s ease;-moz-transition:height .35s ease;-o-transition:height .35s ease;transition:height .35s ease}.collapse.in{height:auto}.close{float:right;font-size:20px;font-weight:bold;line-height:20px;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.close:hover{color:#000;text-decoration:none;cursor:pointer;opacity:.4;filter:alpha(opacity=40)}button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none}.btn{display:inline-block;*display:inline;padding:4px 12px;margin-bottom:0;*margin-left:.3em;font-size:14px;line-height:20px;color:#333;text-align:center;text-shadow:0 1px 1px rgba(255,255,255,0.75);vertical-align:middle;cursor:pointer;background-color:#f5f5f5;*background-color:#e6e6e6;background-image:-moz-linear-gradient(top,#fff,#e6e6e6);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#e6e6e6));background-image:-webkit-linear-gradient(top,#fff,#e6e6e6);background-image:-o-linear-gradient(top,#fff,#e6e6e6);background-image:linear-gradient(to bottom,#fff,#e6e6e6);background-repeat:repeat-x;border:1px solid #bbb;*border:0;border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);border-bottom-color:#a2a2a2;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffe6e6e6',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);*zoom:1;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.btn:hover,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{color:#333;background-color:#e6e6e6;*background-color:#d9d9d9}.btn:active,.btn.active{background-color:#ccc \9}.btn:first-child{*margin-left:0}.btn:hover{color:#333;text-decoration:none;background-position:0 -15px;-webkit-transition:background-position .1s linear;-moz-transition:background-position .1s linear;-o-transition:background-position .1s linear;transition:background-position .1s linear}.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.btn.disabled,.btn[disabled]{cursor:default;background-image:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.btn-large{padding:11px 19px;font-size:17.5px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.btn-large [class^="icon-"],.btn-large [class*=" icon-"]{margin-top:4px}.btn-small{padding:2px 10px;font-size:11.9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.btn-small [class^="icon-"],.btn-small [class*=" icon-"]{margin-top:0}.btn-mini [class^="icon-"],.btn-mini [class*=" icon-"]{margin-top:-1px}.btn-mini{padding:0 6px;font-size:10.5px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.btn-block{display:block;width:100%;padding-right:0;padding-left:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.btn-block+.btn-block{margin-top:5px}input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%}.btn-primary.active,.btn-warning.active,.btn-danger.active,.btn-success.active,.btn-info.active,.btn-inverse.active{color:rgba(255,255,255,0.75)}.btn{border-color:#c5c5c5;border-color:rgba(0,0,0,0.15) rgba(0,0,0,0.15) rgba(0,0,0,0.25)}.btn-primary{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#006dcc;*background-color:#04c;background-image:-moz-linear-gradient(top,#08c,#04c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(to bottom,#08c,#04c);background-repeat:repeat-x;border-color:#04c #04c #002a80;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0044cc',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{color:#fff;background-color:#04c;*background-color:#003bb3}.btn-primary:active,.btn-primary.active{background-color:#039 \9}.btn-warning{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#faa732;*background-color:#f89406;background-image:-moz-linear-gradient(top,#fbb450,#f89406);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));background-image:-webkit-linear-gradient(top,#fbb450,#f89406);background-image:-o-linear-gradient(top,#fbb450,#f89406);background-image:linear-gradient(to bottom,#fbb450,#f89406);background-repeat:repeat-x;border-color:#f89406 #f89406 #ad6704;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450',endColorstr='#fff89406',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{color:#fff;background-color:#f89406;*background-color:#df8505}.btn-warning:active,.btn-warning.active{background-color:#c67605 \9}.btn-danger{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#da4f49;*background-color:#bd362f;background-image:-moz-linear-gradient(top,#ee5f5b,#bd362f);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#bd362f));background-image:-webkit-linear-gradient(top,#ee5f5b,#bd362f);background-image:-o-linear-gradient(top,#ee5f5b,#bd362f);background-image:linear-gradient(to bottom,#ee5f5b,#bd362f);background-repeat:repeat-x;border-color:#bd362f #bd362f #802420;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b',endColorstr='#ffbd362f',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-danger:hover,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{color:#fff;background-color:#bd362f;*background-color:#a9302a}.btn-danger:active,.btn-danger.active{background-color:#942a25 \9}.btn-success{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#5bb75b;*background-color:#51a351;background-image:-moz-linear-gradient(top,#62c462,#51a351);background-image:-webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#51a351));background-image:-webkit-linear-gradient(top,#62c462,#51a351);background-image:-o-linear-gradient(top,#62c462,#51a351);background-image:linear-gradient(to bottom,#62c462,#51a351);background-repeat:repeat-x;border-color:#51a351 #51a351 #387038;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462',endColorstr='#ff51a351',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-success:hover,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{color:#fff;background-color:#51a351;*background-color:#499249}.btn-success:active,.btn-success.active{background-color:#408140 \9}.btn-info{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#49afcd;*background-color:#2f96b4;background-image:-moz-linear-gradient(top,#5bc0de,#2f96b4);background-image:-webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#2f96b4));background-image:-webkit-linear-gradient(top,#5bc0de,#2f96b4);background-image:-o-linear-gradient(top,#5bc0de,#2f96b4);background-image:linear-gradient(to bottom,#5bc0de,#2f96b4);background-repeat:repeat-x;border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff2f96b4',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-info:hover,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{color:#fff;background-color:#2f96b4;*background-color:#2a85a0}.btn-info:active,.btn-info.active{background-color:#24748c \9}.btn-inverse{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#363636;*background-color:#222;background-image:-moz-linear-gradient(top,#444,#222);background-image:-webkit-gradient(linear,0 0,0 100%,from(#444),to(#222));background-image:-webkit-linear-gradient(top,#444,#222);background-image:-o-linear-gradient(top,#444,#222);background-image:linear-gradient(to bottom,#444,#222);background-repeat:repeat-x;border-color:#222 #222 #000;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444',endColorstr='#ff222222',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-inverse:hover,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{color:#fff;background-color:#222;*background-color:#151515}.btn-inverse:active,.btn-inverse.active{background-color:#080808 \9}button.btn,input[type="submit"].btn{*padding-top:3px;*padding-bottom:3px}button.btn::-moz-focus-inner,input[type="submit"].btn::-moz-focus-inner{padding:0;border:0}button.btn.btn-large,input[type="submit"].btn.btn-large{*padding-top:7px;*padding-bottom:7px}button.btn.btn-small,input[type="submit"].btn.btn-small{*padding-top:3px;*padding-bottom:3px}button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding-bottom:1px}.btn-link,.btn-link:active,.btn-link[disabled]{background-color:transparent;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.btn-link{color:#08c;cursor:pointer;border-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-link:hover{color:#005580;text-decoration:underline;background-color:transparent}.btn-link[disabled]:hover{color:#333;text-decoration:none}.btn-group{position:relative;display:inline-block;*display:inline;*margin-left:.3em;font-size:0;white-space:nowrap;vertical-align:middle;*zoom:1}.btn-group:first-child{*margin-left:0}.btn-group+.btn-group{margin-left:5px}.btn-toolbar{margin-top:10px;margin-bottom:10px;font-size:0}.btn-toolbar>.btn+.btn,.btn-toolbar>.btn-group+.btn,.btn-toolbar>.btn+.btn-group{margin-left:5px}.btn-group>.btn{position:relative;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-group>.btn+.btn{margin-left:-1px}.btn-group>.btn,.btn-group>.dropdown-menu,.btn-group>.popover{font-size:14px}.btn-group>.btn-mini{font-size:10.5px}.btn-group>.btn-small{font-size:11.9px}.btn-group>.btn-large{font-size:17.5px}.btn-group>.btn:first-child{margin-left:0;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-bottomleft:4px;-moz-border-radius-topleft:4px}.btn-group>.btn:last-child,.btn-group>.dropdown-toggle{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-bottomright:4px}.btn-group>.btn.large:first-child{margin-left:0;-webkit-border-bottom-left-radius:6px;border-bottom-left-radius:6px;-webkit-border-top-left-radius:6px;border-top-left-radius:6px;-moz-border-radius-bottomleft:6px;-moz-border-radius-topleft:6px}.btn-group>.btn.large:last-child,.btn-group>.large.dropdown-toggle{-webkit-border-top-right-radius:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;border-bottom-right-radius:6px;-moz-border-radius-topright:6px;-moz-border-radius-bottomright:6px}.btn-group>.btn:hover,.btn-group>.btn:focus,.btn-group>.btn:active,.btn-group>.btn.active{z-index:2}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{*padding-top:5px;padding-right:8px;*padding-bottom:5px;padding-left:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.btn-group>.btn-mini+.dropdown-toggle{*padding-top:2px;padding-right:5px;*padding-bottom:2px;padding-left:5px}.btn-group>.btn-small+.dropdown-toggle{*padding-top:5px;*padding-bottom:4px}.btn-group>.btn-large+.dropdown-toggle{*padding-top:7px;padding-right:12px;*padding-bottom:7px;padding-left:12px}.btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.btn-group.open .btn.dropdown-toggle{background-color:#e6e6e6}.btn-group.open .btn-primary.dropdown-toggle{background-color:#04c}.btn-group.open .btn-warning.dropdown-toggle{background-color:#f89406}.btn-group.open .btn-danger.dropdown-toggle{background-color:#bd362f}.btn-group.open .btn-success.dropdown-toggle{background-color:#51a351}.btn-group.open .btn-info.dropdown-toggle{background-color:#2f96b4}.btn-group.open .btn-inverse.dropdown-toggle{background-color:#222}.btn .caret{margin-top:8px;margin-left:0}.btn-mini .caret,.btn-small .caret,.btn-large .caret{margin-top:6px}.btn-large .caret{border-top-width:5px;border-right-width:5px;border-left-width:5px}.dropup .btn-large .caret{border-bottom-width:5px}.btn-primary .caret,.btn-warning .caret,.btn-danger .caret,.btn-info .caret,.btn-success .caret,.btn-inverse .caret{border-top-color:#fff;border-bottom-color:#fff}.btn-group-vertical{display:inline-block;*display:inline;*zoom:1}.btn-group-vertical>.btn{display:block;float:none;max-width:100%;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-group-vertical>.btn+.btn{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:first-child{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0}.btn-group-vertical>.btn:last-child{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px}.btn-group-vertical>.btn-large:first-child{-webkit-border-radius:6px 6px 0 0;-moz-border-radius:6px 6px 0 0;border-radius:6px 6px 0 0}.btn-group-vertical>.btn-large:last-child{-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px}.alert{padding:8px 35px 8px 14px;margin-bottom:20px;text-shadow:0 1px 0 rgba(255,255,255,0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.alert,.alert h4{color:#c09853}.alert h4{margin:0}.alert .close{position:relative;top:-2px;right:-21px;line-height:20px}.alert-success{color:#468847;background-color:#dff0d8;border-color:#d6e9c6}.alert-success h4{color:#468847}.alert-danger,.alert-error{color:#b94a48;background-color:#f2dede;border-color:#eed3d7}.alert-danger h4,.alert-error h4{color:#b94a48}.alert-info{color:#3a87ad;background-color:#d9edf7;border-color:#bce8f1}.alert-info h4{color:#3a87ad}.alert-block{padding-top:14px;padding-bottom:14px}.alert-block>p,.alert-block>ul{margin-bottom:0}.alert-block p+p{margin-top:5px}.nav{margin-bottom:20px;margin-left:0;list-style:none}.nav>li>a{display:block}.nav>li>a:hover{text-decoration:none;background-color:#eee}.nav>li>a>img{max-width:none}.nav>.pull-right{float:right}.nav-header{display:block;padding:3px 15px;font-size:11px;font-weight:bold;line-height:20px;color:#999;text-shadow:0 1px 0 rgba(255,255,255,0.5);text-transform:uppercase}.nav li+.nav-header{margin-top:9px}.nav-list{padding-right:15px;padding-left:15px;margin-bottom:0}.nav-list>li>a,.nav-list .nav-header{margin-right:-15px;margin-left:-15px;text-shadow:0 1px 0 rgba(255,255,255,0.5)}.nav-list>li>a{padding:3px 15px}.nav-list>.active>a,.nav-list>.active>a:hover{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.2);background-color:#08c}.nav-list [class^="icon-"],.nav-list [class*=" icon-"]{margin-right:2px}.nav-list .divider{*width:100%;height:1px;margin:9px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #fff}.nav-tabs,.nav-pills{*zoom:1}.nav-tabs:before,.nav-pills:before,.nav-tabs:after,.nav-pills:after{display:table;line-height:0;content:""}.nav-tabs:after,.nav-pills:after{clear:both}.nav-tabs>li,.nav-pills>li{float:left}.nav-tabs>li>a,.nav-pills>li>a{padding-right:12px;padding-left:12px;margin-right:2px;line-height:14px}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{margin-bottom:-1px}.nav-tabs>li>a{padding-top:8px;padding-bottom:8px;line-height:20px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>.active>a,.nav-tabs>.active>a:hover{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-pills>li>a{padding-top:8px;padding-bottom:8px;margin-top:2px;margin-bottom:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.nav-pills>.active>a,.nav-pills>.active>a:hover{color:#fff;background-color:#08c}.nav-stacked>li{float:none}.nav-stacked>li>a{margin-right:0}.nav-tabs.nav-stacked{border-bottom:0}.nav-tabs.nav-stacked>li>a{border:1px solid #ddd;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.nav-tabs.nav-stacked>li:first-child>a{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-topleft:4px}.nav-tabs.nav-stacked>li:last-child>a{-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-moz-border-radius-bottomright:4px;-moz-border-radius-bottomleft:4px}.nav-tabs.nav-stacked>li>a:hover{z-index:2;border-color:#ddd}.nav-pills.nav-stacked>li>a{margin-bottom:3px}.nav-pills.nav-stacked>li:last-child>a{margin-bottom:1px}.nav-tabs .dropdown-menu{-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px}.nav-pills .dropdown-menu{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.nav .dropdown-toggle .caret{margin-top:6px;border-top-color:#08c;border-bottom-color:#08c}.nav .dropdown-toggle:hover .caret{border-top-color:#005580;border-bottom-color:#005580}.nav-tabs .dropdown-toggle .caret{margin-top:8px}.nav .active .dropdown-toggle .caret{border-top-color:#fff;border-bottom-color:#fff}.nav-tabs .active .dropdown-toggle .caret{border-top-color:#555;border-bottom-color:#555}.nav>.dropdown.active>a:hover{cursor:pointer}.nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>li.dropdown.open.active>a:hover{color:#fff;background-color:#999;border-color:#999}.nav li.dropdown.open .caret,.nav li.dropdown.open.active .caret,.nav li.dropdown.open a:hover .caret{border-top-color:#fff;border-bottom-color:#fff;opacity:1;filter:alpha(opacity=100)}.tabs-stacked .open>a:hover{border-color:#999}.tabbable{*zoom:1}.tabbable:before,.tabbable:after{display:table;line-height:0;content:""}.tabbable:after{clear:both}.tab-content{overflow:auto}.tabs-below>.nav-tabs,.tabs-right>.nav-tabs,.tabs-left>.nav-tabs{border-bottom:0}.tab-content>.tab-pane,.pill-content>.pill-pane{display:none}.tab-content>.active,.pill-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd #ddd}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{min-width:74px;margin-right:0;margin-bottom:3px}.tabs-left>.nav-tabs{float:left;margin-right:19px;border-right:1px solid #ddd}.tabs-left>.nav-tabs>li>a{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs .active>a,.tabs-left>.nav-tabs .active>a:hover{border-color:#ddd transparent #ddd #ddd;*border-right-color:#fff}.tabs-right>.nav-tabs{float:right;margin-left:19px;border-left:1px solid #ddd}.tabs-right>.nav-tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd}.tabs-right>.nav-tabs .active>a,.tabs-right>.nav-tabs .active>a:hover{border-color:#ddd #ddd #ddd transparent;*border-left-color:#fff}.nav>.disabled>a{color:#999}.nav>.disabled>a:hover{text-decoration:none;cursor:default;background-color:transparent}.navbar{*position:relative;*z-index:2;margin-bottom:20px;overflow:visible}.navbar-inner{min-height:40px;padding-right:20px;padding-left:20px;background-color:#fafafa;background-image:-moz-linear-gradient(top,#fff,#f2f2f2);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#f2f2f2));background-image:-webkit-linear-gradient(top,#fff,#f2f2f2);background-image:-o-linear-gradient(top,#fff,#f2f2f2);background-image:linear-gradient(to bottom,#fff,#f2f2f2);background-repeat:repeat-x;border:1px solid #d4d4d4;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#fff2f2f2',GradientType=0);*zoom:1;-webkit-box-shadow:0 1px 4px rgba(0,0,0,0.065);-moz-box-shadow:0 1px 4px rgba(0,0,0,0.065);box-shadow:0 1px 4px rgba(0,0,0,0.065)}.navbar-inner:before,.navbar-inner:after{display:table;line-height:0;content:""}.navbar-inner:after{clear:both}.navbar .container{width:auto}.nav-collapse.collapse{height:auto;overflow:visible}.navbar .brand{display:block;float:left;padding:10px 20px 10px;margin-left:-20px;font-size:20px;font-weight:200;color:#777;text-shadow:0 1px 0 #fff}.navbar .brand:hover{text-decoration:none}.navbar-text{margin-bottom:0;line-height:40px;color:#777}.navbar-link{color:#777}.navbar-link:hover{color:#333}.navbar .divider-vertical{height:40px;margin:0 9px;border-right:1px solid #fff;border-left:1px solid #f2f2f2}.navbar .btn,.navbar .btn-group{margin-top:5px}.navbar .btn-group .btn,.navbar .input-prepend .btn,.navbar .input-append .btn{margin-top:0}.navbar-form{margin-bottom:0;*zoom:1}.navbar-form:before,.navbar-form:after{display:table;line-height:0;content:""}.navbar-form:after{clear:both}.navbar-form input,.navbar-form select,.navbar-form .radio,.navbar-form .checkbox{margin-top:5px}.navbar-form input,.navbar-form select,.navbar-form .btn{display:inline-block;margin-bottom:0}.navbar-form input[type="image"],.navbar-form input[type="checkbox"],.navbar-form input[type="radio"]{margin-top:3px}.navbar-form .input-append,.navbar-form .input-prepend{margin-top:5px;white-space:nowrap}.navbar-form .input-append input,.navbar-form .input-prepend input{margin-top:0}.navbar-search{position:relative;float:left;margin-top:5px;margin-bottom:0}.navbar-search .search-query{padding:4px 14px;margin-bottom:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px}.navbar-static-top{position:static;margin-bottom:0}.navbar-static-top .navbar-inner{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030;margin-bottom:0}.navbar-fixed-top .navbar-inner,.navbar-static-top .navbar-inner{border-width:0 0 1px}.navbar-fixed-bottom .navbar-inner{border-width:1px 0 0}.navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding-right:0;padding-left:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px}.navbar-fixed-top{top:0}.navbar-fixed-top .navbar-inner,.navbar-static-top .navbar-inner{-webkit-box-shadow:0 1px 10px rgba(0,0,0,0.1);-moz-box-shadow:0 1px 10px rgba(0,0,0,0.1);box-shadow:0 1px 10px rgba(0,0,0,0.1)}.navbar-fixed-bottom{bottom:0}.navbar-fixed-bottom .navbar-inner{-webkit-box-shadow:0 -1px 10px rgba(0,0,0,0.1);-moz-box-shadow:0 -1px 10px rgba(0,0,0,0.1);box-shadow:0 -1px 10px rgba(0,0,0,0.1)}.navbar .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0}.navbar .nav.pull-right{float:right;margin-right:0}.navbar .nav>li{float:left}.navbar .nav>li>a{float:none;padding:10px 15px 10px;color:#777;text-decoration:none;text-shadow:0 1px 0 #fff}.navbar .nav .dropdown-toggle .caret{margin-top:8px}.navbar .nav>li>a:focus,.navbar .nav>li>a:hover{color:#333;text-decoration:none;background-color:transparent}.navbar .nav>.active>a,.navbar .nav>.active>a:hover,.navbar .nav>.active>a:focus{color:#555;text-decoration:none;background-color:#e5e5e5;-webkit-box-shadow:inset 0 3px 8px rgba(0,0,0,0.125);-moz-box-shadow:inset 0 3px 8px rgba(0,0,0,0.125);box-shadow:inset 0 3px 8px rgba(0,0,0,0.125)}.navbar .btn-navbar{display:none;float:right;padding:7px 10px;margin-right:5px;margin-left:5px;color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#ededed;*background-color:#e5e5e5;background-image:-moz-linear-gradient(top,#f2f2f2,#e5e5e5);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f2f2f2),to(#e5e5e5));background-image:-webkit-linear-gradient(top,#f2f2f2,#e5e5e5);background-image:-o-linear-gradient(top,#f2f2f2,#e5e5e5);background-image:linear-gradient(to bottom,#f2f2f2,#e5e5e5);background-repeat:repeat-x;border-color:#e5e5e5 #e5e5e5 #bfbfbf;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2',endColorstr='#ffe5e5e5',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075)}.navbar .btn-navbar:hover,.navbar .btn-navbar:active,.navbar .btn-navbar.active,.navbar .btn-navbar.disabled,.navbar .btn-navbar[disabled]{color:#fff;background-color:#e5e5e5;*background-color:#d9d9d9}.navbar .btn-navbar:active,.navbar .btn-navbar.active{background-color:#ccc \9}.navbar .btn-navbar .icon-bar{display:block;width:18px;height:2px;background-color:#f5f5f5;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;-webkit-box-shadow:0 1px 0 rgba(0,0,0,0.25);-moz-box-shadow:0 1px 0 rgba(0,0,0,0.25);box-shadow:0 1px 0 rgba(0,0,0,0.25)}.btn-navbar .icon-bar+.icon-bar{margin-top:3px}.navbar .nav>li>.dropdown-menu:before{position:absolute;top:-7px;left:9px;display:inline-block;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-left:7px solid transparent;border-bottom-color:rgba(0,0,0,0.2);content:''}.navbar .nav>li>.dropdown-menu:after{position:absolute;top:-6px;left:10px;display:inline-block;border-right:6px solid transparent;border-bottom:6px solid #fff;border-left:6px solid transparent;content:''}.navbar-fixed-bottom .nav>li>.dropdown-menu:before{top:auto;bottom:-7px;border-top:7px solid #ccc;border-bottom:0;border-top-color:rgba(0,0,0,0.2)}.navbar-fixed-bottom .nav>li>.dropdown-menu:after{top:auto;bottom:-6px;border-top:6px solid #fff;border-bottom:0}.navbar .nav li.dropdown>a:hover .caret{border-top-color:#555;border-bottom-color:#555}.navbar .nav li.dropdown.open>.dropdown-toggle,.navbar .nav li.dropdown.active>.dropdown-toggle,.navbar .nav li.dropdown.open.active>.dropdown-toggle{color:#555;background-color:#e5e5e5}.navbar .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#777;border-bottom-color:#777}.navbar .nav li.dropdown.open>.dropdown-toggle .caret,.navbar .nav li.dropdown.active>.dropdown-toggle .caret,.navbar .nav li.dropdown.open.active>.dropdown-toggle .caret{border-top-color:#555;border-bottom-color:#555}.navbar .pull-right>li>.dropdown-menu,.navbar .nav>li>.dropdown-menu.pull-right{right:0;left:auto}.navbar .pull-right>li>.dropdown-menu:before,.navbar .nav>li>.dropdown-menu.pull-right:before{right:12px;left:auto}.navbar .pull-right>li>.dropdown-menu:after,.navbar .nav>li>.dropdown-menu.pull-right:after{right:13px;left:auto}.navbar .pull-right>li>.dropdown-menu .dropdown-menu,.navbar .nav>li>.dropdown-menu.pull-right .dropdown-menu{right:100%;left:auto;margin-right:-1px;margin-left:0;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px}.navbar-inverse .navbar-inner{background-color:#1b1b1b;background-image:-moz-linear-gradient(top,#222,#111);background-image:-webkit-gradient(linear,0 0,0 100%,from(#222),to(#111));background-image:-webkit-linear-gradient(top,#222,#111);background-image:-o-linear-gradient(top,#222,#111);background-image:linear-gradient(to bottom,#222,#111);background-repeat:repeat-x;border-color:#252525;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222',endColorstr='#ff111111',GradientType=0)}.navbar-inverse .brand,.navbar-inverse .nav>li>a{color:#999;text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.navbar-inverse .brand:hover,.navbar-inverse .nav>li>a:hover{color:#fff}.navbar-inverse .brand{color:#999}.navbar-inverse .navbar-text{color:#999}.navbar-inverse .nav>li>a:focus,.navbar-inverse .nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .nav .active>a,.navbar-inverse .nav .active>a:hover,.navbar-inverse .nav .active>a:focus{color:#fff;background-color:#111}.navbar-inverse .navbar-link{color:#999}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-inverse .divider-vertical{border-right-color:#222;border-left-color:#111}.navbar-inverse .nav li.dropdown.open>.dropdown-toggle,.navbar-inverse .nav li.dropdown.active>.dropdown-toggle,.navbar-inverse .nav li.dropdown.open.active>.dropdown-toggle{color:#fff;background-color:#111}.navbar-inverse .nav li.dropdown>a:hover .caret{border-top-color:#fff;border-bottom-color:#fff}.navbar-inverse .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#999;border-bottom-color:#999}.navbar-inverse .nav li.dropdown.open>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.active>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.open.active>.dropdown-toggle .caret{border-top-color:#fff;border-bottom-color:#fff}.navbar-inverse .navbar-search .search-query{color:#fff;background-color:#515151;border-color:#111;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);-webkit-transition:none;-moz-transition:none;-o-transition:none;transition:none}.navbar-inverse .navbar-search .search-query:-moz-placeholder{color:#ccc}.navbar-inverse .navbar-search .search-query:-ms-input-placeholder{color:#ccc}.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder{color:#ccc}.navbar-inverse .navbar-search .search-query:focus,.navbar-inverse .navbar-search .search-query.focused{padding:5px 15px;color:#333;text-shadow:0 1px 0 #fff;background-color:#fff;border:0;outline:0;-webkit-box-shadow:0 0 3px rgba(0,0,0,0.15);-moz-box-shadow:0 0 3px rgba(0,0,0,0.15);box-shadow:0 0 3px rgba(0,0,0,0.15)}.navbar-inverse .btn-navbar{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#0e0e0e;*background-color:#040404;background-image:-moz-linear-gradient(top,#151515,#040404);background-image:-webkit-gradient(linear,0 0,0 100%,from(#151515),to(#040404));background-image:-webkit-linear-gradient(top,#151515,#040404);background-image:-o-linear-gradient(top,#151515,#040404);background-image:linear-gradient(to bottom,#151515,#040404);background-repeat:repeat-x;border-color:#040404 #040404 #000;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515',endColorstr='#ff040404',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.navbar-inverse .btn-navbar:hover,.navbar-inverse .btn-navbar:active,.navbar-inverse .btn-navbar.active,.navbar-inverse .btn-navbar.disabled,.navbar-inverse .btn-navbar[disabled]{color:#fff;background-color:#040404;*background-color:#000}.navbar-inverse .btn-navbar:active,.navbar-inverse .btn-navbar.active{background-color:#000 \9}.breadcrumb{padding:8px 15px;margin:0 0 20px;list-style:none;background-color:#f5f5f5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.breadcrumb>li{display:inline-block;*display:inline;text-shadow:0 1px 0 #fff;*zoom:1}.breadcrumb>li>.divider{padding:0 5px;color:#ccc}.breadcrumb>.active{color:#999}.pagination{margin:20px 0}.pagination ul{display:inline-block;*display:inline;margin-bottom:0;margin-left:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;*zoom:1;-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:0 1px 2px rgba(0,0,0,0.05);box-shadow:0 1px 2px rgba(0,0,0,0.05)}.pagination ul>li{display:inline}.pagination ul>li>a,.pagination ul>li>span{float:left;padding:4px 12px;line-height:20px;text-decoration:none;background-color:#fff;border:1px solid #ddd;border-left-width:0}.pagination ul>li>a:hover,.pagination ul>.active>a,.pagination ul>.active>span{background-color:#f5f5f5}.pagination ul>.active>a,.pagination ul>.active>span{color:#999;cursor:default}.pagination ul>.disabled>span,.pagination ul>.disabled>a,.pagination ul>.disabled>a:hover{color:#999;cursor:default;background-color:transparent}.pagination ul>li:first-child>a,.pagination ul>li:first-child>span{border-left-width:1px;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-bottomleft:4px;-moz-border-radius-topleft:4px}.pagination ul>li:last-child>a,.pagination ul>li:last-child>span{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-bottomright:4px}.pagination-centered{text-align:center}.pagination-right{text-align:right}.pagination-large ul>li>a,.pagination-large ul>li>span{padding:11px 19px;font-size:17.5px}.pagination-large ul>li:first-child>a,.pagination-large ul>li:first-child>span{-webkit-border-bottom-left-radius:6px;border-bottom-left-radius:6px;-webkit-border-top-left-radius:6px;border-top-left-radius:6px;-moz-border-radius-bottomleft:6px;-moz-border-radius-topleft:6px}.pagination-large ul>li:last-child>a,.pagination-large ul>li:last-child>span{-webkit-border-top-right-radius:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;border-bottom-right-radius:6px;-moz-border-radius-topright:6px;-moz-border-radius-bottomright:6px}.pagination-mini ul>li:first-child>a,.pagination-small ul>li:first-child>a,.pagination-mini ul>li:first-child>span,.pagination-small ul>li:first-child>span{-webkit-border-bottom-left-radius:3px;border-bottom-left-radius:3px;-webkit-border-top-left-radius:3px;border-top-left-radius:3px;-moz-border-radius-bottomleft:3px;-moz-border-radius-topleft:3px}.pagination-mini ul>li:last-child>a,.pagination-small ul>li:last-child>a,.pagination-mini ul>li:last-child>span,.pagination-small ul>li:last-child>span{-webkit-border-top-right-radius:3px;border-top-right-radius:3px;-webkit-border-bottom-right-radius:3px;border-bottom-right-radius:3px;-moz-border-radius-topright:3px;-moz-border-radius-bottomright:3px}.pagination-small ul>li>a,.pagination-small ul>li>span{padding:2px 10px;font-size:11.9px}.pagination-mini ul>li>a,.pagination-mini ul>li>span{padding:0 6px;font-size:10.5px}.pager{margin:20px 0;text-align:center;list-style:none;*zoom:1}.pager:before,.pager:after{display:table;line-height:0;content:""}.pager:after{clear:both}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px}.pager li>a:hover{text-decoration:none;background-color:#f5f5f5}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:hover,.pager .disabled>span{color:#999;cursor:default;background-color:#fff}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{opacity:0}.modal-backdrop,.modal-backdrop.fade.in{opacity:.8;filter:alpha(opacity=80)}.modal{position:fixed;top:10%;left:50%;z-index:1050;width:560px;margin-left:-280px;background-color:#fff;border:1px solid #999;border:1px solid rgba(0,0,0,0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;outline:0;-webkit-box-shadow:0 3px 7px rgba(0,0,0,0.3);-moz-box-shadow:0 3px 7px rgba(0,0,0,0.3);box-shadow:0 3px 7px rgba(0,0,0,0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box}.modal.fade{top:-25%;-webkit-transition:opacity .3s linear,top .3s ease-out;-moz-transition:opacity .3s linear,top .3s ease-out;-o-transition:opacity .3s linear,top .3s ease-out;transition:opacity .3s linear,top .3s ease-out}.modal.fade.in{top:10%}.modal-header{padding:9px 15px;border-bottom:1px solid #eee}.modal-header .close{margin-top:2px}.modal-header h3{margin:0;line-height:30px}.modal-body{position:relative;max-height:400px;padding:15px;overflow-y:auto}.modal-form{margin-bottom:0}.modal-footer{padding:14px 15px 15px;margin-bottom:0;text-align:right;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;*zoom:1;-webkit-box-shadow:inset 0 1px 0 #fff;-moz-box-shadow:inset 0 1px 0 #fff;box-shadow:inset 0 1px 0 #fff}.modal-footer:before,.modal-footer:after{display:table;line-height:0;content:""}.modal-footer:after{clear:both}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.tooltip{position:absolute;z-index:1030;display:block;padding:5px;font-size:11px;opacity:0;filter:alpha(opacity=0);visibility:visible}.tooltip.in{opacity:.8;filter:alpha(opacity=80)}.tooltip.top{margin-top:-3px}.tooltip.right{margin-left:3px}.tooltip.bottom{margin-top:3px}.tooltip.left{margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;text-decoration:none;background-color:#000;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top-color:#000;border-width:5px 5px 0}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-right-color:#000;border-width:5px 5px 5px 0}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-left-color:#000;border-width:5px 0 5px 5px}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-bottom-color:#000;border-width:0 5px 5px}.popover{position:absolute;top:0;left:0;z-index:1010;display:none;width:236px;padding:1px;text-align:left;white-space:normal;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;font-weight:normal;line-height:18px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover .arrow,.popover .arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover .arrow{border-width:11px}.popover .arrow:after{border-width:10px;content:""}.popover.top .arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,0.25);border-bottom-width:0}.popover.top .arrow:after{bottom:1px;margin-left:-10px;border-top-color:#fff;border-bottom-width:0}.popover.right .arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,0.25);border-left-width:0}.popover.right .arrow:after{bottom:-10px;left:1px;border-right-color:#fff;border-left-width:0}.popover.bottom .arrow{top:-11px;left:50%;margin-left:-11px;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,0.25);border-top-width:0}.popover.bottom .arrow:after{top:1px;margin-left:-10px;border-bottom-color:#fff;border-top-width:0}.popover.left .arrow{top:50%;right:-11px;margin-top:-11px;border-left-color:#999;border-left-color:rgba(0,0,0,0.25);border-right-width:0}.popover.left .arrow:after{right:1px;bottom:-10px;border-left-color:#fff;border-right-width:0}.thumbnails{margin-left:-20px;list-style:none;*zoom:1}.thumbnails:before,.thumbnails:after{display:table;line-height:0;content:""}.thumbnails:after{clear:both}.row-fluid .thumbnails{margin-left:0}.thumbnails>li{float:left;margin-bottom:20px;margin-left:20px}.thumbnail{display:block;padding:4px;line-height:20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 3px rgba(0,0,0,0.055);-moz-box-shadow:0 1px 3px rgba(0,0,0,0.055);box-shadow:0 1px 3px rgba(0,0,0,0.055);-webkit-transition:all .2s ease-in-out;-moz-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}a.thumbnail:hover{border-color:#08c;-webkit-box-shadow:0 1px 4px rgba(0,105,214,0.25);-moz-box-shadow:0 1px 4px rgba(0,105,214,0.25);box-shadow:0 1px 4px rgba(0,105,214,0.25)}.thumbnail>img{display:block;max-width:100%;margin-right:auto;margin-left:auto}.thumbnail .caption{padding:9px;color:#555}.media,.media-body{overflow:hidden;*overflow:visible;zoom:1}.media,.media .media{margin-top:15px}.media:first-child{margin-top:0}.media-object{display:block}.media-heading{margin:0 0 5px}.media .pull-left{margin-right:10px}.media .pull-right{margin-left:10px}.media-list{margin-left:0;list-style:none}.label,.badge{display:inline-block;padding:2px 4px;font-size:11.844px;font-weight:bold;line-height:14px;color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);white-space:nowrap;vertical-align:baseline;background-color:#999}.label{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.badge{padding-right:9px;padding-left:9px;-webkit-border-radius:9px;-moz-border-radius:9px;border-radius:9px}.label:empty,.badge:empty{display:none}a.label:hover,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer}.label-important,.badge-important{background-color:#b94a48}.label-important[href],.badge-important[href]{background-color:#953b39}.label-warning,.badge-warning{background-color:#f89406}.label-warning[href],.badge-warning[href]{background-color:#c67605}.label-success,.badge-success{background-color:#468847}.label-success[href],.badge-success[href]{background-color:#356635}.label-info,.badge-info{background-color:#3a87ad}.label-info[href],.badge-info[href]{background-color:#2d6987}.label-inverse,.badge-inverse{background-color:#333}.label-inverse[href],.badge-inverse[href]{background-color:#1a1a1a}.btn .label,.btn .badge{position:relative;top:-1px}.btn-mini .label,.btn-mini .badge{top:0}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-moz-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-ms-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:0 0}to{background-position:40px 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f7f7f7;background-image:-moz-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f5f5f5),to(#f9f9f9));background-image:-webkit-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:-o-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:linear-gradient(to bottom,#f5f5f5,#f9f9f9);background-repeat:repeat-x;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5',endColorstr='#fff9f9f9',GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1)}.progress .bar{float:left;width:0;height:100%;font-size:12px;color:#fff;text-align:center;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#0e90d2;background-image:-moz-linear-gradient(top,#149bdf,#0480be);background-image:-webkit-gradient(linear,0 0,0 100%,from(#149bdf),to(#0480be));background-image:-webkit-linear-gradient(top,#149bdf,#0480be);background-image:-o-linear-gradient(top,#149bdf,#0480be);background-image:linear-gradient(to bottom,#149bdf,#0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf',endColorstr='#ff0480be',GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width .6s ease;-moz-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress .bar+.bar{-webkit-box-shadow:inset 1px 0 0 rgba(0,0,0,0.15),inset 0 -1px 0 rgba(0,0,0,0.15);-moz-box-shadow:inset 1px 0 0 rgba(0,0,0,0.15),inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 1px 0 0 rgba(0,0,0,0.15),inset 0 -1px 0 rgba(0,0,0,0.15)}.progress-striped .bar{background-color:#149bdf;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px}.progress.active .bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;-ms-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-danger .bar,.progress .bar-danger{background-color:#dd514c;background-image:-moz-linear-gradient(top,#ee5f5b,#c43c35);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#c43c35));background-image:-webkit-linear-gradient(top,#ee5f5b,#c43c35);background-image:-o-linear-gradient(top,#ee5f5b,#c43c35);background-image:linear-gradient(to bottom,#ee5f5b,#c43c35);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b',endColorstr='#ffc43c35',GradientType=0)}.progress-danger.progress-striped .bar,.progress-striped .bar-danger{background-color:#ee5f5b;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-success .bar,.progress .bar-success{background-color:#5eb95e;background-image:-moz-linear-gradient(top,#62c462,#57a957);background-image:-webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#57a957));background-image:-webkit-linear-gradient(top,#62c462,#57a957);background-image:-o-linear-gradient(top,#62c462,#57a957);background-image:linear-gradient(to bottom,#62c462,#57a957);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462',endColorstr='#ff57a957',GradientType=0)}.progress-success.progress-striped .bar,.progress-striped .bar-success{background-color:#62c462;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-info .bar,.progress .bar-info{background-color:#4bb1cf;background-image:-moz-linear-gradient(top,#5bc0de,#339bb9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#339bb9));background-image:-webkit-linear-gradient(top,#5bc0de,#339bb9);background-image:-o-linear-gradient(top,#5bc0de,#339bb9);background-image:linear-gradient(to bottom,#5bc0de,#339bb9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff339bb9',GradientType=0)}.progress-info.progress-striped .bar,.progress-striped .bar-info{background-color:#5bc0de;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-warning .bar,.progress .bar-warning{background-color:#faa732;background-image:-moz-linear-gradient(top,#fbb450,#f89406);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));background-image:-webkit-linear-gradient(top,#fbb450,#f89406);background-image:-o-linear-gradient(top,#fbb450,#f89406);background-image:linear-gradient(to bottom,#fbb450,#f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450',endColorstr='#fff89406',GradientType=0)}.progress-warning.progress-striped .bar,.progress-striped .bar-warning{background-color:#fbb450;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.accordion{margin-bottom:20px}.accordion-group{margin-bottom:2px;border:1px solid #e5e5e5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.accordion-heading{border-bottom:0}.accordion-heading .accordion-toggle{display:block;padding:8px 15px}.accordion-toggle{cursor:pointer}.accordion-inner{padding:9px 15px;border-top:1px solid #e5e5e5}.carousel{position:relative;margin-bottom:20px;line-height:1}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-moz-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>img{display:block;line-height:1}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#fff;text-align:center;background:#222;border:3px solid #fff;-webkit-border-radius:23px;-moz-border-radius:23px;border-radius:23px;opacity:.5;filter:alpha(opacity=50)}.carousel-control.right{right:15px;left:auto}.carousel-control:hover{color:#fff;text-decoration:none;opacity:.9;filter:alpha(opacity=90)}.carousel-caption{position:absolute;right:0;bottom:0;left:0;padding:15px;background:#333;background:rgba(0,0,0,0.75)}.carousel-caption h4,.carousel-caption p{line-height:20px;color:#fff}.carousel-caption h4{margin:0 0 5px}.carousel-caption p{margin-bottom:0}.hero-unit{padding:60px;margin-bottom:30px;font-size:18px;font-weight:200;line-height:30px;color:inherit;background-color:#eee;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;color:inherit}.hero-unit li{line-height:30px}.pull-right{float:right}.pull-left{float:left}.hide{display:none}.show{display:block}.invisible{visibility:hidden}.affix{position:fixed}
diff --git a/openslides/templates/base.html b/openslides/templates/base.html
index c9832a7b2..f045b71d5 100644
--- a/openslides/templates/base.html
+++ b/openslides/templates/base.html
@@ -12,8 +12,8 @@
     <title>{% block title %}{% get_config 'event_name' %}{% endblock %}</title>
 
     <!-- styles -->
-    <link href="{% static 'styles/bootstrap.css' %}" type="text/css" rel="stylesheet">
-    <link href="{% static 'styles/bootstrap-responsive.css' %}" type="text/css" rel="stylesheet">
+    <link href="{% static 'styles/bootstrap.min.css' %}" type="text/css" rel="stylesheet">
+    <link href="{% static 'styles/bootstrap-responsive.min.css' %}" type="text/css" rel="stylesheet">
     <link href="{% static 'styles/base.css' %}" type="text/css" rel="stylesheet">
     <link href="{% static 'img/favicon.png' %}" type="image/png" rel="shortcut icon" />
 
@@ -107,7 +107,7 @@
 {% endblock %}<!--/body-->
 
 <!-- JavaScript (Placed at the end of the document so the pages load faster) -->
-    <script src="{% static 'javascript/jquery.js' %}" type="text/javascript"></script>
+    <script src="{% static 'javascript/jquery.min.js' %}" type="text/javascript"></script>
     <script src="{% static 'javascript/utils.js' %}" type="text/javascript"></script>
     <script src="{% static 'javascript/bootstrap.min.js' %}" type="text/javascript"></script>
     <script type="text/javascript" src="{% url 'django.views.i18n.javascript_catalog' %}"></script>

From b8532fabe4524e04483815d7173f51579c188b70 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Fri, 18 Jan 2013 22:23:31 +0100
Subject: [PATCH 29/88] Removed files from images to img dir.

---
 extras/benchmark/bench.py                       |  16 +---------------
 openslides/assignment/views.py                  |   2 +-
 openslides/motion/views.py                      |   2 +-
 openslides/static/images/bg-header.gif          | Bin 625 -> 0 bytes
 openslides/static/images/bg-submenu.gif         | Bin 85 -> 0 bytes
 openslides/static/images/button.gif             | Bin 169 -> 0 bytes
 openslides/static/images/favicon.png            | Bin 1060 -> 0 bytes
 openslides/static/{images => img}/circle.png    | Bin
 openslides/static/{images => img}/draggable.png | Bin
 .../{images/logo.png => img/logo-small.png}     | Bin
 .../static/{images => img}/tree-bottom.png      | Bin
 openslides/static/{images => img}/tree.png      | Bin
 openslides/static/styles/tabledrag.css          |   8 ++++----
 13 files changed, 7 insertions(+), 21 deletions(-)
 delete mode 100644 openslides/static/images/bg-header.gif
 delete mode 100644 openslides/static/images/bg-submenu.gif
 delete mode 100644 openslides/static/images/button.gif
 delete mode 100644 openslides/static/images/favicon.png
 rename openslides/static/{images => img}/circle.png (100%)
 rename openslides/static/{images => img}/draggable.png (100%)
 rename openslides/static/{images/logo.png => img/logo-small.png} (100%)
 rename openslides/static/{images => img}/tree-bottom.png (100%)
 rename openslides/static/{images => img}/tree.png (100%)

diff --git a/extras/benchmark/bench.py b/extras/benchmark/bench.py
index edcfa3075..31e886d01 100755
--- a/extras/benchmark/bench.py
+++ b/extras/benchmark/bench.py
@@ -32,11 +32,7 @@ URL_SETS = {
         "/static/styles/base.css",
         "/static/javascript/utils.js",
         "/static/javascript/jquery.min.js",
-        "/static/images/bg-submenu.gif",
-        "/static/images/bg-header.gif",
-        "/static/images/logo.png",
-        "/static/images/icons/dialog-information.png",
-        "/static/images/icons/cross.png",
+        "/static/img/logo.png",
     ],
     "agenda": [
         "/agenda/",
@@ -46,11 +42,6 @@ URL_SETS = {
         "/static/styles/agenda.css",
         "/static/javascript/jquery.min.js",
         "/jsi18n/",
-        "/static/images/bg-header.gif",
-        "/static/images/bg-submenu.gif",
-        "/static/images/logo.png",
-        "/static/images/icons/application-pdf.png",
-        "/static/images/icons/cross.png",
     ],
     "application": [
         "/application/",
@@ -58,11 +49,6 @@ URL_SETS = {
         "/static/javascript/utils.js",
         "/static/javascript/jquery.min.js",
         "/jsi18n/",
-        "/static/images/bg-header.gif",
-        "/static/images/bg-submenu.gif",
-        "/static/images/icons/cross.png",
-        "/static/images/logo.png",
-        "/static/images/icons/application-pdf.png",
     ]
 }
 
diff --git a/openslides/assignment/views.py b/openslides/assignment/views.py
index aa6640aa4..46024e1d2 100644
--- a/openslides/assignment/views.py
+++ b/openslides/assignment/views.py
@@ -533,7 +533,7 @@ class AssignmentPollPDF(PDFView):
         pdf_document.build(story)
 
     def append_to_pdf(self, story):
-        imgpath = os.path.join(settings.SITE_ROOT, 'static/images/circle.png')
+        imgpath = os.path.join(settings.SITE_ROOT, 'static/img/circle.png')
         circle = "<img src='%s' width='15' height='15'/>&nbsp;&nbsp;" % imgpath
         cell = []
         cell.append(Spacer(0, 0.8 * cm))
diff --git a/openslides/motion/views.py b/openslides/motion/views.py
index a323b5594..2ab024a62 100644
--- a/openslides/motion/views.py
+++ b/openslides/motion/views.py
@@ -864,7 +864,7 @@ class MotionPollPDF(PDFView):
         pdf_document.build(story)
 
     def append_to_pdf(self, story):
-        imgpath = os.path.join(settings.SITE_ROOT, 'static/images/circle.png')
+        imgpath = os.path.join(settings.SITE_ROOT, 'static/img/circle.png')
         circle = "<img src='%s' width='15' height='15'/>&nbsp;&nbsp;" % imgpath
         cell = []
         cell.append(Spacer(0,0.8*cm))
diff --git a/openslides/static/images/bg-header.gif b/openslides/static/images/bg-header.gif
deleted file mode 100644
index c69df6fbdd2c6cece7062e7fe472a3b385cf92f7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 625
zcmZ?wbhEHb<YJh{aFu~UO-{sGPhM44*hXL8QddqzM%YACT1!#PTwB)GKtW$s(pW><
zLPyp{UqMqr)J#i8Sz1U>MZ#1|Mps2bT~0(pUeriKN=HfDKuyw0PfkZ!Tv<lgNL@-@
zUQ|Ot)Ivv2Sw_fEUCK;bMq5ctTS;6~LCjo7)=*8-T3=pMQOr<HN>x@wS6RY9RZ>q?
z!b(@pN>5&09w;KNA}g$~Dq*TA!+;kk{$v5m>wrj*pBUKwA80A?(2?ptk+Sh%j@A4N
z8pRH4qt@S8Q+9gqqJ0kv5`6S#pMSBXDz|Ot{SQ4ge(P_)|1`bsy!wy-4UJ9BEv;>h
z@||7XJv}`A6DCfYJZ0)cwHY&Kam<-JZ~lUXix$sUTDE+}%9Z?U)~;K>VdEO1EnBy3
z-?4Lx>7Kp&*bW>#boj{8W5*A3pE`Z!?78z7&WK&Ua`oEv8<%Bn-?@A5{)5|!kDok!
z_Dt*LtJmsp-@TXk`04YPuirlE{`~cu>+iq+49r|IKl<AaHgm*k#GEi_I@~Ux>^0{_
zLDSK03FE9g853KN_ba4!$an@dpPZ}_yecO1Q`70`2Fa)9yqwf>cD6<FGns>%m!I#O
zZ_m#m>$PRY#l;?z#e5HLS$SC~V6j)J!`4+-S4V6P`g&mN>g(&{wL4_Jx2?IkImvoO
z?CEW5Z*R{^J~7vOdehzA6`x<-%@%LCzrTT*Th3?4hKC2Vg|y>z7HoWce1fv~JfEFL
zPb6m;XX_o<x%v6|1<u`azP~=VU0xBqI_~T*laA{fl21?LUAXP-?H$Fh*U7RlSOWl*
C%m9%9

diff --git a/openslides/static/images/bg-submenu.gif b/openslides/static/images/bg-submenu.gif
deleted file mode 100644
index 91880b8b3cf8ed8371bd50b24f9d9dfc2a51685a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 85
zcmZ?wbhEHbJi)-l(7?c8qNB;cz@Ye(1xPY5=zs{23<Hx+OaIE#Z}}I`*>bCU^SwR4
m`P&|OOncV3?A57l@3@bD^11%4_xZ1L-~aLRaHX>{SOWl7qalp|

diff --git a/openslides/static/images/button.gif b/openslides/static/images/button.gif
deleted file mode 100644
index 37ee553722aeca8cf04a3291ffa1d844cd80d722..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 169
zcmZ?wbhEHbWMU9!IKsf-HI3bE3X}g#zUT#V9#dJeRvL%S5ldgLU%SP(Y`t^UCeI}o
zyb_nF`_AAFnk`hk&OUdQdCg|;h<Q>eOSR(`DphQBD_mp4fEy_OWC2U+fJl&?46JGo
sHYs?BXnKXJp8Omk#v*#O&`0=iz!d`zq2_}R1vsR585$foSezKF0XbYO%K!iX

diff --git a/openslides/static/images/favicon.png b/openslides/static/images/favicon.png
deleted file mode 100644
index a10d3081088e5196d989da6add813a16899d07e9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1060
zcmV+<1l#+GP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004b3#c}2nYxW
zd<bNS00009a7bBm0003@0003@0cnQ4IRF3v8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11EEPoK~zYIwN%efBUK##zBkh;6N}KHxZS0DAYcg*Xh;Ym#2AyF
zwlQ$zZanB8pa)IF3&w*dFGkmcr#%|h%N~f05X@pAro`QpwP{Q(&>yiaF!as5pI&yF
zX`uzz_)R{Ud2hb?eBS5#{k}n|R0_NpA0K~DN_i)r&wmEKV2sT#E-v2B<#G?}_4+69
zFGBY(W@ctSG7RIEU!Yhlj;yV%ZBI;07@16FGM!G}qm<sOR;#6(2w?xhw(XZ1jYgYj
zEEaohYHG^hoWt1In7*>IGHaUV?~{|0AKXL$c_m6D5^u-j@t^ATI#5dgv@ENMF-Db2
zrGI&OIp#PH5JJFl9B>>5wzjq$A;fR#bo#AmG|H}Z5DJAVp-@OfA`v(~J}&O>@8|aR
z_71bz>|dO7V2lCh9K840+1WnJvR*$rI(oI2gH}0qc6Oc+LXLD@AIjx&Z~AiHsaC5G
z9mfIJbz2Tx*9Frw@!;U#2mn02)&T&3rfC!aq<^neDm_|VUA?`#yZfxazh4au49IXe
zEDD9fv-S1$+nT2R+{*#-k7**2_yYiLWipwUI}>ZQnnfucX*QdZ5F(|NrRnMEdM|Q-
zjxlA7fl^9cm1tR34FGD_5%v_IltLH&7miMWZU$aB+M3K511V*<-2X1XIsgAkluRb)
z3Wb7+F~)OqbMGRAKq-Z!lz<RIoO8uFSCmr87?X@KDTGjt<48)WVvGq&sUn0(+qT8V
z#>Pe}l~OH%;o;#2OG`^J#ux}8?t3@adkP_L{8UQ8>FMbk0Pwgau(`SU%fZ3HxDWz_
z5UqZAzXy+?8>yEogaATFJ{pZaZYxov(Wo1S(MHtkq`kfoLjI0MqwP&TIXU?TW85@N
z6Z{AUgAfb`!7vOk3<CmzKnuFAgQjVKF$Rn=AcO!R1cZ=pFHKP-5_wuGmA+?;fgfHU
zZVKDB_sZq+cbBFJ0O0WO@C!o7N?%`}<yrRQs)l>;%65K!{$(naYF#ER9*?&K!r}0#
zZQEjKXegy=nyzV@jxp9T#yUdi5}qGWS4!zhDcyD5ALi%hKlLBF?V<qyY;SLWRW6r*
zd_LQk%GIr8gpj;#+aGuGwK)I)h{xk95C}ZTX0wl^l#($v3IL{mvV0=);^N|oZQCD~
z%jNfz$z-KdK=0h}3GL?d`8$C?;FYtpv#$-qxC;PxrIZoQd65v3XN*-wM@K)eR;#}*
eEG)QJ@%#e_1>2n&lMRyq0000<MNUMnLSTZG#NM0$

diff --git a/openslides/static/images/circle.png b/openslides/static/img/circle.png
similarity index 100%
rename from openslides/static/images/circle.png
rename to openslides/static/img/circle.png
diff --git a/openslides/static/images/draggable.png b/openslides/static/img/draggable.png
similarity index 100%
rename from openslides/static/images/draggable.png
rename to openslides/static/img/draggable.png
diff --git a/openslides/static/images/logo.png b/openslides/static/img/logo-small.png
similarity index 100%
rename from openslides/static/images/logo.png
rename to openslides/static/img/logo-small.png
diff --git a/openslides/static/images/tree-bottom.png b/openslides/static/img/tree-bottom.png
similarity index 100%
rename from openslides/static/images/tree-bottom.png
rename to openslides/static/img/tree-bottom.png
diff --git a/openslides/static/images/tree.png b/openslides/static/img/tree.png
similarity index 100%
rename from openslides/static/images/tree.png
rename to openslides/static/img/tree.png
diff --git a/openslides/static/styles/tabledrag.css b/openslides/static/styles/tabledrag.css
index 8585bcba0..ed8946288 100644
--- a/openslides/static/styles/tabledrag.css
+++ b/openslides/static/styles/tabledrag.css
@@ -19,7 +19,7 @@ a.tabledrag-handle:hover {
   text-decoration: none;
 }
 a.tabledrag-handle .handle {
-  background: url("../images/draggable.png") no-repeat scroll 0 0 transparent;
+  background: url("../img/draggable.png") no-repeat scroll 0 0 transparent;
   height: 13px;
   margin-top: 4px;
   width: 13px;
@@ -35,13 +35,13 @@ div.indentation {
   width: 10px;
 }
 div.tree-child {
-  background: url(../images/tree.png) no-repeat 11px center; /* LTR */
+  background: url(../img/tree.png) no-repeat 11px center; /* LTR */
 }
 div.tree-child-last {
-  background: url(../images/tree-bottom.png) no-repeat 11px center; /* LTR */
+  background: url(../img/tree-bottom.png) no-repeat 11px center; /* LTR */
 }
 div.tree-child-horizontal {
-  background: url(../images/tree.png) no-repeat -11px center;
+  background: url(../img/tree.png) no-repeat -11px center;
 }
 .tabledrag-toggle-weight-wrapper {
   text-align: right; /* LTR */

From 1ae140c11e7be9750e40394f49a27afdefb4e4b0 Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Sat, 26 Jan 2013 12:28:51 +0100
Subject: [PATCH 30/88] Add docstrings to the motion class

---
 openslides/motion/models.py | 105 +++++++++++++++++++++++++++++-------
 openslides/motion/urls.py   |   2 +-
 openslides/motion/views.py  |  17 +++++-
 3 files changed, 104 insertions(+), 20 deletions(-)

diff --git a/openslides/motion/models.py b/openslides/motion/models.py
index 780e848bc..6b68bda19 100644
--- a/openslides/motion/models.py
+++ b/openslides/motion/models.py
@@ -37,6 +37,12 @@ RELATION = (
 
 
 class RelatedPersonsManager(models.Manager):
+    """
+    Manager for MotionRelatedPersons.
+
+    Returns a custom manager with gives a specific queryset for one type of
+    persons.
+    """
     def __init__(self, relation, *args, **kwargs):
         super(RelatedPersonsManager, self).__init__(*args, **kwargs)
         for key, value in RELATION:
@@ -52,6 +58,15 @@ class RelatedPersonsManager(models.Manager):
 
 
 class MotionRelatedPersons(models.Model):
+    """
+    Saves the all persons related to a motion.
+
+    relation = 1: submitter
+    relation = 2: supporter
+
+    The custom manager submitter and supporter return a queryset with the
+    specific persons.
+    """
     submitter = RelatedPersonsManager(relation=1)
     supporter = RelatedPersonsManager(relation=2)
     objects = models.Manager()
@@ -62,6 +77,9 @@ class MotionRelatedPersons(models.Model):
 
 
 class Motion(SlideMixin, models.Model):
+    """
+    The Motion-Model.
+    """
     prefix = "motion"  # Rename this in the slide-system
 
     # TODO: Use this attribute for the default_version, if the permission system
@@ -93,13 +111,16 @@ class Motion(SlideMixin, models.Model):
 
     # TODO: Use transaction
     def save(self, *args, **kwargs):
+        """
+        Saves the motion. Create or update a motion_version object
+        """
         super(Motion, self).save(*args, **kwargs)
         new_data = False
         for attr in ['_title', '_text', '_reason']:
             if hasattr(self, attr):
                 new_data = True
                 break
-        need_new_version = True #  TODO: Do we need a new version (look in config)
+        need_new_version = True  # TODO: Do we need a new version (look in config)
         if hasattr(self, '_version') or (new_data and need_new_version):
             version = self.new_version
             del self._new_version
@@ -127,70 +148,114 @@ class Motion(SlideMixin, models.Model):
             return reverse('motion_delete', args=[str(self.id)])
 
     def get_title(self):
+        """
+        Get the title of the motion. The titel is taken from motion.version
+        """
         try:
             return self._title
         except AttributeError:
-            return self.default_version.title
+            return self.version.title
 
     def set_title(self, title):
+        """
+        Set the titel of the motion. The titel will me saved in motion.save()
+        """
         self._title = title
 
     title = property(get_title, set_title)
 
     def get_text(self):
+        """
+        Get the text of the motion. Simular to get_title()
+        """
         try:
             return self._text
         except AttributeError:
-            return self.default_version.text
+            return self.version.text
 
     def set_text(self, text):
+        """
+        Set the text of the motion. Simular to set_title()
+        """
         self._text = text
 
     text = property(get_text, set_text)
 
     def get_reason(self):
+        """
+        Get the reason of the motion. Simular to get_title()
+        """
         try:
             return self._reason
         except AttributeError:
-            return self.default_version.reason
+            return self.version.reason
 
     def set_reason(self, reason):
+        """
+        Set the reason of the motion. Simular to set_title()
+        """
         self._reason = reason
 
     reason = property(get_reason, set_reason)
 
+    @property
+    def submitter(self):
+        """
+        Return a queryset with all submitter of this motion.
+        """
+        return MotionRelatedPersons.submitter.filter(motion=self)
+
+    @property
+    def supporter(self):
+        """
+        Returns a queryset with all supporter of this motion.
+        """
+        return MotionRelatedPersons.supporter.filter(motion=self)
+
     @property
     def new_version(self):
+        """
+        On the first call, it creates a new version. On any later call, it
+        use the existing new version.
+
+        The new_version object will be deleted when it is saved into the db
+        """
         try:
             return self._new_version
         except AttributeError:
             self._new_version = MotionVersion(motion=self)
             return self._new_version
 
-    @property
-    def submitter(self):
-        return MotionRelatedPersons.submitter.filter(motion=self)
-
-    @property
-    def supporter(self):
-        return MotionRelatedPersons.supporter.filter(motion=self)
-
     def get_version(self, version_id):
+        """
+        Return a specific version from version_id
+        """
         # TODO: Check case, if version_id is not one of this motion
         return self.versions.get(pk=version_id)
 
 
-    def get_default_version(self):
+    def get_version(self):
+        """
+        Get the "active" version object. This version will be used to get the
+        data for this motion.
+        """
         try:
-            return self._default_version
+            return self._version
         except AttributeError:
             # TODO: choose right version via config
             return self.last_version
 
-    def set_default_version(self, version):
+    def set_version(self, version):
+        """
+        Set the "active" version object.
+
+        If version is None, the last_version will be used.
+        If version is a version object, this object will be used.
+        If version is Int, the N version of this motion will be used.
+        """
         if version is None:
             try:
-                del self._default_version
+                del self._version
             except AttributeError:
                 pass
         else:
@@ -199,12 +264,16 @@ class Motion(SlideMixin, models.Model):
             elif type(version) is not MotionVersion:
                 raise ValueError('The argument \'version\' has to be int or '
                                  'MotionVersion, not %s' % type(version))
-            self._default_version = version
+            # TODO: Test, that the version is one of this motion
+            self._version = version
 
-    default_version = property(get_default_version, set_default_version)
+    version = property(get_version, set_version)
 
     @property
     def last_version(self):
+        """
+        Get the newest version of the motion
+        """
         # TODO: Fix the case, that the motion has no Version
         try:
             return self.versions.order_by('id').reverse()[0]
diff --git a/openslides/motion/urls.py b/openslides/motion/urls.py
index 3020f074e..59b9b7b2d 100644
--- a/openslides/motion/urls.py
+++ b/openslides/motion/urls.py
@@ -33,7 +33,7 @@ urlpatterns = patterns('openslides.motion.views',
         name='motion_edit',
     ),
 
-    url(r'^(?P<pk>\d+)/version/(?P<version_id>\d+)/$',
+    url(r'^(?P<pk>\d+)/version/(?P<version_id>[1-9]\d*)/$',
         'motion_detail',
         name='motion_version_detail',
     ),
diff --git a/openslides/motion/views.py b/openslides/motion/views.py
index 49f4a7ffc..3121c3efd 100644
--- a/openslides/motion/views.py
+++ b/openslides/motion/views.py
@@ -34,6 +34,9 @@ from django.views.generic.edit import ModelFormMixin
 
 
 class MotionListView(ListView):
+    """
+    List all motion.
+    """
     permission_required = 'motion.can_see_motion'
     model = Motion
 
@@ -41,6 +44,9 @@ motion_list = MotionListView.as_view()
 
 
 class MotionDetailView(DetailView):
+    """
+    Show the details of one motion.
+    """
     permission_required = 'motion.can_see_motion'
     model = Motion
     template_name = 'motion/motion_detail.html'
@@ -49,19 +55,25 @@ class MotionDetailView(DetailView):
         object = super(MotionDetailView, self).get_object()
         version_id = self.kwargs.get('version_id', None)
         if version_id is not None:
-            object.default_version = int(version_id) -1
+            object.version = int(version_id) -1
         return object
 
 motion_detail = MotionDetailView.as_view()
 
 
 class MotionMixin(object):
+    """
+    Mixin to add save the version-data to the motion-object
+    """
     def manipulate_object(self, form):
         for attr in ['title', 'text', 'reason']:
             setattr(self.object, attr, form.cleaned_data[attr])
 
 
 class MotionCreateView(MotionMixin, CreateView):
+    """
+    Create a motion.
+    """
     permission_required = 'motion.can_create_motion'
     model = Motion
     form_class = MotionCreateForm
@@ -70,6 +82,9 @@ motion_create = MotionCreateView.as_view()
 
 
 class MotionUpdateView(MotionMixin, UpdateView):
+    """
+    Update a motion.
+    """
     model = Motion
     form_class = MotionUpdateForm
 

From 1f87749742332f26d02c7c9baee553ce561a7c74 Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Sat, 26 Jan 2013 15:25:54 +0100
Subject: [PATCH 31/88] Save the submitters to the motion

---
 openslides/motion/forms.py                    | 19 ++++-
 openslides/motion/models.py                   | 80 +++++--------------
 .../templates/motion/motion_detail.html       | 18 ++++-
 .../motion/templates/motion/motion_list.html  |  6 +-
 openslides/motion/views.py                    | 48 +++++++++--
 openslides/utils/templatetags/tags.py         |  1 +
 openslides/utils/views.py                     |  7 +-
 7 files changed, 104 insertions(+), 75 deletions(-)

diff --git a/openslides/motion/forms.py b/openslides/motion/forms.py
index 9f35e4bab..028328837 100644
--- a/openslides/motion/forms.py
+++ b/openslides/motion/forms.py
@@ -19,6 +19,9 @@ from .models import Motion
 
 
 class BaseMotionForm(forms.ModelForm, CssClassMixin):
+    """
+    Form to automaticly save the version data for a motion.
+    """
     class Meta:
         model = Motion
         fields = ()
@@ -38,12 +41,20 @@ class BaseMotionForm(forms.ModelForm, CssClassMixin):
         widget=forms.Textarea(), required=False, label=_("Reason"))
 
 
-class MotionCreateForm(BaseMotionForm):
-    pass
+class MotionSubmitterMixin(forms.ModelForm):
+    submitter = MultiplePersonFormField(label=_("Submitter"))
 
 
-class MotionUpdateForm(BaseMotionForm):
-    pass
+class MotionSupporterMixin(forms.ModelForm):
+    supporter = MultiplePersonFormField(required=False, label=_("Supporters"))
+
+
+
+
+class MotionTrivialChangesMixin(object):
+    trivial_change = forms.BooleanField(
+        required=False, label=_("Trivial change"),
+        help_text=_("Trivial changes don't create a new version."))
 
 
 class ConfigForm(forms.Form, CssClassMixin):
diff --git a/openslides/motion/models.py b/openslides/motion/models.py
index 6b68bda19..19afe043e 100644
--- a/openslides/motion/models.py
+++ b/openslides/motion/models.py
@@ -31,49 +31,21 @@ from openslides.projector.models import SlideMixin
 from openslides.agenda.models import Item
 
 
-RELATION = (
-    (1, _('Submitter')),
-    (2, _('Supporter')))
-
-
-class RelatedPersonsManager(models.Manager):
-    """
-    Manager for MotionRelatedPersons.
-
-    Returns a custom manager with gives a specific queryset for one type of
-    persons.
-    """
-    def __init__(self, relation, *args, **kwargs):
-        super(RelatedPersonsManager, self).__init__(*args, **kwargs)
-        for key, value in RELATION:
-            if key == relation:
-                self.relation = key
-                break
-        else:
-            raise ValueError('Unknown relation with id %d' % relation)
-
-    def get_query_set(self):
-        return (super(RelatedPersonsManager, self).get_query_set()
-                .filter(relation=self.relation))
-
-
-class MotionRelatedPersons(models.Model):
-    """
-    Saves the all persons related to a motion.
-
-    relation = 1: submitter
-    relation = 2: supporter
-
-    The custom manager submitter and supporter return a queryset with the
-    specific persons.
-    """
-    submitter = RelatedPersonsManager(relation=1)
-    supporter = RelatedPersonsManager(relation=2)
-    objects = models.Manager()
-
+# TODO: Save submitter and supporter in the same table
+class MotionSubmitter(models.Model):
     person = PersonField()
-    relation = models.IntegerField(default=1, choices=RELATION)
-    motion = models.ForeignKey('Motion', related_name="persons")
+    motion = models.ForeignKey('Motion', related_name="submitter")
+
+    def __unicode__(self):
+        return unicode(self.person)
+
+
+class MotionSupporter(models.Model):
+    person = PersonField()
+    motion = models.ForeignKey('Motion', related_name="supporter")
+
+    def __unicode__(self):
+        return unicode(self.person)
 
 
 class Motion(SlideMixin, models.Model):
@@ -198,20 +170,6 @@ class Motion(SlideMixin, models.Model):
 
     reason = property(get_reason, set_reason)
 
-    @property
-    def submitter(self):
-        """
-        Return a queryset with all submitter of this motion.
-        """
-        return MotionRelatedPersons.submitter.filter(motion=self)
-
-    @property
-    def supporter(self):
-        """
-        Returns a queryset with all supporter of this motion.
-        """
-        return MotionRelatedPersons.supporter.filter(motion=self)
-
     @property
     def new_version(self):
         """
@@ -292,9 +250,15 @@ class MotionVersion(models.Model):
     note = models.TextField(null=True, blank=True)
 
     def __unicode__(self):
-        return "%s Version %s" % (self.motion, self.get_version_number())
+        return "%s Version %s" % (self.motion, self.version_number)
 
-    def get_version_number(self):
+    def get_absolute_url(self, link='detail'):
+        if link == 'view' or link == 'detail':
+            return reverse('motion_version_detail', args=[str(self.motion.id),
+                                                          str(self.version_number)])
+
+    @property
+    def version_number(self):
         if self.pk is None:
             return 'new'
         return (MotionVersion.objects.filter(motion=self.motion)
diff --git a/openslides/motion/templates/motion/motion_detail.html b/openslides/motion/templates/motion/motion_detail.html
index 9cd880936..07f048750 100644
--- a/openslides/motion/templates/motion/motion_detail.html
+++ b/openslides/motion/templates/motion/motion_detail.html
@@ -4,9 +4,21 @@
 {% load i18n %}
 {% load staticfiles %}
 
-{% block title %}{{ block.super }} – {% trans "Motion" %} "{{ version.title }}"{% endblock %}
+{% block title %}{{ block.super }} – {% trans "Motion" %} "{{ motion.title }}"{% endblock %}
 
 {% block content %}
-<p>Titel: {{ object.title }} </p>
-<p>Text: {{ object.text }}</p>
+<p>Titel: {{ motion.title }} </p>
+<p>Text: {{ motion.text }}</p>
+<p>Reason: {{ motion.reason }}</p>
+<p>Submitter: {% for submitter in motion.submitter.all %}{{ submitter.person }} {% endfor %}</p>
+
+<ol>
+{% for motion_version in motion.versions.all %}
+    {% if motion_version.id == motion.version.id %}
+        <li><strong><a href="{% model_url motion_version %}">{{ motion_version }}</a></strong></li>
+    {% else %}
+        <li><a href="{% model_url motion_version %}">{{ motion_version }}</a></li>
+    {% endif %}
+{% endfor %}
+</ol>
 {% endblock %}
diff --git a/openslides/motion/templates/motion/motion_list.html b/openslides/motion/templates/motion/motion_list.html
index 32118ff73..9cb2e5506 100644
--- a/openslides/motion/templates/motion/motion_list.html
+++ b/openslides/motion/templates/motion/motion_list.html
@@ -8,9 +8,9 @@
 
 {% block content %}
     <h1>{% trans "Motions" %}</h1>
-    <ul>
+    <ol>
     {% for motion in motion_list %}
-        <li>{{ motion }}</li>
+        <li><a href="{% model_url motion %}">{{ motion }}</a></li>
     {% endfor %}
-    </ul>
+    </ol>
 {% endblock %}
diff --git a/openslides/motion/views.py b/openslides/motion/views.py
index 3121c3efd..c46697f20 100644
--- a/openslides/motion/views.py
+++ b/openslides/motion/views.py
@@ -17,6 +17,7 @@ from django.db import transaction
 from django.db.models import Model
 from django.utils.translation import ugettext as _, ugettext_lazy
 from django.views.generic.detail import SingleObjectMixin
+from django.http import Http404
 
 from openslides.utils.pdf import stylesheet
 from openslides.utils.views import (
@@ -26,8 +27,10 @@ from openslides.utils.template import Tab
 from openslides.utils.utils import html_strong
 from openslides.projector.api import get_active_slide
 from openslides.projector.projector import Widget, SLIDE
-from .models import Motion
-from .forms import MotionCreateForm, MotionUpdateForm
+from openslides.config.models import config
+from .models import Motion, MotionSubmitter
+from .forms import (BaseMotionForm, MotionSubmitterMixin, MotionSupporterMixin,
+                    MotionTrivialChangesMixin)
 
 
 from django.views.generic.edit import ModelFormMixin
@@ -55,7 +58,10 @@ class MotionDetailView(DetailView):
         object = super(MotionDetailView, self).get_object()
         version_id = self.kwargs.get('version_id', None)
         if version_id is not None:
-            object.version = int(version_id) -1
+            try:
+                object.version = int(version_id) -1
+            except IndexError:
+                raise Http404
         return object
 
 motion_detail = MotionDetailView.as_view()
@@ -66,9 +72,28 @@ class MotionMixin(object):
     Mixin to add save the version-data to the motion-object
     """
     def manipulate_object(self, form):
+        super(MotionMixin, self).manipulate_object(form)
         for attr in ['title', 'text', 'reason']:
             setattr(self.object, attr, form.cleaned_data[attr])
 
+    def post_save(self, form):
+        super(MotionMixin, self).post_save(form)
+        # TODO: only delete and save neccessary submitters
+        self.object.submitter.all().delete()
+        MotionSubmitter.objects.bulk_create(
+            [MotionSubmitter(motion=self.object, person=person)
+             for person in form.cleaned_data['submitter']])
+
+    def get_form_class(self):
+        form_classes = [BaseMotionForm]
+        if config['motion_allow_trivial_change']:
+            form_classes.append(MotionTrivialChangesMixin)
+        if self.request.user.has_perm('motion.can_manage_motion'):
+            form_classes.append(MotionSubmitterMixin)
+            if config['motion_min_supporters'] > 0:
+                form_classes.append(MotionSupporterMixin)
+        return type('MotionForm', tuple(form_classes), {})
+
 
 class MotionCreateView(MotionMixin, CreateView):
     """
@@ -76,7 +101,6 @@ class MotionCreateView(MotionMixin, CreateView):
     """
     permission_required = 'motion.can_create_motion'
     model = Motion
-    form_class = MotionCreateForm
 
 motion_create = MotionCreateView.as_view()
 
@@ -85,7 +109,21 @@ class MotionUpdateView(MotionMixin, UpdateView):
     """
     Update a motion.
     """
+    # TODO: set permissions
     model = Motion
-    form_class = MotionUpdateForm
+    apply_url = ''
 
 motion_edit = MotionUpdateView.as_view()
+
+
+def register_tab(request):
+    """
+    Register the projector tab.
+    """
+    selected = request.path.startswith('/motion/')
+    return Tab(
+        title=_('Motions'),
+        url=reverse('motion_list'),
+        permission=request.user.has_perm('motion.can_see_motion'),
+        selected=selected,
+    )
diff --git a/openslides/utils/templatetags/tags.py b/openslides/utils/templatetags/tags.py
index 96809af10..dfa8e02f2 100644
--- a/openslides/utils/templatetags/tags.py
+++ b/openslides/utils/templatetags/tags.py
@@ -35,6 +35,7 @@ def active(request, pattern):
 
 @register.simple_tag
 def model_url(object, link='view'):
+    # TODO: Rename to object_url
     return object.get_absolute_url(link)
 
 
diff --git a/openslides/utils/views.py b/openslides/utils/views.py
index c13087592..412ddac88 100644
--- a/openslides/utils/views.py
+++ b/openslides/utils/views.py
@@ -113,7 +113,7 @@ class SuccessUrlMixin(object):
         if 'apply' in self.request.POST:
             return reverse(self.get_apply_url(), args=[self.object.id])
         if self.success_url:
-            url = reverse(success_url)
+            url = reverse(self.success_url)
         else:
             try:
                 url = self.object.get_absolute_url()
@@ -230,12 +230,15 @@ class ModelFormMixin(object):
         self.object = form.save(commit=False)
         self.manipulate_object(form)
         self.object.save()
-        form.save_m2m()
+        self.post_save(form)
         return HttpResponseRedirect(self.get_success_url())
 
     def manipulate_object(self, form):
         pass
 
+    def post_save(self, form):
+        form.save_m2m()
+
 
 class UpdateView(PermissionMixin, SuccessUrlMixin, ExtraContextMixin,
         ModelFormMixin, _UpdateView):

From 8708ba5da67b14b947a84e84ace1ebc0ae22a2f4 Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Sat, 26 Jan 2013 15:39:35 +0100
Subject: [PATCH 32/88] Only save new version, when version-data has changed

---
 openslides/motion/forms.py  | 2 --
 openslides/motion/models.py | 8 +++++---
 openslides/motion/views.py  | 4 ----
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/openslides/motion/forms.py b/openslides/motion/forms.py
index 028328837..ef644aff1 100644
--- a/openslides/motion/forms.py
+++ b/openslides/motion/forms.py
@@ -49,8 +49,6 @@ class MotionSupporterMixin(forms.ModelForm):
     supporter = MultiplePersonFormField(required=False, label=_("Supporters"))
 
 
-
-
 class MotionTrivialChangesMixin(object):
     trivial_change = forms.BooleanField(
         required=False, label=_("Trivial change"),
diff --git a/openslides/motion/models.py b/openslides/motion/models.py
index 19afe043e..65c73d326 100644
--- a/openslides/motion/models.py
+++ b/openslides/motion/models.py
@@ -87,11 +87,13 @@ class Motion(SlideMixin, models.Model):
         Saves the motion. Create or update a motion_version object
         """
         super(Motion, self).save(*args, **kwargs)
-        new_data = False
-        for attr in ['_title', '_text', '_reason']:
-            if hasattr(self, attr):
+        for attr in ['title', 'text', 'reason']:
+            if getattr(self, attr) != getattr(self.last_version, attr):
                 new_data = True
                 break
+        else:
+            new_data = False
+
         need_new_version = True  # TODO: Do we need a new version (look in config)
         if hasattr(self, '_version') or (new_data and need_new_version):
             version = self.new_version
diff --git a/openslides/motion/views.py b/openslides/motion/views.py
index c46697f20..23815b9d2 100644
--- a/openslides/motion/views.py
+++ b/openslides/motion/views.py
@@ -32,10 +32,6 @@ from .models import Motion, MotionSubmitter
 from .forms import (BaseMotionForm, MotionSubmitterMixin, MotionSupporterMixin,
                     MotionTrivialChangesMixin)
 
-
-from django.views.generic.edit import ModelFormMixin
-
-
 class MotionListView(ListView):
     """
     List all motion.

From 567e6c975aabeae60b14bc27f8d2755f56dac8ed Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Sat, 26 Jan 2013 16:05:30 +0100
Subject: [PATCH 33/88] Show initial submitters in the update-form

---
 openslides/motion/forms.py | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/openslides/motion/forms.py b/openslides/motion/forms.py
index ef644aff1..98dd674ae 100644
--- a/openslides/motion/forms.py
+++ b/openslides/motion/forms.py
@@ -27,12 +27,12 @@ class BaseMotionForm(forms.ModelForm, CssClassMixin):
         fields = ()
 
     def __init__(self, *args, **kwargs):
-        motion = kwargs.get('instance', None)
-        if motion is not None:
-            initial = kwargs.setdefault('initial', {})
-            initial['title'] = motion.title
-            initial['text'] = motion.text
-            initial['reason'] = motion.reason
+        self.motion = kwargs.get('instance', None)
+        self.initial = kwargs.setdefault('initial', {})
+        if self.motion is not None:
+            self.initial['title'] = self.motion.title
+            self.initial['text'] = self.motion.text
+            self.initial['reason'] = self.motion.reason
         super(BaseMotionForm, self).__init__(*args, **kwargs)
 
     title = forms.CharField(widget=forms.TextInput(), label=_("Title"))
@@ -44,6 +44,13 @@ class BaseMotionForm(forms.ModelForm, CssClassMixin):
 class MotionSubmitterMixin(forms.ModelForm):
     submitter = MultiplePersonFormField(label=_("Submitter"))
 
+    def __init__(self, *args, **kwargs):
+        if self.motion is not None:
+            submitter = [submitter.person.person_id for submitter in self.motion.submitter.all()]
+            print submitter
+            self.initial['submitter'] = submitter
+        super(MotionSubmitterMixin, self).__init__(*args, **kwargs)
+
 
 class MotionSupporterMixin(forms.ModelForm):
     supporter = MultiplePersonFormField(required=False, label=_("Supporters"))

From ecb6419f8cc153056c06a4890faa06c7d87b975f Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Sat, 26 Jan 2013 16:19:53 +0100
Subject: [PATCH 34/88] fixed apply and success url in utils.views

---
 openslides/motion/views.py |  1 -
 openslides/utils/views.py  | 44 +++++++++++++++++++++++---------------
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/openslides/motion/views.py b/openslides/motion/views.py
index 23815b9d2..631290e2a 100644
--- a/openslides/motion/views.py
+++ b/openslides/motion/views.py
@@ -107,7 +107,6 @@ class MotionUpdateView(MotionMixin, UpdateView):
     """
     # TODO: set permissions
     model = Motion
-    apply_url = ''
 
 motion_edit = MotionUpdateView.as_view()
 
diff --git a/openslides/utils/views.py b/openslides/utils/views.py
index 412ddac88..106c9d9f2 100644
--- a/openslides/utils/views.py
+++ b/openslides/utils/views.py
@@ -24,6 +24,7 @@ from reportlab.lib.units import cm
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
 from django.core.context_processors import csrf
+from django.core.exceptions import ImproperlyConfigured
 from django.core.urlresolvers import reverse
 from django.conf import settings
 from django.dispatch import receiver
@@ -107,13 +108,32 @@ class ExtraContextMixin(object):
         return context
 
 
-class SuccessUrlMixin(object):
+class UrlMixin(object):
+    apply_url_name = None
+    success_url_name = None
+    success_url = None
+    apply_url = None
+
+    def get_apply_url(self):
+        if self.apply_url_name:
+            return reverse(self.apply_url_name)
+        elif self.apply_url:
+            return self.apply_url
+        else:
+            try:
+                return self.object.get_absolute_url('edit')
+            except AttributeError:
+                raise ImproperlyConfigured(
+                    "No URL to redirect to. Provide an apply_url_name.")
+
     def get_success_url(self):
         messages.success(self.request, self.get_success_message())
         if 'apply' in self.request.POST:
-            return reverse(self.get_apply_url(), args=[self.object.id])
-        if self.success_url:
-            url = reverse(self.success_url)
+            return self.get_apply_url()
+        if self.success_url_name:
+            return reverse(self.success_url)
+        elif self.success_url:
+            return self.success_url
         else:
             try:
                 url = self.object.get_absolute_url()
@@ -219,7 +239,7 @@ class RedirectView(PermissionMixin, AjaxMixin, _RedirectView):
         return reverse(super(RedirectView, self).get_redirect_url(**kwargs))
 
 
-class FormView(PermissionMixin, ExtraContextMixin, SuccessUrlMixin, _FormView):
+class FormView(PermissionMixin, ExtraContextMixin, UrlMixin, _FormView):
     def form_invalid(self, form):
         messages.error(self.request, _('Please check the form for errors.'))
         return super(FormView, self).form_invalid(form)
@@ -240,7 +260,7 @@ class ModelFormMixin(object):
         form.save_m2m()
 
 
-class UpdateView(PermissionMixin, SuccessUrlMixin, ExtraContextMixin,
+class UpdateView(PermissionMixin, UrlMixin, ExtraContextMixin,
         ModelFormMixin, _UpdateView):
     def form_invalid(self, form):
         messages.error(self.request, _('Please check the form for errors.'))
@@ -250,18 +270,8 @@ class UpdateView(PermissionMixin, SuccessUrlMixin, ExtraContextMixin,
         return _('%s was successfully modified.') % html_strong(self.object)
 
 
-class CreateView(PermissionMixin, SuccessUrlMixin, ExtraContextMixin,
+class CreateView(PermissionMixin, UrlMixin, ExtraContextMixin,
         ModelFormMixin, _CreateView):
-    apply_url = None
-    success_url = None
-
-    def get_apply_url(self):
-        if self.apply_url:
-            return self.apply_url
-        else:
-            raise ImproperlyConfigured(
-                "No URL to redirect to. Provide a apply_url.")
-
     def form_invalid(self, form):
         messages.error(self.request, _('Please check the form for errors.'))
         return super(CreateView, self).form_invalid(form)

From d3b340769bae9bdedbeecaf421228d507bc7f2b3 Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Sat, 26 Jan 2013 16:33:55 +0100
Subject: [PATCH 35/88] Added motion config tab

---
 openslides/motion/__init__.py                 |  1 +
 openslides/motion/models.py                   | 12 +++----
 openslides/motion/signals.py                  | 28 ++++++++++++++++
 .../motion/templates/motion/config.html       | 22 +++++++++++++
 openslides/motion/views.py                    | 33 +++++++++++++++++--
 openslides/utils/views.py                     |  4 +--
 6 files changed, 90 insertions(+), 10 deletions(-)
 create mode 100644 openslides/motion/signals.py
 create mode 100644 openslides/motion/templates/motion/config.html

diff --git a/openslides/motion/__init__.py b/openslides/motion/__init__.py
index e69de29bb..f7f3759f3 100644
--- a/openslides/motion/__init__.py
+++ b/openslides/motion/__init__.py
@@ -0,0 +1 @@
+import openslides.motion.signals
diff --git a/openslides/motion/models.py b/openslides/motion/models.py
index 65c73d326..600a5c59a 100644
--- a/openslides/motion/models.py
+++ b/openslides/motion/models.py
@@ -17,7 +17,7 @@ from django.db import models
 from django.db.models import Max
 from django.dispatch import receiver
 from django.utils.translation import pgettext
-from django.utils.translation import ugettext_lazy as _, ugettext_noop, ugettext
+from django.utils.translation import ugettext_lazy, ugettext_noop, ugettext as _
 
 from openslides.utils.utils import _propper_unicode
 from openslides.utils.person import PersonField
@@ -242,13 +242,13 @@ class Motion(SlideMixin, models.Model):
 
 
 class MotionVersion(models.Model):
-    title = models.CharField(max_length=255, verbose_name=_("Title"))
+    title = models.CharField(max_length=255, verbose_name=ugettext_lazy("Title"))
     text = models.TextField(verbose_name=_("Text"))
-    reason = models.TextField(null=True, blank=True, verbose_name=_("Reason"))
+    reason = models.TextField(null=True, blank=True, verbose_name=ugettext_lazy("Reason"))
     rejected = models.BooleanField(default=False)
     creation_time = models.DateTimeField(auto_now=True)
     motion = models.ForeignKey(Motion, related_name='versions')
-    identifier = models.CharField(max_length=255, verbose_name=_("Version identifier"))
+    identifier = models.CharField(max_length=255, verbose_name=ugettext_lazy("Version identifier"))
     note = models.TextField(null=True, blank=True)
 
     def __unicode__(self):
@@ -268,8 +268,8 @@ class MotionVersion(models.Model):
 
 
 class Category(models.Model):
-    name = models.CharField(max_length=255, verbose_name=_("Category name"))
-    prefix = models.CharField(max_length=32, verbose_name=_("Category prefix"))
+    name = models.CharField(max_length=255, verbose_name=ugettext_lazy("Category name"))
+    prefix = models.CharField(max_length=32, verbose_name=ugettext_lazy("Category prefix"))
 
     def __unicode__(self):
         return self.name
diff --git a/openslides/motion/signals.py b/openslides/motion/signals.py
new file mode 100644
index 000000000..b73637485
--- /dev/null
+++ b/openslides/motion/signals.py
@@ -0,0 +1,28 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+    openslides.motion.signales
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    Signals for the motion app.
+
+    :copyright: 2011, 2012 by OpenSlides team, see AUTHORS.
+    :license: GNU GPL, see LICENSE for more details.
+"""
+
+from django.dispatch import receiver
+from django.utils.translation import ugettext as _
+
+from openslides.config.signals import default_config_value
+
+@receiver(default_config_value, dispatch_uid="motion_default_config")
+def default_config(sender, key, **kwargs):
+    return {
+        'motion_min_supporters': 0,
+        'motion_preamble': _('The assembly may decide,'),
+        'motion_pdf_ballot_papers_selection': 'CUSTOM_NUMBER',
+        'motion_pdf_ballot_papers_number': '8',
+        'motion_pdf_title': _('Motions'),
+        'motion_pdf_preamble': '',
+        'motion_allow_trivial_change': False,
+    }.get(key)
diff --git a/openslides/motion/templates/motion/config.html b/openslides/motion/templates/motion/config.html
new file mode 100644
index 000000000..42e064444
--- /dev/null
+++ b/openslides/motion/templates/motion/config.html
@@ -0,0 +1,22 @@
+{% extends "config/base_config.html" %}
+
+{% load i18n %}
+
+{% block title %}{{ block.super }} – {% trans "Motion settings" %}{% endblock %}
+
+{% block content %}
+    <h1>{% trans "Motion settings" %}</h1>
+    <form action="" method="post">{% csrf_token %}
+    {{ form.as_p }}
+    <p>
+    <button class="button" type="submit">
+        <span class="icon ok">{% trans 'Save' %}</span>
+    </button>
+    <a href="{% url 'config_motion' %}">
+    <button class="button" type="button" onclick="window.location='{% url 'config_motion' %}'">
+        <span class="icon cancel">{% trans 'Cancel' %}</span>
+    </button>
+    </a>
+    </p>
+    </form>
+{% endblock %}
diff --git a/openslides/motion/views.py b/openslides/motion/views.py
index 631290e2a..b26752892 100644
--- a/openslides/motion/views.py
+++ b/openslides/motion/views.py
@@ -22,7 +22,7 @@ from django.http import Http404
 from openslides.utils.pdf import stylesheet
 from openslides.utils.views import (
     TemplateView, RedirectView, UpdateView, CreateView, DeleteView, PDFView,
-    DetailView, ListView)
+    DetailView, ListView, FormView)
 from openslides.utils.template import Tab
 from openslides.utils.utils import html_strong
 from openslides.projector.api import get_active_slide
@@ -30,7 +30,7 @@ from openslides.projector.projector import Widget, SLIDE
 from openslides.config.models import config
 from .models import Motion, MotionSubmitter
 from .forms import (BaseMotionForm, MotionSubmitterMixin, MotionSupporterMixin,
-                    MotionTrivialChangesMixin)
+                    MotionTrivialChangesMixin, ConfigForm)
 
 class MotionListView(ListView):
     """
@@ -111,6 +111,35 @@ class MotionUpdateView(MotionMixin, UpdateView):
 motion_edit = MotionUpdateView.as_view()
 
 
+class Config(FormView):
+    permission_required = 'config.can_manage_config'
+    form_class = ConfigForm
+    template_name = 'motion/config.html'
+    success_url_name = 'config_motion'
+
+    def get_initial(self):
+        return {
+            'motion_min_supporters': config['motion_min_supporters'],
+            'motion_preamble': config['motion_preamble'],
+            'motion_pdf_ballot_papers_selection': config['motion_pdf_ballot_papers_selection'],
+            'motion_pdf_ballot_papers_number': config['motion_pdf_ballot_papers_number'],
+            'motion_pdf_title': config['motion_pdf_title'],
+            'motion_pdf_preamble': config['motion_pdf_preamble'],
+            'motion_allow_trivial_change': config['motion_allow_trivial_change'],
+        }
+
+    def form_valid(self, form):
+        config['motion_min_supporters'] = form.cleaned_data['motion_min_supporters']
+        config['motion_preamble'] = form.cleaned_data['motion_preamble']
+        config['motion_pdf_ballot_papers_selection'] = form.cleaned_data['motion_pdf_ballot_papers_selection']
+        config['motion_pdf_ballot_papers_number'] = form.cleaned_data['motion_pdf_ballot_papers_number']
+        config['motion_pdf_title'] = form.cleaned_data['motion_pdf_title']
+        config['motion_pdf_preamble'] = form.cleaned_data['motion_pdf_preamble']
+        config['motion_allow_trivial_change'] = form.cleaned_data['motion_allow_trivial_change']
+        messages.success(self.request, _('Motion settings successfully saved.'))
+        return super(Config, self).form_valid(form)
+
+
 def register_tab(request):
     """
     Register the projector tab.
diff --git a/openslides/utils/views.py b/openslides/utils/views.py
index 106c9d9f2..0958421d0 100644
--- a/openslides/utils/views.py
+++ b/openslides/utils/views.py
@@ -127,11 +127,11 @@ class UrlMixin(object):
                     "No URL to redirect to. Provide an apply_url_name.")
 
     def get_success_url(self):
-        messages.success(self.request, self.get_success_message())
         if 'apply' in self.request.POST:
             return self.get_apply_url()
+
         if self.success_url_name:
-            return reverse(self.success_url)
+            return reverse(self.success_url_name)
         elif self.success_url:
             return self.success_url
         else:

From 0702d49e2e82a3bd701f833739df5acc05d626aa Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Sat, 26 Jan 2013 16:42:23 +0100
Subject: [PATCH 36/88] Save the supporter

---
 openslides/motion/forms.py                           |  9 +++++++--
 .../motion/templates/motion/motion_detail.html       |  1 +
 openslides/motion/views.py                           | 12 ++++++++----
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/openslides/motion/forms.py b/openslides/motion/forms.py
index 98dd674ae..559317556 100644
--- a/openslides/motion/forms.py
+++ b/openslides/motion/forms.py
@@ -47,7 +47,6 @@ class MotionSubmitterMixin(forms.ModelForm):
     def __init__(self, *args, **kwargs):
         if self.motion is not None:
             submitter = [submitter.person.person_id for submitter in self.motion.submitter.all()]
-            print submitter
             self.initial['submitter'] = submitter
         super(MotionSubmitterMixin, self).__init__(*args, **kwargs)
 
@@ -55,8 +54,14 @@ class MotionSubmitterMixin(forms.ModelForm):
 class MotionSupporterMixin(forms.ModelForm):
     supporter = MultiplePersonFormField(required=False, label=_("Supporters"))
 
+    def __init__(self, *args, **kwargs):
+        if self.motion is not None:
+            supporter = [supporter.person.person_id for supporter in self.motion.supporter.all()]
+            self.initial['supporter'] = supporter
+        super(MotionSupporterMixin, self).__init__(*args, **kwargs)
 
-class MotionTrivialChangesMixin(object):
+
+class MotionTrivialChangesMixin(forms.ModelForm):
     trivial_change = forms.BooleanField(
         required=False, label=_("Trivial change"),
         help_text=_("Trivial changes don't create a new version."))
diff --git a/openslides/motion/templates/motion/motion_detail.html b/openslides/motion/templates/motion/motion_detail.html
index 07f048750..fd5880ada 100644
--- a/openslides/motion/templates/motion/motion_detail.html
+++ b/openslides/motion/templates/motion/motion_detail.html
@@ -11,6 +11,7 @@
 <p>Text: {{ motion.text }}</p>
 <p>Reason: {{ motion.reason }}</p>
 <p>Submitter: {% for submitter in motion.submitter.all %}{{ submitter.person }} {% endfor %}</p>
+<p>Supporter: {% for supporter in motion.supporter.all %}{{ supporter.person }} {% endfor %}</p>
 
 <ol>
 {% for motion_version in motion.versions.all %}
diff --git a/openslides/motion/views.py b/openslides/motion/views.py
index b26752892..dcc8eaf8d 100644
--- a/openslides/motion/views.py
+++ b/openslides/motion/views.py
@@ -28,7 +28,7 @@ from openslides.utils.utils import html_strong
 from openslides.projector.api import get_active_slide
 from openslides.projector.projector import Widget, SLIDE
 from openslides.config.models import config
-from .models import Motion, MotionSubmitter
+from .models import Motion, MotionSubmitter, MotionSupporter
 from .forms import (BaseMotionForm, MotionSubmitterMixin, MotionSupporterMixin,
                     MotionTrivialChangesMixin, ConfigForm)
 
@@ -74,20 +74,24 @@ class MotionMixin(object):
 
     def post_save(self, form):
         super(MotionMixin, self).post_save(form)
-        # TODO: only delete and save neccessary submitters
+        # TODO: only delete and save neccessary submitters and supporter
         self.object.submitter.all().delete()
+        self.object.supporter.all().delete()
         MotionSubmitter.objects.bulk_create(
             [MotionSubmitter(motion=self.object, person=person)
              for person in form.cleaned_data['submitter']])
+        MotionSupporter.objects.bulk_create(
+            [MotionSupporter(motion=self.object, person=person)
+             for person in form.cleaned_data['supporter']])
 
     def get_form_class(self):
         form_classes = [BaseMotionForm]
-        if config['motion_allow_trivial_change']:
-            form_classes.append(MotionTrivialChangesMixin)
         if self.request.user.has_perm('motion.can_manage_motion'):
             form_classes.append(MotionSubmitterMixin)
             if config['motion_min_supporters'] > 0:
                 form_classes.append(MotionSupporterMixin)
+        if config['motion_allow_trivial_change']:
+            form_classes.append(MotionTrivialChangesMixin)
         return type('MotionForm', tuple(form_classes), {})
 
 

From 87e42cf9f85720aa9f260405f9540afd4719bd1a Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Sat, 26 Jan 2013 17:09:13 +0100
Subject: [PATCH 37/88] Let the user choose if the motion should have a new
 version via config or form

---
 openslides/motion/forms.py   | 17 ++++++++++-------
 openslides/motion/models.py  |  4 ++--
 openslides/motion/signals.py |  2 +-
 openslides/motion/views.py   | 16 +++++++++++-----
 4 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/openslides/motion/forms.py b/openslides/motion/forms.py
index 559317556..66307761a 100644
--- a/openslides/motion/forms.py
+++ b/openslides/motion/forms.py
@@ -61,9 +61,9 @@ class MotionSupporterMixin(forms.ModelForm):
         super(MotionSupporterMixin, self).__init__(*args, **kwargs)
 
 
-class MotionTrivialChangesMixin(forms.ModelForm):
-    trivial_change = forms.BooleanField(
-        required=False, label=_("Trivial change"),
+class MotionCreateNewVersionMixin(forms.ModelForm):
+    new_version = forms.BooleanField(
+        required=False, label=_("Create new version"), initial=True,
         help_text=_("Trivial changes don't create a new version."))
 
 
@@ -108,9 +108,12 @@ class ConfigForm(forms.Form, CssClassMixin):
         label=_("Preamble text for PDF document (all motions)")
     )
 
-    motion_allow_trivial_change = forms.BooleanField(
-        label=_("Allow trivial changes"),
-        help_text=_('Warning: Trivial changes undermine the motions '
-                    'autorisation system.'),
+    motion_create_new_version = forms.ChoiceField(
+        widget=forms.Select(),
+        label=_("Create new versions"),
         required=False,
+        choices=(
+            ('ALLWASY_CREATE_NEW_VERSION', _('create allways a new versions')),
+            ('NEVER_CREATE_NEW_VERSION', _('create never a new version')),
+            ('ASK_USER', _('Let the user choose if he wants to create a new version')))
     )
diff --git a/openslides/motion/models.py b/openslides/motion/models.py
index 600a5c59a..279276f8d 100644
--- a/openslides/motion/models.py
+++ b/openslides/motion/models.py
@@ -94,8 +94,8 @@ class Motion(SlideMixin, models.Model):
         else:
             new_data = False
 
-        need_new_version = True  # TODO: Do we need a new version (look in config)
-        if hasattr(self, '_version') or (new_data and need_new_version):
+        need_new_version = config['motion_create_new_version'] == 'ALLWASY_CREATE_NEW_VERSION'
+        if hasattr(self, '_new_version') or (new_data and need_new_version):
             version = self.new_version
             del self._new_version
             version.motion = self  # Test if this line is realy neccessary.
diff --git a/openslides/motion/signals.py b/openslides/motion/signals.py
index b73637485..c9b1ece36 100644
--- a/openslides/motion/signals.py
+++ b/openslides/motion/signals.py
@@ -24,5 +24,5 @@ def default_config(sender, key, **kwargs):
         'motion_pdf_ballot_papers_number': '8',
         'motion_pdf_title': _('Motions'),
         'motion_pdf_preamble': '',
-        'motion_allow_trivial_change': False,
+        'motion_create_new_version': 'ALLWASY_CREATE_NEW_VERSION',
     }.get(key)
diff --git a/openslides/motion/views.py b/openslides/motion/views.py
index dcc8eaf8d..d02aac3c3 100644
--- a/openslides/motion/views.py
+++ b/openslides/motion/views.py
@@ -30,7 +30,7 @@ from openslides.projector.projector import Widget, SLIDE
 from openslides.config.models import config
 from .models import Motion, MotionSubmitter, MotionSupporter
 from .forms import (BaseMotionForm, MotionSubmitterMixin, MotionSupporterMixin,
-                    MotionTrivialChangesMixin, ConfigForm)
+                    MotionCreateNewVersionMixin, ConfigForm)
 
 class MotionListView(ListView):
     """
@@ -72,6 +72,12 @@ class MotionMixin(object):
         for attr in ['title', 'text', 'reason']:
             setattr(self.object, attr, form.cleaned_data[attr])
 
+        try:
+            if form.cleaned_data['new_version']:
+                self.object.new_version
+        except KeyError:
+            pass
+
     def post_save(self, form):
         super(MotionMixin, self).post_save(form)
         # TODO: only delete and save neccessary submitters and supporter
@@ -90,8 +96,8 @@ class MotionMixin(object):
             form_classes.append(MotionSubmitterMixin)
             if config['motion_min_supporters'] > 0:
                 form_classes.append(MotionSupporterMixin)
-        if config['motion_allow_trivial_change']:
-            form_classes.append(MotionTrivialChangesMixin)
+        if config['motion_create_new_version'] == 'ASK_USER':
+            form_classes.append(MotionCreateNewVersionMixin)
         return type('MotionForm', tuple(form_classes), {})
 
 
@@ -129,7 +135,7 @@ class Config(FormView):
             'motion_pdf_ballot_papers_number': config['motion_pdf_ballot_papers_number'],
             'motion_pdf_title': config['motion_pdf_title'],
             'motion_pdf_preamble': config['motion_pdf_preamble'],
-            'motion_allow_trivial_change': config['motion_allow_trivial_change'],
+            'motion_create_new_version': config['motion_create_new_version'],
         }
 
     def form_valid(self, form):
@@ -139,7 +145,7 @@ class Config(FormView):
         config['motion_pdf_ballot_papers_number'] = form.cleaned_data['motion_pdf_ballot_papers_number']
         config['motion_pdf_title'] = form.cleaned_data['motion_pdf_title']
         config['motion_pdf_preamble'] = form.cleaned_data['motion_pdf_preamble']
-        config['motion_allow_trivial_change'] = form.cleaned_data['motion_allow_trivial_change']
+        config['motion_create_new_version'] = form.cleaned_data['motion_create_new_version']
         messages.success(self.request, _('Motion settings successfully saved.'))
         return super(Config, self).form_valid(form)
 

From d911e311d6d6c036956f59d3735ed770546a29ae Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Sat, 26 Jan 2013 18:18:02 +0100
Subject: [PATCH 38/88] Let the user support and unsupport the motion

---
 openslides/motion/models.py | 27 ++++++++++++++++
 openslides/motion/urls.py   | 10 ++++++
 openslides/motion/views.py  | 61 ++++++++++++++++++++++++++++++++++++-
 3 files changed, 97 insertions(+), 1 deletion(-)

diff --git a/openslides/motion/models.py b/openslides/motion/models.py
index 279276f8d..510d481ac 100644
--- a/openslides/motion/models.py
+++ b/openslides/motion/models.py
@@ -240,6 +240,33 @@ class Motion(SlideMixin, models.Model):
         except IndexError:
             return self.new_version
 
+    def is_supporter(self, person):
+        try:
+            return self.supporter.filter(person=person).exists()
+        except AttributeError:
+            return False
+
+    def support(self, person):
+        """
+        Add a Supporter to the list of supporters of the motion.
+        """
+        if not self.is_supporter(person):
+            MotionSupporter(motion=self, person=person).save()
+            #self.writelog(_("Supporter: +%s") % (person))
+        # TODO: Raise a precise exception for the view in else-clause
+
+    def unsupport(self, person):
+        """
+        remove a supporter from the list of supporters of the motion
+        """
+        try:
+            self.supporter.filter(person=person).delete()
+        except MotionSupporter.DoesNotExist:
+            # TODO: Don't do nothing but raise a precise exception for the view
+            pass
+        #else:
+            #self.writelog(_("Supporter: -%s") % (person))
+
 
 class MotionVersion(models.Model):
     title = models.CharField(max_length=255, verbose_name=ugettext_lazy("Title"))
diff --git a/openslides/motion/urls.py b/openslides/motion/urls.py
index 59b9b7b2d..ebc1c2155 100644
--- a/openslides/motion/urls.py
+++ b/openslides/motion/urls.py
@@ -37,4 +37,14 @@ urlpatterns = patterns('openslides.motion.views',
         'motion_detail',
         name='motion_version_detail',
     ),
+
+    url(r'^(?P<pk>\d+)/support/$',
+        'motion_support',
+        name='motion_support',
+    ),
+
+    url(r'^(?P<pk>\d+)/unsupport/$',
+        'motion_unsupport',
+        name='motion_unsupport',
+    ),
 )
diff --git a/openslides/motion/views.py b/openslides/motion/views.py
index d02aac3c3..4875dae36 100644
--- a/openslides/motion/views.py
+++ b/openslides/motion/views.py
@@ -22,7 +22,7 @@ from django.http import Http404
 from openslides.utils.pdf import stylesheet
 from openslides.utils.views import (
     TemplateView, RedirectView, UpdateView, CreateView, DeleteView, PDFView,
-    DetailView, ListView, FormView)
+    DetailView, ListView, FormView, QuestionMixin)
 from openslides.utils.template import Tab
 from openslides.utils.utils import html_strong
 from openslides.projector.api import get_active_slide
@@ -121,6 +121,65 @@ class MotionUpdateView(MotionMixin, UpdateView):
 motion_edit = MotionUpdateView.as_view()
 
 
+class SupportView(SingleObjectMixin, QuestionMixin, RedirectView):
+    """
+    Classed based view to support or unsupport a motion. Use
+    support=True or support=False in urls.py
+    """
+    permission_required = 'motion.can_support_motion'
+    model = Motion
+    support = True
+
+    def get(self, request, *args, **kwargs):
+        self.object = self.get_object()
+        return super(SupportView, self).get(request, *args, **kwargs)
+
+    def check_allowed_actions(self, request):
+        """
+        Checks whether request.user can support or unsupport the motion.
+        Returns True or False.
+        """
+        return True #TODO
+        allowed_actions = self.object.get_allowed_actions(request.user)
+        if self.support and not 'support' in allowed_actions:
+            messages.error(request, _('You can not support this motion.'))
+            return False
+        elif not self.support and not 'unsupport' in allowed_actions:
+            messages.error(request, _('You can not unsupport this motion.'))
+            return False
+        else:
+            return True
+
+    def pre_redirect(self, request, *args, **kwargs):
+        if self.check_allowed_actions(request):
+            super(SupportView, self).pre_redirect(request, *args, **kwargs)
+
+    def get_question(self):
+        if self.support:
+            return _('Do you really want to support this motion?')
+        else:
+            return _('Do you really want to unsupport this motion?')
+
+    def case_yes(self):
+        if self.check_allowed_actions(self.request):
+            if self.support:
+                self.object.support(person=self.request.user)
+            else:
+                self.object.unsupport(person=self.request.user)
+
+    def get_success_message(self):
+        if self.support:
+            return _("You have supported this motion successfully.")
+        else:
+            return _("You have unsupported this motion successfully.")
+
+    def get_redirect_url(self, **kwargs):
+        return self.object.get_absolute_url()
+
+motion_support = SupportView.as_view(support=True)
+motion_unsupport = SupportView.as_view(support=False)
+
+
 class Config(FormView):
     permission_required = 'config.can_manage_config'
     form_class = ConfigForm

From 82ad5e2de02abc9a7dc5986176ddba465883b0c2 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Thu, 31 Jan 2013 10:19:56 +0100
Subject: [PATCH 39/88] Major changes for new twitter bootstrap template (e.g.
 replaced icons)

---
 openslides/agenda/static/javascript/agenda.js |  19 +-
 openslides/agenda/templates/agenda/edit.html  |  30 +-
 .../agenda/templates/agenda/item_row.html     |  16 +-
 .../agenda/templates/agenda/overview.html     |   4 +-
 .../agenda/templates/agenda/widget.html       |  27 +-
 .../templates/assignment/config.html          |  23 +-
 .../templates/assignment/overview.html        |  16 +-
 .../templates/assignment/poll_view.html       |  66 +-
 .../assignment/templates/assignment/view.html |  21 +-
 .../templates/assignment/widget.html          |  17 +-
 .../config/templates/config/general.html      |  66 +-
 openslides/locale/de/LC_MESSAGES/django.mo    | Bin 34677 -> 36354 bytes
 openslides/locale/de/LC_MESSAGES/django.po    | 679 +++++++++---------
 .../motion/templates/motion/config.html       |  23 +-
 openslides/motion/templates/motion/edit.html  |  35 +-
 .../motion/templates/motion/overview.html     |  21 +-
 .../motion/templates/motion/poll_view.html    |  17 +-
 openslides/motion/templates/motion/view.html  |  59 +-
 .../motion/templates/motion/widget.html       |  17 +-
 .../static/javascript/participant.js          |  16 +-
 .../templates/participant/config.html         |   5 +-
 .../templates/participant/group_overview.html |   2 +-
 .../templates/participant/group_widget.html   |  17 +-
 .../templates/participant/login.html          |  20 +-
 .../templates/participant/overview.html       |  38 +-
 .../templates/participant/settings.html       |  15 +-
 .../templates/participant/user_widget.html    |  17 +-
 .../projector/static/javascript/dashboard.js  |  23 -
 .../projector/static/styles/dashboard.css     |   8 +-
 .../projector/control_countdown.html          |   5 +-
 .../projector/control_overlay_message.html    |   6 +-
 .../projector/custom_slide_widget.html        |  36 +-
 .../templates/projector/dashboard.html        |   2 +-
 .../templates/projector/live_view_widget.html |  20 +-
 .../templates/projector/overlay_widget.html   |  14 +-
 openslides/static/javascript/utils.js         |  16 +-
 openslides/static/styles/base.css             |  66 +-
 openslides/templates/base.html                |   6 +-
 openslides/templates/formbuttons_save.html    |   2 +-
 39 files changed, 757 insertions(+), 733 deletions(-)

diff --git a/openslides/agenda/static/javascript/agenda.js b/openslides/agenda/static/javascript/agenda.js
index c2be1928f..69432803f 100644
--- a/openslides/agenda/static/javascript/agenda.js
+++ b/openslides/agenda/static/javascript/agenda.js
@@ -20,7 +20,7 @@ function hideClosedSlides(hide) {
     if (hide) {
         $('#hidelink').attr('title', 'show');
         $('#hidelink').removeClass('hide').addClass('show');
-        $('.close_link.closed').parent().parent().each(function() {
+        $('.close_link .icon-checked-new').parent().parent().parent().each(function() {
             hideLine($(this));
         });
         hidden = $('#menu-overview tr:hidden').size();
@@ -35,7 +35,8 @@ function hideClosedSlides(hide) {
 }
 
 $(function() {
-    $('.close_link a').click(function(event) {
+    // change participant status (on/off)
+    $('.close_link').click(function(event) {
         event.preventDefault();
         var link = $(this);
         $.ajax({
@@ -44,15 +45,15 @@ $(function() {
             dataType: 'json',
             success: function(data) {
                 if (data.closed) {
-                    newclass = 'closed';
-                    link.parent().parent().parent().addClass('itemdoneline');
+                    newclass = 'icon-checked-new';
+                    link.parent().parent().addClass('offline');
+                    link.addClass('btn-success');
                 } else {
-                    newclass = 'open';
-                    link.parent().parent().parent().removeClass('itemdoneline');
+                    newclass = 'icon-unchecked-new';
+                    link.parent().parent().removeClass('offline');
+                    link.removeClass('btn-success');
                 }
-                link.parent().removeClass('closed open').addClass(newclass);
-
-
+                link.children('i').removeClass('icon-checked-new icon-unchecked-new').addClass(newclass);
                 link.attr('href', data.link);
             }
         });
diff --git a/openslides/agenda/templates/agenda/edit.html b/openslides/agenda/templates/agenda/edit.html
index 95f414f49..4c5d86455 100644
--- a/openslides/agenda/templates/agenda/edit.html
+++ b/openslides/agenda/templates/agenda/edit.html
@@ -23,29 +23,13 @@
         </small>
     </h1>
     <form action="" method="post">{% csrf_token %}
-        {% for field in form %}
-        <div class="control-group{% if field.errors %} error{% endif%}">
-            <label for="id_{{ field.name }}">{{ field.label }}{% if field.field.required %}<span class="required">*</span>{% endif %}:</label>
-            {{ field }}
-            {% if field.errors %}
-            <span class="help-inline">{{ field.errors }}</span>
-            {% endif %}
-            {% if field.help_text %}
-            <span class="help-inline">{{ field.help_text }})</span>
-            {% endif %}
-        </div>
-        {% endfor %}
-        <div class="control-group">
-            <button class="btn btn-primary" type="submit">
-                {% trans 'Save' %}
-            </button>
-            <button class="btn" type="submit" name="apply">
-                {% trans 'Apply' %}
-            </button>
-            <a href="{% url 'item_overview' %}" class="btn">
-                {% trans 'Cancel' %}
-            </a>
-        </div>
+        {% include "form.html" %}
+        <p>
+        {% include "formbuttons_saveapply.html" %}
+        <a href='{% url 'item_overview' %}' class="btn">
+            {% trans 'Cancel' %}
+        </a>
+        </p>
         <small>* {% trans "required" %}</small>
     </form>
 {% endblock %}
diff --git a/openslides/agenda/templates/agenda/item_row.html b/openslides/agenda/templates/agenda/item_row.html
index 6dab2dcf6..ee09dfc8b 100644
--- a/openslides/agenda/templates/agenda/item_row.html
+++ b/openslides/agenda/templates/agenda/item_row.html
@@ -3,16 +3,14 @@
 {% load tags %}
 
     <td>
-        <span class="close_link {% if item.closed %}closed{% else %}open{% endif %}">
         {% if perms.agenda.can_manage_agenda %}
-            <a href="{% if item.closed %}{% url 'item_open' item.id %}{% else %}{% url 'item_close' item.id %}{% endif %}" 
-                class="btn btn-mini" title="{% trans 'Reopen item' %}">
-                <i class="icon- custom-icons"></i>
+            <a href="{% if item.closed %}{% url 'item_open' item.id %}{% else %}{% url 'item_close' item.id %}{% endif %}"
+                class="close_link btn btn-mini {% if item.closed %}btn-success{% endif %}" title="{% trans 'Change status (open/closed)' %}">
+                <i class="{% if item.closed %}icon-checked-new{% else %}icon-unchecked-new{% endif %}"></i>
             </a>
         {% else %}
-            <i class="icon- custom-icons"></i>
+            <i class="icon-"></i>
         {% endif %}
-        </span>
     </td>
     <td>
         {% for p in item.get_ancestors %}
@@ -33,8 +31,8 @@
     <td>
         <span style="width: 1px; white-space: nowrap;">
         {% if perms.projector.can_manage_projector %}
-            <a href="{% url 'projector_activate_slide' item.sid  %}" class="activate_link btn {% if item.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Activate item' %}">
-                <i class="icon icon-facetime-video {% if item.active %}icon-white{% endif %}"></i>
+            <a href="{% url 'projector_activate_slide' item.sid  %}" class="activate_link btn {% if item.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show' %}">
+                <i class="icon-facetime-video {% if item.active %}icon-white{% endif %}"></i>
             </a>
         {% endif %}
         {% if perms.agenda.can_manage_agenda %}
@@ -46,7 +44,7 @@
             </a>
             {% if not item.is_leaf_node %}
                 <a href="{% url 'projector_activate_slide' item.sid 'summary' %}" class="activate_link btn btn-mini" title="{% trans 'Activate summary for this item' %}">
-                    <img src="{% static 'images/icons/summary.png' %}">
+                    <i class="icon-summary"></i>
                 </a>
             {% endif %}
         {% endif %}
diff --git a/openslides/agenda/templates/agenda/overview.html b/openslides/agenda/templates/agenda/overview.html
index 55f8e1490..7346cc862 100644
--- a/openslides/agenda/templates/agenda/overview.html
+++ b/openslides/agenda/templates/agenda/overview.html
@@ -96,7 +96,7 @@
                 {% if perms.projector.can_manage_projector %}
                     <span>
                     <a href="{% url 'projector_activate_slide' 'agenda' %}" class="activate_link btn {% if active_sid == 'agenda' %}btn-primary{% endif %} btn-mini" title="{% trans 'Activate agenda' %}">
-                        <i class="icon icon-facetime-video {% if active_sid == 'agenda' %}icon-white{% endif %}"></i>
+                        <i class="icon-facetime-video {% if active_sid == 'agenda' %}icon-white{% endif %}"></i>
                     </a>
                     <span>
                 {% endif %}
@@ -105,7 +105,7 @@
             </tr>
         {% if items %}
             {% for item in items %}
-            <tr class="draggable{% if item.active %} activeline{% endif %}{% if item.closed %} itemdoneline{% endif %}">
+            <tr class="draggable{% if item.active %} activeline{% endif %}{% if item.closed %} offline{% endif %}">
                 {% include "agenda/item_row.html" %}
             </tr>
             {% endfor %}
diff --git a/openslides/agenda/templates/agenda/widget.html b/openslides/agenda/templates/agenda/widget.html
index ce856707b..2ccd1933a 100644
--- a/openslides/agenda/templates/agenda/widget.html
+++ b/openslides/agenda/templates/agenda/widget.html
@@ -4,8 +4,8 @@
 
 <ul style="line-height: 180%">
     <li class="{% if agenda.active %}activeline{% endif %}">
-        <a href="{% url 'projector_activate_slide' agenda.key  %}" class="activate_projector btn {% if agenda.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show agenda' %}">
-            <i class="icon icon-facetime-video {% if agenda.active %}icon-white{% endif %}"></i>
+        <a href="{% url 'projector_activate_slide' agenda.key  %}" class="activate_link btn {% if agenda.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show agenda' %}">
+            <i class="icon-facetime-video {% if agenda.active %}icon-white{% endif %}"></i>
         </a>&nbsp;
         <a href="{% url 'projctor_preview_slide' agenda.key %}" title="{% trans 'Preview' %}" class="icon preview right">
             <span></span>
@@ -17,27 +17,22 @@
 <ul style="line-height: 180%">
 {% for item in items %}
     <li class="{% if item.active %}activeline{% endif %}">
-        <a href="{% url 'projector_activate_slide' item.sid  %}" class="activate_projector btn {% if item.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show item' %}">
-            <i class="icon icon-facetime-video {% if item.active %}icon-white{% endif %}"></i>
+        <a href="{% url 'projector_activate_slide' item.sid  %}" class="activate_link btn {% if item.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show' %}">
+            <i class="icon-facetime-video {% if item.active %}icon-white{% endif %}"></i>
         </a>&nbsp;
-        <a href="{% model_url item 'delete' %}" title="{% trans 'Delete' %}" class="icon delete right">
-            <span></span>
+        <a href="{% model_url item 'edit' %}" title="{% trans 'Edit' %}" class="btn btn-mini right">
+            <i class="icon-pencil"></i>
         </a>
-        <a href="{% model_url item 'edit' %}" title="{% trans 'Edit' %}" class="icon edit right">
-            <span></span>
-        </a>
-        <a href="{% url 'projctor_preview_slide' item.sid %}" title="{% trans 'Preview' %}" class="icon preview right">
-            <span></span>
+        <a href="{% url 'projctor_preview_slide' item.sid %}" title="{% trans 'Preview' %}" class="btn btn-mini right">
+            <i class="icon-search"></i>
         </a>
         {% if not item.is_leaf_node %}
-        <a class="activate_projector right" href="{% url 'projector_activate_slide' item.sid 'summary' %}">
-            <img src="{% static 'images/icons/summary.png' %}"
-                title="{% trans 'Activate summary for this item' %}"
-                style="padding-right: 2px;">
+        <a class="activate_link btn btn-mini {% if item.active %}btn-primary{% endif %} right" href="{% url 'projector_activate_slide' item.sid 'summary' %}" title="{% trans 'Activate summary for this item' %}">
+            <i class="icon-summary {% if item.active %}icon-white{% endif %}"></i>
         </a>
         {% endif %}
         {% for p in item.get_ancestors %}
-            <span class="indentation">&nbsp;</span>
+            <span class="indentation"></span>
         {% endfor %}
         <a href="{% model_url item 'view' %}">{{ item }}</a>
         {{ item.get_title_supplement|safe }}
diff --git a/openslides/assignment/templates/assignment/config.html b/openslides/assignment/templates/assignment/config.html
index 4468d33c9..2de60af06 100644
--- a/openslides/assignment/templates/assignment/config.html
+++ b/openslides/assignment/templates/assignment/config.html
@@ -5,20 +5,19 @@
 {% block title %}{{ block.super }} – {% trans "Election settings" %}{% endblock %}
 
 {% block content %}
-    <h1>{% trans "Configuration" %}: {% trans "Elections" %}
+    <h1>
+        {% trans "Configuration" %}
+        <small>{% trans "Elections" %}</small>
         {% block config_submenu %}{{ block.super }}{% endblock %}
     </h1>
     <form action="" method="post">{% csrf_token %}
-    {{ form.as_p }}
-    <p>
-    <button class="button" type="submit">
-        <span class="icon ok">{% trans 'Save' %}</span>
-    </button>
-    <a href="{% url 'config_assignment' %}">
-    <button class="button" type="button" onclick="window.location='{% url 'config_assignment' %}'">
-        <span class="icon cancel">{% trans 'Cancel' %}</span>
-    </button>
-    </a>
-    </p>
+        {% include "form.html" %}
+        <p>
+        {% include "formbuttons_save.html" %}
+        <a href="{% url 'config_assignment' %}" class="btn">
+            {% trans 'Cancel' %}
+        </a>
+        </p>
+        <small>* {% trans "required" %}</small>
     </form>
 {% endblock %}
diff --git a/openslides/assignment/templates/assignment/overview.html b/openslides/assignment/templates/assignment/overview.html
index 2f58ebeca..f38cc5489 100644
--- a/openslides/assignment/templates/assignment/overview.html
+++ b/openslides/assignment/templates/assignment/overview.html
@@ -53,15 +53,21 @@
             <td>
                 <span style="width: 1px; white-space: nowrap;">
                 {% if perms.projector.can_manage_projector %}
-                    <a class="activate_link {% if assignment.active %}active{% endif %}" href="{% url 'projector_activate_slide' assignment.sid %}" title="{% trans 'Activate election' %}">
-                        <span></span>
+                    <a href="{% url 'projector_activate_slide' assignment.sid  %}" class="activate_link btn {% if assignment.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show' %}">
+                        <i class="icon-facetime-video {% if assignment.active %}icon-white{% endif %}"></i>
                     </a>
                 {% endif %}
                 {% if perms.assignment.can_manage_assignment %}
-                    <a href="{% url 'assignment_edit' assignment.id %}"><img src="{% static 'images/icons/edit.png' %}" title="{% trans 'Edit election' %}"></a>
-                    <a href="{% url 'assignment_delete' assignment.id %}"><img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Delete election' %}"></a>
+                    <a href="{% url 'assignment_edit' assignment.id %}" title="{% trans 'Edit' %}" class="btn btn-mini">
+                        <i class="icon-pencil"></i>
+                    </a>
+                    <a href="{% url 'assignment_delete' assignment.id %}" title="{% trans 'Delete' %}" class="btn btn-mini">
+                        <i class="icon-remove"></i>
+                    </a>
                 {% endif %}
-                <a href="{% url 'print_assignment' assignment.id %}" title="{% trans 'Election as PDF' %}"><img src="{% static 'images/icons/pdf.png' %}"></a>
+                <a href="{% url 'print_assignment' assignment.id  %}" class="btn btn-mini" title="{% trans 'Print election as PDF' %}">
+                    <i class="icon-print"></i>
+                </a>
                 </span>
             </td>
         </tr>
diff --git a/openslides/assignment/templates/assignment/poll_view.html b/openslides/assignment/templates/assignment/poll_view.html
index dea08982f..f7c90ad9f 100644
--- a/openslides/assignment/templates/assignment/poll_view.html
+++ b/openslides/assignment/templates/assignment/poll_view.html
@@ -5,15 +5,30 @@
 {% block title %}{{ block.super }} – {% trans "Election" %} "{{ assignment }}" – {{ ballotnumber }}. {% trans "ballot" %}{% endblock %}
 
 {% block content %}
-    <h1>{{ assignment }} – {{ ballotnumber }}. {% trans "ballot" %}</h1>
-    {% if assignment.polldescription %}
-        <p><b>{% trans "Short description (for ballot paper)" %}:</b> {{ assignment.polldescription }}</p>
+<h1>
+    {{ assignment }}
+    <small>
+    {{ ballotnumber }}. {% trans "ballot" %}
+    </small>
+    <small class="pull-right">
+    <a href="{% url 'assignment_overview' %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
+    <!-- activate projector -->
+    {% if perms.projector.can_manage_projector %}
+        <a href="{% url 'projector_activate_slide' assignment.sid  %}" class="activate_link btn {% if assignment.active %}btn-primary{% endif %} btn-mini" rel="tooltip" data-original-title="{% trans 'Show motion' %}">
+            <i class="icon-facetime-video {% if assignment.active %}icon-white{% endif %}"></i>
+        </a>
     {% endif %}
-    <i class="helptext">{% trans "Special values" %}: -1 = {% trans 'majority' %}; -2 = {% trans 'undocumented' %}</i>
+    </small>
+</h1>
 
-    <form action="" method="post" class="small-form">{% csrf_token %}
+{% if assignment.polldescription %}
+    <p><b>{% trans "Short description (for ballot paper)" %}:</b> {{ assignment.polldescription }}</p>
+{% endif %}
 
-    <table style="width:auto">
+<i class="helptext">{% trans "Special values" %}: -1 = {% trans 'majority' %}; -2 = {% trans 'undocumented' %}</i>
+
+<form action="" method="post" class="small-form">{% csrf_token %}
+    <table class="table table-striped table-bordered" style="width: auto;">
         <tr>
             <th>{% trans "Candidates" %}</th>
             {% for value in poll.get_vote_values %}
@@ -31,7 +46,7 @@
                 {% endfor %}
             </tr>
         {% endfor %}
-        <tr class="total">
+        <tr>
             <td>{% trans "Invalid votes" %}</td>
             {% for value in poll.get_vote_values %}
                 {% if forloop.first %}
@@ -41,7 +56,7 @@
                 {% endif %}
             {% endfor %}
         </tr>
-        <tr class="total">
+        <tr class="total warning">
             <td>{% trans "Votes cast" %}</td>
             {% for value in poll.get_vote_values %}
                 {% if forloop.first %}
@@ -54,26 +69,21 @@
     </table>
 
     <p>
-    <a href="{% url 'print_assignment_poll' poll.id %}">
-    <button class="button" type="button" onclick="window.location='{% url 'print_assignment_poll' poll.id %}'">
-        <span class="icon pdf">{% trans 'Ballot paper as PDF' %}</span>
-    </button>
+    <a href="{% url 'print_assignment_poll' poll.id %}" class="btn">
+        <i class="icon-print"></i> {% trans 'Ballot paper as PDF' %}
     </a>
     </p>
-
-    <p>
-    <button class="button" type="submit">
-        <span class="icon ok">{% trans 'Save' %}</span>
-    </button>
-    <button class="button" type="submit" name="apply">
-        <span class="icon apply">{% trans 'Apply' %}</span>
-    </button>
-    <a href="{% url 'assignment_view' poll.assignment.id %}">
-    <button class="button" type="button" onclick="window.location='{% url 'assignment_view' poll.assignment.id %}'">
-        <span class="icon cancel">{% trans 'Cancel' %}</span>
-    </button>
-    </a>
-    </p>
-
-    </form>
+    <!-- Control buttons -->
+    <div class="control-group">
+        <button type="submit" class="btn btn-primary">
+            {% trans 'Save' %}
+        </button>
+        <button type="submit" name="apply" class="btn">
+            {% trans 'Apply' %}
+        </button>
+        <a href="{% url 'assignment_view' poll.assignment.id %}" class="btn">
+            {% trans 'Cancel' %}
+        </a>
+    </div>
+</form>
 {% endblock %}
diff --git a/openslides/assignment/templates/assignment/view.html b/openslides/assignment/templates/assignment/view.html
index 138609886..f7ab63059 100644
--- a/openslides/assignment/templates/assignment/view.html
+++ b/openslides/assignment/templates/assignment/view.html
@@ -14,15 +14,18 @@
 {% endblock %}
 
 {% block content %}
-    <h1>{{ assignment }}
-        <small class="pull-right">
-        <a href="{% url 'assignment_overview' %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
-        {% if perms.projector.can_manage_projector %}
-            <a href="{% url 'projector_activate_slide' assignment.sid  %}" class="btn btn-primary btn-mini" title="{% trans 'Show election' %}"><i class="icon-facetime-video icon-white"></i></a>
-        {% endif %}
-        </small>
-    </h1>
-
+<h1>
+    {{ assignment }}
+    <small class="pull-right">
+    <a href="{% url 'assignment_overview' %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
+    <!-- activate projector -->
+    {% if perms.projector.can_manage_projector %}
+        <a href="{% url 'projector_activate_slide' assignment.sid  %}" class="activate_link btn {% if assignment.active %}btn-primary{% endif %} btn-mini" rel="tooltip" data-original-title="{% trans 'Show motion' %}">
+            <i class="icon-facetime-video {% if assignment.active %}icon-white{% endif %}"></i>
+        </a>
+    {% endif %}
+    </small>
+</h1>
 
 <div class="row-fluid">
 <div class="span9">
diff --git a/openslides/assignment/templates/assignment/widget.html b/openslides/assignment/templates/assignment/widget.html
index 985db4e20..f428d341a 100644
--- a/openslides/assignment/templates/assignment/widget.html
+++ b/openslides/assignment/templates/assignment/widget.html
@@ -5,17 +5,14 @@
 <ul style="line-height: 180%">
 {% for assignment in assignments %}
     <li class="{% if assignment.active %}activeline{% endif %}">
-        <a href="{% url 'projector_activate_slide' assignment.sid %}" class="activate_link {% if assignment.active %}active{% endif %}">
-            <div></div>
+        <a href="{% url 'projector_activate_slide' assignment.sid  %}" class="activate_link btn {% if assignment.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show' %}">
+            <i class="icon-facetime-video {% if assignment.active %}icon-white{% endif %}"></i>
+        </a>&nbsp;
+        <a href="{% model_url assignment 'edit' %}" title="{% trans 'Edit' %}" class="btn btn-mini right">
+            <i class="icon-pencil"></i>
         </a>
-        <a href="{% model_url assignment 'delete' %}" title="{% trans 'Delete' %}" class="icon delete right">
-            <span></span>
-        </a>
-        <a href="{% model_url assignment 'edit' %}" title="{% trans 'Edit' %}" class="icon edit right">
-            <span></span>
-        </a>
-        <a href="{% url 'projctor_preview_slide' assignment.sid %}" title="{% trans 'Preview' %}" class="icon preview right">
-            <span></span>
+        <a href="{% url 'projctor_preview_slide' assignment.sid %}" title="{% trans 'Preview' %}" class="btn btn-mini right">
+            <i class="icon-search"></i>
         </a>
         <a href="{% model_url assignment 'view' %}">{{ assignment }}</a>
     </li>
diff --git a/openslides/config/templates/config/general.html b/openslides/config/templates/config/general.html
index b77bf75dc..f5ef585d8 100644
--- a/openslides/config/templates/config/general.html
+++ b/openslides/config/templates/config/general.html
@@ -5,7 +5,9 @@
 {% block title %}{{ block.super }} – {% trans "General settings" %}{% endblock %}
 
 {% block content %}
-    <h1>{% trans "Configuration" %}: {% trans "General" %}
+    <h1>
+        {% trans "Configuration" %}
+        <small>{% trans "General" %}</small>
         {% block config_submenu %}{{ block.super }}{% endblock %}
     </h1>
     <form action="" method="post">{% csrf_token %}
@@ -13,13 +15,16 @@
         <legend>{% trans "Event" %}</legend>
         {% for field in form %}
             {% if "id_event" in field.label_tag %}
-            <p>
-            {{ field.errors }}
-            {{ field.required }}
-            {{ field.label_tag }}
-            {{ field }}
-            {{ field.help_text }}
-            </p>
+            <div class="control-group{% if field.errors %} error{% endif%}">
+                <label for="id_{{ field.name }}">{{ field.label }}{% if field.field.required %}<span class="required">*</span>{% endif %}:</label>
+                {{ field }}
+                {% if field.errors %}
+                    <span class="help-inline">{{ field.errors }}</span>
+                {% endif %}
+                {% if field.help_text %}
+                    <span class="help-inline">{{ field.help_text }}</span>
+                {% endif %}
+            </div>
             {% endif %}
         {% endfor %}
     </fieldset>
@@ -28,13 +33,16 @@
         <legend>{% trans "Welcome Widget" %}</legend>
         {% for field in form %}
             {% if "id_welcome" in field.label_tag %}
-            <p>
-            {{ field.errors }}
-            {{ field.required }}
-            {{ field.label_tag }}
-            {{ field }}
-            {{ field.help_text }}
-            </p>
+            <div class="control-group{% if field.errors %} error{% endif%}">
+                <label for="id_{{ field.name }}">{{ field.label }}{% if field.field.required %}<span class="required">*</span>{% endif %}:</label>
+                {{ field }}
+                {% if field.errors %}
+                    <span class="help-inline">{{ field.errors }}</span>
+                {% endif %}
+                {% if field.help_text %}
+                    <span class="help-inline">{{ field.help_text }}</span>
+                {% endif %}
+            </div>
             {% endif %}
         {% endfor %}
     </fieldset>
@@ -43,25 +51,25 @@
         <legend>{% trans "System" %}</legend>
         {% for field in form %}
             {% if "id_system" in field.label_tag %}
-            <p>
-            {{ field.errors }}
-            {{ field.required }}
-            {{ field.label_tag }}
-            {{ field }}
-            {{ field.help_text }}
-            </p>
+            <div class="control-group{% if field.errors %} error{% endif%}">
+                <label for="id_{{ field.name }}">{{ field.label }}{% if field.field.required %}<span class="required">*</span>{% endif %}:</label>
+                {{ field }}
+                {% if field.errors %}
+                    <span class="help-inline">{{ field.errors }}</span>
+                {% endif %}
+                {% if field.help_text %}
+                    <span class="help-inline">{{ field.help_text }}</span>
+                {% endif %}
+            </div>
             {% endif %}
         {% endfor %}
     </fieldset>
     <p>
-    <button class="button" type="submit">
-        <span class="icon ok">{% trans 'Save' %}</span>
-    </button>
-    <a href="{% url 'config_general' %}">
-    <button class="button" type="button" onclick="window.location='{% url 'config_general' %}'">
-        <span class="icon cancel">{% trans 'Cancel' %}</span>
-    </button>
+    {% include "formbuttons_save.html" %}
+    <a href='{% url 'config_general' %}' class="btn">
+        {% trans 'Cancel' %}
     </a>
     </p>
+    <small>* {% trans "required" %}</small>
     </form>
 {% endblock %}
diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo
index 49342f7b97002be0ca31d74a30286fe89541565e..446374eff4d0eb3977a70dd0158e07d3a0b07b1e 100644
GIT binary patch
delta 11621
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

delta 10127
zcmYk=30PIt`p5CjVHQOcMNrX$3W$gzDmj5jI3^A`U`_~vN--!xPSr63hn%wGlsT2&
z%=9`PEvKtFlyyzL4O(VerZ(MX^){IK|NhQi{h#*pynfbNd+oi~e%D(2P;=HgZZC1T
zuGIBgVR4-Dv8={8G}N+k9hS976^@`d%W8qa*bv)bH|&cK;9TQ-*p7OWc*|;wgN(B=
zi25$9fd{ZTp2WJA<+8q_5Jkfs)HCb1v`xWi>H{$bOE4Cf;yB!g?J*+3en3AAq&@`o
zpi!oM0!C0TGw0`G9qLQ47SFdfQm9SC4s3!)FaR%OI9|tK{MEEOTG{=BF@*Lg<V~zt
zBneh0tdF^<%vGWj*PuTh!diF?gL%GnjzSH*h;#5dzKIhPEo(HkX>D0KxDeIv8aBf3
zQ3I=yWM`}%YQXJKFVYj8SYWJ14fG`p!UO11!*L2q$$8Yszr;wqi#i|C#!g`ZsyzcW
zfQPUFR$?eFM)hBd%IHqifR3W>`@ZpO(|)fF`B$pLSut8P4UPS<9`%{1H(rXha1H8#
zFQeAX>&UEFADi=j$@bLMMXiM>)IejfHm0F6mW{e!PBQt|n-|ic8%{GPmKisoQu$A;
ziSM9pa1q1s8Y-2yP%m;9wI=-73VL7|>N+Q?Jqh*T&ZtcFc9|0+(MiJuOu>1keh_&%
z>k{fsLpaIuusULA9EU6eYYleAQ<#drY>lSa1^sX&YT&u30TiJ!>zZax%t4KC5$erW
zquy*Q>H&LDZ}h402UNd%SO>#8*xR!iY8UiD?ej8J2HdCtY(!1XE6DXOYY&CGG@L+f
zmkX$EatAd+pN{t8s)?#MLJcGimGV?$8fw5<sD9a~#X17@-I#(J=ql88TfH*>yC`Tx
zuc6-PC~6@8@piDR+gL#T4^-;%$gc)ihDlh7y5T0%{tD_ryHKe=j_hRX6gI<~=){Qo
zEUTaP|9up)a1OS@Q>YvMj9u_I%)}0z>`Y9<c<OU89Cx7J{5amk)2J6Z$^ucQPN4?=
zA!<N3kXf_7L01fgCOk!EphlRFS_{>vR4zl!-CC@NFQG3ULS^D8YQS%x9`Fw8f$yR|
z;h&;1au+qQ+N@OdZ_t(b*BdvXK@aMSx^Sp5AGL@kquyk>akFXPi;=W{ge~wV)MAU^
z7fRPPN4;2YV-acq3sKj(yODp5csmVxz;4tHj+y#d)WEKw9`Lm}ADU*b@<yo4WTK{^
zKdS#QRR3|P`&OItD^M9;j}AQMq7X&lBs%d5YGn6Nsg6vy=Qs)LQ}2Ol&oT94Y)E~M
zah*B8A0uc#gL=X1sLXzC`~|h^T>jndPh=!&F?B$8p4A5%;Nz$VtUwKP7b>;?M($yK
zj~Y-?hP^m5QJENwEpa3&15aTubff0}W2B$Ux=KNF@(rrv&#1-c=wTa*dO$<e_H2vF
zL<VZAhGPPbM=i3&*aSD2^G8tkJB@nqhZu@iFqr3C-%-$ozhDdov)7ceMAQS4jcKSG
z^+P>iIBGzZ$Pbz|7hB^#bmHfz7xTT}ZVy3axD%?qKSuF<YbXURqEgfdr=v#bLZxyE
zD)p<d9qvXw_!{bgx3DS3WZB!X2P%`j(YsbqQ(269(JJ)AmFQB(=PBrh+fWZaj9P@J
zQ4hY3E$~lNs+;$;`(>l98;#0T32ODvL_Ts>HR`&<s5NvImBBwyi!rDd`PZ9Aurd<S
ziF%X%sDTutKh8o8^hpfBWv0FwwH97R^*>_T&!Fym8I|fU&G{dUf1(Cjt2g=AHi+zP
z-#8I<A_e_04V8gR)Bs1LGBY3bW-nkYzKPB7TYLy>_p!eZMX2kZ!RB}v^@5+F?r*vJ
z+HdHOanwUlH%>vlQ4Z<`6R;mXi@tanb%U!Ih+m*?{5?ivD4n&KTVoIoK=sQ(Wh~d|
zs-&O{EJVHOdTfOIjUS*=|0AlO{^-}7hhqq~Kn)}rwFWw(rYsX{U?0?655WM;L)NP`
z$*#Ms?G$vO2ld9UoBBD_NIyY+$$mz?S#W=Qpz){&^f2}QsOu-7QeBD4)N`oCw+>t5
zeoVj{=+yqNoo%N)8MUv6VPmX7bzFve@F8^KMbupXj{F>0(F5!$8i{(qTx^3LEW*!G
z+phmW%j%9}QB$!VgLuC65(PbYCn`l}O^5U7pne(k2A`SsJE(o_JIE|vWIb7lsOu|G
znVE%}`?;toU24v6!(i%r&=o@AFa;;Rg?gi}Q4fwAY_IkNtVul+b;E(E8;mgR`KDfm
zS|c+|`y$j@cn-B|HsE7EOaUfR?>L0~E0uXe?7wEK@ImTFkTF<whT191NB#)1UNrTO
zF_e14VfMfhP*aqOTEs(5y%d$%MX24e4V`!zTjICF$iE8phqGWX9oyqxR0_W`-ZcJc
z49>9^Wj$0z5-|)rU^w<fW#S=hi^Zr+tVJijh*|?DTojbr)2KQ62y5XjtdEWn_5dSM
zZ`cF%!O2A}(rVNczK9yY4%E~fMQzKsaXFsFGdP~F)5F+qBnur~YboeWe@1PayQmw+
zjIvXfgnFZF)STsE5-!GgJcNz#8tTFKumJ{-wo@O2dXWrt;&9aYX~@*Otfdqh(y#}$
zea@f;@;mCrO~%;UrweKz{ZVr|4kOWJT#f3#8#RzKn2H}_I);w5`)8vvH337l|EHM~
zb5R4?fLa3wy&d?ZqNe07>c%0t_5kXm2G9ZZp~*(|8;rFv7o)Mv)EA=`=Q?bKuVJK%
z!sirp<2$HS`H!=wpb=_u#iQOl8TEiH)B_$wy-B{QPsIr8PodV-8q}0+!4!NSwc7&n
z?A?@r`tMIGk3urKu``~;p7<wr#jJeh4`*W>9z*Z$Kn?gNYCyr`?Wu}Ft^Pz)Pe)~H
z5Nc5tp$1kup8R`9N`n^N7Sz7>pl)y+HS+VQZ5mWy|Eje^4PXfBi#HaPsY29%N>SHW
zVFIo~W$qX%L+7v#eo;XF)$vyvG?0)&`$mzd8^@q7Y>C>hsi@VPj!khmHpWL$*Sk>z
z+lZRdZKyZjhsyL>)P1Z8tUCyDQBdk;qaOGScEeSujvt^OeuB;LD(V4#6YV#vjV-8m
z#^yK{nKf$;mf&^lfDcZxGdvHosJoGkVYxn{P>(`tk^NzL0QE*wFc6nuJs<v9#9->%
z9=0>K&-fOq-z7}PYZ!;k9<jd<eX%9=DX7J|29>F87^MBbpMo-Q41Muk`-FAgcm?&~
zFHtx633Wq9vAqowu?F>i7=Xht2}hgur%_Y50=2d_p|0P9b+rF4QP86K4m+YRc~dGo
zV<L{hnz#U!>XqjFA>*gWn^?Z3_WrJknzA_5{!c^=yf5neG7>|v5?k<mtBQi&a4W{5
z2Se~8*1{X80o+85+$yuDECH3dbkubNP!Fy^Ez%j7gv&4nkD?aiRn$O!N0&aC^(WgG
zv_pNN`l2ovkDAMB)P>v4`8Uv?`lsj}Al9aS6O~EdDRu^<P}?mHGjS;DKC4if*)@gy
zE2U>?P|9y&9c)l;&us!~d-g%i@hDXP38;Pxu^+C(F#HNNpx;na5;)Z!P#CH`4t1Xn
z*aW*zCI1@vSQ<3aQq+yAQLA~SX+Muj@wcd{s9Rw#wx*~D#i6cii+Vr?D#Z_A3QjQX
z&tW+A%~%ijyG+9wjHlr$DmB5C_9r>sI07{l3s4W-g$Z~7HSlYw0sM|_FyvAD#k!!@
zQa@D2hNITnB-GTq$|-0hOE3aAVS7A?nv(BPsjJK9N{h;g`to%$jzE1crlW4W!qhjQ
z=K3%;!1Jg#|IXBXrn4@z|Dz~maUuun;#%WQRH}~~&mk9BpP&ZTaEARwOh;Xphsr<&
z>bh#wkJq!PU2_&S)xV%J5;#*CVgAD@=))0<x<PBy6r_1Ou;@&CiSY?kMwViITxay4
z-tcYI^_Nliy@Og4j#>8htcA)*T};*fZ$&|Gl!scC)z}(0oA!6HfckAr!jX^J&PT18
zS5dzWSI`fA9=Eq=0BX_JMD<HSWojh0!xD52qOgI2FaBt}h5Dxdifz$)!oEQ=YHf_b
zP+WxS_dF^Sn~VognK*}y@ES(rJ=8#>d23}l!$tme;b0oHIwzv$Xa*`}3s5&&j(X6`
zs5jVUJb@a>1<b}9sO#F#wjYp=>OT;5-+YY1a%_l;W^+Lk3R`Gsif^KB_ysCuw^55F
z`bm3=63{_C8yn*wOvMsZN;hL7UO-KuV~)M}+M@0^0z2YtRKHhU6trJI$NRC)Q)B~&
zq1v|?FJL-#|0@2z!z|Q5-$M2O5Vh(Ps_g-%Vhie-sPDx@RAwflFU~?Ix?HBiM$}Yn
zMZNJ+%)-;C)Q8QrrzjG2!&aydP<sr(F{tYbPy?HcO1TR&aVhG-@1Zh&0a*hs>ox_A
zJYXIx7sF9=Rv*>g6181AqPAT&2I45JgX2-xH6vc8utsgfCSn5hXYn$zmC$iaojG`{
z^)H_99hDlwIPpIIlh{UiG|`9njJggsgY_w)X&6WQU&kT}-Kb9`o;Qs{jQ*zIYt-ix
z%?Ur#HbU}zt0RRirjgIT_c%#Ci_qNa7)W`NU9=uCednWx2qb0@e{lYL;x6$DbsZOp
zTZE6PAEG>q@@7+aJw(IX#84V0V;u4K<7v||2v2e11fhA>--JcxT%oyOJGL}!n<-x<
z22+2D_?mJWeu-KSI(q8;3n(lg?&qYA6~ss0lKoFGJWO=u{J)5Pre6fkHRUdxAEtBm
zCDuk<PJB$1nm*?!2M{L-7j4Dp&HrjD+8SRG`NVEwDiKQi7r52jV2zO`YdvwCdQaka
zHE`@Bx=^ns@+gl~BgZD{e_~&v9pw$g7RnC7JOA<%{bLUOFA^O;6Zd;d_CJ26T#0U?
zE&UGQ8>W9EcBQ_J_y^%O?f#TYDBr|}rj4Tg-~TGCrExJnfWP80HFD^a8co{^-WofF
z@&?K&#8Z@i!-GU`$^(d_ly4JliNB6;+T)4E#5<-j5?4~^u)qJ>#}ULbyHO{s)~5Uh
z<)%al5k=?+Yboc-u?LYs`C(!^F@gF_%prn_zQi;_M=RWgubO(USN30h3I~WMz1`UV
zlpiG0OkJPha6(_L>!$4&Od>83IYf8jAlED*E>K=cbR!y5e}<?a{!9I@BZk5Us%TE9
zxd+FF$7Itbp4vaKGcksEh5DOBEh0?4Tq9}CqW1UWTPi8E>u8T_?V>e_a$U+p@CKeW
z?X#&z5((6=nYLK!_Yq~ptF*PjBg8~=UhLI$y-DNiL@5muQAaD{Id6%-XlbiS3^4Wo
z8Ix!mN;wAanKm!fbzC79P~K(gpHqL0a&1DN|MP@*yF5=ri0SliZ=?MayMywBgno1u
zasD~erxxxt<)%1?I6<@^j+pB^8EfKF;sK%w=XET{7ww`oi{)ZHYAVli;xWo&h%#aX
zv5K}j=E6oeg|?l<%fuW)M|+|V5y1J5YT(#tt{Fvn9g$1COC%Gq#B_7sm2V1f(b$0U
z4AgNSG0$7#Z+vV_^e0}R&r_yd?4&-NNG7IJk0uTigQ&N|)5LLNEcF)nBJLpc;-R7!
zm4;LvM<=!>0*Q6h3yCSjZ0a3Q$7JI|$_bQfn7Ymd=^u_eL^IRg2~(+mN30@#BG%J3
z5WOFQg;bVM+(T4S?yYun{J<V*;L4!pAvzFs>2Z`;K^!7<bSA2Z-PHRNy(l*#qRe@U
z)}xf)!)juz8aOg(JBH(kQ<T$*BFaw?iNtDx!<`db%e9YlGpRW6ucL}`>fh?$m=n+7
ze&R6aMq~58^(p>a`9GYCGxa?<il|51heUyC|B>=TKK!ztq0ocICx~+55$aE39x<Ni
zPUv`vcwGf^%%lBj%1-pmZ0Q&1S>JYr!*hSiet%C`r`G-<eJct}oa2kjrWO{syQZ~v
zludNcOl$7mo)+C8ulx~bkxu7LbrzJB7FyYbCHaNro=a)LKJFjWJ)SMy>-f0OW?Xdd
z>5<{N+hdKxvoULykNfpriSC=d4tWmtZs71MEG`_sr{5J{_Yc{b?((c?_vit^p3(t(
zecY`E#kz9`#d_8b+V3BjoZ?JL>C(|NYIux~=ZTze13k-ghx>Z&<hS+rq)b}v<GEBc
zIv}iPQE5ea-b80%d2wMu(ZmXO>g0Ie{tUTzatoi~?oE?Z68`FvS3LFqyE#jEm7>D(
z!cr@{sA6JqQDFhE@!jM!A9rf`JDz~4U3@&FD;oK@=U4XjT&cY7@SL9hiI02CtR(lc
zS?4{EKX$<3my<WC*i+@2@8^!M8WA|4vSKFpb1$Br<bJ!Vw&zAwsKb3{ZnQgTUb<)5
IyeR?y2UWq`u>b%7

diff --git a/openslides/locale/de/LC_MESSAGES/django.po b/openslides/locale/de/LC_MESSAGES/django.po
index 4831c9e46..52ccc8a7c 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: OpenSlides 1.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-02 22:59+0100\n"
+"POT-Creation-Date: 2013-01-18 22:49+0100\n"
 "PO-Revision-Date: 2012-07-28 11:07+0200\n"
 "Last-Translator: Emanuel Schuetze <emanuel@intevation.de>\n"
 "Language-Team: support@openslides.de\n"
@@ -34,18 +34,18 @@ msgid "Parent item"
 msgstr "Elternelement"
 
 #: agenda/models.py:34 config/forms.py:59 motion/forms.py:22
-#: motion/models.py:539 motion/templates/motion/view.html:100
+#: motion/models.py:539 motion/templates/motion/view.html:101
 #: projector/models.py:29
 msgid "Title"
 msgstr "Titel"
 
 #: agenda/models.py:35 motion/forms.py:23 motion/models.py:540
-#: motion/templates/motion/view.html:101 projector/models.py:30
+#: motion/templates/motion/view.html:102 projector/models.py:30
 msgid "Text"
 msgstr "Text"
 
 #: agenda/models.py:36 agenda/templates/agenda/overview.html:77
-#: agenda/templates/agenda/view.html:13 participant/models.py:60
+#: agenda/templates/agenda/view.html:37 participant/models.py:60
 #: participant/templates/participant/overview.html:108
 #: participant/templates/participant/user_detail.html:45
 msgid "Comment"
@@ -134,12 +134,12 @@ msgstr "Konfiguration"
 msgid "Save"
 msgstr "Speichern"
 
-#: agenda/templates/agenda/config.html:19 agenda/templates/agenda/edit.html:47
+#: agenda/templates/agenda/config.html:19 agenda/templates/agenda/edit.html:46
 #: assignment/templates/assignment/config.html:19
 #: assignment/templates/assignment/edit.html:31
 #: assignment/templates/assignment/poll_view.html:73
 #: config/templates/config/general.html:62
-#: motion/templates/motion/config.html:19 motion/templates/motion/edit.html:48
+#: motion/templates/motion/config.html:19 motion/templates/motion/edit.html:47
 #: motion/templates/motion/import.html:44
 #: motion/templates/motion/poll_view.html:82
 #: participant/templates/participant/config.html:16
@@ -150,7 +150,7 @@ msgid "Cancel"
 msgstr "Abbrechen"
 
 #: agenda/templates/agenda/edit.html:8 agenda/templates/agenda/edit.html:17
-#: agenda/templates/agenda/item_row.html:40
+#: agenda/templates/agenda/view.html:20
 msgid "Edit item"
 msgstr "Eintrag bearbeiten"
 
@@ -159,22 +159,22 @@ msgstr "Eintrag bearbeiten"
 msgid "New item"
 msgstr "Neuer Eintrag"
 
-#: agenda/templates/agenda/edit.html:22
+#: agenda/templates/agenda/edit.html:22 agenda/templates/agenda/view.html:12
 #: assignment/templates/assignment/edit.html:22
 #: assignment/templates/assignment/view.html:19
 #: motion/templates/motion/edit.html:22 motion/templates/motion/import.html:10
-#: motion/templates/motion/view.html:29
+#: motion/templates/motion/view.html:30
 #: participant/templates/participant/edit.html:22
 #: participant/templates/participant/group_edit.html:22
 #: participant/templates/participant/import.html:11
 #: projector/templates/projector/new.html:11
 #: projector/templates/projector/select_widgets.html:10
 msgid "Back to overview"
-msgstr ""
+msgstr "Zurück zur Übersicht"
 
 #: agenda/templates/agenda/edit.html:43
 #: assignment/templates/assignment/poll_view.html:69
-#: assignment/templates/assignment/view.html:84
+#: assignment/templates/assignment/view.html:83
 #: motion/templates/motion/edit.html:44
 #: motion/templates/motion/poll_view.html:79
 #: projector/templates/projector/control_overlay_message.html:8
@@ -182,7 +182,7 @@ msgstr ""
 msgid "Apply"
 msgstr "Übernehmen"
 
-#: agenda/templates/agenda/edit.html:51
+#: agenda/templates/agenda/edit.html:49
 #: assignment/templates/assignment/edit.html:34
 #: motion/templates/motion/edit.html:52 motion/templates/motion/import.html:47
 #: participant/templates/participant/edit.html:39
@@ -192,24 +192,37 @@ msgstr "Übernehmen"
 msgid "required"
 msgstr "erforderlich"
 
-#: agenda/templates/agenda/item_row.html:8
-msgid "Mark item as done"
-msgstr "Eintrag als erledigt markieren"
+#: agenda/templates/agenda/item_row.html:9
+msgid "Reopen item"
+msgstr "Eintrag wieder öffnen"
 
-#: agenda/templates/agenda/item_row.html:12
-msgid "Item closed"
-msgstr "Eintrag erledigt"
-
-#: agenda/templates/agenda/item_row.html:35
-#: agenda/templates/agenda/overview.html:98
+#: agenda/templates/agenda/item_row.html:36
 msgid "Activate item"
 msgstr "Eintrag projizieren"
 
 #: agenda/templates/agenda/item_row.html:41
-msgid "Delete item"
-msgstr "Eintrag löschen"
+#: agenda/templates/agenda/widget.html:26
+#: assignment/templates/assignment/view.html:136
+#: assignment/templates/assignment/widget.html:14
+#: motion/templates/motion/widget.html:14
+#: participant/templates/participant/group_widget.html:14
+#: participant/templates/participant/user_widget.html:13
+#: projector/templates/projector/custom_slide_widget.html:29
+msgid "Edit"
+msgstr "Bearbeiten"
 
 #: agenda/templates/agenda/item_row.html:44
+#: agenda/templates/agenda/widget.html:23
+#: assignment/templates/assignment/view.html:137
+#: assignment/templates/assignment/widget.html:11
+#: motion/templates/motion/widget.html:11
+#: participant/templates/participant/group_widget.html:11
+#: participant/templates/participant/user_widget.html:10
+#: projector/templates/projector/custom_slide_widget.html:32
+msgid "Delete"
+msgstr "Löschen"
+
+#: agenda/templates/agenda/item_row.html:48
 #: agenda/templates/agenda/widget.html:35
 msgid "Activate summary for this item"
 msgstr "Zusammenfassung für diesen Eintrag projizieren"
@@ -219,24 +232,24 @@ msgid "Do you want to save the changed order of agenda items?"
 msgstr "Möchten Sie die geänderte Reihenfolge der Einträge speichern?"
 
 #: agenda/templates/agenda/overview.html:50 assignment/models.py:291
-#: assignment/views.py:587 assignment/templates/assignment/view.html:172
-#: assignment/templates/assignment/view.html:176
+#: assignment/views.py:587 assignment/templates/assignment/view.html:170
+#: assignment/templates/assignment/view.html:174
 #: assignment/templates/projector/Assignment.html:78
 #: assignment/templates/projector/Assignment.html:82 motion/models.py:574
-#: motion/views.py:830 motion/views.py:881
-#: motion/templates/motion/view.html:214
-#: motion/templates/projector/Motion.html:37 utils/utils.py:49
-#: utils/views.py:108
+#: motion/views.py:824 motion/views.py:875
+#: motion/templates/motion/view.html:219
+#: motion/templates/projector/Motion.html:37 utils/utils.py:45
+#: utils/views.py:104
 msgid "Yes"
 msgstr "Ja"
 
 #: agenda/templates/agenda/overview.html:51 assignment/models.py:291
-#: assignment/views.py:588 assignment/templates/assignment/view.html:173
+#: assignment/views.py:588 assignment/templates/assignment/view.html:171
 #: assignment/templates/projector/Assignment.html:79 motion/models.py:574
-#: motion/views.py:830 motion/views.py:882
-#: motion/templates/motion/view.html:215
-#: motion/templates/projector/Motion.html:38 utils/utils.py:49
-#: utils/views.py:108
+#: motion/views.py:824 motion/views.py:876
+#: motion/templates/motion/view.html:220
+#: motion/templates/projector/Motion.html:38 utils/utils.py:45
+#: utils/views.py:104
 msgid "No"
 msgstr "Nein"
 
@@ -245,14 +258,13 @@ msgstr "Nein"
 #: motion/templates/motion/overview.html:14
 #: participant/templates/participant/group_overview.html:12
 #: participant/templates/participant/overview.html:22
-#: projector/templates/projector/custom_slide_widget.html:20
+#: projector/templates/projector/custom_slide_widget.html:19
 msgid "New"
-msgstr ""
+msgstr "Neu"
 
 #: agenda/templates/agenda/overview.html:61
-#, fuzzy
 msgid "Print agenda as PDF"
-msgstr "Tagesordnung als PDF"
+msgstr "Tagesordnung als PDF drucken"
 
 #: agenda/templates/agenda/overview.html:66
 msgid "Hide closed items"
@@ -276,45 +288,48 @@ msgstr "Eintrag"
 msgid "Actions"
 msgstr "Aktionen"
 
+#: agenda/templates/agenda/overview.html:98
+#, fuzzy
+msgid "Activate agenda"
+msgstr "Eintrag projizieren"
+
 #: agenda/templates/agenda/overview.html:114
 #: agenda/templates/agenda/widget.html:46
-#: projector/templates/projector/custom_slide_widget.html:42
+#: projector/templates/projector/custom_slide_widget.html:40
 msgid "No items available."
 msgstr "Keine Einträge vorhanden."
 
+#: agenda/templates/agenda/view.html:15
+#: motion/templates/motion/poll_view.html:21
+#: motion/templates/motion/view.html:34 motion/templates/motion/view.html:318
+msgid "More actions"
+msgstr "Mehr Aktionen"
+
+#: agenda/templates/agenda/view.html:21
+msgid "Delete item"
+msgstr "Eintrag löschen"
+
+#: agenda/templates/agenda/view.html:26 agenda/templates/agenda/widget.html:20
+msgid "Show item"
+msgstr "Eintrag projizieren"
+
+#: agenda/templates/agenda/widget.html:7
+msgid "Show agenda"
+msgstr "Tagesordnung anzeigen"
+
 #: agenda/templates/agenda/widget.html:10
 #: agenda/templates/agenda/widget.html:29
 #: assignment/templates/assignment/widget.html:17
 #: motion/templates/motion/widget.html:17
 #: participant/templates/participant/group_widget.html:17
 #: participant/templates/participant/user_widget.html:16
-#: projector/templates/projector/custom_slide_widget.html:11
-#: projector/templates/projector/custom_slide_widget.html:36
+#: projector/templates/projector/custom_slide_widget.html:10
+#: projector/templates/projector/custom_slide_widget.html:35
 msgid "Preview"
 msgstr "Vorschau"
 
-#: agenda/templates/agenda/widget.html:23
-#: assignment/templates/assignment/view.html:139
-#: assignment/templates/assignment/widget.html:11
-#: motion/templates/motion/widget.html:11
-#: participant/templates/participant/group_widget.html:11
-#: participant/templates/participant/user_widget.html:10
-#: projector/templates/projector/custom_slide_widget.html:33
-msgid "Delete"
-msgstr "Löschen"
-
-#: agenda/templates/agenda/widget.html:26
-#: assignment/templates/assignment/view.html:138
-#: assignment/templates/assignment/widget.html:14
-#: motion/templates/motion/widget.html:14
-#: participant/templates/participant/group_widget.html:14
-#: participant/templates/participant/user_widget.html:13
-#: projector/templates/projector/custom_slide_widget.html:30
-msgid "Edit"
-msgstr "Bearbeiten"
-
 #: assignment/forms.py:24 assignment/models.py:51 assignment/views.py:381
-#: assignment/templates/assignment/view.html:240
+#: assignment/templates/assignment/view.html:239
 #: assignment/templates/projector/Assignment.html:21
 msgid "Number of available posts"
 msgstr "Anzahl der zur Wahl stehenden Posten"
@@ -373,17 +388,17 @@ msgid "Always Yes-No-Abstain per candidate."
 msgstr "Ja, Nein, Enthaltung pro Kandidat/in."
 
 #: assignment/models.py:44 assignment/templates/assignment/overview.html:25
-#: assignment/templates/assignment/view.html:249
+#: assignment/templates/assignment/view.html:248
 msgid "Searching for candidates"
 msgstr "Auf Kandidatensuche"
 
 #: assignment/models.py:45 assignment/templates/assignment/overview.html:26
-#: assignment/templates/assignment/view.html:253
+#: assignment/templates/assignment/view.html:252
 msgid "Voting"
 msgstr "Im Wahlvorgang"
 
 #: assignment/models.py:46 assignment/templates/assignment/overview.html:27
-#: assignment/templates/assignment/view.html:257
+#: assignment/templates/assignment/view.html:256
 msgid "Finished"
 msgstr "Abgeschlossen"
 
@@ -478,9 +493,9 @@ msgstr "Neue Wahl wurde erfolgreich angelegt."
 msgid "Election was successfully modified."
 msgstr "Wahl wurde erfolgreich geändert."
 
-#: assignment/views.py:130 motion/views.py:245 motion/views.py:689
-#: participant/views.py:508 participant/views.py:531 utils/views.py:222
-#: utils/views.py:240 utils/views.py:264
+#: assignment/views.py:130 motion/views.py:239 motion/views.py:683
+#: participant/views.py:504 participant/views.py:528 utils/views.py:218
+#: utils/views.py:236 utils/views.py:260
 msgid "Please check the form for errors."
 msgstr "Bitte kontrollieren Sie das Formular nach Fehlern."
 
@@ -548,7 +563,7 @@ msgid "not elected"
 msgstr "nicht gewählt"
 
 #: assignment/views.py:293 assignment/views.py:482
-#: assignment/templates/assignment/view.html:51
+#: assignment/templates/assignment/view.html:50
 msgid "elected"
 msgstr "gewählt"
 
@@ -573,22 +588,22 @@ msgstr "Wahlen: %s"
 #: assignment/views.py:388 assignment/views.py:424
 #: assignment/templates/assignment/overview.html:37
 #: assignment/templates/assignment/poll_view.html:18
-#: assignment/templates/assignment/view.html:40
-#: assignment/templates/assignment/view.html:127
+#: assignment/templates/assignment/view.html:39
+#: assignment/templates/assignment/view.html:125
 #: assignment/templates/projector/Assignment.html:38
 #: assignment/templates/projector/Assignment.html:56
 msgid "Candidates"
 msgstr "Kandidaten/innen"
 
-#: assignment/views.py:413 motion/views.py:823
-#: motion/templates/motion/view.html:188
+#: assignment/views.py:413 motion/views.py:817
+#: motion/templates/motion/view.html:193
 msgid "Vote results"
 msgstr "Abstimmungsergebnis"
 
 #: assignment/views.py:417 assignment/templates/assignment/poll_view.html:5
 #: assignment/templates/assignment/poll_view.html:8
-#: assignment/templates/assignment/view.html:122
-#: assignment/templates/assignment/view.html:130
+#: assignment/templates/assignment/view.html:120
+#: assignment/templates/assignment/view.html:128
 #: assignment/templates/projector/Assignment.html:59
 msgid "ballot"
 msgstr "Wahlgang"
@@ -609,19 +624,19 @@ msgstr ""
 "E: %(ABSTAIN)s"
 
 #: assignment/views.py:456 assignment/templates/assignment/poll_view.html:35
-#: assignment/templates/assignment/view.html:190
+#: assignment/templates/assignment/view.html:188
 #: assignment/templates/projector/Assignment.html:96
 #: motion/templates/motion/poll_view.html:58
 msgid "Invalid votes"
 msgstr "Ungültige Stimmen"
 
 #: assignment/views.py:463 assignment/templates/assignment/poll_view.html:45
-#: assignment/templates/assignment/view.html:206
-#: assignment/templates/assignment/view.html:211
+#: assignment/templates/assignment/view.html:204
+#: assignment/templates/assignment/view.html:209
 #: assignment/templates/projector/Assignment.html:109
-#: assignment/templates/projector/Assignment.html:115 motion/views.py:830
+#: assignment/templates/projector/Assignment.html:115 motion/views.py:824
 #: motion/templates/motion/poll_view.html:62
-#: motion/templates/motion/view.html:219
+#: motion/templates/motion/view.html:224
 #: motion/templates/projector/Motion.html:42 poll/models.py:76
 msgid "Votes cast"
 msgstr "Abgegebene Stimmen"
@@ -653,9 +668,9 @@ msgid_plural "%d available posts"
 msgstr[0] "%d verfügbare Posten"
 msgstr[1] "%d verfügbare Posten"
 
-#: assignment/views.py:588 assignment/templates/assignment/view.html:174
-#: assignment/templates/projector/Assignment.html:80 motion/views.py:830
-#: motion/views.py:883 motion/templates/motion/view.html:216
+#: assignment/views.py:588 assignment/templates/assignment/view.html:172
+#: assignment/templates/projector/Assignment.html:80 motion/views.py:824
+#: motion/views.py:877 motion/templates/motion/view.html:221
 #: motion/templates/projector/Motion.html:39
 msgid "Abstention"
 msgstr "Enthaltung"
@@ -681,9 +696,8 @@ msgid "New election"
 msgstr "Neue Wahl"
 
 #: assignment/templates/assignment/overview.html:16
-#, fuzzy
 msgid "Print all elections as PDF"
-msgstr "Alle Wahlen als PDF"
+msgstr "Alle Wahlen als PDF drucken"
 
 #: assignment/templates/assignment/overview.html:22
 #: participant/templates/participant/overview.html:55
@@ -692,11 +706,11 @@ msgstr "Filter"
 
 #: assignment/templates/assignment/overview.html:24
 #: assignment/templates/assignment/overview.html:38
-#: assignment/templates/assignment/view.html:237
-#: assignment/templates/projector/Assignment.html:18 motion/views.py:801
+#: assignment/templates/assignment/view.html:236
+#: assignment/templates/projector/Assignment.html:18 motion/views.py:795
 #: motion/templates/motion/overview.html:36
 #: motion/templates/motion/overview.html:57
-#: motion/templates/motion/view.html:178
+#: motion/templates/motion/view.html:183
 #: motion/templates/projector/Motion.html:11
 #: participant/templates/participant/overview.html:86
 msgid "Status"
@@ -734,7 +748,7 @@ msgstr "Wahl löschen"
 
 #: assignment/templates/assignment/overview.html:64
 msgid "Election as PDF"
-msgstr "Wahl als PDF"
+msgstr "Wahl als PDF drucken"
 
 #: assignment/templates/assignment/poll_view.html:10
 msgid "Short description (for ballot paper)"
@@ -765,77 +779,76 @@ msgstr "Stimmzettel als PDF"
 msgid "Show election"
 msgstr "Wahl projizieren"
 
-#: assignment/templates/assignment/view.html:47
-#: assignment/templates/assignment/view.html:104
+#: assignment/templates/assignment/view.html:46
+#: assignment/templates/assignment/view.html:102
 msgid "Remove candidate"
 msgstr "Kandidate/in entfernen"
 
-#: assignment/templates/assignment/view.html:54
+#: assignment/templates/assignment/view.html:53
 msgid "Mark candidate as not elected"
 msgstr "Kandidat/in als nicht gewählt markieren"
 
-#: assignment/templates/assignment/view.html:60
+#: assignment/templates/assignment/view.html:59
 #: assignment/templates/projector/Assignment.html:44
 msgid "No candidates available."
 msgstr "Keine Kandidaten/innen vorhanden."
 
-#: assignment/templates/assignment/view.html:70
+#: assignment/templates/assignment/view.html:69
 msgid "Withdraw self candidature"
 msgstr "Eigene Kandidatur zurückziehen"
 
-#: assignment/templates/assignment/view.html:74
+#: assignment/templates/assignment/view.html:73
 msgid "Self candidature"
 msgstr "Selbst kandidieren"
 
-#: assignment/templates/assignment/view.html:86
+#: assignment/templates/assignment/view.html:85
 msgid "Add new participant"
 msgstr "Neue/n Teilnehmer/in hinzufügen"
 
-#: assignment/templates/assignment/view.html:100
+#: assignment/templates/assignment/view.html:98
 msgid "Blocked Candidates"
 msgstr "Blockierte Kandidaten/innen"
 
-#: assignment/templates/assignment/view.html:107
+#: assignment/templates/assignment/view.html:105
 msgid "No blocked candidates available."
 msgstr "Keine blockierten Kandidaten/innen vorhanden."
 
-#: assignment/templates/assignment/view.html:115
+#: assignment/templates/assignment/view.html:113
 #: assignment/templates/projector/Assignment.html:52
 msgid "Election results"
 msgstr "Wahlergebnisse"
 
-#: assignment/templates/assignment/view.html:135
+#: assignment/templates/assignment/view.html:133
 msgid "Publish/unpublish results"
 msgstr "Ergebnisse veröffentlichen/unveröffentlichen"
 
-#: assignment/templates/assignment/view.html:146
-#: assignment/templates/assignment/view.html:227
+#: assignment/templates/assignment/view.html:144
+#: assignment/templates/assignment/view.html:225
 msgid "New ballot"
 msgstr "Neuer Wahlgang"
 
-#: assignment/templates/assignment/view.html:159
+#: assignment/templates/assignment/view.html:157
 #: assignment/templates/projector/Assignment.html:69
 msgid "Candidate is elected"
 msgstr "Kandidat/in ist gewählt"
 
-#: assignment/templates/assignment/view.html:178
+#: assignment/templates/assignment/view.html:176
 #: assignment/templates/projector/Assignment.html:84
 msgid "was not a <br> candidate"
 msgstr "war kein Kandidat"
 
-#: assignment/templates/assignment/view.html:195
-#: assignment/templates/projector/Assignment.html:100 motion/views.py:830
-#: motion/templates/motion/view.html:217
+#: assignment/templates/assignment/view.html:193
+#: assignment/templates/projector/Assignment.html:100 motion/views.py:824
+#: motion/templates/motion/view.html:222
 #: motion/templates/projector/Motion.html:40
 msgid "Invalid"
 msgstr "Ungültig"
 
-#: assignment/templates/assignment/view.html:223
-#, fuzzy
+#: assignment/templates/assignment/view.html:221
 msgid "No ballots available."
-msgstr "Keine Ergebnisse vorhanden."
+msgstr "Keine Wahlgänge vorhanden."
 
-#: assignment/templates/assignment/view.html:246
+#: assignment/templates/assignment/view.html:245
 msgid "Change status"
 msgstr "Status ändern"
 
@@ -863,7 +876,7 @@ msgstr "Veranstalter"
 msgid "Allow access for anonymous guest users"
 msgstr "Erlaube Zugriff für anonyme Gast-Nutzer"
 
-#: config/forms.py:65 participant/forms.py:123
+#: config/forms.py:65 participant/forms.py:126
 msgid "Welcome text"
 msgstr "Willkommenstext"
 
@@ -889,8 +902,8 @@ msgstr "Allgemein"
 
 #: config/models.py:126 config/templates/config/version.html:5
 #: config/templates/config/version.html:8
-#: config/templates/config/version.html:13 motion/views.py:815
-#: motion/templates/motion/view.html:25 motion/templates/motion/view.html:98
+#: config/templates/config/version.html:13 motion/views.py:809
+#: motion/templates/motion/view.html:26 motion/templates/motion/view.html:99
 msgid "Version"
 msgstr "Version"
 
@@ -914,8 +927,8 @@ msgstr "Willkommens-Widget"
 msgid "System"
 msgstr "System"
 
-#: motion/forms.py:25 motion/models.py:541 motion/views.py:849
-#: motion/templates/motion/view.html:85 motion/templates/motion/view.html:102
+#: motion/forms.py:25 motion/models.py:541 motion/views.py:843
+#: motion/templates/motion/view.html:86 motion/templates/motion/view.html:103
 #: motion/templates/projector/Motion.html:77
 msgid "Reason"
 msgstr "Begründung"
@@ -928,19 +941,19 @@ msgstr "Triviale Änderung"
 msgid "Trivial changes don't create a new version."
 msgstr "Triviale Änderungen erzeugen keine neue Version."
 
-#: motion/forms.py:35 motion/models.py:63 motion/views.py:768
+#: motion/forms.py:35 motion/models.py:63 motion/views.py:762
 #: motion/templates/motion/overview.html:58
-#: motion/templates/motion/view.html:162
+#: motion/templates/motion/view.html:167
 #: motion/templates/projector/Motion.html:55
 msgid "Submitter"
 msgstr "Antragsteller/in"
 
-#: motion/forms.py:44 motion/views.py:788
-#: motion/templates/motion/view.html:166
+#: motion/forms.py:44 motion/views.py:782
+#: motion/templates/motion/view.html:171
 msgid "Supporters"
 msgstr "Unterstützer/innen"
 
-#: motion/forms.py:50 participant/forms.py:111
+#: motion/forms.py:50 participant/forms.py:114
 msgid "CSV File"
 msgstr "CSV-Datei"
 
@@ -958,7 +971,7 @@ msgstr "Mindestanzahl erforderlicher Unterstützer/innen für einen Antrag"
 
 #: motion/forms.py:67
 msgid "Choose 0 to disable the supporting system"
-msgstr "Wähle 0 um das Unterstützersystem zu deaktivieren"
+msgstr "Zum Deaktivieren des Unterstützersystems '0' eingeben"
 
 #: motion/forms.py:72
 msgid "Motion preamble"
@@ -990,12 +1003,12 @@ msgid "Permitted"
 msgstr "Zugelassen"
 
 #: motion/models.py:44 motion/templates/motion/overview.html:41
-#: motion/templates/motion/view.html:301
+#: motion/templates/motion/view.html:304
 msgid "Accepted"
 msgstr "Angenommen"
 
 #: motion/models.py:45 motion/templates/motion/overview.html:42
-#: motion/templates/motion/view.html:306
+#: motion/templates/motion/view.html:309
 msgid "Rejected"
 msgstr "Abgelehnt"
 
@@ -1003,17 +1016,17 @@ msgstr "Abgelehnt"
 msgid "Withdrawed"
 msgstr "Zurückgezogen"
 
-#: motion/models.py:47 motion/templates/motion/view.html:321
+#: motion/models.py:47 motion/templates/motion/view.html:323
 msgid "Adjourned"
 msgstr "Vertagt"
 
 # please check!
-#: motion/models.py:48 motion/templates/motion/view.html:324
+#: motion/models.py:48 motion/templates/motion/view.html:326
 msgid "Not Concerned"
 msgstr "Nicht befasst"
 
 # please check!
-#: motion/models.py:49 motion/templates/motion/view.html:327
+#: motion/models.py:49 motion/templates/motion/view.html:329
 msgid "Commited a bill"
 msgstr "Verwiesen (in Ausschuss)"
 
@@ -1118,7 +1131,7 @@ msgid "by"
 msgstr "von"
 
 #: motion/models.py:453 motion/templates/motion/view.html:12
-#: motion/templates/motion/view.html:23 motion/templates/motion/widget.html:27
+#: motion/templates/motion/view.html:24 motion/templates/motion/widget.html:27
 #: motion/templates/projector/Motion.html:65
 #: participant/templates/participant/personal_info_widget.html:13
 #: participant/templates/participant/personal_info_widget.html:32
@@ -1155,33 +1168,33 @@ msgstr "Darf Anträge verwalten"
 msgid "The assembly may decide,"
 msgstr "Die Versammlung möge beschließen,"
 
-#: motion/models.py:603 motion/views.py:718 motion/views.py:943
-#: motion/views.py:954 motion/templates/motion/base_motion.html:9
+#: motion/models.py:603 motion/views.py:712 motion/views.py:937
+#: motion/views.py:949 motion/templates/motion/base_motion.html:9
 #: motion/templates/motion/config.html:8
 #: motion/templates/motion/overview.html:7
 #: motion/templates/motion/overview.html:11
 msgid "Motions"
 msgstr "Anträge"
 
-#: motion/views.py:173
+#: motion/views.py:167
 msgid "You have not the necessary rights to create or edit motions."
 msgstr ""
 "Sie haben nicht die nötigen Rechte, um Anträge zu erstellen oder zu "
 "bearbeiten."
 
-#: motion/views.py:178
+#: motion/views.py:172
 msgid "You can not edit this motion."
 msgstr "Sie dürfen diesen Antrag nicht bearbeiten."
 
-#: motion/views.py:236
+#: motion/views.py:230
 msgid "New motion was successfully created."
 msgstr "Neuer Antrag wurde erfolgreich angelegt."
 
-#: motion/views.py:238
+#: motion/views.py:232
 msgid "Motion was successfully modified."
 msgstr "Antrag wurde erfolgreich geändert."
 
-#: motion/views.py:252
+#: motion/views.py:246
 msgid ""
 "Attention: Do you really want to edit this motion? The supporters will "
 "<b>not</b> be removed automatically because you can manage motions. Please "
@@ -1191,7 +1204,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."
 
-#: motion/views.py:254
+#: motion/views.py:248
 #, python-format
 msgid ""
 "Attention: Do you really want to edit this motion? All <b>%s</b> supporters "
@@ -1200,128 +1213,128 @@ msgstr ""
 "Wollen Sie den Antrag wirklich ändern? Alle <b>%s</b> Unterstützer/innen "
 "werden dann automatisch entfernt. Versuchen Sie diese erneut zu gewinnen."
 
-#: motion/views.py:286
+#: motion/views.py:280
 msgid "Motion number was successfully set."
 msgstr "Antragsnummer wurde erfolgreich gesetzt."
 
-#: motion/views.py:302
+#: motion/views.py:296
 msgid "Motion was successfully authorized."
 msgstr "Antrag wurde erfolgreich zugelassen."
 
-#: motion/views.py:317
+#: motion/views.py:311
 msgid "Motion was successfully rejected."
 msgstr "Antrag wurde erfolgreich verworfen."
 
-#: motion/views.py:333
+#: motion/views.py:327
 #, python-format
 msgid "Motion status was set to: <b>%s</b>."
 msgstr "Antragsstatus wurde gesetzt auf: <b>%s</b>."
 
-#: motion/views.py:349
+#: motion/views.py:343
 msgid "Motion status was reset."
 msgstr "Antragsstatus wurde zurückgesetzt."
 
-#: motion/views.py:376
+#: motion/views.py:370
 msgid "You can not support this motion."
 msgstr "Sie dürfen diesen Antrag nicht unterstützen."
 
-#: motion/views.py:379
+#: motion/views.py:373
 msgid "You can not unsupport this motion."
 msgstr "Sie dürfen Ihre Unterstützung für diesen Antrag nicht entziehen."
 
-#: motion/views.py:390
+#: motion/views.py:384
 msgid "Do you really want to support this motion?"
 msgstr "Wollen Sie wirklich diesen Antrag unterstützen?"
 
-#: motion/views.py:392
+#: motion/views.py:386
 msgid "Do you really want to unsupport this motion?"
 msgstr "Wollen Sie wirklich Ihre Unterstützung für diesen Antrag entziehen?"
 
-#: motion/views.py:403
+#: motion/views.py:397
 msgid "You have supported this motion successfully."
 msgstr "Sie haben den Antrag erfolgreich unterstützt."
 
-#: motion/views.py:405
+#: motion/views.py:399
 msgid "You have unsupported this motion successfully."
 msgstr "Sie haben dem Antrag erfolgreich Ihre Unterstützung entzogen."
 
-#: motion/views.py:419
+#: motion/views.py:413
 msgid "New vote was successfully created."
 msgstr "Neue Abstimmung erfolgreich angelegt."
 
-#: motion/views.py:435
+#: motion/views.py:429
 msgid "Poll deleted"
 msgstr "Abstimmung gelöscht"
 
-#: motion/views.py:436
+#: motion/views.py:430
 msgid "Poll was successfully deleted."
 msgstr "Abstimmung wurde erfolgreich gelöscht."
 
-#: motion/views.py:438
+#: motion/views.py:432
 #, python-format
 msgid "the %s. poll"
 msgstr "die %s. Abstimmung"
 
-#: motion/views.py:479 motion/views.py:488
+#: motion/views.py:473 motion/views.py:482
 #, python-format
 msgid "You can not delete motion <b>%s</b>."
 msgstr "Sie können Antrag <b>%s</b> nicht löschen."
 
-#: motion/views.py:484 motion/views.py:492
+#: motion/views.py:478 motion/views.py:486
 #, python-format
 msgid "Motion <b>%s</b> was successfully deleted."
 msgstr "Antrag <b>%s</b> wurde erfolgreich gelöscht."
 
-#: motion/views.py:494
+#: motion/views.py:488
 msgid "Invalid request"
 msgstr "Ungültige Anfrage"
 
-#: motion/views.py:518
+#: motion/views.py:512
 msgid "Poll was updated"
 msgstr "Abstimmung wurde aktualisiert"
 
-#: motion/views.py:535
+#: motion/views.py:529
 #, python-format
 msgid "Version <b>%s</b> accepted."
 msgstr "Version <b>%s</b> akzeptiert."
 
-#: motion/views.py:537
+#: motion/views.py:531
 #, python-format
 msgid "Do you really want to authorize version <b>%s</b>?"
 msgstr "Soll Version <b>%s</b> wirklich zugelassen werden?"
 
-#: motion/views.py:547
+#: motion/views.py:541
 #, python-format
 msgid "Version <b>%s</b> rejected."
 msgstr "Version <b>%s</b> zurückgewiesen."
 
-#: motion/views.py:549
+#: motion/views.py:543
 msgid "ERROR by rejecting the version."
 msgstr "FEHLER beim Zurückweisen der Version."
 
-#: motion/views.py:551
+#: motion/views.py:545
 #, python-format
 msgid "Do you really want to reject version <b>%s</b>?"
 msgstr "Soll Version <b>%s</b> wirklich zurückgewiesen werden?"
 
-#: motion/views.py:587 motion/views.py:591 motion/views.py:597
-#: motion/views.py:600 participant/api.py:81
+#: motion/views.py:581 motion/views.py:585 motion/views.py:591
+#: motion/views.py:594 participant/api.py:78
 #, python-format
 msgid "Ignoring malformed line %d in import file."
 msgstr "Fehlerhafte Zeile %d der Quelldatei wurde ignoriert."
 
-#: motion/views.py:608
+#: motion/views.py:602
 #, python-format
 msgid "Ignoring line %d because the assigned group may not act as a person."
 msgstr ""
 "Fehlerhafte Zeile %d der Quelldatei wurde ignoriert da die verwendete Gruppe "
 "nicht als Person auftreten darf."
 
-#: motion/views.py:617
+#: motion/views.py:611
 msgid "Created by motion import."
 msgstr "Erstellt durch Antragsimport."
 
-#: motion/views.py:631
+#: motion/views.py:625
 #, python-format
 msgid ""
 "Ignoring line %d because it contains an incomplete first / last name pair."
@@ -1329,52 +1342,52 @@ msgstr ""
 "Fehlerhafte Zeile %d der Quelldatei wurde ignoriert, da Vor- bzw. Nachname "
 "Leerstrings enthalten."
 
-#: motion/views.py:669
+#: motion/views.py:663
 #, python-format
 msgid "%d motion was successfully imported."
 msgid_plural "%d motions were successfully imported."
 msgstr[0] "%d Antrag wurde erfolgreich importiert."
 msgstr[1] "%d Anträge wurden erfolgreich importiert."
 
-#: motion/views.py:672
+#: motion/views.py:666
 #, python-format
 msgid "%d motion was successfully modified."
 msgid_plural "%d motions were successfully modified."
 msgstr[0] "%d Antrag wurde erfolgreich geändert."
 msgstr[1] "%d Anträge wurden erfolgreich geändert."
 
-#: motion/views.py:675
+#: motion/views.py:669
 #, 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."
 
-#: motion/views.py:678
+#: motion/views.py:672
 #, python-format
 msgid "%d new group was added."
 msgid_plural "%d new groups were added."
 msgstr[0] "%d neue Gruppe wurde erstellt."
 msgstr[1] "%d neue Gruppen wurden erstellt."
 
-#: motion/views.py:681
+#: motion/views.py:675
 #, python-format
 msgid "%d group assigned to motions."
 msgid_plural "%d groups assigned to motions."
 msgstr[0] "%d Gruppe wurde zugewiesen."
 msgstr[1] "%d Gruppen wurden zugewiesen."
 
-#: motion/views.py:685 participant/api.py:97
+#: motion/views.py:679 participant/api.py:94
 msgid "Import aborted because of severe errors in the input file."
 msgstr "Import auf Grund von schweren Fehlern in der Quelldatei abgebrochen."
 
-#: motion/views.py:687 participant/api.py:99
+#: motion/views.py:681 participant/api.py:96
 msgid "Import file has wrong character encoding, only UTF-8 is supported!"
 msgstr ""
 "Die Quelldatei benutzt eine ungültige Zeichenkodierung, es wird nur UTF-8 "
 "wird unterstützt!"
 
-#: motion/views.py:691
+#: motion/views.py:685
 msgid ""
 "Attention: Existing motions will be modified if you import new motions with "
 "the same number."
@@ -1382,7 +1395,7 @@ msgstr ""
 "Achtung: Existierende Anträge werden geändert wenn Sie neue Anträge mit "
 "identischer Nummer importieren."
 
-#: motion/views.py:692
+#: motion/views.py:686
 msgid ""
 "Attention: Importing an motions without a number multiple times will create "
 "duplicates."
@@ -1390,52 +1403,52 @@ msgstr ""
 "Achtung: Bei mehrfachem Import eines Antrags ohne Nummer können Duplikate "
 "entstehen."
 
-#: motion/views.py:725 motion/views.py:863
+#: motion/views.py:719 motion/views.py:857
 #: motion/templates/motion/poll_view.html:7
 #: motion/templates/motion/poll_view.html:14
-#: motion/templates/motion/view.html:8 motion/templates/motion/view.html:21
+#: motion/templates/motion/view.html:8 motion/templates/motion/view.html:22
 #: motion/templates/projector/Motion.html:7
 #: motion/templates/projector/Motion.html:65
 msgid "Motion"
 msgstr "Antrag"
 
-#: motion/views.py:739 motion/templates/motion/overview.html:101
+#: motion/views.py:733 motion/templates/motion/overview.html:101
 msgid "No motions available."
 msgstr "Keine Anträge vorhanden."
 
-#: motion/views.py:744 motion/views.py:746 motion/views.py:761
-#: motion/views.py:763 motion/templates/motion/base_motion.html:24
+#: motion/views.py:738 motion/views.py:740 motion/views.py:755
+#: motion/views.py:757 motion/templates/motion/base_motion.html:24
 #: motion/templates/projector/Motion.html:63
 msgid "Motion No."
 msgstr "Antrag Nr."
 
-#: motion/views.py:778
+#: motion/views.py:772
 msgid "Signature"
 msgstr "Unterschrift"
 
-#: motion/views.py:829 motion/templates/motion/base_motion.html:55
+#: motion/views.py:823 motion/templates/motion/base_motion.html:55
 #: motion/templates/motion/poll_view.html:7
 #: motion/templates/motion/poll_view.html:14
-#: motion/templates/motion/view.html:54 motion/templates/motion/view.html:206
+#: motion/templates/motion/view.html:55 motion/templates/motion/view.html:211
 #: motion/templates/projector/Motion.html:33
 msgid "Vote"
 msgstr "Abstimmung"
 
-#: motion/views.py:863
+#: motion/views.py:857
 msgid "Poll"
 msgstr "Abstimmung"
 
-#: motion/views.py:877
+#: motion/views.py:871
 #, python-format
 msgid "Motion No. %s"
 msgstr "Antrag Nr. %s"
 
-#: motion/views.py:879
+#: motion/views.py:873
 #, python-format
 msgid "%d. Vote"
 msgstr "%d. Abstimmung"
 
-#: motion/views.py:936
+#: motion/views.py:930
 msgid "Motion settings successfully saved."
 msgstr "Antrags-Einstellungen wurden erfolgreich gespeichert."
 
@@ -1466,13 +1479,13 @@ msgstr "Antrag anzeigen"
 #: motion/templates/motion/base_motion.html:38
 #: motion/templates/motion/edit.html:8 motion/templates/motion/edit.html:17
 #: motion/templates/motion/overview.html:89
-#: motion/templates/motion/view.html:39
+#: motion/templates/motion/view.html:40
 msgid "Edit motion"
 msgstr "Antrag bearbeiten"
 
 #: motion/templates/motion/base_motion.html:42
 #: motion/templates/motion/overview.html:91
-#: motion/templates/motion/view.html:43
+#: motion/templates/motion/view.html:44
 msgid "Delete motion"
 msgstr "Antrag löschen"
 
@@ -1486,7 +1499,7 @@ msgid "Show Motion"
 msgstr "Antrag projizieren"
 
 #: motion/templates/motion/base_motion.html:61
-#: motion/templates/motion/view.html:60
+#: motion/templates/motion/view.html:61
 msgid "New agenda item"
 msgstr "Neuer Tagesordnungseintrag"
 
@@ -1533,9 +1546,8 @@ msgid "Import"
 msgstr "Importieren"
 
 #: motion/templates/motion/overview.html:19
-#, fuzzy
 msgid "Print all motions as PDF"
-msgstr "Alle Anträge als PDF"
+msgstr "Alle Anträge als PDF drucken"
 
 #: motion/templates/motion/overview.html:27
 msgid "Need supporters"
@@ -1566,7 +1578,7 @@ msgstr[1] "Anträge"
 
 #: motion/templates/motion/overview.html:52
 msgid "#"
-msgstr ""
+msgstr "#"
 
 #: motion/templates/motion/overview.html:53
 msgid "Motion title"
@@ -1577,7 +1589,7 @@ msgid "Number of supporters"
 msgstr "Anzahl der Unterstützer/innen"
 
 #: motion/templates/motion/overview.html:59
-#: motion/templates/motion/view.html:242
+#: motion/templates/motion/view.html:247
 msgid "Creation Time"
 msgstr "Erstellungszeit"
 
@@ -1586,160 +1598,141 @@ msgid "Activate motion"
 msgstr "Antrag projizieren"
 
 #: motion/templates/motion/poll_view.html:18
-#, fuzzy
 msgid "Back to motion"
-msgstr "Antrag bearbeiten"
-
-#: motion/templates/motion/poll_view.html:21
-#: motion/templates/motion/view.html:33 motion/templates/motion/view.html:316
-#, fuzzy
-msgid "More actions"
-msgstr "Anträge"
+msgstr "Zurück zum Antrag"
 
 #: motion/templates/motion/poll_view.html:27
-#: motion/templates/motion/view.html:209
+#: motion/templates/motion/view.html:214
 msgid "Delete Vote"
 msgstr "Abstimmung löschen"
 
 #: motion/templates/motion/poll_view.html:32
-#, fuzzy
-msgid "Show Application"
-msgstr "Wahl projizieren"
+#: motion/templates/motion/view.html:49
+msgid "Show motion"
+msgstr "Antrag projizieren"
 
 #: motion/templates/motion/poll_view.html:48
 msgid "Option"
 msgstr "Wahlmöglichkeit"
 
-#: motion/templates/motion/view.html:30
-#, fuzzy
+#: motion/templates/motion/view.html:31
 msgid "Print this motion as PDF"
-msgstr "Alle Anträge als PDF"
+msgstr "Diesen Antrag als PDF drucken"
 
-#: motion/templates/motion/view.html:48
-#, fuzzy
-msgid "Show motion"
-msgstr "Antrag projizieren"
-
-#: motion/templates/motion/view.html:74
+#: motion/templates/motion/view.html:75
 msgid "This is not the newest version."
 msgstr "Dies ist nicht die neuste Version."
 
-#: motion/templates/motion/view.html:74 motion/templates/motion/view.html:76
+#: motion/templates/motion/view.html:75 motion/templates/motion/view.html:77
 msgid "Go to version"
 msgstr "Gehe zu Version"
 
-#: motion/templates/motion/view.html:76
+#: motion/templates/motion/view.html:77
 msgid "This is not the authorized version."
 msgstr "Dies ist nicht die zugelassene Version."
 
-#: motion/templates/motion/view.html:81
-#, fuzzy
+#: motion/templates/motion/view.html:82
 msgid "Motion text"
-msgstr "Antragstitel"
+msgstr "Antragstext"
 
-#: motion/templates/motion/view.html:94
+#: motion/templates/motion/view.html:95
 msgid "Version History"
 msgstr "Versionshistorie"
 
-#: motion/templates/motion/view.html:99
+#: motion/templates/motion/view.html:100
 msgid "Time"
 msgstr "Zeit"
 
-#: motion/templates/motion/view.html:109
+#: motion/templates/motion/view.html:110
 msgid "Version authorized"
 msgstr "Version %d zugelassen"
 
-#: motion/templates/motion/view.html:112
+#: motion/templates/motion/view.html:113
 msgid "Permit Version"
 msgstr "Version zulassen"
 
-#: motion/templates/motion/view.html:115
+#: motion/templates/motion/view.html:116
 msgid "Reject Version"
 msgstr "Version verwerfen"
 
-#: motion/templates/motion/view.html:119
+#: motion/templates/motion/view.html:120
 msgid "Version rejected"
 msgstr "Version verworfen"
 
-#: motion/templates/motion/view.html:129 motion/templates/motion/view.html:136
-#: motion/templates/motion/view.html:143
+#: motion/templates/motion/view.html:130 motion/templates/motion/view.html:137
+#: motion/templates/motion/view.html:144
 msgid "unchanged"
 msgstr "unverändert"
 
-#: motion/templates/motion/view.html:152
-msgid "Log"
-msgstr "Log"
+#: motion/templates/motion/view.html:154
+msgid "Show log"
+msgstr "Log anzeigen"
 
-#: motion/templates/motion/view.html:194 motion/templates/motion/view.html:226
+#: motion/templates/motion/view.html:199 motion/templates/motion/view.html:231
 msgid "New vote"
 msgstr "Neue Abstimmung"
 
-#: motion/templates/motion/view.html:208
+#: motion/templates/motion/view.html:213
 msgid "Edit Vote"
 msgstr "Abstimmung bearbeiten"
 
-#: motion/templates/motion/view.html:233
-#, fuzzy
+#: motion/templates/motion/view.html:238
 msgid "No results"
-msgstr "Abstimmungsergebnis"
+msgstr "Keine Ergebnisse"
 
-#: motion/templates/motion/view.html:248
-#, fuzzy
+#: motion/templates/motion/view.html:253
 msgid "Withdraw motion"
-msgstr "Zurückziehen"
+msgstr "Antrag zurückziehen"
 
-#: motion/templates/motion/view.html:256
-#, fuzzy
+#: motion/templates/motion/view.html:261
 msgid "Unsupport motion"
-msgstr "Darf Anträge unterstützen"
+msgstr "Antrag nicht unterstützen"
 
-#: motion/templates/motion/view.html:262
+#: motion/templates/motion/view.html:267
 msgid "Support"
 msgstr "Unterstützen"
 
-#: motion/templates/motion/view.html:269
+#: motion/templates/motion/view.html:274
 msgid "minimum required supporters"
 msgstr "minimal erforderliche Unterstützer/innen"
 
-#: motion/templates/motion/view.html:276
+#: motion/templates/motion/view.html:281
 msgid "Manage motion"
-msgstr "Antrag Verwalten"
+msgstr "Antrag verwalten"
 
-#: motion/templates/motion/view.html:279
+#: motion/templates/motion/view.html:284
 msgid "Formal validation"
 msgstr "Formale Gültigkeitsprüfung"
 
-#: motion/templates/motion/view.html:282
+#: motion/templates/motion/view.html:286
 msgid "Publish"
 msgstr "Veröffentlichen"
 
-#: motion/templates/motion/view.html:285
+#: motion/templates/motion/view.html:289
 msgid "Permit"
 msgstr "Zulassen"
 
-#: motion/templates/motion/view.html:288
-#, fuzzy
+#: motion/templates/motion/view.html:292
 msgid "Not permit"
-msgstr "Nicht zulassen (verwerfen)"
+msgstr "Nicht zulassen"
 
-#: motion/templates/motion/view.html:291
+#: motion/templates/motion/view.html:295
 msgid "Set number"
 msgstr "Setze Nummer"
 
-#: motion/templates/motion/view.html:297
+#: motion/templates/motion/view.html:300
 msgid "Result after vote"
 msgstr "Ergebnis nach der Abstimmung"
 
-#: motion/templates/motion/view.html:330
-#, fuzzy
+#: motion/templates/motion/view.html:332
 msgid "Withdrawed by Submitter"
 msgstr "Zurückgezogen durch Antragsteller/in"
 
-#: motion/templates/motion/view.html:337
+#: motion/templates/motion/view.html:339
 msgid "For Administration only:"
 msgstr "Nur zur Administration:"
 
-#: motion/templates/motion/view.html:339
+#: motion/templates/motion/view.html:341
 msgid "Reset"
 msgstr "Zurücksetzen"
 
@@ -1759,18 +1752,18 @@ msgstr "Keine Abstimmungsergebnisse vorhanden."
 msgid "Participant"
 msgstr "Teilnehmer"
 
-#: participant/forms.py:27 participant/views.py:608
+#: participant/forms.py:28 participant/views.py:605
 #: participant/templates/participant/group_overview.html:7
 #: participant/templates/participant/group_overview.html:10
 #: participant/templates/participant/user_detail.html:14
 msgid "Groups"
 msgstr "Gruppen"
 
-#: participant/forms.py:52
+#: participant/forms.py:53
 msgid "Permissions"
 msgstr "Rechte"
 
-#: participant/forms.py:55 participant/views.py:546 participant/views.py:594
+#: participant/forms.py:56 participant/views.py:543 participant/views.py:591
 #: participant/templates/participant/config.html:8
 #: participant/templates/participant/group_overview.html:13
 #: participant/templates/participant/overview.html:7
@@ -1779,28 +1772,28 @@ msgstr "Rechte"
 msgid "Participants"
 msgstr "Teilnehmer/innen"
 
-#: participant/forms.py:92
+#: participant/forms.py:93
 msgid "You can not edit the name for this group."
 msgstr "Sie dürfen den Namen dieser Gruppe nicht bearbeiten."
 
-#: participant/forms.py:96
+#: participant/forms.py:97
 #, python-format
 msgid "Group name \"%s\" is reserved for internal use."
 msgstr "Der Gruppenname \"%s\" ist für interne Verwendung reserviert."
 
-#: participant/forms.py:118
+#: participant/forms.py:121
 msgid "System URL"
 msgstr "System URL"
 
-#: participant/forms.py:119 participant/forms.py:124
+#: participant/forms.py:122 participant/forms.py:127
 msgid "Printed in PDF of first time passwords only."
 msgstr "Erscheint nur im PDF der Erst-Passwörter"
 
-#: participant/forms.py:127
+#: participant/forms.py:130
 msgid "Sort participants by first name"
 msgstr "Teilnehmer/innen nach Vornamen sortieren"
 
-#: participant/forms.py:128
+#: participant/forms.py:131
 msgid "Disable for sorting by last name"
 msgstr "Deaktivieren für Sortierung nach Nachnamen"
 
@@ -1850,7 +1843,7 @@ msgstr "Nur zum Filtern der Teilnehmerliste."
 msgid "Typ"
 msgstr "Typ"
 
-#: participant/models.py:54 participant/views.py:255
+#: participant/models.py:54 participant/views.py:248
 #: participant/templates/participant/overview.html:79
 #: participant/templates/participant/overview.html:106
 #: participant/templates/participant/user_detail.html:34
@@ -1894,98 +1887,98 @@ msgstr "Zum Beispiel als Antragsteller."
 msgid "Welcome to OpenSlides!"
 msgstr "Willkommen bei OpenSlides!"
 
-#: participant/views.py:207
+#: participant/views.py:200
 msgid "You can not delete yourself."
 msgstr "Sie dürfen sich nicht selbst löschen."
 
-#: participant/views.py:228
+#: participant/views.py:221
 msgid "You can not deactivate yourself."
 msgstr "Sie dürfen sich nicht selbst deaktivieren."
 
-#: participant/views.py:231
+#: participant/views.py:224
 msgid "You can not deactivate the administrator."
 msgstr "Sie dürfen den Administrator nicht deaktivieren."
 
-#: participant/views.py:250
+#: participant/views.py:243
 msgid "Participant-list"
 msgstr "Teilnehmerliste"
 
-#: participant/views.py:251
+#: participant/views.py:244
 msgid "List of Participants"
 msgstr "Teilnehmerliste"
 
-#: participant/views.py:254
+#: participant/views.py:247
 #: participant/templates/participant/overview.html:103
 msgid "Last Name"
 msgstr "Nachname"
 
-#: participant/views.py:254
+#: participant/views.py:247
 #: participant/templates/participant/overview.html:102
 msgid "First Name"
 msgstr "Vorname"
 
-#: participant/views.py:254
+#: participant/views.py:247
 #: participant/templates/participant/group_overview.html:19
 msgid "Group"
 msgstr "Gruppe"
 
-#: participant/views.py:254 participant/templates/participant/overview.html:71
+#: participant/views.py:247 participant/templates/participant/overview.html:71
 #: participant/templates/participant/overview.html:105
 #: participant/templates/participant/user_detail.html:29
 msgid "Type"
 msgstr "Typ"
 
-#: participant/views.py:286
+#: participant/views.py:279
 msgid "Participant-passwords"
 msgstr "Teilnehmer-Passwoerter"
 
-#: participant/views.py:308
+#: participant/views.py:301
 msgid "Account for OpenSlides"
 msgstr "Zugang für OpenSlides"
 
-#: participant/views.py:310
+#: participant/views.py:303
 #, python-format
 msgid "for %s"
 msgstr "für %s"
 
-#: participant/views.py:313
+#: participant/views.py:306
 #, python-format
 msgid "User: %s"
 msgstr "Nutzername: %s"
 
-#: participant/views.py:317
+#: participant/views.py:310
 #, python-format
 msgid "Password: %s"
 msgstr "Passwort: %s"
 
-#: participant/views.py:322
+#: participant/views.py:315
 #, python-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: participant/views.py:364
+#: participant/views.py:357
 #, python-format
 msgid "%d new participants were successfully imported."
 msgstr "%d neue Teilnehmer/innen wurden erfolgreich importiert."
 
-#: participant/views.py:375
+#: participant/views.py:368
 msgid "Do you really want to reset the password?"
 msgstr "Soll das Passwort wirklich zurückgesetzt werden?"
 
-#: participant/views.py:388
+#: participant/views.py:381
 #, python-format
 msgid "The Password for %s was successfully reset."
 msgstr "Das Passwort für %s wurde erfolgreich zurückgesetzt."
 
-#: participant/views.py:445
+#: participant/views.py:438
 msgid "You can not delete this Group."
 msgstr "Sie dürfen diese Gruppe nicht löschen."
 
-#: participant/views.py:473
+#: participant/views.py:466
 msgid "Participants settings successfully saved."
 msgstr "Teilnehmer/innen-Einstellungen wurden erfolgreich gespeichert."
 
-#: participant/views.py:483
+#: participant/views.py:476
 #, python-format
 msgid ""
 "Installation was successfully! Use %(user)s (password: %(password)s) for "
@@ -1998,15 +1991,15 @@ msgstr ""
 "Sie das Passwort nach der ersten Anmeldung! Anderenfalls erscheint diese "
 "Meldung weiterhin für alle und ist ein Sicherheitsrisiko."
 
-#: participant/views.py:506
+#: participant/views.py:502
 msgid "User settings successfully saved."
 msgstr "Nutzereinstellungen wurden erfolgreich gespeichert."
 
-#: participant/views.py:528
+#: participant/views.py:525
 msgid "Password successfully changed."
 msgstr "Passwort wurde erfolgreich geändert."
 
-#: participant/views.py:580
+#: participant/views.py:577
 msgid "My motions and elections"
 msgstr "Meine Anträge und Wahlen"
 
@@ -2080,21 +2073,20 @@ msgstr ""
 "Benutzername und Passwort wurden nicht akzeptiert. Bitte versuchen Sie es "
 "erneut."
 
-#: participant/templates/participant/login.html:29
+#: participant/templates/participant/login.html:35
 msgid "Username"
-msgstr ""
+msgstr "Benutzername"
 
-#: participant/templates/participant/login.html:33
-#, fuzzy
+#: participant/templates/participant/login.html:39
 msgid "Password"
-msgstr "Passwort: %s"
+msgstr "Passwort"
 
-#: participant/templates/participant/login.html:38
-#: participant/templates/participant/overview.html:39 templates/base.html:44
+#: participant/templates/participant/login.html:44
+#: participant/templates/participant/overview.html:39 templates/base.html:45
 msgid "Login"
 msgstr "Anmelden"
 
-#: participant/templates/participant/login.html:42
+#: participant/templates/participant/login.html:48
 msgid "Continue as guest"
 msgstr "Weiter als Gast"
 
@@ -2109,24 +2101,20 @@ msgid "User groups"
 msgstr "Neue Gruppe"
 
 #: participant/templates/participant/overview.html:35
-#, fuzzy
 msgid "List of participants"
 msgstr "Teilnehmerliste"
 
 #: participant/templates/participant/overview.html:36
-#, fuzzy
 msgid "First time passwords"
-msgstr "Erst-Passwörter als PDF"
+msgstr "Erst-Passwörter"
 
 #: participant/templates/participant/overview.html:44
-#, fuzzy
 msgid "Print list of participants as PDF"
-msgstr "Teilnehmerliste als PDF"
+msgstr "Teilnehmerliste als PDF drucken"
 
 #: participant/templates/participant/overview.html:47
-#, fuzzy
 msgid "Print first time passwords as PDF"
-msgstr "Erst-Passwörter als PDF"
+msgstr "Erst-Passwörter als PDF drucken"
 
 #: participant/templates/participant/overview.html:61
 #: participant/templates/participant/overview.html:76
@@ -2175,6 +2163,7 @@ msgstr "Keine Teilnehmer/innen vorhanden."
 
 #: participant/templates/participant/password_change.html:5
 #: participant/templates/participant/password_change.html:8
+#: participant/templates/participant/settings.html:13
 msgid "Password Settings"
 msgstr "Passwort-Einstellungen"
 
@@ -2197,10 +2186,15 @@ msgid "I am candidate for the following elections:"
 msgstr "Ich bin Kandidat/in bei folgenden Wahlen:"
 
 #: participant/templates/participant/settings.html:5
-#: participant/templates/participant/settings.html:8
+#: participant/templates/participant/settings.html:12
+#: participant/templates/participant/settings.html:19
 msgid "Personal Settings"
 msgstr "Persönliche Einstellungen"
 
+#: participant/templates/participant/settings.html:10
+msgid "User Settings"
+msgstr "Benutzereinstellungen"
+
 #: participant/templates/participant/user_detail.html:19
 msgid "The participant is not member of any group."
 msgstr "Teilnehmer/in ist kein Mitglied einer Gruppe."
@@ -2262,15 +2256,15 @@ msgstr "s"
 msgid "Save as default"
 msgstr "Als Voreinstellung speichern"
 
-#: projector/templates/projector/control_countdown.html:14
+#: projector/templates/projector/control_countdown.html:15
 msgid "Reset countdown"
 msgstr "Countdown zurücksetzen"
 
-#: projector/templates/projector/control_countdown.html:17
+#: projector/templates/projector/control_countdown.html:18
 msgid "Start countdown"
 msgstr "Countdown starten"
 
-#: projector/templates/projector/control_countdown.html:20
+#: projector/templates/projector/control_countdown.html:21
 msgid "Stop countdown"
 msgstr "Countdown stoppen"
 
@@ -2278,18 +2272,17 @@ msgstr "Countdown stoppen"
 msgid "Clean message"
 msgstr "Message leeren"
 
-#: projector/templates/projector/custom_slide_widget.html:14
+#: projector/templates/projector/custom_slide_widget.html:13
 msgid "Welcome Page"
 msgstr "Willkommensseite"
 
 #: projector/templates/projector/dashboard.html:20
-#, fuzzy
 msgid "Manage widgets"
-msgstr "Widgets auswählen"
+msgstr "Widgets verwalten"
 
 #: projector/templates/projector/dashboard.html:20
 msgid "Widgets"
-msgstr ""
+msgstr "Widgets"
 
 #: projector/templates/projector/live_view_widget.html:9
 msgid "Zoom in"
@@ -2333,24 +2326,23 @@ msgstr "Seite nicht gefunden."
 msgid "Server Error"
 msgstr "Serverfehler"
 
-#: templates/base.html:28
+#: templates/base.html:29
 msgid "Home"
 msgstr "Startseite"
 
-#: templates/base.html:38
-msgid "Profile"
-msgstr ""
-
 #: templates/base.html:39
-#, fuzzy
-msgid "Change password"
-msgstr "Vorgegebenes Passwort"
+msgid "Profile"
+msgstr "Profil"
 
-#: templates/base.html:41
+#: templates/base.html:40
+msgid "Change password"
+msgstr "Passwort ändern"
+
+#: templates/base.html:42
 msgid "Logout"
 msgstr "Abmelden"
 
-#: templates/base.html:97
+#: templates/base.html:98
 msgid ""
 "Get <a href='http://openslides.org/support' target='_blank'>professional "
 "support</a> for OpenSlides."
@@ -2358,49 +2350,49 @@ msgstr ""
 "Nutzen Sie unseren <a href='http://openslides.org/support' "
 "target='_blank'>professionellen Support</a> für OpenSlides."
 
-#: utils/pdf.py:227
+#: utils/pdf.py:226
 #, python-format
 msgid "As of: %s"
 msgstr "Stand: %s"
 
-#: utils/pdf.py:238 utils/pdf.py:247
+#: utils/pdf.py:237 utils/pdf.py:246
 #, python-format
 msgid "Page %s"
 msgstr "Seite %s"
 
-#: utils/utils.py:63 utils/views.py:287
+#: utils/utils.py:59 utils/views.py:283
 #, python-format
 msgid "Do you really want to delete %s?"
 msgstr "Soll %s wirklich gelöscht werden?"
 
-#: utils/utils.py:110
+#: utils/utils.py:106
 msgid "Sorry, you have no rights to see this page."
 msgstr "Bedaure, Sie haben keine Berechtigung diese Seite zu sehen."
 
-#: utils/views.py:106
+#: utils/views.py:102
 msgid "Are you sure?"
 msgstr "Sind Sie sicher?"
 
-#: utils/views.py:107
+#: utils/views.py:103
 msgid "Thank you for your answer"
 msgstr "Danke für Ihre Antwort"
 
-#: utils/views.py:244
+#: utils/views.py:240
 #, python-format
 msgid "%s was successfully modified."
 msgstr "%s wurde erfolgreich bearbeitet."
 
-#: utils/views.py:275
+#: utils/views.py:271
 #, python-format
 msgid "%s was successfully created."
 msgstr "%s wurde erfolgreich angelegt."
 
-#: utils/views.py:293
+#: utils/views.py:289
 #, python-format
 msgid "%s was successfully deleted."
 msgstr "%s wurde erfolgreich gelöscht."
 
-#: utils/views.py:308
+#: utils/views.py:304
 msgid "undefined-filename"
 msgstr "undefinierter-dateiname"
 
@@ -2408,15 +2400,25 @@ msgstr "undefinierter-dateiname"
 msgid "Enter valid JSON"
 msgstr "Gebe valides JSON ein"
 
+#~ msgid "Mark item as done"
+#~ msgstr "Eintrag als erledigt markieren"
+
+#~ msgid "Item closed"
+#~ msgstr "Eintrag erledigt"
+
+#, fuzzy
+#~ msgid "Show Application"
+#~ msgstr "Wahl projizieren"
+
+#~ msgid "Log"
+#~ msgstr "Log"
+
 #~ msgid "All items"
 #~ msgstr "Alle Einträge"
 
 #~ msgid "View item"
 #~ msgstr "Eintrag anzeigen"
 
-#~ msgid "Show item"
-#~ msgstr "Eintrag projizieren"
-
 #~ msgid "Done"
 #~ msgstr "Erledigt"
 
@@ -2450,9 +2452,6 @@ msgstr "Gebe valides JSON ein"
 #~ msgid "Close this notification"
 #~ msgstr "Meldung ausblenden"
 
-#~ msgid "User Settings"
-#~ msgstr "Benutzereinstellungen"
-
 #~ msgid "Overview"
 #~ msgstr "Übersicht"
 
diff --git a/openslides/motion/templates/motion/config.html b/openslides/motion/templates/motion/config.html
index 7f0503147..b36f60a68 100644
--- a/openslides/motion/templates/motion/config.html
+++ b/openslides/motion/templates/motion/config.html
@@ -5,20 +5,19 @@
 {% block title %}{{ block.super }} – {% trans "Motion settings" %}{% endblock %}
 
 {% block content %}
-    <h1>{% trans "Configuration" %}: {% trans "Motions" %}
+    <h1>
+        {% trans "Configuration" %}
+        <small>{% trans "Motions" %}</small>
         {% block config_submenu %}{{ block.super }}{% endblock %}
     </h1>
     <form action="" method="post">{% csrf_token %}
-    {{ form.as_p }}
-    <p>
-    <button class="button" type="submit">
-        <span class="icon ok">{% trans 'Save' %}</span>
-    </button>
-    <a href="{% url 'config_motion' %}">
-    <button class="button" type="button" onclick="window.location='{% url 'config_motion' %}'">
-        <span class="icon cancel">{% trans 'Cancel' %}</span>
-    </button>
-    </a>
-    </p>
+        {% include "form.html" %}
+        <p>
+        {% include "formbuttons_save.html" %}
+        <a href="{% url 'config_motion' %}" class="btn">
+            {% trans 'Cancel' %}
+        </a>
+        </p>
+        <small>* {% trans "required" %}</small>
     </form>
 {% endblock %}
diff --git a/openslides/motion/templates/motion/edit.html b/openslides/motion/templates/motion/edit.html
index 65945b9b3..d1c0828ee 100644
--- a/openslides/motion/templates/motion/edit.html
+++ b/openslides/motion/templates/motion/edit.html
@@ -13,17 +13,18 @@
 
 {% block content %}
     <h1>
-    {% if motion %}
-        {% trans "Edit motion" %}
-    {% else %}
-        {% trans "New motion" %}
-    {% endif %}
-    <small class="pull-right">
-    <a href="{% url 'motion_overview' %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
-    </small>
+        {% if motion %}
+            {% trans "Edit motion" %}
+        {% else %}
+            {% trans "New motion" %}
+        {% endif %}
+        <small class="pull-right">
+        <a href="{% url 'motion_overview' %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
+        </small>
     </h1>
     <form action="" method="post">{% csrf_token %}
-        {% for field in form %}
+        {% include "form.html" %}
+        {% for field in managerform %}
         <div class="control-group{% if field.errors %} error{% endif%}">
             <label for="id_{{ field.name }}">{{ field.label }}{% if field.field.required %}<span class="required">*</span>{% endif %}:</label>
             {{ field }}
@@ -35,20 +36,12 @@
             {% endif %}
         </div>
         {% endfor %}
-        {{ managerform.as_p }}
-        <div class="control-group">
-        <button class="btn btn-primary" type="submit">
-            {% trans 'Save' %}
-        </button>
-        <button class="btn" type="submit" name="apply">
-            {% trans 'Apply' %}
-        </button>
-        <a href="{% url 'motion_overview' %}" class="btn">
+        <p>
+        {% include "formbuttons_saveapply.html" %}
+        <a href='{% url 'motion_overview' %}' class="btn">
             {% trans 'Cancel' %}
         </a>
-        </button>
-        </a>
-        </div>
+        </p>
         <small>* {% trans "required" %}</small>
     </form>
 {% endblock %}
diff --git a/openslides/motion/templates/motion/overview.html b/openslides/motion/templates/motion/overview.html
index 736d68c6c..4c9850559 100644
--- a/openslides/motion/templates/motion/overview.html
+++ b/openslides/motion/templates/motion/overview.html
@@ -14,7 +14,7 @@
             <a href="{% url 'motion_new' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'New motion' %}"><i class="icon-plus"></i> {% trans "New" %}</a>
         {% endif %}
         {% if perms.motion.can_manage_motion %}
-            <a href="{% url 'motion_import' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Import motions' %}"><i class="icon-share-alt"></i> {% trans 'Import' %}</a>
+            <a href="{% url 'motion_import' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Import motions' %}"><i class="icon-import"></i> {% trans 'Import' %}</a>
         {% endif %}
         <a href="{% url 'print_motions' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print all motions as PDF' %}"><i class="icon-print"></i> PDF</a>
         </small>
@@ -61,8 +61,7 @@
         </tr>
     {% for app_info in motions %}
     {% with motion=app_info.motion useractions=app_info.actions %}
-        <tr class="{% cycle '' 'odd' %}
-            {% if motion.active %}activeline{% endif %}">
+        <tr class="{% if motion.active %}activeline{% endif %}">
             <td>{% if motion.number %}{{ motion.number }}{% else %}-{% endif %}</td>
             <td><a href="{% url 'motion_view' motion.id %}">{{ motion.public_version.title }}</a></td>
         {% if min_supporters > 0 %}
@@ -81,17 +80,23 @@
             <td>
                 <span style="width: 1px; white-space: nowrap;">
                 {% if perms.projector.can_manage_projector %}
-                    <a class="activate_link {% if motion.active %}active{% endif %}" href="{% url 'projector_activate_slide' motion.sid %}" title="{% trans 'Activate motion' %}">
-                        <span></span>
+                    <a href="{% url 'projector_activate_slide' motion.sid  %}" class="activate_link btn {% if motion.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show' %}">
+                        <i class="icon-facetime-video {% if motion.active %}icon-white{% endif %}"></i>
                     </a>
                 {% endif %}
                 {% if perms.motion.can_manage_motion %}
-                    <a href="{% url 'motion_edit' motion.id %}"><img src="{% static 'images/icons/edit.png' %}" title="{% trans 'Edit motion' %}"></a>
+                    <a href="{% url 'motion_edit' motion.id %}" title="{% trans 'Edit' %}" class="btn btn-mini">
+                        <i class="icon-pencil"></i>
+                    </a>
                     {% if "delete" in useractions %}
-                    <a href="{% url 'motion_delete' motion.id %}"><img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Delete motion' %}"></a>
+                    <a href="{% url 'motion_delete' motion.id %}" title="{% trans 'Delete' %}" class="btn btn-mini">
+                        <i class="icon-remove"></i>
+                    </a>
                     {% endif %}
                 {% endif %}
-                <a href="{% url 'print_motion' motion.id  %}" title="{% trans 'Motion as PDF' %}"><img src="{% static 'images/icons/pdf.png' %}"></a>
+                <a href="{% url 'print_motion' motion.id  %}" class="btn btn-mini" title="{% trans 'Print motion as PDF' %}">
+                    <i class="icon-print"></i>
+                </a>
                 </span>
             </td>
         </tr>
diff --git a/openslides/motion/templates/motion/poll_view.html b/openslides/motion/templates/motion/poll_view.html
index b4365a90f..11c61baf6 100644
--- a/openslides/motion/templates/motion/poll_view.html
+++ b/openslides/motion/templates/motion/poll_view.html
@@ -10,12 +10,19 @@
 {% block content %}
 <h1>
     {{ motion.public_version.title }}
+    <br>
     <small>
     {% trans "Motion" %} {{ motion.number }}, {{ ballot }}. {% trans "Vote" %}
     </small>
     <small class="pull-right">
     <div class="btn-toolbar">
         <a href="{% url 'motion_view' motion.id %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to motion" %}</a>
+        <!-- activate projector -->
+        {% if perms.projector.can_manage_projector %}
+            <a href="{% url 'projector_activate_slide' motion.sid  %}" class="activate_link btn {% if motion.active %}btn-primary{% endif %} btn-mini" rel="tooltip" data-original-title="{% trans 'Show motion' %}">
+                <i class="icon-facetime-video {% if motion.active %}icon-white{% endif %}"></i>
+            </a>
+        {% endif %}
         <div class="btn-group">
             <a data-toggle="dropdown" href="#" class="btn btn-mini dropdown-toggle">
                 {% trans 'More actions' %}
@@ -26,12 +33,6 @@
                 {% if "delete" in actions %}
                     <li><a href="{% url 'motion_poll_delete' poll.id %}"><i class="icon-remove"></i> {% trans 'Delete Vote' %}</a></li>
                 {% endif %}
-                <!-- activate projector -->
-                {% if perms.projector.can_manage_projector %}
-                    <li>
-                        <a class="activate_link {% if item.active %}active{% endif %}" href="{% url 'projector_activate_slide' motion.sid  %}"><i class="icon-facetime-video"></i> {% trans 'Show motion' %}</a>
-                    </li>
-                {% endif %}
             </ul>
         </div>
     </div>
@@ -54,11 +55,11 @@
                     <td>{{ value.errors }}{{ value }}</td>
                 </tr>
             {% endfor %}
-            <tr class="total">
+            <tr>
                 <td>{% trans "Invalid votes" %}</td>
                 <td>{{ pollform.votesinvalid.errors }}{{ pollform.votesinvalid }}</td>
             </tr>
-            <tr class="total">
+            <tr class="total warning">
                 <td>{% trans "Votes cast" %}</td>
                 <td>{{ pollform.votescast.errors }}{{ pollform.votescast }}</td>
             </tr>
diff --git a/openslides/motion/templates/motion/view.html b/openslides/motion/templates/motion/view.html
index cbae6988f..de7d03936 100644
--- a/openslides/motion/templates/motion/view.html
+++ b/openslides/motion/templates/motion/view.html
@@ -29,6 +29,12 @@
     <div class="btn-toolbar">
         <a href="{% url 'motion_overview' %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
         <a href="{% url 'print_motion' motion.id  %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print this motion as PDF' %}"><i class="icon-print"></i> PDF</a>
+        <!-- activate projector -->
+        {% if perms.projector.can_manage_projector %}
+            <a href="{% url 'projector_activate_slide' motion.sid  %}" class="activate_link btn {% if motion.active %}btn-primary{% endif %} btn-mini" rel="tooltip" data-original-title="{% trans 'Show motion' %}">
+                <i class="icon-facetime-video {% if motion.active %}icon-white{% endif %}"></i>
+            </a>
+        {% endif %}
         <div class="btn-group">
             <a data-toggle="dropdown" href="#" class="btn btn-mini dropdown-toggle">
                 {% trans 'More actions' %}
@@ -43,12 +49,6 @@
                 {% if "delete" in actions %}
                     <li><a href="{% url 'motion_delete' motion.id  %}"><i class="icon-remove"></i> {% trans 'Delete motion' %}</a></li>
                 {% endif %}
-                <!-- activate projector -->
-                {% if perms.projector.can_manage_projector %}
-                    <li>
-                        <a class="activate_link {% if item.active %}active{% endif %}" href="{% url 'projector_activate_slide' motion.sid  %}"><i class="icon-facetime-video"></i> {% trans 'Show motion' %}</a>
-                    </li>
-                {% endif %}
                 <!-- edit poll -->
                 {% if perms.motion.can_manage_motion %}
                     {% for poll in motion.polls %}
@@ -150,8 +150,12 @@
     {% endif %}
     <!-- Log -->
     {% if perms.motion.can_manage_motion %}
-        <h4>{% trans "Log" %}:</h4>
-        <small>{{ motion.log|linebreaks }}</small>
+        <button type="button" class="btn" data-toggle="collapse" data-target="#log">
+            {% trans "Show log" %}
+        </button>
+        <div id="log" class="collapse out">
+            <small>{{ motion.log|linebreaks }}</small>
+        </div>
     {% endif %}
 
 </div> <!--/span-->
@@ -278,40 +282,37 @@
     <!-- Formal validation -->
     {% if "pub" in actions or "per" in actions or "nop" in actions or "setnumber" in actions %}
         <h5>{% trans "Formal validation" %}:</h5>
-        <div class="btn-group btn-group-vertical">
-            {% if "pub" in actions %}
-                <a href="{% url 'motion_set_status' motion.id 'pub' %}" class="btn">{% trans 'Publish' %}</a>
-            {% endif %}
-            {% if "per" in actions %}
-                <a href="{% url 'motion_permit' motion.id %}" class="btn btn-info">{% trans 'Permit' %}</a>
-            {% endif %}
-            {% if "nop" in actions %}
-                <a href="{% url 'motion_notpermit' motion.id %}" class="btn">{% trans 'Not permit' %}</a>
-            {% endif %}
-            {% if "setnumber" in actions %}
-                <a href="{% url 'motion_set_number' motion.id %}" class="btn">{% trans 'Set number' %}</a>
-            {% endif %}
-        </div>
+        {% if "pub" in actions %}
+            <p><a href="{% url 'motion_set_status' motion.id 'pub' %}" class="btn">{% trans 'Publish' %}</a></p>
+        {% endif %}
+        {% if "per" in actions %}
+            <p><a href="{% url 'motion_permit' motion.id %}" class="btn btn-info">{% trans 'Permit' %}</a></p>
+        {% endif %}
+        {% if "nop" in actions %}
+            <p><a href="{% url 'motion_notpermit' motion.id %}" class="btn">{% trans 'Not permit' %}</a></p>
+        {% endif %}
+        {% if "setnumber" in actions %}
+            <p><a href="{% url 'motion_set_number' motion.id %}" class="btn">{% trans 'Set number' %}</a></p>
+        {% endif %}
     {% endif %}
     <!-- Result after vote -->
     {% if "acc" in actions or "rej" in actions %}
         <h5>{% trans "Result after vote" %}:</h5>
-        <div class="btn-group btn-group-vertical">
+        <div>
             {% if "acc" in actions %}
-            <a href="{% url 'motion_set_status' motion.id 'acc' %}" class="btn btn-success">
+            <p><a href="{% url 'motion_set_status' motion.id 'acc' %}" class="btn btn-success">
                 <i class="icon-ok icon-white"></i> {% trans 'Accepted' %}
-            </a>
+            </a></p>
             {% endif %}
             {% if "rej" in actions %}
-            <a href="{% url 'motion_set_status' motion.id 'rej' %}" class="btn btn-danger">
+            <p><a href="{% url 'motion_set_status' motion.id 'rej' %}" class="btn btn-danger">
                 <i class="icon-ban-circle icon-white"></i> {% trans 'Rejected' %}
-            </a>
+            </a></p>
             {% endif %}
         </div>
     {% endif %}
     <!-- Result after debate -->
     {% if "adj" in actions or "noc" in actions or "com" in actions or "wit" in actions %}
-        <br><br>
         <div class="btn-group">
             <a data-toggle="dropdown" href="#" class="btn dropdown-toggle">
                 {% trans 'More actions' %}
@@ -337,7 +338,7 @@
     <hr>
     <h5>{% trans "For Administration only:" %}</h5>
     <a href="{% url 'motion_reset' motion.id %}" class="btn btn-danger">
-        {% trans 'Reset' %}
+        <i  class="icon-exclamation-sign icon-white"></i> {% trans 'Reset' %}
     </a>
     </div> <!--/well-->
     {% endif %} {# end perms.motion.can_support_motion #}
diff --git a/openslides/motion/templates/motion/widget.html b/openslides/motion/templates/motion/widget.html
index c0796de89..d7488530c 100644
--- a/openslides/motion/templates/motion/widget.html
+++ b/openslides/motion/templates/motion/widget.html
@@ -5,17 +5,14 @@
 <ul style="line-height: 180%">
 {% for motion in motions %}
     <li class="{% if motion.active %}activeline{% endif %}">
-        <a href="{% url 'projector_activate_slide' motion.sid %}" class="activate_link {% if motion.active %}active{% endif %}">
-            <div></div>
+        <a href="{% url 'projector_activate_slide' motion.sid  %}" class="activate_link btn {% if motion.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show' %}">
+            <i class="icon-facetime-video {% if motion.active %}icon-white{% endif %}"></i>
+        </a>&nbsp;
+        <a href="{% model_url motion 'edit' %}" title="{% trans 'Edit' %}" class="btn btn-mini right">
+            <i class="icon-pencil"></i>
         </a>
-        <a href="{% model_url motion 'delete' %}" title="{% trans 'Delete' %}" class="icon delete right">
-            <span></span>
-        </a>
-        <a href="{% model_url motion 'edit' %}" title="{% trans 'Edit' %}" class="icon edit right">
-            <span></span>
-        </a>
-        <a href="{% url 'projctor_preview_slide' motion.sid %}" title="{% trans 'Preview' %}" class="icon preview right">
-            <span></span>
+        <a href="{% url 'projctor_preview_slide' motion.sid %}" title="{% trans 'Preview' %}" class="btn btn-mini right">
+            <i class="icon-search"></i>
         </a>
         <a href="{% model_url motion 'view' %}">
             {{ motion.public_version.title }}
diff --git a/openslides/participant/static/javascript/participant.js b/openslides/participant/static/javascript/participant.js
index bf17d5202..6dff8e739 100644
--- a/openslides/participant/static/javascript/participant.js
+++ b/openslides/participant/static/javascript/participant.js
@@ -6,22 +6,24 @@
  */
 
 $(function() {
+    // change participant status (on/off)
     $('.status_link').click(function(event) {
         event.preventDefault();
-        link = $(this);
-        group = $(this).parent();
+        var link = $(this);
         $.ajax({
             type: 'GET',
-            url: link.attr('href'),
+            url: $(this).attr('href'),
             dataType: 'json',
             success: function(data) {
                 if (data.active) {
-                    group.children('.status_link.deactivate').show();
-                    group.children('.status_link.activate').hide();
+                    newclass = 'icon-on';
+                    link.addClass('btn-success');
                 } else {
-                    group.children('.status_link.deactivate').hide();
-                    group.children('.status_link.activate').show();
+                    newclass = 'icon-off';
+                    link.removeClass('btn-success');
                 }
+                link.children('i').removeClass('icon-off icon-on').addClass(newclass);
+                link.attr('href', data.link);
             }
         });
     });
diff --git a/openslides/participant/templates/participant/config.html b/openslides/participant/templates/participant/config.html
index 8548a5bd2..50258fe52 100644
--- a/openslides/participant/templates/participant/config.html
+++ b/openslides/participant/templates/participant/config.html
@@ -5,7 +5,9 @@
 {% block title %}{{ block.super }} – {% trans "Participant settings" %}{% endblock %}
 
 {% block content %}
-    <h1>{% trans "Configuration" %}: {% trans "Participants" %}
+    <h1>
+        {% trans "Configuration" %}
+        <small>{% trans "Participants" %}</small>
         {% block config_submenu %}{{ block.super }}{% endblock %}
     </h1>
     <form action="" method="post">{% csrf_token %}
@@ -16,5 +18,6 @@
             {% trans 'Cancel' %}
         </a>
         </p>
+        <small>* {% trans "required" %}</small>
     </form>
 {% endblock %}
diff --git a/openslides/participant/templates/participant/group_overview.html b/openslides/participant/templates/participant/group_overview.html
index 08e09ea57..3cdbfa171 100644
--- a/openslides/participant/templates/participant/group_overview.html
+++ b/openslides/participant/templates/participant/group_overview.html
@@ -10,7 +10,7 @@
     <h1>{% trans "Groups" %}
         <small class="pull-right">
         <a href="{% url 'user_group_new' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'New group' %}"><i class="icon-plus"></i> {% trans "New" %}</a>
-        <a href="{% url 'user_overview' %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Participants" %}</a>
+        <a href="{% url 'user_overview' %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to participants overview" %}</a>
         </small>
     </h1>
 
diff --git a/openslides/participant/templates/participant/group_widget.html b/openslides/participant/templates/participant/group_widget.html
index 88a2eb91c..5145bccc2 100644
--- a/openslides/participant/templates/participant/group_widget.html
+++ b/openslides/participant/templates/participant/group_widget.html
@@ -5,17 +5,14 @@
 {% for group in groups %}
     {% if group.name != 'Anonymous' and group.name != 'Registered' %}
     <li class="{% if group.active %}activeline{% endif %}">
-        <a href="{% url 'projector_activate_slide' group.sid %}" class="activate_link {% if group.active %}active{% endif %}">
-            <div></div>
+        <a href="{% url 'projector_activate_slide' group.sid  %}" class="activate_link btn {% if group.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show' %}">
+            <i class="icon-facetime-video {% if group.active %}icon-white{% endif %}"></i>
+        </a>&nbsp;
+        <a href="{% model_url group 'edit' %}" title="{% trans 'Edit' %}" class="btn btn-mini right">
+            <i class="icon-pencil"></i>
         </a>
-        <a href="{% model_url group 'delete' %}" title="{% trans 'Delete' %}" class="icon delete right">
-            <span></span>
-        </a>
-        <a href="{% model_url group 'edit' %}" title="{% trans 'Edit' %}" class="icon edit right">
-            <span></span>
-        </a>
-        <a href="{% url 'projctor_preview_slide' group.sid %}" title="{% trans 'Preview' %}" class="icon preview right">
-            <span></span>
+        <a href="{% url 'projctor_preview_slide' group.sid %}" title="{% trans 'Preview' %}" class="btn btn-mini right">
+            <i class="icon-search"></i>
         </a>
         <a href="{% model_url group 'view' %}">{{ group }}</a>
     </li>
diff --git a/openslides/participant/templates/participant/login.html b/openslides/participant/templates/participant/login.html
index af1083ce1..1e61f90fd 100644
--- a/openslides/participant/templates/participant/login.html
+++ b/openslides/participant/templates/participant/login.html
@@ -3,6 +3,9 @@
 {% load i18n %}
 {% load staticfiles %}
 
+{% block loginbutton %}
+{% endblock %}
+
 {% block body %}
 <div id="login-page" class="container">
     <h2><img src="/static/img/logo-login.png"></h2>
@@ -44,22 +47,11 @@
             {% trans 'Login' %}
         </button>
         {% if os_enable_anonymous_login %}
-        <button id="anonymous_login" class="btn">
-            {% trans 'Continue as guest' %}
-        </button>
+            <a id="anonymous_login" class="btn" href="{% url 'dashboard' %}">
+                {% trans 'Continue as guest' %}
+            </a>
         {% endif %}
         <input type="hidden" name="next" value="{{ next }}" />
         </p>
     </form>
 {% endblock %}
-{% block javascript %}
-    {% if os_enable_anonymous_login %}
-        <script>
-            $("#anonymous_login").live('click', function () {
-                window.location.href = "{% url 'item_overview' %}";
-                return false;
-            });
-        </script>
-    {% endif %}
-</div>
-{% endblock %}
diff --git a/openslides/participant/templates/participant/overview.html b/openslides/participant/templates/participant/overview.html
index b272a7fcc..cdd052767 100644
--- a/openslides/participant/templates/participant/overview.html
+++ b/openslides/participant/templates/participant/overview.html
@@ -9,25 +9,29 @@
 {% block header %}
     {% if perms.participant.can_manage_participant %}
         <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 javascript %}
+    {% if perms.participant.can_manage_participant %}
+        <script type="text/javascript" src="{% static 'javascript/participant.js' %}"></script>
+    {% endif %}
+{% endblock %}
+    
 {% block content %}
     <h1>{% trans "Participants" %}
         <small class="pull-right">
         <div class="btn-toolbar">
             {% if perms.participant.can_manage_participant %}
                 <a href="{% url 'user_new' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'New participant' %}"><i class="icon-plus"></i> {% trans "New" %}</a>
-                <a href="{% url 'user_group_overview' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'All user groups' %}"><i class="icon-user"></i> {% trans "User groups" %}</a>
-                <a href="{% url 'user_import' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Import participants' %}"><i class="icon-share-alt"></i> {% trans 'Import' %}</a>
+                <a href="{% url 'user_group_overview' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'All user groups' %}"><i class="icon-group"></i> {% trans "User groups" %}</a>
+                <a href="{% url 'user_import' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Import participants' %}"><i class="icon-import"></i> {% trans 'Import' %}</a>
             {% endif %}
             {% if perms.participant.can_see_participant and perms.participant.can_manage_participant %}
                 <div class="btn-group pull-right">
                     {% if user.is_authenticated %}
                     <a href="#" data-toggle="dropdown" class="btn btn-mini dropdown-toggle">
-                          <i class="icon-print"></i> Print as PDF
+                          <i class="icon-print"></i> PDF
                           <span class="caret"></span>
                     </a>
                     <ul class="dropdown-menu">
@@ -111,7 +115,7 @@
             {% endif %}
         </tr>
         {% for user in users %}
-            <tr>
+            <tr class="{% if user.active %}activeline{% endif %}">
                 <td>{{ user.first_name }}</td>
                 <td>{{ user.last_name }}</td>
                 <td class="optional">{{ user.structure_level }}</td>
@@ -126,20 +130,24 @@
                     </td>
                     <td>
                         <span style="width: 1px; white-space: nowrap;">
-                            <a href="{% url 'user_edit' user.id %}">
-                                <img src="{% static 'images/icons/edit.png' %}" title="{% trans 'Edit participant' %}">
+                            {% if perms.projector.can_manage_projector %}
+                               <a href="{% url 'projector_activate_slide' user.sid  %}" class="activate_link btn {% if user.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show' %}">
+                                   <i class="icon-facetime-video {% if user.active %}icon-white{% endif %}"></i>
+                               </a>
+                            {% endif %}
+                            <a href="{% url 'user_edit' user.id %}" title="{% trans 'Edit' %}" class="btn btn-mini">
+                                <i class="icon-pencil"></i>
                             </a>
                             {% if user != request_user %}
-                            <a href="{% url 'user_delete' user.id %}">
-                                <img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Delete participant' %}">
+                            <a href="{% url 'user_delete' user.id %}" title="{% trans 'Delete' %}" class="btn btn-mini">
+                                <i class="icon-remove"></i>
                             </a>
                             {% endif %}
                             {% if user != request_user and not user.is_superuser %}
-                            <a class="status_link deactivate" href="{% url 'user_status_deactivate' user.id %}" title="{% trans 'Change status to inactive' %}"{% if not user.is_active %} style="display:none"{% endif %}>
-                                <span></span>
-                            </a>
-                            <a class="status_link activate" href="{% url 'user_status_activate' user.id %}" title="{% trans 'Change status to active' %}"{% if user.is_active %} style="display:none"{% endif %}>
-                                <span></span>
+                            <a href="{% url 'user_status_toggle' user.id %}"
+                              class="status_link btn btn-mini {% if user.is_active %}btn-success{% endif %}"
+                              title="{% trans 'Change status (active/inactive)' %}">
+                                <i class="{% if user.is_active %}icon-on{% else %}icon-off{% endif %}"></i>
                             </a>
                             {% endif %}
                         </span>
diff --git a/openslides/participant/templates/participant/settings.html b/openslides/participant/templates/participant/settings.html
index 25afa5bde..f7dfa77d8 100644
--- a/openslides/participant/templates/participant/settings.html
+++ b/openslides/participant/templates/participant/settings.html
@@ -2,21 +2,10 @@
 
 {% load i18n %}
 
-{% block title %}{{ block.super }} – {% trans "Personal Settings" %}{% endblock %}
+{% block title %}{{ block.super }} – {% trans "Edit profile" %}{% endblock %}
 
-<<<<<<< .merge_file_gQQrGK
-=======
-{% block submenu %}
-    <h4 class="sectiontitle">{% trans "User Settings" %}</h4>
-    <ul>
-        <li class="selected"><a href="{% url 'user_settings' %}">{% trans "Personal Settings" %}</a></li>
-        <li><a href="{% url 'password_change' %}">{% trans "Password Settings" %}</a></li>
-    </ul>
-{% endblock %}
-
->>>>>>> .merge_file_n8pEk9
 {% block content %}
-    <h1>{% trans "Personal Settings" %}</h1>
+    <h1>{% trans "Edit profile" %}</h1>
 
     <form action="" method="post">{% csrf_token %}
         {% include "form.html" %}
diff --git a/openslides/participant/templates/participant/user_widget.html b/openslides/participant/templates/participant/user_widget.html
index ab762774e..59df7c69f 100644
--- a/openslides/participant/templates/participant/user_widget.html
+++ b/openslides/participant/templates/participant/user_widget.html
@@ -4,17 +4,14 @@
 <ul style="line-height: 180%">
 {% for user in users %}
     <li class="{% if user.active %}activeline{% endif %}">
-        <a href="{% url 'projector_activate_slide' user.sid %}" class="activate_link {% if user.active %}active{% endif %}">
-            <div></div>
+        <a href="{% url 'projector_activate_slide' user.sid  %}" class="activate_link btn {% if user.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show' %}">
+            <i class="icon-facetime-video {% if user.active %}icon-white{% endif %}"></i>
+        </a>&nbsp;
+        <a href="{% model_url user 'edit' %}" title="{% trans 'Edit' %}" class="btn btn-mini right">
+            <i class="icon-pencil"></i>
         </a>
-        <a href="{% model_url user 'delete' %}" title="{% trans 'Delete' %}" class="icon delete right">
-            <span></span>
-        </a>
-        <a href="{% model_url user 'edit' %}" title="{% trans 'Edit' %}" class="icon edit right">
-            <span></span>
-        </a>
-        <a href="{% url 'projctor_preview_slide' user.sid %}" title="{% trans 'Preview' %}" class="icon preview right">
-            <span></span>
+        <a href="{% url 'projctor_preview_slide' user.sid %}" title="{% trans 'Preview' %}" class="btn btn-mini right">
+            <i class="icon-search"></i>
         </a>
         <a href="{% model_url user 'view' %}">{{ user }}</a>
     </li>
diff --git a/openslides/projector/static/javascript/dashboard.js b/openslides/projector/static/javascript/dashboard.js
index d258c7e1c..02eb44d4e 100644
--- a/openslides/projector/static/javascript/dashboard.js
+++ b/openslides/projector/static/javascript/dashboard.js
@@ -50,29 +50,6 @@ $(function() {
         $( "#iframe" ).css('zoom', '0.25');
     }
 
-    // activate an element to show it on projector
-    $('.activate_projector').click(function(event) {
-        event.preventDefault();
-        var link = $(this);
-        $.ajax({
-            type: 'GET',
-            url: $(this).attr('href'),
-            dataType: 'json',
-            success: function(data) {
-                $('.activate_projector').removeClass('btn-primary');
-                $('.activate_projector .icon').removeClass('icon-white');
-                $('li').removeClass('activeline');
-                //$('div').removeClass('activeline');
-                link.addClass('btn-primary');
-                link.find('.icon').addClass('icon-white');
-                link.parent().addClass('activeline');
-            },
-            error: function () {
-                alert("Ajax Error");
-            }
-        });
-    });
-
     $('a.overlay').click(function(event) {
         event.preventDefault();
         var link = $(this);
diff --git a/openslides/projector/static/styles/dashboard.css b/openslides/projector/static/styles/dashboard.css
index 4a9524f65..0266e64c2 100644
--- a/openslides/projector/static/styles/dashboard.css
+++ b/openslides/projector/static/styles/dashboard.css
@@ -79,6 +79,10 @@
 #countdown_time {
     width: 40px;
 }
+#overlay_message_text {
+    width: 90%;
+    height: 12px;
+}
 
 /* iframe */
 #iframe {
@@ -88,7 +92,6 @@
     -moz-transform: scale(0.25);
     -webkit-transform: scale(0.25);
     -o-transform: scale(0.25);
-
     width: 1024px;
     height: 768px;
 }
@@ -142,6 +145,3 @@ a.overlay div {
 a.overlay.active div {
     background-image: url(../images/icons/accept.png);
 }
-
-
-
diff --git a/openslides/projector/templates/projector/control_countdown.html b/openslides/projector/templates/projector/control_countdown.html
index 4d9b8248b..a2c93248a 100644
--- a/openslides/projector/templates/projector/control_countdown.html
+++ b/openslides/projector/templates/projector/control_countdown.html
@@ -8,10 +8,9 @@
             <input class="projector_countdown_spinval" id="countdown_time" name="countdown_time" type="number" min="0" value="{{ countdown_time }}">
             <span class="add-on">{% trans "s" context "seconds" %}</span>
         </div>
-        <a id="countdown_set" class="countdown_control btn btn-small" href="{% url 'countdown_set_default' %}" title="{% trans 'Save as default' %}">
-            <img src="{% static 'images/icons/document-save.png' %}" alt="{% url 'countdown_set_default' %}">
+        <a id="countdown_set" class="countdown_control btn btn-small" href="{% url 'countdown_set_default' %}" title="{% trans 'Save time as default' %}">
+            <i class="icon-refresh"></i>
         </a>
-
         <a id="countdown_reset" class="countdown_control btn btn-small" href="{% url 'countdown_reset' %}" title="{% trans 'Reset countdown' %}">
             <i class="icon-fast-backward"></i>
         </a>
diff --git a/openslides/projector/templates/projector/control_overlay_message.html b/openslides/projector/templates/projector/control_overlay_message.html
index 4d3b5ea99..5c9c205ed 100644
--- a/openslides/projector/templates/projector/control_overlay_message.html
+++ b/openslides/projector/templates/projector/control_overlay_message.html
@@ -5,10 +5,10 @@
 <form id="overlay_message" action="{% url 'projector_overlay_message' %}" method="post" style="display:inline-block;">{% csrf_token %}
     <div class="input-append">
         <input id="overlay_message_text" name='message_text' type='text' value="{% get_config 'projector_message' %}">
-        <button type="submit" class="btn btn-primary" name="message" rel="tooltip" data-original-title="{% trans 'Apply' %}">
-            <i class="icon-refresh icon-white"></i>
+        <button type="submit" class="btn btn-mini btn-primary" name="message" title="{% trans 'Apply' %}">
+            <i class="icon-ok icon-white"></i>
         </button>
-        <button type="submit" class="btn" name='message-clean' title="{% trans 'Clean message' %}">
+        <button type="submit" class="btn btn-mini" name='message-clean' title="{% trans 'Clean message' %}">
             <i class="icon-remove"></i>
         </button>
     </div>
diff --git a/openslides/projector/templates/projector/custom_slide_widget.html b/openslides/projector/templates/projector/custom_slide_widget.html
index 631b28d6c..64445a72c 100644
--- a/openslides/projector/templates/projector/custom_slide_widget.html
+++ b/openslides/projector/templates/projector/custom_slide_widget.html
@@ -4,35 +4,30 @@
 
 <ul style="line-height: 180%">
     <li class="{% if welcomepage_is_active %}activeline{% endif %}">
-        <a href="{% url 'projector_activate_welcomepage' %}" class="activate_link {% if welcomepage_is_active %}active{% endif %}">
-            <div></div>
-        </a>
-        <a href="{% url 'projctor_preview_welcomepage' %}" title="{% trans 'Preview' %}" class="icon preview right">
-            <span></span>
+        <a href="{% url 'projector_activate_welcomepage' %}" class="activate_link btn {% if welcomepage_is_active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show' %}">
+            <i class="icon-facetime-video {% if welcomepage_is_active %}icon-white{% endif %}"></i>
+        </a>&nbsp;
+        <a href="{% url 'projctor_preview_welcomepage' %}" title="{% trans 'Preview' %}" class="btn btn-mini right">
+            <i class="icon-search"></i>
         </a>
         {% trans 'Welcome Page' %}
     </li>
 </ul>
 <hr>
-<div class="pull-right">
-<a href="{% url 'customslide_new' %}" class="btn btn-mini">
-    <i class="icon-plus"></i>{% trans 'New' %}
-</a>
-</div>
 <ul style="line-height: 180%">
 {% for slide in slides %}
     <li class="{% if slide.active %}activeline{% endif %}">
-        <a href="{% url 'projector_activate_slide' slide.sid %}" class="activate_link {% if slide.active %}active{% endif %}">
-            <div></div>
-        </a>
+        <a href="{% url 'projector_activate_slide' slide.sid  %}" class="activate_link btn {% if slide.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show' %}">
+            <i class="icon-facetime-video {% if slide.active %}icon-white{% endif %}"></i>
+        </a>&nbsp;
         <a href="{% url 'customslide_edit' slide.id %}">{{ slide }}</a>
-        <a href="{% url 'customslide_edit' slide.id %}" title="{% trans 'Edit' %}" class="btn btn-mini">
-            <i class="icon-pencil"></i>
-        </a>
-        <a href="{% url 'customslide_delete' slide.id %}" title="{% trans 'Delete' %}" class="btn btn-mini">
+        <a href="{% url 'customslide_delete' slide.id %}" title="{% trans 'Delete' %}" class="btn btn-mini right">
             <i class="icon-remove"></i>
         </a>
-        <a href="{% url 'projctor_preview_slide' slide.sid %}" title="{% trans 'Preview' %}" class="btn btn-mini">
+        <a href="{% url 'customslide_edit' slide.id %}" title="{% trans 'Edit' %}" class="btn btn-mini right">
+            <i class="icon-pencil"></i>
+        </a>
+        <a href="{% url 'projctor_preview_slide' slide.sid %}" title="{% trans 'Preview' %}" class="btn btn-mini right">
             <i class="icon-search"></i>
         </a>
     </li>
@@ -40,3 +35,8 @@
     <li>{% trans 'No items available.' %}</li>
 {% endfor %}
 </ul>
+<p style="line-height: 280%">
+<a href="{% url 'customslide_new' %}" class="btn btn-mini right">
+    <i class="icon-plus"></i>{% trans 'New' %}
+</a>
+</p>
\ No newline at end of file
diff --git a/openslides/projector/templates/projector/dashboard.html b/openslides/projector/templates/projector/dashboard.html
index 02442910f..76e50a0c8 100644
--- a/openslides/projector/templates/projector/dashboard.html
+++ b/openslides/projector/templates/projector/dashboard.html
@@ -41,7 +41,7 @@
         {% for name, widget in widgets.items %}
             {% if widget.default_column == 2 %}
                 <div class="widget" id="widget_{{ widget.get_name }}">
-                    <div class="widget-header"><i class="icon-star"></i>
+                    <div class="widget-header"><i class="{% if widget %}icon-{{widget.name}}{% else %}icon-star{% endif %}"></i>
                         <h3>{% trans widget.get_title %}<h3>
                     </div>
                     <div class="widget-content">
diff --git a/openslides/projector/templates/projector/live_view_widget.html b/openslides/projector/templates/projector/live_view_widget.html
index d1594a6f9..fbcb4cb95 100644
--- a/openslides/projector/templates/projector/live_view_widget.html
+++ b/openslides/projector/templates/projector/live_view_widget.html
@@ -6,24 +6,24 @@
 {% if perms.projector.can_manage_projector %}
     <div style="float: right;">
         <p>
-        <a class="projector_edit" href="{% url 'projector_bigger' %}" title="{% trans 'Zoom in' %}">
-            <img src="{% static 'images/icons/zoom-in.png' %}" />
+        <a class="projector_edit btn btn-mini" href="{% url 'projector_bigger' %}" title="{% trans 'Zoom in' %}">
+            <i class="icon-zoom-in"></i>
         </a><br>
-        <a class="projector_edit" href="{% url 'projector_smaller' %}" title="{% trans 'Zoom out' %}">
-            <img src="{% static 'images/icons/zoom-out.png' %}" />
+        <a class="projector_edit btn btn-mini" href="{% url 'projector_smaller' %}" title="{% trans 'Zoom out' %}">
+            <i class="icon-zoom-out"></i>
         </a>
         </p>
         <p>
-        <a class="projector_edit" href="{% url 'projector_up' %}" title="{% trans 'Scroll text up' %}">
-            <img src="{% static 'images/icons/go-up.png' %}" />
+        <a class="projector_edit btn btn-mini" href="{% url 'projector_up' %}" title="{% trans 'Scroll text up' %}">
+            <i class="icon-arrow-up"></i>
         </a><br>
-        <a class="projector_edit" href="{% url 'projector_down' %}" title="{% trans 'Scroll text down' %}">
-            <img src="{% static 'images/icons/go-down.png' %}" />
+        <a class="projector_edit btn btn-mini" href="{% url 'projector_down' %}" title="{% trans 'Scroll text down' %}">
+            <i class="icon-arrow-down"></i>
         </a>
         </p>
         <p>
-        <a class="projector_edit" href="{% url 'projector_clean' %}" title="{% trans 'Reset projector view' %}">
-            <img src="{% static 'images/icons/view-reset.png' %}" />
+        <a class="projector_edit btn btn-mini" href="{% url 'projector_clean' %}" title="{% trans 'Reset projector view' %}">
+            <i class="icon-resize-small"></i>
         </a>
         </p>
     </div>
diff --git a/openslides/projector/templates/projector/overlay_widget.html b/openslides/projector/templates/projector/overlay_widget.html
index 7a98c67de..51d68f8da 100644
--- a/openslides/projector/templates/projector/overlay_widget.html
+++ b/openslides/projector/templates/projector/overlay_widget.html
@@ -4,19 +4,21 @@
 <ul>
     {% for overlay in overlays %}
         <li>
-            <a id="{{ overlay.def_name }}_inactive" href="{% url 'projector_overlay_activate' overlay.def_name %}" class="overlay"{% if overlay.active %} style="display:none"{% endif %}>
-                <div></div>
-            </a>
-            <a id="{{ overlay.def_name }}_active" href="{% url 'projector_overlay_deactivate' overlay.def_name %}" class="overlay active"{% if not overlay.active %} style="display:none"{% endif %}>
-                <div></div>
+            <a id="{{ overlay.def_name }}"
+              href="{% if overlay.active %}{% url 'projector_overlay_deactivate' overlay.def_name %}{% else %}{% url 'projector_overlay_activate' overlay.def_name %}{% endif %}"
+              class="overlay btn btn-mini">
+                <i class="{% if overlay.active %}icon-checked-new{% else %}icon-unchecked-new{% endif %}"></i>
             </a>
 
-            {{ overlay }}:
+
             {# TODO: Call the html via overlay.html #}
             {% if overlay.def_name == "Countdown" %}
+                <p>{{ overlay }}:<br>
                 {% include 'projector/control_countdown.html' %}
+                </p>
             {% endif %}
             {% if overlay.def_name == "Message" %}
+                {{ overlay }}:<br>
                 {% include 'projector/control_overlay_message.html' %}
             {% endif %}
         </li>
diff --git a/openslides/static/javascript/utils.js b/openslides/static/javascript/utils.js
index b676bc80b..9179feaa2 100644
--- a/openslides/static/javascript/utils.js
+++ b/openslides/static/javascript/utils.js
@@ -28,11 +28,19 @@ $(function () {
             data: '',
             success: function(data) {
                 $('.activate_link').removeClass('btn-primary');
-                $('.icon').removeClass('icon-white');
-                $('tr').removeClass('activeline');
-                link.parent().parent().parent().addClass('activeline');
+                $('.activate_link i').removeClass('icon-white');
+                // is table line
+                if ( link.parent().parent().parent().is("tr") ) {
+                    $('tr').removeClass('activeline');
+                    link.parent().parent().parent().addClass('activeline');
+                }
+                // is widget list item
+                if ( link.parent().is("li") ) {
+                    $('li').removeClass('activeline');
+                    link.parent().addClass('activeline');
+                }
                 link.addClass('btn-primary');
-                link.find('.icon').addClass('icon-white');
+                link.children('i').addClass('icon-white');
             }
         });
     });
diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css
index edaa7be43..771beedeb 100644
--- a/openslides/static/styles/base.css
+++ b/openslides/static/styles/base.css
@@ -32,6 +32,9 @@ body {
     font-size: 20px;
     color: #999999;
 }
+footer {
+    margin-bottom: 20px;
+}
 
 /* Headings and Links */
 h1 {
@@ -79,7 +82,7 @@ a:hover {
 
 
 /** Utils **/
-tr.itemdoneline td, li.itemdoneline {
+tr.offline td, li.offline {
     background-color: #EAEAEA !important;
 }
 tr.activeline td, li.activeline {
@@ -97,6 +100,12 @@ tr.total td {
 .nobr {
     white-space: nowrap;
 }
+.right {
+    float: right;
+}
+.indentation {
+    margin-left: 12px;
+}
 /* show optional column */
 .optional {
     display: auto;
@@ -122,6 +131,9 @@ textarea {
 form .required label:after {
     content: " *";
 }
+legend + .control-group {
+    margin-top: 0px !important;
+}
 
 
 /** Left sitebar navigation **/
@@ -213,7 +225,13 @@ form .required label:after {
     background-position: 0 -24px;
 }
 .icon-agenda {
-    background-position: -264px 0;
+/*    background-position: -264px 0;*/
+    background-position: 0;
+    background-image: url("../img/glyphicons_045_calendar.png");
+}
+.leftmenu ul li.active a span.ico i.icon-agenda {
+    background-position: 0;
+    background-image: url("../img/glyphicons_045_calendar_white.png");
 }
 .icon-motion, .icon-motions {
     background-position: -24px -24px;
@@ -227,17 +245,51 @@ form .required label:after {
 .icon-config {
     background-position: -360px -144px;
 }
+.icon-welcome {
+    background-position: 0 -24px;
+}
+.icon-live_view {
+    background-position: -432px -48px;
+}
+.icon-overlays {
+    background-position: -120px 0px;
+}
+.icon-custom_slide {
+    background-position: -120px 0px;
+}
+
+
 
 /** More glyphicons free icons **/
-.custom-icons {
+.icon-on, .icon-checked-new {
+    background-image: url("../img/glyphicons_152_check.png");
     background-position: 0;
 }
-.icon-check_new, .close_link.closed i {
-    background-image: url("../img/glyphicons_152_check.png");
-}
-.icon-uncheck_new, .close_link.open i {
+.status_link .icon-off, .icon-unchecked-new {
     background-image: url("../img/glyphicons_153_unchecked.png");
+    background-position: 0;
 }
+.icon-summary {
+    background-image: url("../img/glyphicons_154_more_windows.png");
+    background-position: 0;
+}
+.icon-summary.icon-white {
+    background-image: url("../img/glyphicons_154_more_windows_white.png");
+    background-position: 0;
+}
+.icon-login {
+    background-image: url("../img/glyphicons_044_keys.png");
+    background-position: 0;
+}
+.icon-group {
+    background-image: url("../img/glyphicons_043_group.png");
+    background-position: 0;
+}
+.icon-import {
+    background-image: url("../img/glyphicons_358_file_import.png");
+    background-position: 0;
+}
+
 
 /** Responsive **/
 @media (max-width: 767px) {
diff --git a/openslides/templates/base.html b/openslides/templates/base.html
index f045b71d5..8a6a3d916 100644
--- a/openslides/templates/base.html
+++ b/openslides/templates/base.html
@@ -28,6 +28,7 @@
                 <div id="header">
                     <a href="/" class="logo" title="{% trans 'Home' %}"><img src="{% static 'img/logo.png' %}"></a>
                     <!--<a class="title" href="#">{% get_config 'event_name' %}</a>-->
+                    {% block loginbutton %}
                     <div class="btn-group pull-right">
                         {% if user.is_authenticated %}
                         <a href="#" data-toggle="dropdown" class="btn btn-small dropdown-toggle">
@@ -36,15 +37,16 @@
                         </a>
                         <ul class="dropdown-menu">
                             {% url 'user_settings' as url_usersettings %}
-                            <li><a href="{% url 'user_settings' %}"><i class="icon-cog"></i> {% trans "Profile" %}</a></li>
+                            <li><a href="{% url 'user_settings' %}"><i class="icon-cog"></i> {% trans "Edit profile" %}</a></li>
                             <li><a href="{% url 'password_change' %}"><i class="icon-lock"></i> {% trans "Change password" %}</a></li>
                             <li class="divider"></li>
                             <li><a href="{% url 'user_logout' %}"><i class="icon-off"></i> {% trans "Logout" %}</a></li>
                         </ul>
                         {% else %}
-                            <a href="{% url 'user_login' %}" class="btn">{% trans "Login" %}</a>
+                            <a href="{% url 'user_login' %}" class="btn"><i class="icon-login"></i> {% trans "Login" %}</a>
                         {% endif %}
                     </div>
+                    {% endblock %}
                 </div> <!--/#header-->
             </div> <!--/.span12-->
         </div>
diff --git a/openslides/templates/formbuttons_save.html b/openslides/templates/formbuttons_save.html
index d3b5a6ba6..25dd6fbf4 100644
--- a/openslides/templates/formbuttons_save.html
+++ b/openslides/templates/formbuttons_save.html
@@ -2,4 +2,4 @@
 
 <button class="btn btn-primary" type="submit">
     {% trans 'Save' %}
-</button>
\ No newline at end of file
+</button>

From 033ecd9497015e2f36144fb2a941a28c9bbf9313 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Thu, 31 Jan 2013 10:20:53 +0100
Subject: [PATCH 40/88] Added new glyphicons icons.

---
 openslides/static/img/glyphicons_043_group.png   | Bin 0 -> 1030 bytes
 .../static/img/glyphicons_043_group_white.png    | Bin 0 -> 1070 bytes
 openslides/static/img/glyphicons_044_keys.png    | Bin 0 -> 1107 bytes
 .../static/img/glyphicons_045_calendar.png       | Bin 0 -> 1067 bytes
 .../static/img/glyphicons_045_calendar_white.png | Bin 0 -> 1111 bytes
 .../static/img/glyphicons_056_projector.png      | Bin 0 -> 452 bytes
 .../img/glyphicons_056_projector_small.png       | Bin 0 -> 341 bytes
 .../static/img/glyphicons_154_more_windows.png   | Bin 0 -> 1034 bytes
 .../img/glyphicons_154_more_windows_white.png    | Bin 0 -> 1070 bytes
 .../static/img/glyphicons_358_file_import.png    | Bin 0 -> 1059 bytes
 10 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 openslides/static/img/glyphicons_043_group.png
 create mode 100644 openslides/static/img/glyphicons_043_group_white.png
 create mode 100644 openslides/static/img/glyphicons_044_keys.png
 create mode 100644 openslides/static/img/glyphicons_045_calendar.png
 create mode 100644 openslides/static/img/glyphicons_045_calendar_white.png
 create mode 100644 openslides/static/img/glyphicons_056_projector.png
 create mode 100644 openslides/static/img/glyphicons_056_projector_small.png
 create mode 100644 openslides/static/img/glyphicons_154_more_windows.png
 create mode 100644 openslides/static/img/glyphicons_154_more_windows_white.png
 create mode 100644 openslides/static/img/glyphicons_358_file_import.png

diff --git a/openslides/static/img/glyphicons_043_group.png b/openslides/static/img/glyphicons_043_group.png
new file mode 100644
index 0000000000000000000000000000000000000000..d0cf9eeed1a1550d10828098f62c908d56d9d340
GIT binary patch
literal 1030
zcmV+h1o``kP)<h;3K|Lk000e1NJLTq000gE000RH1^@s60!<xh0008fX+uL$Nkc;*
zP;zf(X>4Tx04R}-l+Q~PVHn51vyB)iL11Qkh@nGBs7w}RMCGo(*tBg~f0Po$?CiU{
zle4qa%<P&X5neiG(LE{;9{K}3c<7Xu!oVy7>26U(f|ru*d1uDm5$(qdGxK?$AK&MB
z-{F0M8d)(-JtP5n!?BWmQR({Vm{j`_Asj&+!l+YJ+l(X<1E9fUv1@F;hrqupt$X|b
zI_lE4ng@jaK<G!B*($K_7ugG0Y6K9uUc-cAI>h%lTb}(f=ak3uu6-!kMZ8FSKs7BM
z|C+c%%_(W1MkH>@24YeH&g(_h@8=*r^~@L^r0;R+=`OQ-d=_TXN_RhT8}a8f>+a#2
z#Pb=gH%8n{&sxUn9rjo_p*gW3k3%Dd9v|?z$w<Yo`kJEYM3dY4c4@F@+kQ*AoFEPp
zC&vr@Jf@LyJEw9(*E|;Vsa#jw=XX{y$?G1Ym^o8-{}=TZdWBKwV9;RD+kk{5`Vd7c
zOjsx&LmrJHG_o=`#v-;czGtM4M1UpouT##tn{yjQ%H~-kh{iF~Qc;lP5As)eRembZ
z$zNu}#pbGK#=5Dg%MZSjF0Z_;>wEp4JbjhwM#!rpOV)g4O?IHuKzA8qHe6NWHQ4?5
zW?+>pP^lFuS83d>RC0Yby(58Yf7(5YU7B8Os@7T+7jCT7FHP^*tHQ2TvC67;&Z}|3
zd?p?hPl_?ILp%pbyd-vt7sYOxofiix8N;NaVZv3ip-`5AN%ERI{+SmG@2t6_p^q8N
z(o~6`|AbY@XgUiV(SNxAbMSk`qp>3J!UhhXuG%(|?j0gDE>~^N72v`*x)0t~ZOwEZ
z4m|-D&ZtGJ<Vy>}8;WLk96sqPn3I;4%{fxLET5GkbR{t<W~gl~lA`O9>#`+_*~}`j
zbQ|o<sdi7Lo_3|?Q@OlB=dbn=u=TK9{`st2-g-_wtN}0e-@v^6MNSwoNdN!<32;bR
za{vGf6951U69E94oEQKA0NY7KK~yM_ZP77GgFz4l;O~#O5JW2x(&_=cfp`T43$d|H
z=>a@|C|*DiBGDo?wu)$_orR!iVJQ;gKNkNi*}{RxzS((ic6Jw<h)@GtXcOE2)SE))
zaELMbxI!exSiyB_dJ&-*7cfcTK8BU?5_`#~n2!iOU3}m!`2)Vp;uDX_Z!_<V5i!Ag
z7Vj~tjH7G@ZxJyqg;iYSC{NhINj2(e?mcHd#9D*jJoy|i*u-Lrx)<aXXIR1p+6KGX
zZ5@LYx8)kyph<p!8!Xp<bDW}|YRrP~T#t(W4~<=PCvIO#82|tP07*qoM6N<$g1OS)
Aw*UYD

literal 0
HcmV?d00001

diff --git a/openslides/static/img/glyphicons_043_group_white.png b/openslides/static/img/glyphicons_043_group_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..94908b008a65f212ad7780877bbe2fdf8fef1069
GIT binary patch
literal 1070
zcmV+}1kwA6P)<h;3K|Lk000e1NJLTq000gE000RH1^@s60!<xh0008cX+uL$Nkc;*
zP;zf(X>4Tx0C?Jslgn!qSrmuA>fE4^APlsxUJRF6NRT9y4>Te^(n)Nhv2DsklORZ^
z`gV7jo9dcd)o~ON$;PG5FnjT_aN!@|!i6i{C=q-ih<g=96x^t^i|TY&@Of5W{m!|+
zbIvU;blSxr&?yOXeq@|nR!&Y$%N5T^v7Rn6bQRq&7%UXV0E$7N`6fO-!2)>L_x=1&
zqpK9Ub6~B6)ccYOUFi4>)GCux(;zgEJ{biOh;u;N#QOh0dM4)UK-!EuLm+MetK7gu
zAnpMJZnao~P66~*5;Zdkp3`-=InN(JxAG?r0~;W9R)r%?wiZgo;R8TFSg%TIcm(JL
z>w4MSHwyFs&&y`tM9kJkFB%<>Id#O>`LQOi^Jnshnw}zvvd)r!IDdF#Nk38CUjQ;-
zIkU9`4zLDNdrw!#kH&22)77DTlOLJ7GXeYsscV5QjK#C1?l6T$;o+n3kvQbY(no-y
zMi~zejYkfJkHX*)GW*?1O(DUO953;CiNWJ<>L?@*N66+`=xsSj`>FlLer#X1ui39J
zX6ild%z`=Yxr-OxQ9xl@zRhfNrr6)5#vmF^1;t!zr!X;TV!E<_G1GQ(7cab1=kp&E
zTdG8-K4wsa%wq7EN1+K(3?{n$==K!)?wMQb+Pxl&o5vn@-#xSJu4><GrCM7p|8CbM
z&nxk#*d#{9fY^Z)d&FL`TMUZ<u~Uq-PE6qAaT0|gq=?4n6mr@BTdE~~YXGEk%2&p7
zrIX9bf~l1~trAc47wO-O$*E}>({vqfgs^sNTl?T(0oIzuwiX?PU2mb|L0jv|!0JnI
zbDLW?^G$2Zx(|{1CjuC%1*eQxsYY_MZEu%@L7<f!_1*qnS=3q@uTqUdX;i4pyejn*
zmbYw<UAnW-`J&PIumM*52VeeeG(KHvG`?Jgj^}V&e+9t2{Y5{fPvigq00v@9M??Vs
z0RI60puMM)00009a7bBm000XU000XU0RWnu7ytkO2XskIMF-sh91kcYFWG5;0002t
zNkl<ZD9>%t!79X26bA6$pSMtAC1uM4cmpYAPg%&u*3tub0Ff6^YBV-%Y)P!l&O#9j
zOKBSOS<GQ3e093tx%d0dJ@;Hmnk0V3T9SUn`akE*7=m%^;T&^VK~u4cSzMH6;He6e
zNxB(eJ4q`;oF&;R-b*r(#FznIa9#WsZ-#iqUGb~Re~eu`7r#M!#MrK4@Pr;nGN0tM
zTDecMk>qfs)uY<$RNhLm&?Nb+n@{k7WlYu3)PNpwjA<;P-z3>Y2aDJ#aew3)DKqTi
o5;LQJb5N~(<S*W9-T&5q0h+w(?607jzyJUM07*qoM6N<$g1dL}UjP6A

literal 0
HcmV?d00001

diff --git a/openslides/static/img/glyphicons_044_keys.png b/openslides/static/img/glyphicons_044_keys.png
new file mode 100644
index 0000000000000000000000000000000000000000..600345713d6cf56243f55552047f94592bc69800
GIT binary patch
literal 1107
zcmV-Z1g!gsP)<h;3K|Lk000e1NJLTq000dD000gM1^@s6^naGp0008fX+uL$Nkc;*
zP;zf(X>4Tx04R}-l+Q~PVHn51vyB)iL11Qkh@nGBs7w}RMCGo(*tBg~f0Po$?CiU{
zle4qa%<P&X5neiG(LE{;9{K}3c<7Xu!oVy7>26U(f|ru*d1uDm5$(qdGxK?$AK&MB
z-{F0M8d)(-JtP5n!?BWmQR({Vm{j`_Asj&+!l+YJ+l(X<1E9fUv1@F;hrqupt$X|b
zI_lE4ng@jaK<G!B*($K_7ugG0Y6K9uUc-cAI>h%lTb}(f=ak3uu6-!kMZ8FSKs7BM
z|C+c%%_(W1MkH>@24YeH&g(_h@8=*r^~@L^r0;R+=`OQ-d=_TXN_RhT8}a8f>+a#2
z#Pb=gH%8n{&sxUn9rjo_p*gW3k3%Dd9v|?z$w<Yo`kJEYM3dY4c4@F@+kQ*AoFEPp
zC&vr@Jf@LyJEw9(*E|;Vsa#jw=XX{y$?G1Ym^o8-{}=TZdWBKwV9;RD+kk{5`Vd7c
zOjsx&LmrJHG_o=`#v-;czGtM4M1UpouT##tn{yjQ%H~-kh{iF~Qc;lP5As)eRembZ
z$zNu}#pbGK#=5Dg%MZSjF0Z_;>wEp4JbjhwM#!rpOV)g4O?IHuKzA8qHe6NWHQ4?5
zW?+>pP^lFuS83d>RC0Yby(58Yf7(5YU7B8Os@7T+7jCT7FHP^*tHQ2TvC67;&Z}|3
zd?p?hPl_?ILp%pbyd-vt7sYOxofiix8N;NaVZv3ip-`5AN%ERI{+SmG@2t6_p^q8N
z(o~6`|AbY@XgUiV(SNxAbMSk`qp>3J!UhhXuG%(|?j0gDE>~^N72v`*x)0t~ZOwEZ
z4m|-D&ZtGJ<Vy>}8;WLk96sqPn3I;4%{fxLET5GkbR{t<W~gl~lA`O9>#`+_*~}`j
zbQ|o<sdi7Lo_3|?Q@OlB=dbn=u=TK9{`st2-g-_wtN}0e-@v^6MNSwoNdN!<32;bR
za{vGf6951U69E94oEQKA0VqjCK~yM_UC}X5)Iksh@ZbLL1WRMcU2F^uU%-amSVCe*
zkVu1pl7fn!mg*W43%`M#G&U4SBMrui?xKk_8WN6xl_x{N{EwAQCNppMz1=sn@D}^{
ziOBec&v=hV5dlp^$ofC>Hr`bD6t6H>3mbfJy8=fz#Gl;zgn6tcE}5-VH;-^u;jOg(
zt+G~N7UvbQjlWpL_r%Xq)M+B(2Zs6T82_>!VhT?ZFSOR0%zO7eXRl8&jo%gLZX#ID
zjWO2oys~<YrQ~&+>b0xPUvhdE_*gl3S4!ze#JCl}gKU0;#}RQH5ifC&=RNG!J+)pN
zbW+@|O<ZQZR!VtYizZFB11Y6EjEEELRGdLA>SjztIRF?`HgPw-KE5VlruzN%yoU|E
ZxB=gpe+6j?CW`<7002ovPDHLkV1l;I3uXWS

literal 0
HcmV?d00001

diff --git a/openslides/static/img/glyphicons_045_calendar.png b/openslides/static/img/glyphicons_045_calendar.png
new file mode 100644
index 0000000000000000000000000000000000000000..937daeed0ba99ead340d19723775e04ce14c501b
GIT binary patch
literal 1067
zcmV+`1l0S9P)<h;3K|Lk000e1NJLTq000dD000gM1^@s6^naGp0008fX+uL$Nkc;*
zP;zf(X>4Tx04R}-l+Q~PVHn51vyB)iL11Qkh@nGBs7w}RMCGo(*tBg~f0Po$?CiU{
zle4qa%<P&X5neiG(LE{;9{K}3c<7Xu!oVy7>26U(f|ru*d1uDm5$(qdGxK?$AK&MB
z-{F0M8d)(-JtP5n!?BWmQR({Vm{j`_Asj&+!l+YJ+l(X<1E9fUv1@F;hrqupt$X|b
zI_lE4ng@jaK<G!B*($K_7ugG0Y6K9uUc-cAI>h%lTb}(f=ak3uu6-!kMZ8FSKs7BM
z|C+c%%_(W1MkH>@24YeH&g(_h@8=*r^~@L^r0;R+=`OQ-d=_TXN_RhT8}a8f>+a#2
z#Pb=gH%8n{&sxUn9rjo_p*gW3k3%Dd9v|?z$w<Yo`kJEYM3dY4c4@F@+kQ*AoFEPp
zC&vr@Jf@LyJEw9(*E|;Vsa#jw=XX{y$?G1Ym^o8-{}=TZdWBKwV9;RD+kk{5`Vd7c
zOjsx&LmrJHG_o=`#v-;czGtM4M1UpouT##tn{yjQ%H~-kh{iF~Qc;lP5As)eRembZ
z$zNu}#pbGK#=5Dg%MZSjF0Z_;>wEp4JbjhwM#!rpOV)g4O?IHuKzA8qHe6NWHQ4?5
zW?+>pP^lFuS83d>RC0Yby(58Yf7(5YU7B8Os@7T+7jCT7FHP^*tHQ2TvC67;&Z}|3
zd?p?hPl_?ILp%pbyd-vt7sYOxofiix8N;NaVZv3ip-`5AN%ERI{+SmG@2t6_p^q8N
z(o~6`|AbY@XgUiV(SNxAbMSk`qp>3J!UhhXuG%(|?j0gDE>~^N72v`*x)0t~ZOwEZ
z4m|-D&ZtGJ<Vy>}8;WLk96sqPn3I;4%{fxLET5GkbR{t<W~gl~lA`O9>#`+_*~}`j
zbQ|o<sdi7Lo_3|?Q@OlB=dbn=u=TK9{`st2-g-_wtN}0e-@v^6MNSwoNdN!<32;bR
za{vGf6951U69E94oEQKA0RTxvK~yM_ozlN6#Zef?@z-<nW4ehFCCNaskrac$aQ_6u
zUC5sxS?_cQi_NNRnEVY!`3nprDWw>UejI~GzHSswefrdSpYwd4o^zB^U={_9Qi@KY
zk$kq4B5;IxjNuBm=*~ldCk$8kX(as93bfK|c>STs7almnbAm`v`^HPE>tF44rEg#m
zBRIhd_OR}KP)oSM9d=|=9Wz+X5pQ?+TJk!|N78O?3`E2N79*k;%MsCsDcs}nqs4+A
zOrx2V+a2Ca-cwC#qaQ;NF_8&d=`GA*84uM#9AgxdIK(*iv-&}HbB=3l*7DMG>c#uF
ldF}9*${BF!^WlD@i#NS6ac#EZp@aYc002ovPDHLkV1jVb{15;D

literal 0
HcmV?d00001

diff --git a/openslides/static/img/glyphicons_045_calendar_white.png b/openslides/static/img/glyphicons_045_calendar_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..bbc8ff5954cac33594d3a36e6b74524016fc2982
GIT binary patch
literal 1111
zcmV-d1gQIoP)<h;3K|Lk000e1NJLTq000dD000gM1^@s6^naGp0008cX+uL$Nkc;*
zP;zf(X>4Tx0C?Jslgn!qSrmuA>fE4^APlsxUJRF6NRT9y4>Te^(n)Nhv2DsklORZ^
z`gV7jo9dcd)o~ON$;PG5FnjT_aN!@|!i6i{C=q-ih<g=96x^t^i|TY&@Of5W{m!|+
zbIvU;blSxr&?yOXeq@|nR!&Y$%N5T^v7Rn6bQRq&7%UXV0E$7N`6fO-!2)>L_x=1&
zqpK9Ub6~B6)ccYOUFi4>)GCux(;zgEJ{biOh;u;N#QOh0dM4)UK-!EuLm+MetK7gu
zAnpMJZnao~P66~*5;Zdkp3`-=InN(JxAG?r0~;W9R)r%?wiZgo;R8TFSg%TIcm(JL
z>w4MSHwyFs&&y`tM9kJkFB%<>Id#O>`LQOi^Jnshnw}zvvd)r!IDdF#Nk38CUjQ;-
zIkU9`4zLDNdrw!#kH&22)77DTlOLJ7GXeYsscV5QjK#C1?l6T$;o+n3kvQbY(no-y
zMi~zejYkfJkHX*)GW*?1O(DUO953;CiNWJ<>L?@*N66+`=xsSj`>FlLer#X1ui39J
zX6ild%z`=Yxr-OxQ9xl@zRhfNrr6)5#vmF^1;t!zr!X;TV!E<_G1GQ(7cab1=kp&E
zTdG8-K4wsa%wq7EN1+K(3?{n$==K!)?wMQb+Pxl&o5vn@-#xSJu4><GrCM7p|8CbM
z&nxk#*d#{9fY^Z)d&FL`TMUZ<u~Uq-PE6qAaT0|gq=?4n6mr@BTdE~~YXGEk%2&p7
zrIX9bf~l1~trAc47wO-O$*E}>({vqfgs^sNTl?T(0oIzuwiX?PU2mb|L0jv|!0JnI
zbDLW?^G$2Zx(|{1CjuC%1*eQxsYY_MZEu%@L7<f!_1*qnS=3q@uTqUdX;i4pyejn*
zmbYw<UAnW-`J&PIumM*52VeeeG(KHvG`?Jgj^}V&e+9t2{Y5{fPvigq00v@9M??Vs
z0RI60puMM)00009a7bBm000XU000XU0RWnu7ytkO2XskIMF-sh91k@UXb7N_0003B
zNkl<ZD9@eJu}Yjl6vgr1x2&dGL?J{7!B{A07m+|LEK>LgDYj93gdn!sY>_6Ntzef}
z<rz{+o*>O45)cBhNa?yKMef4p!)9~ga%T9?%o)y%B$909Z|&8*-FwBil4z1#;x$%q
zja$qiXmF3^DSp)?i5aVl(>k$(aXGZ>AKoPShEaj0K<5!nb@#uo2k-F|&+!%SaE?P<
zVi!N~6CYKSy(F)a>{rAeT6$2tmn0LXGxV^8H`u`wyu|`G@C(0T;xwORGfBTr9<;Py
ze16(#fJHpRS~(n-o?yGichf<9!3(V8GgfhdO?;}TzvBi+o!T_2eyDFVZt26+8cmWR
dUe54L!#})5!!LW+L2Up4002ovPDHLkV1f%R1g`)9

literal 0
HcmV?d00001

diff --git a/openslides/static/img/glyphicons_056_projector.png b/openslides/static/img/glyphicons_056_projector.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d644db309dd23ba8d0d6d6e08aaf312c40f8953
GIT binary patch
literal 452
zcmV;#0XzPQP)<h;3K|Lk000e1NJLTq000~S000>X1^@s6BEU{300009a7bBm000XU
z000XU0RWnu7ytkPc1c7*R7i=%mA_KLKoEz&bu7|hNl9y$(oXHH9Nxgt`3@Gq8~6zL
z0*>PgK#3J}wv={aN4FNY7cVD6$OZ8?b92e<UcT&~OHfq~HGol_&j|?<kz7Rb6yGGE
zsb2>*dp}$|O(Ci3QbaryRbB3Yy;STiYnB7|KxX$nn=@O_<2_;yM^mGeipa<=H^4+y
zKSX2*6hJR<U739>B3-j*Kzd4n4zK`p$5;TJXdlCxP5X=~a0gu4JdNzbvWB+MMiW&X
zh)5sTL>pjk;KDnpszAGQ2ryICfnEF7&wwl737Ewj+D2FaUk1AYx`AyCd;$~ri7@Qa
zci<U#+XM7!^9s1er83qTu4yU?f#<-(9<We7T+OmAwhh&z@(Xy|0OTVqfHAISvF5lF
zP|-oU6xSdZxJcKynr`jV5SS97*UZ2xTpA0asJ8+CREO%)#yWb0ZND^)^)JBD5jZ8I
u{NsyASxcYqRPB0Jm{R{1k8NOe&-w<8>{iGS^aN!90000<MNUMnLSTYoe7w&9

literal 0
HcmV?d00001

diff --git a/openslides/static/img/glyphicons_056_projector_small.png b/openslides/static/img/glyphicons_056_projector_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba0ec42829c109166b6d8d5d21f7f8a7d3de52e1
GIT binary patch
literal 341
zcmeAS@N?(olHy`uVBq!ia0vp^d>}Rl8<3oNC%zs?u_bxCyD<C*!3BGlPX>x`7I;J!
zGca%qgD@k*tT_@uLG}_)Usv|KjI1K+W@)nmnt?)(JY5_^G|u;4I<Ms#D8lyP{=URV
z=QI}f^t_AcT-nIzD(5io0Qa3v@dtq}p9D0L5+1NlNm*91OJ;IuR%y|@tyx>IZ~yjd
z`~Iyjr`at#bkFl2>x*7bnTHl{URqq=_)OlY`)G@~)Z*2TZMH3bZTjj0<FrDS?ScWS
ze~-Ac*eA*#KF}Y)RB|$ULSe^Ljf%EQDt3=;CVuGEz4O>ss^>$4_mpS7;*N)6E=j(5
zsCF$VajUQ2=Jk`d924>@5dXeBD4|z8W~<xXp1r9*JJV8yEK5c5A748Bdd87Y?Eg;n
jaj^^6UCf)c?hliujiIa~o5u#AZy7vY{an^LB{Ts5ZKjOa

literal 0
HcmV?d00001

diff --git a/openslides/static/img/glyphicons_154_more_windows.png b/openslides/static/img/glyphicons_154_more_windows.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f533aa7b5b59c164b0552063b2cc764c204519c
GIT binary patch
literal 1034
zcmV+l1oiugP)<h;3K|Lk000e1NJLTq000XB000XJ1^@s6sjPP<0008fX+uL$Nkc;*
zP;zf(X>4Tx04R}-l+Q~PVHn51vyB)iL11Qkh@nGBs7w}RMCGo(*tBg~f0Po$?CiU{
zle4qa%<P&X5neiG(LE{;9{K}3c<7Xu!oVy7>26U(f|ru*d1uDm5$(qdGxK?$AK&MB
z-{F0M8d)(-JtP5n!?BWmQR({Vm{j`_Asj&+!l+YJ+l(X<1E9fUv1@F;hrqupt$X|b
zI_lE4ng@jaK<G!B*($K_7ugG0Y6K9uUc-cAI>h%lTb}(f=ak3uu6-!kMZ8FSKs7BM
z|C+c%%_(W1MkH>@24YeH&g(_h@8=*r^~@L^r0;R+=`OQ-d=_TXN_RhT8}a8f>+a#2
z#Pb=gH%8n{&sxUn9rjo_p*gW3k3%Dd9v|?z$w<Yo`kJEYM3dY4c4@F@+kQ*AoFEPp
zC&vr@Jf@LyJEw9(*E|;Vsa#jw=XX{y$?G1Ym^o8-{}=TZdWBKwV9;RD+kk{5`Vd7c
zOjsx&LmrJHG_o=`#v-;czGtM4M1UpouT##tn{yjQ%H~-kh{iF~Qc;lP5As)eRembZ
z$zNu}#pbGK#=5Dg%MZSjF0Z_;>wEp4JbjhwM#!rpOV)g4O?IHuKzA8qHe6NWHQ4?5
zW?+>pP^lFuS83d>RC0Yby(58Yf7(5YU7B8Os@7T+7jCT7FHP^*tHQ2TvC67;&Z}|3
zd?p?hPl_?ILp%pbyd-vt7sYOxofiix8N;NaVZv3ip-`5AN%ERI{+SmG@2t6_p^q8N
z(o~6`|AbY@XgUiV(SNxAbMSk`qp>3J!UhhXuG%(|?j0gDE>~^N72v`*x)0t~ZOwEZ
z4m|-D&ZtGJ<Vy>}8;WLk96sqPn3I;4%{fxLET5GkbR{t<W~gl~lA`O9>#`+_*~}`j
zbQ|o<sdi7Lo_3|?Q@OlB=dbn=u=TK9{`st2-g-_wtN}0e-@v^6MNSwoNdN!<32;bR
za{vGf6951U69E94oEQKA0N+VOK~xx(UC_@egaH%<@ZbH+82OWlrdZi|14>!*0v^Cl
zS<9Bk5KSp>;XRZcvR5>N!gnp^Dx5m2bMC$8+`uXJ@s2OF_{2QMIL^%Li0Hy2c1v8u
z0DUar7)O~YGX)+pa}6Tm2<v#O3rkq3g_nU_Y~cWVxI(8m#uK)&0XJC2u=4rO((jr&
z*J4z~L_{Yh=$W90mj<(CY%x<}`im~Q4W4m=xhe(?qWCl1HaIL(AFq&^ADP)^=6jh(
zXnvPC!v&`6*8{9pgdN-mn#^n?ViV_OdaWpJnWr%P1|(cvGPFe+SO5S307*qoM6N<$
Ef@*2ylmGw#

literal 0
HcmV?d00001

diff --git a/openslides/static/img/glyphicons_154_more_windows_white.png b/openslides/static/img/glyphicons_154_more_windows_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed393b2223aa0f95af9e773bd11b8ebd134da8a0
GIT binary patch
literal 1070
zcmV+}1kwA6P)<h;3K|Lk000e1NJLTq000XB000XJ1^@s6sjPP<0008cX+uL$Nkc;*
zP;zf(X>4Tx0C?Jslgn!qSrmuA>fE4^APlsxUJRF6NRT9y4>Te^(n)Nhv2DsklORZ^
z`gV7jo9dcd)o~ON$;PG5FnjT_aN!@|!i6i{C=q-ih<g=96x^t^i|TY&@Of5W{m!|+
zbIvU;blSxr&?yOXeq@|nR!&Y$%N5T^v7Rn6bQRq&7%UXV0E$7N`6fO-!2)>L_x=1&
zqpK9Ub6~B6)ccYOUFi4>)GCux(;zgEJ{biOh;u;N#QOh0dM4)UK-!EuLm+MetK7gu
zAnpMJZnao~P66~*5;Zdkp3`-=InN(JxAG?r0~;W9R)r%?wiZgo;R8TFSg%TIcm(JL
z>w4MSHwyFs&&y`tM9kJkFB%<>Id#O>`LQOi^Jnshnw}zvvd)r!IDdF#Nk38CUjQ;-
zIkU9`4zLDNdrw!#kH&22)77DTlOLJ7GXeYsscV5QjK#C1?l6T$;o+n3kvQbY(no-y
zMi~zejYkfJkHX*)GW*?1O(DUO953;CiNWJ<>L?@*N66+`=xsSj`>FlLer#X1ui39J
zX6ild%z`=Yxr-OxQ9xl@zRhfNrr6)5#vmF^1;t!zr!X;TV!E<_G1GQ(7cab1=kp&E
zTdG8-K4wsa%wq7EN1+K(3?{n$==K!)?wMQb+Pxl&o5vn@-#xSJu4><GrCM7p|8CbM
z&nxk#*d#{9fY^Z)d&FL`TMUZ<u~Uq-PE6qAaT0|gq=?4n6mr@BTdE~~YXGEk%2&p7
zrIX9bf~l1~trAc47wO-O$*E}>({vqfgs^sNTl?T(0oIzuwiX?PU2mb|L0jv|!0JnI
zbDLW?^G$2Zx(|{1CjuC%1*eQxsYY_MZEu%@L7<f!_1*qnS=3q@uTqUdX;i4pyejn*
zmbYw<UAnW-`J&PIumM*52VeeeG(KHvG`?Jgj^}V&e+9t2{Y5{fPvigq00v@9M??Vs
z0RI60puMM)00009a7bBm000XU000XU0RWnu7ytkO2XskIMF-sh91s#F^8_-O0002t
zNkl<Z7}I6YF-n6`5Cq`wy(B8pLIgo8D?LFJ1drhXECkV7Y_+kou@wZt&KqbiSa<+i
zNiQf#3`GC6aMS3*6wA);%xsB>GwflEZ#4MA0){xj13D!l`q;-KTA0Bk7Y}p!0!l=@
zV$E+IV*{T_TEYtYxG53wf^8gN7q@69hIqpcHrpvzv5q@j`d{~Wt|`}Gkiq2Dg4yh6
z@lnxDVuQIH#-Ga_bSmC)iunvCZI#4yxv4lx(jrDVoTSn?`vGdj6V5YrFaNxpSWOE(
obW21`LvG<JNu#vVB)Ns_9}dMtFPt1+9{>OV07*qoM6N<$g6FyBf&c&j

literal 0
HcmV?d00001

diff --git a/openslides/static/img/glyphicons_358_file_import.png b/openslides/static/img/glyphicons_358_file_import.png
new file mode 100644
index 0000000000000000000000000000000000000000..36dd2c32226133ed8d8554e0d4aa4ac05ad6ee6a
GIT binary patch
literal 1059
zcmV+;1l;?HP)<h;3K|Lk000e1NJLTq000aC000dL1^@s6ohgq(0008fX+uL$Nkc;*
zP;zf(X>4Tx04R}-l+Q~PVHn51vyB)iL11Qkh@nGBs7w}RMCGo(*tBg~f0Po$?CiU{
zle4qa%<P&X5neiG(LE{;9{K}3c<7Xu!oVy7>26U(f|ru*d1uDm5$(qdGxK?$AK&MB
z-{F0M8d)(-JtP5n!?BWmQR({Vm{j`_Asj&+!l+YJ+l(X<1E9fUv1@F;hrqupt$X|b
zI_lE4ng@jaK<G!B*($K_7ugG0Y6K9uUc-cAI>h%lTb}(f=ak3uu6-!kMZ8FSKs7BM
z|C+c%%_(W1MkH>@24YeH&g(_h@8=*r^~@L^r0;R+=`OQ-d=_TXN_RhT8}a8f>+a#2
z#Pb=gH%8n{&sxUn9rjo_p*gW3k3%Dd9v|?z$w<Yo`kJEYM3dY4c4@F@+kQ*AoFEPp
zC&vr@Jf@LyJEw9(*E|;Vsa#jw=XX{y$?G1Ym^o8-{}=TZdWBKwV9;RD+kk{5`Vd7c
zOjsx&LmrJHG_o=`#v-;czGtM4M1UpouT##tn{yjQ%H~-kh{iF~Qc;lP5As)eRembZ
z$zNu}#pbGK#=5Dg%MZSjF0Z_;>wEp4JbjhwM#!rpOV)g4O?IHuKzA8qHe6NWHQ4?5
zW?+>pP^lFuS83d>RC0Yby(58Yf7(5YU7B8Os@7T+7jCT7FHP^*tHQ2TvC67;&Z}|3
zd?p?hPl_?ILp%pbyd-vt7sYOxofiix8N;NaVZv3ip-`5AN%ERI{+SmG@2t6_p^q8N
z(o~6`|AbY@XgUiV(SNxAbMSk`qp>3J!UhhXuG%(|?j0gDE>~^N72v`*x)0t~ZOwEZ
z4m|-D&ZtGJ<Vy>}8;WLk96sqPn3I;4%{fxLET5GkbR{t<W~gl~lA`O9>#`+_*~}`j
zbQ|o<sdi7Lo_3|?Q@OlB=dbn=u=TK9{`st2-g-_wtN}0e-@v^6MNSwoNdN!<32;bR
za{vGf6951U69E94oEQKA0QgBnK~yM_b<w>pMNtq1;P2cYqPcVmT2V@fLZMMnskn)s
z=v5N&5?(<o8ZY1pL`6eECmITL5}b3l;?7C76DHYNvsY&CS!+g03HnGV1MBmNBWy=q
zr)3x&e@BHeoEAmVPbrmkVakdIDB`s69{gER6y4^}19Y=|6caeWIHrWQtxWelJ{q3B
z!%tazXa~OF7>9Tbz6y^cXxAMUaDok-;|i;|jt*6(z%w3k+mQ2sUEJi4I+*-tq%-K@
zEhjse$21mkhkYz#2Wwb~4nx1;VLiyp7~vi+f*WM|Q@w{?;1ZrNi@6x<uU*xbufPhM
dS>9Z1`2*JPR{yU|!qNZ$002ovPDHLkV1i4k?JWQR

literal 0
HcmV?d00001


From adeaf248ef56da307e5012e786e800b11a45b566 Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Fri, 1 Feb 2013 12:51:01 +0100
Subject: [PATCH 41/88] Changed utils.- and poll.views

---
 openslides/poll/views.py  | 67 +++++++++++++++++++++------------------
 openslides/utils/views.py | 16 +++++++---
 2 files changed, 48 insertions(+), 35 deletions(-)

diff --git a/openslides/poll/views.py b/openslides/poll/views.py
index 70c48e7cc..2293e8c54 100644
--- a/openslides/poll/views.py
+++ b/openslides/poll/views.py
@@ -12,42 +12,20 @@
 
 from django.http import HttpResponseRedirect
 from django.forms.models import modelform_factory
+from django.core.exceptions import ImproperlyConfigured
 
-from openslides.utils.views import TemplateView
+from openslides.utils.views import TemplateView, UrlMixin
 
 
-class PollFormView(TemplateView):
-    template_name = 'poll/poll.html'
-    poll_argument = 'poll_id'
+class PollFormView(UrlMixin, TemplateView):
+    poll_class = None
 
-    def set_poll(self, poll_id):
-        poll_id = poll_id
-        self.poll = self.poll_class.objects.get(pk=poll_id)
-
-    def get_context_data(self, **kwargs):
-        context = super(PollFormView, self).get_context_data(**kwargs)
-        self.set_poll(self.kwargs['poll_id'])
-        context['poll'] = self.poll
-        if 'forms' in kwargs:
-            context['forms'] = kwargs['forms']
-            context['pollform'] = kwargs['pollform']
-        else:
-            context['forms'] = self.poll.get_vote_forms()
-            FormClass = self.get_modelform_class()
-            context['pollform'] = FormClass(instance=self.poll,
-                                            prefix='pollform')
-        return context
-
-    def get_success_url(self):
-        return self.success_url
-
-    def get_modelform_class(self):
-        fields = []
-        self.poll.append_pollform_fields(fields)
-        return modelform_factory(self.poll.__class__, fields=fields)
+    def get(self, request, *args, **kwargs):
+        self.poll = self.object = self.get_object()
+        return super(PollFormView, self).get(request, *args, **kwargs)
 
     def post(self, request, *args, **kwargs):
-        self.set_poll(self.kwargs['poll_id'])
+        self.poll = self.object = self.get_object()
         option_forms = self.poll.get_vote_forms(data=self.request.POST)
 
         FormClass = self.get_modelform_class()
@@ -76,3 +54,32 @@ class PollFormView(TemplateView):
 
         pollform.save()
         return HttpResponseRedirect(self.get_success_url())
+
+    def get_poll_class(self):
+        if self.poll_class is not None:
+            return self.poll_class
+        else:
+            raise ImproperlyConfigured(
+                "No poll class defined.  Either provide a poll_class or define"
+                " a get_poll_class method.")
+
+    def get_object(self):
+        return self.get_poll_class().objects.get(pk=self.kwargs['poll_id'])
+
+    def get_context_data(self, **kwargs):
+        context = super(PollFormView, self).get_context_data(**kwargs)
+        context['poll'] = self.poll
+        if 'forms' in kwargs:
+            context['forms'] = kwargs['forms']
+            context['pollform'] = kwargs['pollform']
+        else:
+            context['forms'] = self.poll.get_vote_forms()
+            FormClass = self.get_modelform_class()
+            context['pollform'] = FormClass(instance=self.poll,
+                                            prefix='pollform')
+        return context
+
+    def get_modelform_class(self):
+        fields = []
+        self.poll.append_pollform_fields(fields)
+        return modelform_factory(self.poll.__class__, fields=fields)
diff --git a/openslides/utils/views.py b/openslides/utils/views.py
index 0958421d0..4051f93e2 100644
--- a/openslides/utils/views.py
+++ b/openslides/utils/views.py
@@ -116,7 +116,7 @@ class UrlMixin(object):
 
     def get_apply_url(self):
         if self.apply_url_name:
-            return reverse(self.apply_url_name)
+            return reverse(self.apply_url_name, args=self.get_url_name_args())
         elif self.apply_url:
             return self.apply_url
         else:
@@ -131,17 +131,19 @@ class UrlMixin(object):
             return self.get_apply_url()
 
         if self.success_url_name:
-            return reverse(self.success_url_name)
+            return reverse(self.success_url_name, args=self.get_url_name_args())
         elif self.success_url:
             return self.success_url
         else:
             try:
-                url = self.object.get_absolute_url()
+                return self.object.get_absolute_url()
             except AttributeError:
                 raise ImproperlyConfigured(
                     "No URL to redirect to.  Either provide a url or define"
                     " a get_absolute_url method on the Model.")
-        return url
+
+    def get_url_name_args(self):
+        return []
 
 
 class QuestionMixin(object):
@@ -218,6 +220,7 @@ class AjaxView(PermissionMixin, AjaxMixin, View):
 class RedirectView(PermissionMixin, AjaxMixin, _RedirectView):
     permanent = False
     allow_ajax = False
+    url_name = None
 
     def pre_redirect(self, request, *args, **kwargs):
         pass
@@ -236,7 +239,10 @@ class RedirectView(PermissionMixin, AjaxMixin, _RedirectView):
         return super(RedirectView, self).get(request, *args, **kwargs)
 
     def get_redirect_url(self, **kwargs):
-        return reverse(super(RedirectView, self).get_redirect_url(**kwargs))
+        if self.url_name is not None:
+            return reverse(self.url_name)
+        else:
+            return super(RedirectView, self).get_redirect_url(**kwargs)
 
 
 class FormView(PermissionMixin, ExtraContextMixin, UrlMixin, _FormView):

From da7a7a9d68e27b833203bfcda845e9e71ec9dfae Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Fri, 1 Feb 2013 12:51:54 +0100
Subject: [PATCH 42/88] Add Poll-system to the new motion app

---
 openslides/motion/models.py                   | 46 +++++++++++++
 .../templates/motion/motion_detail.html       | 60 +++++++++++++++++
 .../motion/templates/motion/poll_form.html    | 48 ++++++++++++++
 openslides/motion/urls.py                     | 15 +++++
 openslides/motion/views.py                    | 64 ++++++++++++++++---
 5 files changed, 223 insertions(+), 10 deletions(-)
 create mode 100644 openslides/motion/templates/motion/poll_form.html

diff --git a/openslides/motion/models.py b/openslides/motion/models.py
index 510d481ac..0be499419 100644
--- a/openslides/motion/models.py
+++ b/openslides/motion/models.py
@@ -267,6 +267,13 @@ class Motion(SlideMixin, models.Model):
         #else:
             #self.writelog(_("Supporter: -%s") % (person))
 
+    def create_poll(self):
+        # TODO: auto increment the poll_number in the Database
+        poll_number = self.polls.aggregate(Max('poll_number'))['poll_number__max'] or 0
+        poll = MotionPoll.objects.create(motion=self, poll_number=poll_number + 1)
+        poll.set_options()
+        return poll
+
 
 class MotionVersion(models.Model):
     title = models.CharField(max_length=255, verbose_name=ugettext_lazy("Title"))
@@ -307,3 +314,42 @@ class Comment(models.Model):
     text = models.TextField()
     author = PersonField()
     creation_time = models.DateTimeField(auto_now=True)
+
+
+class MotionVote(BaseVote):
+    option = models.ForeignKey('MotionOption')
+
+
+class MotionOption(BaseOption):
+    poll = models.ForeignKey('MotionPoll')
+    vote_class = MotionVote
+
+
+class MotionPoll(CountInvalid, CountVotesCast, BasePoll):
+    option_class = MotionOption
+    vote_values = [
+        ugettext_noop('Yes'), ugettext_noop('No'), ugettext_noop('Abstain')]
+
+    motion = models.ForeignKey(Motion, related_name='polls')
+    poll_number = models.PositiveIntegerField(default=1)
+
+    class Meta:
+        unique_together = ("motion", "poll_number")
+
+    def get_absolute_url(self, link='edit'):
+        return reverse('motion_poll_edit', args=[str(self.motion.pk),
+                                                 str(self.poll_number)])
+
+    def get_motion(self):
+        return self.motion
+
+    def set_options(self):
+        #TODO: maybe it is possible with .create() to call this without poll=self
+        self.get_option_class()(poll=self).save()
+
+    def append_pollform_fields(self, fields):
+        CountInvalid.append_pollform_fields(self, fields)
+        CountVotesCast.append_pollform_fields(self, fields)
+
+    def get_ballot(self):
+        return self.motion.motionpoll_set.filter(id__lte=self.id).count()
diff --git a/openslides/motion/templates/motion/motion_detail.html b/openslides/motion/templates/motion/motion_detail.html
index fd5880ada..86c27502e 100644
--- a/openslides/motion/templates/motion/motion_detail.html
+++ b/openslides/motion/templates/motion/motion_detail.html
@@ -22,4 +22,64 @@
     {% endif %}
 {% endfor %}
 </ol>
+
+
+<h4>{% trans "Vote results" %}:</h4>
+        {% with motion.polls.all as polls %}
+        {% if not polls.exists %}
+            {% if perms.motion.can_manage_motion %}
+                <a href="{% url 'motion_poll_create' motion.id %}">
+                    <span class="button">
+                        <span class="icon statistics">{% trans 'New vote' %}</span>
+                    </span>
+                </a>
+            {% else %}
+            -
+            {% endif %}
+        {% endif %}
+        <ul class="results">
+        {% for poll in polls %}
+        {% if perms.motion.can_manage_motion or poll.has_votes %}
+            <li>
+                {% if perms.motion.can_manage_motion %}
+                    <strong>{{ forloop.counter }}. {% trans "Vote" %} </strong>
+                    <a class="icon edit" href="{% model_url poll %}" title="{% trans 'Edit Vote' %}">
+                            <span></span>
+                    </a>
+                    <a class="icon delete" href="{% model_url poll %}" title="{% trans 'Delete Vote' %}">
+                        <span></span>
+                    </a>
+                {% elif poll.has_votes %}
+                    <strong>{{ forloop.counter }}. {% trans "Vote" %}:</strong>
+                {% endif %}
+                <br>
+                {% if poll.has_votes %}
+                    {% with poll.get_options.0 as option %}
+                        <img src="{% static 'images/icons/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ option.Yes }}<br>
+                        <img src="{% static 'images/icons/voting-no.png' %}" title="{% trans 'No' %}"> {{ option.No }}<br>
+                        <img src="{% static 'images/icons/voting-abstention.png' %}" title="{% trans 'Abstention' %}"> {{ option.Abstain }}<br>
+                        <img src="{% static 'images/icons/voting-invalid.png' %}" title="{% trans 'Invalid' %}"> {{ poll.print_votesinvalid }}<br>
+                        <div style="border-top: 1px solid; padding-top: 5px; margin: 5px 0; width: 10em;">
+                            <img src="{% static 'images/icons/voting-total.png' %}" title="{% trans 'Votes cast' %}"> {{ poll.print_votescast }}
+                        </div>
+                    {% endwith %}
+                    {% if perms.motion.can_manage_motion %}
+                        {% if forloop.last %}
+                        <a href="{% url 'motion_poll_create' motion.pk %}">
+                            <span class="button"><span class="icon statistics">{% trans 'New vote' %}</span></span>
+                        </a>
+                        {% endif %}
+                    {% endif %}
+                {% else %}
+                    {% if perms.motion.can_manage_motion %}
+                        <a href="{% model_url poll %}">
+                            <span class="button"><span class="icon statistics">{% trans 'Enter result' %}</span></span>
+                        </a>
+                     {% endif %}
+                {% endif %}
+            </li>
+        {% endif %}
+        {% endfor %}
+        </ul>
+        {% endwith %}
 {% endblock %}
diff --git a/openslides/motion/templates/motion/poll_form.html b/openslides/motion/templates/motion/poll_form.html
new file mode 100644
index 000000000..f7cd3635a
--- /dev/null
+++ b/openslides/motion/templates/motion/poll_form.html
@@ -0,0 +1,48 @@
+{% extends 'base.html' %}
+
+{% load i18n %}
+{% load staticfiles %}
+{% load tags %}
+
+{% block content %}
+    <h1>{{ motion }}</h1>
+    <i class="helptext">{% trans "Special values" %}: -1 = {% trans 'majority' %}; -2 = {% trans 'undocumented' %}</i>
+    <form action="" method="post" class="small-form">{% csrf_token %}
+        {{ pre_form }}
+        <span id="poll_id" style="display:none">{{ object.pk }}</span>
+        <table class="table" style="width: auto;">
+            <tr>
+                <th>{% trans "Option" %}</th>
+                <th>{% trans "Votes" %}</th>
+            </tr>
+            {% for value in forms.0 %}
+                <tr>
+                    <td>{{ value.label }}</td>
+                    <td>{{ value.errors }}{{ value }}</td>
+                </tr>
+            {% endfor %}
+            <tr class="total">
+                <td>{% trans "Invalid votes" %}</td>
+                <td>{{ pollform.votesinvalid.errors }}{{ pollform.votesinvalid }}</td>
+            </tr>
+            <tr class="total">
+                <td>{% trans "Votes cast" %}</td>
+                <td>{{ pollform.votescast.errors }}{{ pollform.votescast }}</td>
+            </tr>
+        </table>
+
+        {{ post_form }}
+
+        <p>
+            <button class="button" type="submit">
+                <span class="icon ok">{% trans 'Save' %}</span>
+            </button>
+            <button class="button" type="submit" name="apply">
+                <span class="icon apply">{% trans 'Apply' %}</span>
+            </button>
+            <a href="{% model_url motion %}">
+                <span class="icon cancel">{% trans 'Cancel' %}</span>
+            </a>
+        </p>
+    </form>
+{% endblock %}
diff --git a/openslides/motion/urls.py b/openslides/motion/urls.py
index ebc1c2155..bdd7575a6 100644
--- a/openslides/motion/urls.py
+++ b/openslides/motion/urls.py
@@ -47,4 +47,19 @@ urlpatterns = patterns('openslides.motion.views',
         'motion_unsupport',
         name='motion_unsupport',
     ),
+
+    url(r'^(?P<pk>\d+)/create_poll/$',
+        'poll_create',
+        name='motion_poll_create',
+    ),
+
+    url(r'^(?P<pk>\d+)/poll/(?P<poll_number>\d+)/edit$',
+        'poll_edit',
+        name='motion_poll_edit',
+    ),
+
+    ## url(r'^poll/(?P<poll_id>\d+)/del/$',
+        ## 'delete_poll',
+        ## name='motion_poll_delete',
+    ## ),
 )
diff --git a/openslides/motion/views.py b/openslides/motion/views.py
index 4875dae36..c0cada64d 100644
--- a/openslides/motion/views.py
+++ b/openslides/motion/views.py
@@ -22,13 +22,14 @@ from django.http import Http404
 from openslides.utils.pdf import stylesheet
 from openslides.utils.views import (
     TemplateView, RedirectView, UpdateView, CreateView, DeleteView, PDFView,
-    DetailView, ListView, FormView, QuestionMixin)
+    DetailView, ListView, FormView, QuestionMixin, SingleObjectMixin)
 from openslides.utils.template import Tab
 from openslides.utils.utils import html_strong
+from openslides.poll.views import PollFormView
 from openslides.projector.api import get_active_slide
 from openslides.projector.projector import Widget, SLIDE
 from openslides.config.models import config
-from .models import Motion, MotionSubmitter, MotionSupporter
+from .models import Motion, MotionSubmitter, MotionSupporter, MotionPoll
 from .forms import (BaseMotionForm, MotionSubmitterMixin, MotionSupporterMixin,
                     MotionCreateNewVersionMixin, ConfigForm)
 
@@ -81,14 +82,16 @@ class MotionMixin(object):
     def post_save(self, form):
         super(MotionMixin, self).post_save(form)
         # TODO: only delete and save neccessary submitters and supporter
-        self.object.submitter.all().delete()
-        self.object.supporter.all().delete()
-        MotionSubmitter.objects.bulk_create(
-            [MotionSubmitter(motion=self.object, person=person)
-             for person in form.cleaned_data['submitter']])
-        MotionSupporter.objects.bulk_create(
-            [MotionSupporter(motion=self.object, person=person)
-             for person in form.cleaned_data['supporter']])
+        if 'submitter' in form.cleaned_data:
+            self.object.submitter.all().delete()
+            MotionSubmitter.objects.bulk_create(
+                [MotionSubmitter(motion=self.object, person=person)
+                 for person in form.cleaned_data['submitter']])
+        if 'supporter' in form.cleaned_data:
+            self.object.supporter.all().delete()
+            MotionSupporter.objects.bulk_create(
+                [MotionSupporter(motion=self.object, person=person)
+                 for person in form.cleaned_data['supporter']])
 
     def get_form_class(self):
         form_classes = [BaseMotionForm]
@@ -180,6 +183,47 @@ motion_support = SupportView.as_view(support=True)
 motion_unsupport = SupportView.as_view(support=False)
 
 
+class PollCreateView(SingleObjectMixin, RedirectView):
+    permission_required = 'motion.can_manage_motion'
+    model = Motion
+
+    def get(self, request, *args, **kwargs):
+        self.object = self.get_object()
+        return super(PollCreateView, self).get(request, *args, **kwargs)
+
+    def pre_redirect(self, request, *args, **kwargs):
+        self.poll = self.object.create_poll()
+        messages.success(request, _("New vote was successfully created."))
+
+    def get_redirect_url(self, **kwargs):
+        return reverse('motion_poll_edit', args=[self.object.pk, self.poll.poll_number])
+
+poll_create = PollCreateView.as_view()
+
+
+class PollUpdateView(PollFormView):
+    permission_required = 'motion.can_manage_motion'
+    poll_class = MotionPoll
+    template_name = 'motion/poll_form.html'
+    success_url_name = 'motion_detail'
+
+    def get_object(self):
+        return MotionPoll.objects.filter(
+            motion=self.kwargs['pk'],
+            poll_number=self.kwargs['poll_number']).get()
+
+    def get_context_data(self, **kwargs):
+        context = super(PollUpdateView, self).get_context_data(**kwargs)
+        context.update({
+            'motion': self.poll.motion})
+        return context
+
+    def get_url_name_args(self):
+        return [self.poll.motion.pk]
+
+poll_edit = PollUpdateView.as_view()
+
+
 class Config(FormView):
     permission_required = 'config.can_manage_config'
     form_class = ConfigForm

From b6256b73e0263709533b16f4225fab91b2c56f12 Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Fri, 1 Feb 2013 13:24:30 +0100
Subject: [PATCH 43/88] Changed utils.views.DeleteView

---
 openslides/utils/views.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/openslides/utils/views.py b/openslides/utils/views.py
index 4051f93e2..a8b8657dd 100644
--- a/openslides/utils/views.py
+++ b/openslides/utils/views.py
@@ -287,10 +287,25 @@ class CreateView(PermissionMixin, UrlMixin, ExtraContextMixin,
 
 
 class DeleteView(SingleObjectMixin, QuestionMixin, RedirectView):
+    question_url_name = None
+    success_url_name = None
+
     def get(self, request, *args, **kwargs):
         self.object = self.get_object()
         return super(DeleteView, self).get(request, *args, **kwargs)
 
+    def get_redirect_url(self, **kwargs):
+        if self.request.method == 'GET':
+            if self.question_url_name is not None:
+                return reverse(self.question_url_name, args=self.get_url_name_args())
+            else:
+                return self.object.get_absolute_url()
+        else:
+            return reverse(self.success_url_name, args=self.get_url_name_args())
+
+    def get_url_name_args(self):
+        return [self.poll.motion.pk]
+
     def get_question(self):
         return _('Do you really want to delete %s?') % html_strong(self.object)
 

From 3f02a28002845e8d3cc8c4cc3a1d441b0bfed505 Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Fri, 1 Feb 2013 13:24:44 +0100
Subject: [PATCH 44/88] Added a poll delete view to the new motion app

---
 openslides/motion/models.py                   | 11 ++++++++--
 .../templates/motion/motion_detail.html       |  4 ++--
 openslides/motion/urls.py                     | 10 ++++-----
 openslides/motion/views.py                    | 21 +++++++++++++------
 4 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/openslides/motion/models.py b/openslides/motion/models.py
index 0be499419..8c8d8ad60 100644
--- a/openslides/motion/models.py
+++ b/openslides/motion/models.py
@@ -336,9 +336,16 @@ class MotionPoll(CountInvalid, CountVotesCast, BasePoll):
     class Meta:
         unique_together = ("motion", "poll_number")
 
+    def __unicode__(self):
+        return _('Ballot %d') % self.poll_number
+
     def get_absolute_url(self, link='edit'):
-        return reverse('motion_poll_edit', args=[str(self.motion.pk),
-                                                 str(self.poll_number)])
+        if link == 'edit':
+            return reverse('motion_poll_edit', args=[str(self.motion.pk),
+                                                     str(self.poll_number)])
+        if link == 'delete':
+            return reverse('motion_poll_delete', args=[str(self.motion.pk),
+                                                       str(self.poll_number)])
 
     def get_motion(self):
         return self.motion
diff --git a/openslides/motion/templates/motion/motion_detail.html b/openslides/motion/templates/motion/motion_detail.html
index 86c27502e..22e80067c 100644
--- a/openslides/motion/templates/motion/motion_detail.html
+++ b/openslides/motion/templates/motion/motion_detail.html
@@ -43,10 +43,10 @@
             <li>
                 {% if perms.motion.can_manage_motion %}
                     <strong>{{ forloop.counter }}. {% trans "Vote" %} </strong>
-                    <a class="icon edit" href="{% model_url poll %}" title="{% trans 'Edit Vote' %}">
+                    <a class="icon edit" href="{% model_url poll 'edit' %}" title="{% trans 'Edit Vote' %}">
                             <span></span>
                     </a>
-                    <a class="icon delete" href="{% model_url poll %}" title="{% trans 'Delete Vote' %}">
+                    <a class="icon delete" href="{% model_url poll 'delete' %}" title="{% trans 'Delete Vote' %}">
                         <span></span>
                     </a>
                 {% elif poll.has_votes %}
diff --git a/openslides/motion/urls.py b/openslides/motion/urls.py
index bdd7575a6..449de24d8 100644
--- a/openslides/motion/urls.py
+++ b/openslides/motion/urls.py
@@ -53,13 +53,13 @@ urlpatterns = patterns('openslides.motion.views',
         name='motion_poll_create',
     ),
 
-    url(r'^(?P<pk>\d+)/poll/(?P<poll_number>\d+)/edit$',
+    url(r'^(?P<pk>\d+)/poll/(?P<poll_number>\d+)/edit/$',
         'poll_edit',
         name='motion_poll_edit',
     ),
 
-    ## url(r'^poll/(?P<poll_id>\d+)/del/$',
-        ## 'delete_poll',
-        ## name='motion_poll_delete',
-    ## ),
+    url(r'^(?P<pk>\d+)/poll/(?P<poll_number>\d+)/del/$',
+        'poll_delete',
+        name='motion_poll_delete',
+    ),
 )
diff --git a/openslides/motion/views.py b/openslides/motion/views.py
index c0cada64d..b08f6d29f 100644
--- a/openslides/motion/views.py
+++ b/openslides/motion/views.py
@@ -201,10 +201,8 @@ class PollCreateView(SingleObjectMixin, RedirectView):
 poll_create = PollCreateView.as_view()
 
 
-class PollUpdateView(PollFormView):
+class PollMixin(object):
     permission_required = 'motion.can_manage_motion'
-    poll_class = MotionPoll
-    template_name = 'motion/poll_form.html'
     success_url_name = 'motion_detail'
 
     def get_object(self):
@@ -212,18 +210,29 @@ class PollUpdateView(PollFormView):
             motion=self.kwargs['pk'],
             poll_number=self.kwargs['poll_number']).get()
 
+    def get_url_name_args(self):
+        return [self.object.motion.pk]
+
+
+class PollUpdateView(PollMixin, PollFormView):
+    poll_class = MotionPoll
+    template_name = 'motion/poll_form.html'
+
     def get_context_data(self, **kwargs):
         context = super(PollUpdateView, self).get_context_data(**kwargs)
         context.update({
             'motion': self.poll.motion})
         return context
 
-    def get_url_name_args(self):
-        return [self.poll.motion.pk]
-
 poll_edit = PollUpdateView.as_view()
 
 
+class PollDeleteView(PollMixin, DeleteView):
+    model = MotionPoll
+
+poll_delete = PollDeleteView.as_view()
+
+
 class Config(FormView):
     permission_required = 'config.can_manage_config'
     form_class = ConfigForm

From fb82a1787b40f731b8b2b612028016ded073e558 Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Fri, 1 Feb 2013 16:33:45 +0100
Subject: [PATCH 45/88] Add workflows for motions

---
 openslides/global_settings.py                 |  5 +-
 openslides/motion/forms.py                    |  7 ++
 openslides/motion/models.py                   | 29 +++++++-
 openslides/motion/signals.py                  |  2 +-
 .../templates/motion/motion_detail.html       |  1 +
 openslides/motion/views.py                    |  2 +
 openslides/motion/workflow.py                 | 74 +++++++++++++++++++
 7 files changed, 116 insertions(+), 4 deletions(-)
 create mode 100644 openslides/motion/workflow.py

diff --git a/openslides/global_settings.py b/openslides/global_settings.py
index 94f900059..a02ef47e2 100644
--- a/openslides/global_settings.py
+++ b/openslides/global_settings.py
@@ -26,9 +26,12 @@ LOGIN_REDIRECT_URL = '/'
 
 SESSION_COOKIE_NAME = 'OpenSlidesSessionID'
 
-
 ugettext = lambda s: s
 
+MOTION_WORKFLOW = (
+    ('default', ugettext('default'), 'openslides.motion.workflow.default_workflow'),
+)
+
 LANGUAGES = (
     ('de', ugettext('German')),
     ('en', ugettext('English')),
diff --git a/openslides/motion/forms.py b/openslides/motion/forms.py
index 66307761a..b488a7a2a 100644
--- a/openslides/motion/forms.py
+++ b/openslides/motion/forms.py
@@ -16,6 +16,7 @@ from django.utils.translation import ugettext as _
 from openslides.utils.forms import CssClassMixin
 from openslides.utils.person import PersonFormField, MultiplePersonFormField
 from .models import Motion
+from .workflow import motion_workflow_choices
 
 
 class BaseMotionForm(forms.ModelForm, CssClassMixin):
@@ -117,3 +118,9 @@ class ConfigForm(forms.Form, CssClassMixin):
             ('NEVER_CREATE_NEW_VERSION', _('create never a new version')),
             ('ASK_USER', _('Let the user choose if he wants to create a new version')))
     )
+
+    motion_workflow = forms.ChoiceField(
+        widget=forms.Select(),
+        label=_("Workflow for the motions"),
+        required=True,
+        choices=motion_workflow_choices())
diff --git a/openslides/motion/models.py b/openslides/motion/models.py
index 8c8d8ad60..323bb153c 100644
--- a/openslides/motion/models.py
+++ b/openslides/motion/models.py
@@ -30,6 +30,8 @@ from openslides.projector.api import register_slidemodel
 from openslides.projector.models import SlideMixin
 from openslides.agenda.models import Item
 
+from .workflow import motion_workflow_choices, get_state, State
+
 
 # TODO: Save submitter and supporter in the same table
 class MotionSubmitter(models.Model):
@@ -58,8 +60,7 @@ class Motion(SlideMixin, models.Model):
     #       is deactivated. Maybe it has to be renamed.
     permitted_version = models.ForeignKey(
         'MotionVersion', null=True, blank=True, related_name="permitted")
-    # TODO: Define status
-    status = models.CharField(max_length=3)
+    state_id = models.CharField(max_length=3)
     # Log (Translatable)
     identifier = models.CharField(max_length=255, null=True, blank=True,
                                   unique=True)
@@ -86,6 +87,9 @@ class Motion(SlideMixin, models.Model):
         """
         Saves the motion. Create or update a motion_version object
         """
+        if not self.state_id:
+            self.state = 'default'
+
         super(Motion, self).save(*args, **kwargs)
         for attr in ['title', 'text', 'reason']:
             if getattr(self, attr) != getattr(self.last_version, attr):
@@ -268,12 +272,33 @@ class Motion(SlideMixin, models.Model):
             #self.writelog(_("Supporter: -%s") % (person))
 
     def create_poll(self):
+        """
+        Create a new poll for this motion
+        """
         # TODO: auto increment the poll_number in the Database
         poll_number = self.polls.aggregate(Max('poll_number'))['poll_number__max'] or 0
         poll = MotionPoll.objects.create(motion=self, poll_number=poll_number + 1)
         poll.set_options()
         return poll
 
+    def get_state(self):
+        """
+        Get the state of this motion. Return a State object.
+        """
+        return get_state(self.state_id)
+
+    def set_state(self, state):
+        """
+        Set the state of this motion.
+
+        state has to be a valid state id or State object.
+        """
+        if type(state) is not State:
+            state = get_state(state)
+        self.state_id = state.id
+
+    state = property(get_state, set_state)
+
 
 class MotionVersion(models.Model):
     title = models.CharField(max_length=255, verbose_name=ugettext_lazy("Title"))
diff --git a/openslides/motion/signals.py b/openslides/motion/signals.py
index c9b1ece36..5735545a8 100644
--- a/openslides/motion/signals.py
+++ b/openslides/motion/signals.py
@@ -25,4 +25,4 @@ def default_config(sender, key, **kwargs):
         'motion_pdf_title': _('Motions'),
         'motion_pdf_preamble': '',
         'motion_create_new_version': 'ALLWASY_CREATE_NEW_VERSION',
-    }.get(key)
+        'motion_workflow': 'default'}.get(key)
diff --git a/openslides/motion/templates/motion/motion_detail.html b/openslides/motion/templates/motion/motion_detail.html
index 22e80067c..8a498a6c5 100644
--- a/openslides/motion/templates/motion/motion_detail.html
+++ b/openslides/motion/templates/motion/motion_detail.html
@@ -12,6 +12,7 @@
 <p>Reason: {{ motion.reason }}</p>
 <p>Submitter: {% for submitter in motion.submitter.all %}{{ submitter.person }} {% endfor %}</p>
 <p>Supporter: {% for supporter in motion.supporter.all %}{{ supporter.person }} {% endfor %}</p>
+<p>State: {{ motion.state }}</p>
 
 <ol>
 {% for motion_version in motion.versions.all %}
diff --git a/openslides/motion/views.py b/openslides/motion/views.py
index b08f6d29f..ff627880b 100644
--- a/openslides/motion/views.py
+++ b/openslides/motion/views.py
@@ -248,6 +248,7 @@ class Config(FormView):
             'motion_pdf_title': config['motion_pdf_title'],
             'motion_pdf_preamble': config['motion_pdf_preamble'],
             'motion_create_new_version': config['motion_create_new_version'],
+            'motion_workflow': config['motion_workflow'],
         }
 
     def form_valid(self, form):
@@ -258,6 +259,7 @@ class Config(FormView):
         config['motion_pdf_title'] = form.cleaned_data['motion_pdf_title']
         config['motion_pdf_preamble'] = form.cleaned_data['motion_pdf_preamble']
         config['motion_create_new_version'] = form.cleaned_data['motion_create_new_version']
+        config['motion_workflow'] = form.cleaned_data['motion_workflow']
         messages.success(self.request, _('Motion settings successfully saved.'))
         return super(Config, self).form_valid(form)
 
diff --git a/openslides/motion/workflow.py b/openslides/motion/workflow.py
new file mode 100644
index 000000000..bb4c809c3
--- /dev/null
+++ b/openslides/motion/workflow.py
@@ -0,0 +1,74 @@
+from django.conf import settings
+from django.core import exceptions
+from django.utils.importlib import import_module
+
+from openslides.config.models import config
+ugettext = lambda s: s
+
+_workflow = None
+
+class State(object):
+    def __init__(self, id, name, next_states=[], poll=False, support=False):
+        self.id = id
+        self.name = name
+        self.next_states = next_states
+        self.poll = poll
+        self.support = support
+
+    def __unicode__(self):
+        return self.name
+
+
+def motion_workflow_choices():
+    for workflow in settings.MOTION_WORKFLOW:
+        yield workflow[0], workflow[1]
+
+
+def get_state(state='default'):
+    global _workflow
+    if _workflow is not None:
+        return _workflow[state]
+    _workflow = {}
+    for workflow in settings.MOTION_WORKFLOW:
+        if workflow[0] == config['motion_workflow']:
+            try:
+                wf_module, wf_default_state_name = workflow[2].rsplit('.', 1)
+            except ValueError:
+                raise exceptions.ImproperlyConfigured(
+                    '%s isn\'t a workflow module' % workflow[2])
+            try:
+                mod = import_module(wf_module)
+            except ImportError as e:
+                raise exceptions.ImproperlyConfigured(
+                    'Error importing workflow %s: "%s"' % (wf_module, e))
+            try:
+                default_state = getattr(mod, wf_default_state_name)
+            except AttributeError:
+                raise exceptions.ImproperlyConfigured(
+                    'Workflow module "%s" does not define a "%s" State'
+                    % (wf_module, wf_default_state_name))
+            _workflow['default'] = default_state
+            break
+    else:
+        raise ImproperlyConfigured('Unknown workflow %s' % conf['motion_workflow'])
+
+    populate_workflow(default_state, _workflow)
+    return get_state(state)
+
+def populate_workflow(state, workflow):
+    workflow[state.id] = state
+    for s in state.next_states:
+        if s.id not in workflow:
+            populate_workflow(s, workflow)
+
+
+default_workflow = State('pub', ugettext('Published'), support=True, next_states=[
+    State('per', ugettext('Permitted'), poll=True, next_states=[
+        State('acc', ugettext('Accepted')),
+        State('rej', ugettext('Rejected')),
+        State('wit', ugettext('Withdrawed')),
+        State('adj', ugettext('Adjourned')),
+        State('noc', ugettext('Not Concerned')),
+        State('com', ugettext('Commited a bill')),
+        State('rev', ugettext('Needs Review'))]),
+    State('nop', ugettext('Rejected (not authorized)'))])

From ac41a02ac5aa5a7254023bec04b4f3345a462ebd Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Fri, 1 Feb 2013 16:44:06 +0100
Subject: [PATCH 46/88] Block supporting, unsupporting and creation of poll in
 some states

---
 openslides/motion/models.py   | 43 +++++++++++++++++++++--------------
 openslides/motion/workflow.py |  3 +++
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/openslides/motion/models.py b/openslides/motion/models.py
index 323bb153c..95d3f1770 100644
--- a/openslides/motion/models.py
+++ b/openslides/motion/models.py
@@ -30,7 +30,7 @@ from openslides.projector.api import register_slidemodel
 from openslides.projector.models import SlideMixin
 from openslides.agenda.models import Item
 
-from .workflow import motion_workflow_choices, get_state, State
+from .workflow import motion_workflow_choices, get_state, State, WorkflowError
 
 
 # TODO: Save submitter and supporter in the same table
@@ -254,32 +254,41 @@ class Motion(SlideMixin, models.Model):
         """
         Add a Supporter to the list of supporters of the motion.
         """
-        if not self.is_supporter(person):
-            MotionSupporter(motion=self, person=person).save()
-            #self.writelog(_("Supporter: +%s") % (person))
-        # TODO: Raise a precise exception for the view in else-clause
+        if self.state.support:
+            if not self.is_supporter(person):
+                MotionSupporter(motion=self, person=person).save()
+                #self.writelog(_("Supporter: +%s") % (person))
+            # TODO: Raise a precise exception for the view in else-clause
+        else:
+            raise WorkflowError("You can not support a motion in state %s" % self.state.name)
 
     def unsupport(self, person):
         """
-        remove a supporter from the list of supporters of the motion
+        Remove a supporter from the list of supporters of the motion
         """
-        try:
-            self.supporter.filter(person=person).delete()
-        except MotionSupporter.DoesNotExist:
-            # TODO: Don't do nothing but raise a precise exception for the view
-            pass
-        #else:
-            #self.writelog(_("Supporter: -%s") % (person))
+        if self.state.support:
+            try:
+                self.supporter.filter(person=person).delete()
+            except MotionSupporter.DoesNotExist:
+                # TODO: Don't do nothing but raise a precise exception for the view
+                pass
+            #else:
+                #self.writelog(_("Supporter: -%s") % (person))
+        else:
+            raise WorkflowError("You can not unsupport a motion in state %s" % self.state.name)
 
     def create_poll(self):
         """
         Create a new poll for this motion
         """
         # TODO: auto increment the poll_number in the Database
-        poll_number = self.polls.aggregate(Max('poll_number'))['poll_number__max'] or 0
-        poll = MotionPoll.objects.create(motion=self, poll_number=poll_number + 1)
-        poll.set_options()
-        return poll
+        if self.state.poll:
+            poll_number = self.polls.aggregate(Max('poll_number'))['poll_number__max'] or 0
+            poll = MotionPoll.objects.create(motion=self, poll_number=poll_number + 1)
+            poll.set_options()
+            return poll
+        else:
+            raise WorkflowError("You can not create a poll in state %s" % self.state.name)
 
     def get_state(self):
         """
diff --git a/openslides/motion/workflow.py b/openslides/motion/workflow.py
index bb4c809c3..04178f0d0 100644
--- a/openslides/motion/workflow.py
+++ b/openslides/motion/workflow.py
@@ -18,6 +18,9 @@ class State(object):
     def __unicode__(self):
         return self.name
 
+class WorkflowError(Exception):
+    pass
+
 
 def motion_workflow_choices():
     for workflow in settings.MOTION_WORKFLOW:

From 1a2f0a1b5a2bd527090102db5da1c9738d3ef8a2 Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Fri, 1 Feb 2013 17:20:11 +0100
Subject: [PATCH 47/88] Added links to set and reset the state of a motion

---
 openslides/motion/models.py                   | 23 ++++++++++-----
 .../templates/motion/motion_detail.html       |  9 ++++++
 openslides/motion/urls.py                     | 10 +++++++
 openslides/motion/views.py                    | 29 +++++++++++++++++++
 openslides/motion/workflow.py                 |  5 +++-
 openslides/utils/views.py                     |  5 +++-
 6 files changed, 72 insertions(+), 9 deletions(-)

diff --git a/openslides/motion/models.py b/openslides/motion/models.py
index 95d3f1770..e40aa91e4 100644
--- a/openslides/motion/models.py
+++ b/openslides/motion/models.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 """
     openslides.motion.models
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    ~~~~~~~~~~~~~~~~~~~~~~~~
 
     Models for the motion app.
 
@@ -88,7 +88,7 @@ class Motion(SlideMixin, models.Model):
         Saves the motion. Create or update a motion_version object
         """
         if not self.state_id:
-            self.state = 'default'
+            self.reset_state()
 
         super(Motion, self).save(*args, **kwargs)
         for attr in ['title', 'text', 'reason']:
@@ -296,18 +296,27 @@ class Motion(SlideMixin, models.Model):
         """
         return get_state(self.state_id)
 
-    def set_state(self, state):
+    def set_state(self, next_state):
         """
         Set the state of this motion.
 
-        state has to be a valid state id or State object.
+        next_state has to be a valid state id or State object.
         """
-        if type(state) is not State:
-            state = get_state(state)
-        self.state_id = state.id
+        if type(next_state) is not State:
+            next_state = get_state(next_state)
+        if next_state in self.state.next_states:
+            self.state_id = next_state.id
+        else:
+            raise WorkflowError('%s is not a valid next_state' % next_state)
 
     state = property(get_state, set_state)
 
+    def reset_state(self):
+        """
+        Set the state to the default state.
+        """
+        self.state_id = get_state('default').id
+
 
 class MotionVersion(models.Model):
     title = models.CharField(max_length=255, verbose_name=ugettext_lazy("Title"))
diff --git a/openslides/motion/templates/motion/motion_detail.html b/openslides/motion/templates/motion/motion_detail.html
index 8a498a6c5..ceae96d0d 100644
--- a/openslides/motion/templates/motion/motion_detail.html
+++ b/openslides/motion/templates/motion/motion_detail.html
@@ -13,7 +13,16 @@
 <p>Submitter: {% for submitter in motion.submitter.all %}{{ submitter.person }} {% endfor %}</p>
 <p>Supporter: {% for supporter in motion.supporter.all %}{{ supporter.person }} {% endfor %}</p>
 <p>State: {{ motion.state }}</p>
+<h4>possible stats:</h4>
+<ul>
+{% for state in motion.state.next_states %}
+    <li><a href="{% url 'motion_set_state' motion.pk state.id %}">{{ state }}</a></li>
+{% endfor %}
+    <li><a href="{% url 'motion_reset_state' motion.pk %}">Reset State</a></li>
+</ul>
 
+
+<h4>Versions</h4>
 <ol>
 {% for motion_version in motion.versions.all %}
     {% if motion_version.id == motion.version.id %}
diff --git a/openslides/motion/urls.py b/openslides/motion/urls.py
index 449de24d8..132a9b332 100644
--- a/openslides/motion/urls.py
+++ b/openslides/motion/urls.py
@@ -62,4 +62,14 @@ urlpatterns = patterns('openslides.motion.views',
         'poll_delete',
         name='motion_poll_delete',
     ),
+
+    url(r'^(?P<pk>\d+)/set_state/(?P<state>[a-z]{3})/$',
+        'set_state',
+        name='motion_set_state',
+    ),
+
+    url(r'^(?P<pk>\d+)/reset_state/$',
+        'reset_state',
+        name='motion_reset_state',
+    ),
 )
diff --git a/openslides/motion/views.py b/openslides/motion/views.py
index ff627880b..e867409c1 100644
--- a/openslides/motion/views.py
+++ b/openslides/motion/views.py
@@ -32,6 +32,7 @@ from openslides.config.models import config
 from .models import Motion, MotionSubmitter, MotionSupporter, MotionPoll
 from .forms import (BaseMotionForm, MotionSubmitterMixin, MotionSupporterMixin,
                     MotionCreateNewVersionMixin, ConfigForm)
+from .workflow import WorkflowError
 
 class MotionListView(ListView):
     """
@@ -233,6 +234,34 @@ class PollDeleteView(PollMixin, DeleteView):
 poll_delete = PollDeleteView.as_view()
 
 
+class MotionSetStateView(SingleObjectMixin, RedirectView):
+    permission_required = 'motion.can_manage_motion'
+    url_name = 'motion_detail'
+    model = Motion
+    reset = False
+
+    def pre_redirect(self, request, *args, **kwargs):
+        self.object = self.get_object()
+        try:
+            if self.reset:
+                self.object.reset_state()
+            else:
+                self.object.state = kwargs['state']
+        except WorkflowError:
+            messages.error(request, _('Can not set the state to: %s.')
+                                      % html_strong(kwargs['state']))
+        else:
+            self.object.save()
+            messages.success(request, _('Motion status was set to: %s.'
+                                        % html_strong(self.object.state)))
+
+    def get_url_name_args(self):
+        return [self.object.pk]
+
+set_state = MotionSetStateView.as_view()
+reset_state = MotionSetStateView.as_view(reset=True)
+
+
 class Config(FormView):
     permission_required = 'config.can_manage_config'
     form_class = ConfigForm
diff --git a/openslides/motion/workflow.py b/openslides/motion/workflow.py
index 04178f0d0..18348c756 100644
--- a/openslides/motion/workflow.py
+++ b/openslides/motion/workflow.py
@@ -30,7 +30,10 @@ def motion_workflow_choices():
 def get_state(state='default'):
     global _workflow
     if _workflow is not None:
-        return _workflow[state]
+        try:
+            return _workflow[state]
+        except KeyError:
+            raise WorkflowError('Unknown state: %s' % state)
     _workflow = {}
     for workflow in settings.MOTION_WORKFLOW:
         if workflow[0] == config['motion_workflow']:
diff --git a/openslides/utils/views.py b/openslides/utils/views.py
index a8b8657dd..1b0c49496 100644
--- a/openslides/utils/views.py
+++ b/openslides/utils/views.py
@@ -240,10 +240,13 @@ class RedirectView(PermissionMixin, AjaxMixin, _RedirectView):
 
     def get_redirect_url(self, **kwargs):
         if self.url_name is not None:
-            return reverse(self.url_name)
+            return reverse(self.url_name, args=self.get_url_name_args())
         else:
             return super(RedirectView, self).get_redirect_url(**kwargs)
 
+    def get_url_name_args(self):
+        return []
+
 
 class FormView(PermissionMixin, ExtraContextMixin, UrlMixin, _FormView):
     def form_invalid(self, form):

From 6c3eb0f7651e3441edcf831442e3186b77c677e8 Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Fri, 1 Feb 2013 17:35:27 +0100
Subject: [PATCH 48/88] fixed urls in views from the participant app

---
 openslides/agenda/views.py      |  2 +-
 openslides/participant/views.py | 14 +++-----------
 openslides/utils/views.py       |  2 +-
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/openslides/agenda/views.py b/openslides/agenda/views.py
index 55b42e204..96f2b18e3 100644
--- a/openslides/agenda/views.py
+++ b/openslides/agenda/views.py
@@ -162,7 +162,7 @@ class ItemDelete(DeleteView):
     """
     permission_required = 'agenda.can_manage_agenda'
     model = Item
-    url = 'item_overview'
+    success_url_name = 'item_overview'
 
     def get_answer_options(self):
         if self.object.children.exists():
diff --git a/openslides/participant/views.py b/openslides/participant/views.py
index e39b5d9e6..fc282e1d1 100644
--- a/openslides/participant/views.py
+++ b/openslides/participant/views.py
@@ -163,8 +163,6 @@ class UserCreateView(CreateView):
     model = User
     context_object_name = 'edit_user'
     form_class = UserCreateForm
-    success_url = 'user_overview'
-    apply_url = 'user_edit'
 
     def manipulate_object(self, form):
         self.object.username = gen_username(
@@ -183,8 +181,6 @@ class UserUpdateView(UpdateView):
     model = User
     context_object_name = 'edit_user'
     form_class = UserUpdateForm
-    success_url = 'user_overview'
-    apply_url = 'participant_edit'
 
 
 class UserDeleteView(DeleteView):
@@ -193,7 +189,7 @@ class UserDeleteView(DeleteView):
     """
     permission_required = 'participant.can_manage_participant'
     model = User
-    url = 'user_overview'
+    success_url_name = 'user_overview'
 
     def pre_redirect(self, request, *args, **kwargs):
         if self.get_object() == self.request.user:
@@ -208,7 +204,7 @@ class SetUserStatusView(RedirectView, SingleObjectMixin):
     """
     permission_required = 'participant.can_manage_participant'
     allow_ajax = True
-    url = 'user_overview'
+    url_name = 'user_overview'
     model = User
 
     def pre_redirect(self, request, *args, **kwargs):
@@ -400,8 +396,6 @@ class GroupCreateView(CreateView):
     context_object_name = 'group'
     model = Group
     form_class = GroupForm
-    success_url = 'user_group_overview'
-    apply_url = 'user_group_edit'
 
     def get(self, request, *args, **kwargs):
         delete_default_permissions()
@@ -417,8 +411,6 @@ class GroupUpdateView(UpdateView):
     model = Group
     context_object_name = 'group'
     form_class = GroupForm
-    success_url = 'user_group_overview'
-    apply_url = 'user_group_edit'
 
     def get(self, request, *args, **kwargs):
         delete_default_permissions()
@@ -431,7 +423,7 @@ class GroupDeleteView(DeleteView):
     """
     permission_required = 'participant.can_manage_participant'
     model = Group
-    url = 'user_group_overview'
+    success_url_name = 'user_group_overview'
 
     def pre_redirect(self, request, *args, **kwargs):
         if self.get_object().name.lower() in ['anonymous', 'registered']:
diff --git a/openslides/utils/views.py b/openslides/utils/views.py
index 1b0c49496..3f048f532 100644
--- a/openslides/utils/views.py
+++ b/openslides/utils/views.py
@@ -307,7 +307,7 @@ class DeleteView(SingleObjectMixin, QuestionMixin, RedirectView):
             return reverse(self.success_url_name, args=self.get_url_name_args())
 
     def get_url_name_args(self):
-        return [self.poll.motion.pk]
+        return []
 
     def get_question(self):
         return _('Do you really want to delete %s?') % html_strong(self.object)

From bd317aed3144a2a9ede17cd7398ddb0365881a7c Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Fri, 1 Feb 2013 19:19:18 +0100
Subject: [PATCH 49/88] Wrote tests for openslides.motion.models.Motion

---
 openslides/motion/models.py |  24 ++------
 tests/motion/__init__.py    |   0
 tests/motion/test_models.py | 117 ++++++++++++++++++++++++++++++++++++
 tests/test_motion.py        |  41 -------------
 4 files changed, 121 insertions(+), 61 deletions(-)
 create mode 100644 tests/motion/__init__.py
 create mode 100644 tests/motion/test_models.py
 delete mode 100644 tests/test_motion.py

diff --git a/openslides/motion/models.py b/openslides/motion/models.py
index e40aa91e4..5380ba6f8 100644
--- a/openslides/motion/models.py
+++ b/openslides/motion/models.py
@@ -113,7 +113,9 @@ class Motion(SlideMixin, models.Model):
             _attr = '_%s' % attr
             try:
                 setattr(version, attr, getattr(self, _attr))
+                delattr(self, _attr)
             except AttributeError:
+                # If the _attr was not set, use the value from last_version
                 setattr(version, attr, getattr(self.last_version, attr))
         version.save()
 
@@ -190,14 +192,6 @@ class Motion(SlideMixin, models.Model):
             self._new_version = MotionVersion(motion=self)
             return self._new_version
 
-    def get_version(self, version_id):
-        """
-        Return a specific version from version_id
-        """
-        # TODO: Check case, if version_id is not one of this motion
-        return self.versions.get(pk=version_id)
-
-
     def get_version(self):
         """
         Get the "active" version object. This version will be used to get the
@@ -206,7 +200,6 @@ class Motion(SlideMixin, models.Model):
         try:
             return self._version
         except AttributeError:
-            # TODO: choose right version via config
             return self.last_version
 
     def set_version(self, version):
@@ -245,10 +238,7 @@ class Motion(SlideMixin, models.Model):
             return self.new_version
 
     def is_supporter(self, person):
-        try:
-            return self.supporter.filter(person=person).exists()
-        except AttributeError:
-            return False
+        return self.supporter.filter(person=person).exists()
 
     def support(self, person):
         """
@@ -267,13 +257,7 @@ class Motion(SlideMixin, models.Model):
         Remove a supporter from the list of supporters of the motion
         """
         if self.state.support:
-            try:
-                self.supporter.filter(person=person).delete()
-            except MotionSupporter.DoesNotExist:
-                # TODO: Don't do nothing but raise a precise exception for the view
-                pass
-            #else:
-                #self.writelog(_("Supporter: -%s") % (person))
+            self.supporter.filter(person=person).delete()
         else:
             raise WorkflowError("You can not unsupport a motion in state %s" % self.state.name)
 
diff --git a/tests/motion/__init__.py b/tests/motion/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/motion/test_models.py b/tests/motion/test_models.py
new file mode 100644
index 000000000..eda00fdd2
--- /dev/null
+++ b/tests/motion/test_models.py
@@ -0,0 +1,117 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+    Tests for openslides.motion.models
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    :copyright: 2011, 2012 by OpenSlides team, see AUTHORS.
+    :license: GNU GPL, see LICENSE for more details.
+"""
+
+from django.test import TestCase
+
+from openslides.participant.models import User
+from openslides.config.models import config
+from openslides.motion.models import Motion
+from openslides.motion.workflow import WorkflowError
+
+
+class ModelTest(TestCase):
+    def setUp(self):
+        self.motion = Motion.objects.create(title='v1')
+        self.test_user = User.objects.create(username='blub')
+
+    def test_create_new_version(self):
+        config['motion_create_new_version'] = 'ALLWASY_CREATE_NEW_VERSION'
+        motion = Motion.objects.create(title='m1')
+        self.assertEqual(motion.versions.count(), 1)
+
+        motion.new_version
+        motion.save()
+        self.assertEqual(motion.versions.count(), 2)
+
+        motion.title = 'new title'
+        motion.save()
+        self.assertEqual(motion.versions.count(), 3)
+
+        motion.save()
+        self.assertEqual(motion.versions.count(), 3)
+
+        config['motion_create_new_version'] = 'NEVER_CREATE_NEW_VERSION'
+        motion.text = 'new text'
+        motion.save()
+        self.assertEqual(motion.versions.count(), 3)
+
+    def test_version_data(self):
+        motion = Motion()
+        self.assertEqual(motion.title, '')
+        with self.assertRaises(AttributeError):
+            self._title
+
+        motion.title = 'title'
+        self.assertEqual(motion._title, 'title')
+
+        motion.reason = 'reason'
+        self.assertEqual(motion._reason, 'reason')
+
+    def test_version(self):
+        motion = Motion.objects.create(title='v1')
+        motion.title = 'v2'
+        motion.save()
+        v2_version = motion.version
+        motion.title = 'v3'
+        motion.save()
+        with self.assertRaises(AttributeError):
+            self._title
+        self.assertEqual(motion.title, 'v3')
+
+        motion.version = 0
+        self.assertEqual(motion.title, 'v1')
+
+        motion.version = v2_version
+        self.assertEqual(motion.title, 'v2')
+
+        motion.version = None
+        motion.version = None # Test to set a version to None, which is already None
+        self.assertEqual(motion.title, 'v3')
+
+        with self.assertRaises(ValueError):
+            motion.version = 'wrong'
+
+    def test_absolute_url(self):
+        motion_id = self.motion.id
+
+        self.assertEqual(self.motion.get_absolute_url('detail'), '/motion/%d/' % motion_id)
+        self.assertEqual(self.motion.get_absolute_url('edit'), '/motion/%d/edit/' % motion_id)
+        #self.assertEqual(self.motion.get_absolute_url('delete'), '/motion/%d/del/' % motion_id)
+
+    def test_supporter(self):
+        self.assertFalse(self.motion.is_supporter(self.test_user))
+        self.motion.support(self.test_user)
+        self.assertTrue(self.motion.is_supporter(self.test_user))
+        self.motion.unsupport(self.test_user)
+        self.assertFalse(self.motion.is_supporter(self.test_user))
+        self.motion.unsupport(self.test_user)
+
+    def test_poll(self):
+        self.motion.state = 'per'
+        poll = self.motion.create_poll()
+        self.assertEqual(poll.poll_number, 1)
+
+    def test_state(self):
+        self.motion.reset_state()
+        self.assertEqual(self.motion.state.id, 'pub')
+
+        with self.assertRaises(WorkflowError):
+            self.motion.create_poll()
+
+        self.motion.set_state('per')
+        self.assertEqual(self.motion.state.id, 'per')
+        with self.assertRaises(WorkflowError):
+            self.motion.support(self.test_user)
+        with self.assertRaises(WorkflowError):
+            self.motion.unsupport(self.test_user)
+
+        with self.assertRaises(WorkflowError):
+            self.motion.set_state('per')
+
diff --git a/tests/test_motion.py b/tests/test_motion.py
deleted file mode 100644
index 26c506c37..000000000
--- a/tests/test_motion.py
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-"""
-    openslides.motion.tests
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    Unit tests for the motion app.
-
-    :copyright: 2011, 2012 by OpenSlides team, see AUTHORS.
-    :license: GNU GPL, see LICENSE for more details.
-"""
-
-from django.test import TestCase
-
-from openslides.participant.models import User
-from openslides.motion.models import Motion
-
-
-class MotionTest(TestCase):
-    def setUp(self):
-        self.admin = User(username='testadmin')
-        self.admin.save()
-        self.anonym = User(username='testanoym')
-        self.anonym.save()
-        self.app1 = Motion(submitter=self.admin)
-        self.app1.save()
-
-    def refresh(self):
-        self.app1 = Motion.objects.get(pk=self.app1.id)
-
-    def testVersion(self):
-        self.assertTrue(self.app1.versions.exists())
-        self.assertEqual(self.app1.last_version, self.app1.versions[0])
-        self.assertEqual(self.app1.creation_time, self.app1.last_version.time)
-
-        self.app1.title = "app1"
-        self.app1.save()
-        self.refresh()
-
-        self.assertEqual(self.app1.versions.count(), 2)
-        self.assertEqual(self.app1.last_version, self.app1.versions[1])

From 0f7d0e349c2c3dd707102e24a8fb64992d0d3e0b Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Sat, 2 Feb 2013 00:26:08 +0100
Subject: [PATCH 50/88] Fixed URLs in projector views

---
 openslides/projector/views.py | 16 ++++++----------
 openslides/urls.py            |  2 +-
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/openslides/projector/views.py b/openslides/projector/views.py
index 997e89cf2..2ebb67569 100644
--- a/openslides/projector/views.py
+++ b/openslides/projector/views.py
@@ -151,7 +151,7 @@ class ActivateView(RedirectView):
     Activate a Slide.
     """
     permission_required = 'projector.can_manage_projector'
-    url = 'dashboard'
+    url_name = 'dashboard'
     allow_ajax = True
 
     def pre_redirect(self, request, *args, **kwargs):
@@ -209,7 +209,7 @@ class ProjectorEdit(RedirectView):
     Scale or scroll the projector.
     """
     permission_required = 'projector.can_manage_projector'
-    url = 'dashboard'
+    url_name = 'dashboard'
     allow_ajax = True
 
     def pre_redirect(self, request, *args, **kwargs):
@@ -233,7 +233,7 @@ class CountdownEdit(RedirectView):
     Start, stop or reset the countdown.
     """
     permission_required = 'projector.can_manage_projector'
-    url = 'dashboard'
+    url_name = 'dashboard'
     allow_ajax = True
 
     def pre_redirect(self, request, *args, **kwargs):
@@ -284,7 +284,7 @@ class OverlayMessageView(RedirectView):
     """
     Sets or clears the overlay message
     """
-    url = 'dashboard'
+    url_name = 'dashboard'
     allow_ajax = True
     permission_required = 'projector.can_manage_projector'
 
@@ -305,7 +305,7 @@ class ActivateOverlay(RedirectView):
     """
     Activate or deactivate an overlay.
     """
-    url = 'dashboard'
+    url_name = 'dashboard'
     allow_ajax = True
     permission_required = 'projector.can_manage_projector'
 
@@ -341,8 +341,6 @@ class CustomSlideCreateView(CreateView):
     template_name = 'projector/new.html'
     model = ProjectorSlide
     context_object_name = 'customslide'
-    success_url = 'dashboard'
-    apply_url = 'customslide_edit'
 
 
 class CustomSlideUpdateView(UpdateView):
@@ -353,8 +351,6 @@ class CustomSlideUpdateView(UpdateView):
     template_name = 'projector/new.html'
     model = ProjectorSlide
     context_object_name = 'customslide'
-    success_url = 'dashboard'
-    apply_url = 'customslide_edit'
 
 
 class CustomSlideDeleteView(DeleteView):
@@ -363,7 +359,7 @@ class CustomSlideDeleteView(DeleteView):
     """
     permission_required = 'projector.can_manage_projector'
     model = ProjectorSlide
-    url = 'dashboard'
+    url_name = 'dashboard'
 
 
 def register_tab(request):
diff --git a/openslides/urls.py b/openslides/urls.py
index 800ef85e6..5689e475a 100644
--- a/openslides/urls.py
+++ b/openslides/urls.py
@@ -20,7 +20,7 @@ handler500 = 'openslides.utils.views.server_error'
 
 urlpatterns = patterns('',
     # Redirect to dashboard URL
-    url(r'^$', RedirectView.as_view(url='dashboard'), name='home',),
+    url(r'^$', RedirectView.as_view(url='projector/dashboard'), name='home',),
 
     (r'^agenda/', include('openslides.agenda.urls')),
     (r'^motion/', include('openslides.motion.urls')),

From 1518543a9a7562e793027660c19356234a196043 Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Sat, 2 Feb 2013 00:27:16 +0100
Subject: [PATCH 51/88] Added motion widget and deletion of motions

---
 openslides/motion/__init__.py                 |  2 ++
 openslides/motion/models.py                   |  7 ++--
 openslides/motion/slides.py                   |  4 +++
 .../motion/templates/motion/widget.html       | 34 +++++++++++++++++++
 openslides/motion/urls.py                     |  5 +++
 openslides/motion/views.py                    | 19 +++++++++++
 6 files changed, 69 insertions(+), 2 deletions(-)
 create mode 100644 openslides/motion/slides.py
 create mode 100644 openslides/motion/templates/motion/widget.html

diff --git a/openslides/motion/__init__.py b/openslides/motion/__init__.py
index f7f3759f3..092f9eb05 100644
--- a/openslides/motion/__init__.py
+++ b/openslides/motion/__init__.py
@@ -1 +1,3 @@
 import openslides.motion.signals
+import openslides.motion.slides
+
diff --git a/openslides/motion/models.py b/openslides/motion/models.py
index 5380ba6f8..72734da68 100644
--- a/openslides/motion/models.py
+++ b/openslides/motion/models.py
@@ -54,7 +54,7 @@ class Motion(SlideMixin, models.Model):
     """
     The Motion-Model.
     """
-    prefix = "motion"  # Rename this in the slide-system
+    prefix = "motion"
 
     # TODO: Use this attribute for the default_version, if the permission system
     #       is deactivated. Maybe it has to be renamed.
@@ -278,7 +278,10 @@ class Motion(SlideMixin, models.Model):
         """
         Get the state of this motion. Return a State object.
         """
-        return get_state(self.state_id)
+        try:
+            return get_state(self.state_id)
+        except WorkflowError:
+            return None
 
     def set_state(self, next_state):
         """
diff --git a/openslides/motion/slides.py b/openslides/motion/slides.py
new file mode 100644
index 000000000..9f93fdd38
--- /dev/null
+++ b/openslides/motion/slides.py
@@ -0,0 +1,4 @@
+from openslides.projector.api import register_slidemodel
+from .models import Motion
+
+register_slidemodel(Motion)
diff --git a/openslides/motion/templates/motion/widget.html b/openslides/motion/templates/motion/widget.html
new file mode 100644
index 000000000..c0796de89
--- /dev/null
+++ b/openslides/motion/templates/motion/widget.html
@@ -0,0 +1,34 @@
+{% load staticfiles %}
+{% load i18n %}
+{% load tags %}
+
+<ul style="line-height: 180%">
+{% for motion in motions %}
+    <li class="{% if motion.active %}activeline{% endif %}">
+        <a href="{% url 'projector_activate_slide' motion.sid %}" class="activate_link {% if motion.active %}active{% endif %}">
+            <div></div>
+        </a>
+        <a href="{% model_url motion 'delete' %}" title="{% trans 'Delete' %}" class="icon delete right">
+            <span></span>
+        </a>
+        <a href="{% model_url motion 'edit' %}" title="{% trans 'Edit' %}" class="icon edit right">
+            <span></span>
+        </a>
+        <a href="{% url 'projctor_preview_slide' motion.sid %}" title="{% trans 'Preview' %}" class="icon preview right">
+            <span></span>
+        </a>
+        <a href="{% model_url motion 'view' %}">
+            {{ motion.public_version.title }}
+        </a>
+        ({% trans "motion" %}
+        {% if motion.number %}
+            {{ motion.number }})
+        {% else %}
+            <i>[{% trans "no number" %}]</i>)
+        {% endif %}
+    </li>
+{% empty %}
+    <li>{% trans 'No motion available.' %}</li>
+{% endfor %}
+</ul>
+
diff --git a/openslides/motion/urls.py b/openslides/motion/urls.py
index 132a9b332..cfca9dfa0 100644
--- a/openslides/motion/urls.py
+++ b/openslides/motion/urls.py
@@ -33,6 +33,11 @@ urlpatterns = patterns('openslides.motion.views',
         name='motion_edit',
     ),
 
+    url(r'^(?P<pk>\d+)/del/$',
+        'motion_delete',
+        name='motion_delete',
+    ),
+
     url(r'^(?P<pk>\d+)/version/(?P<version_id>[1-9]\d*)/$',
         'motion_detail',
         name='motion_version_detail',
diff --git a/openslides/motion/views.py b/openslides/motion/views.py
index e867409c1..1728cc9a4 100644
--- a/openslides/motion/views.py
+++ b/openslides/motion/views.py
@@ -125,6 +125,17 @@ class MotionUpdateView(MotionMixin, UpdateView):
 motion_edit = MotionUpdateView.as_view()
 
 
+class MotionDeleteView(DeleteView):
+    """
+    Delete one Motion.
+    """
+    model = Motion
+    success_url_name = 'motion_list'
+    # TODO: Check permissions
+
+motion_delete = MotionDeleteView.as_view()
+
+
 class SupportView(SingleObjectMixin, QuestionMixin, RedirectView):
     """
     Classed based view to support or unsupport a motion. Use
@@ -304,3 +315,11 @@ def register_tab(request):
         permission=request.user.has_perm('motion.can_see_motion'),
         selected=selected,
     )
+
+def get_widgets(request):
+    return [Widget(
+        name='motions',
+        display_name=_('Motions'),
+        template='motion/widget.html',
+        context={'motions': Motion.objects.all()},
+        permission_required='projector.can_manage_projector')]

From 910e0f17e75e3c905aba9243d57caa74313835bd Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Sat, 2 Feb 2013 00:37:43 +0100
Subject: [PATCH 52/88] Add slide Date to the motion

---
 openslides/motion/models.py                       | 10 ++++++++++
 openslides/motion/templates/projector/Motion.html |  8 ++++----
 openslides/motion/views.py                        |  1 +
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/openslides/motion/models.py b/openslides/motion/models.py
index 72734da68..97cd9c04f 100644
--- a/openslides/motion/models.py
+++ b/openslides/motion/models.py
@@ -304,6 +304,16 @@ class Motion(SlideMixin, models.Model):
         """
         self.state_id = get_state('default').id
 
+    def slide(self):
+        """
+        return the slide dict
+        """
+        data = super(Motion, self).slide()
+        data['motion'] = self
+        data['title'] = self.title
+        data['template'] = 'projector/Motion.html'
+        return data
+
 
 class MotionVersion(models.Model):
     title = models.CharField(max_length=255, verbose_name=ugettext_lazy("Title"))
diff --git a/openslides/motion/templates/projector/Motion.html b/openslides/motion/templates/projector/Motion.html
index ab094313f..db7e8d54a 100644
--- a/openslides/motion/templates/projector/Motion.html
+++ b/openslides/motion/templates/projector/Motion.html
@@ -16,10 +16,10 @@
             {% if motion.status == "rej" %}
             <img src="{% static 'images/icons/voting-no.png' %}">
             {% endif %}
-            {% trans motion.get_status_display %}
+            {% trans motion.status %}
         {% else %}
             {% for note in motion.notes %}
-            {{ note }}
+                {{ note }}
             {% endfor %}
         {% endif %}
         </p>
@@ -53,7 +53,7 @@
         {% endwith %}
 
         <p><b>{% trans "Submitter" %}:</b><br>
-        {{ motion.submitter }}
+        {{ motion.submitter.person }}
         </p>
     </div>
     </div>
@@ -65,7 +65,7 @@
         {% trans "Motion" %} <i>[{% trans "no number" %}]</i>
     {% endif %}
     </h1>
-    <b>{{ motion.public_version.title }}</b>
+    <b>{{ motion.title }}</b>
     <hr>
 {% endblock %}
 
diff --git a/openslides/motion/views.py b/openslides/motion/views.py
index 1728cc9a4..2c692d091 100644
--- a/openslides/motion/views.py
+++ b/openslides/motion/views.py
@@ -34,6 +34,7 @@ from .forms import (BaseMotionForm, MotionSubmitterMixin, MotionSupporterMixin,
                     MotionCreateNewVersionMixin, ConfigForm)
 from .workflow import WorkflowError
 
+
 class MotionListView(ListView):
     """
     List all motion.

From a27bd7eadea30b9035f935024c17e645fb727da6 Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Sat, 2 Feb 2013 00:51:08 +0100
Subject: [PATCH 53/88] Add motion to agenda

---
 openslides/motion/models.py |  7 +++++++
 openslides/motion/urls.py   |  5 +++++
 openslides/motion/views.py  | 16 ++++++++++++++++
 tests/motion/test_models.py |  2 +-
 4 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/openslides/motion/models.py b/openslides/motion/models.py
index 97cd9c04f..fb252e2a8 100644
--- a/openslides/motion/models.py
+++ b/openslides/motion/models.py
@@ -314,6 +314,13 @@ class Motion(SlideMixin, models.Model):
         data['template'] = 'projector/Motion.html'
         return data
 
+    def get_agenda_title(self):
+        return self.last_version.title
+
+    ## def get_agenda_title_supplement(self):
+        ## number = self.number or '<i>[%s]</i>' % ugettext('no number')
+        ## return '(%s %s)' % (ugettext('motion'), number)
+
 
 class MotionVersion(models.Model):
     title = models.CharField(max_length=255, verbose_name=ugettext_lazy("Title"))
diff --git a/openslides/motion/urls.py b/openslides/motion/urls.py
index cfca9dfa0..f1781650c 100644
--- a/openslides/motion/urls.py
+++ b/openslides/motion/urls.py
@@ -77,4 +77,9 @@ urlpatterns = patterns('openslides.motion.views',
         'reset_state',
         name='motion_reset_state',
     ),
+
+    url(r'^(?P<pk>\d+)/agenda/$',
+        'create_agenda_item',
+        name='motion_create_agenda',
+    ),
 )
diff --git a/openslides/motion/views.py b/openslides/motion/views.py
index 2c692d091..bb7405629 100644
--- a/openslides/motion/views.py
+++ b/openslides/motion/views.py
@@ -29,6 +29,7 @@ from openslides.poll.views import PollFormView
 from openslides.projector.api import get_active_slide
 from openslides.projector.projector import Widget, SLIDE
 from openslides.config.models import config
+from openslides.agenda.models import Item
 from .models import Motion, MotionSubmitter, MotionSupporter, MotionPoll
 from .forms import (BaseMotionForm, MotionSubmitterMixin, MotionSupporterMixin,
                     MotionCreateNewVersionMixin, ConfigForm)
@@ -274,6 +275,21 @@ set_state = MotionSetStateView.as_view()
 reset_state = MotionSetStateView.as_view(reset=True)
 
 
+class CreateAgendaItemView(SingleObjectMixin, RedirectView):
+    permission_required = 'agenda.can_manage_agenda'
+    url_name = 'item_overview'
+    model = Motion
+
+    def get(self, request, *args, **kwargs):
+        self.object = self.get_object()
+        return super(CreateAgendaItemView, self).get(request, *args, **kwargs)
+
+    def pre_redirect(self, request, *args, **kwargs):
+        self.item = Item.objects.create(related_sid=self.object.sid)
+
+create_agenda_item = CreateAgendaItemView.as_view()
+
+
 class Config(FormView):
     permission_required = 'config.can_manage_config'
     form_class = ConfigForm
diff --git a/tests/motion/test_models.py b/tests/motion/test_models.py
index eda00fdd2..ee4dc38be 100644
--- a/tests/motion/test_models.py
+++ b/tests/motion/test_models.py
@@ -83,7 +83,7 @@ class ModelTest(TestCase):
 
         self.assertEqual(self.motion.get_absolute_url('detail'), '/motion/%d/' % motion_id)
         self.assertEqual(self.motion.get_absolute_url('edit'), '/motion/%d/edit/' % motion_id)
-        #self.assertEqual(self.motion.get_absolute_url('delete'), '/motion/%d/del/' % motion_id)
+        self.assertEqual(self.motion.get_absolute_url('delete'), '/motion/%d/del/' % motion_id)
 
     def test_supporter(self):
         self.assertFalse(self.motion.is_supporter(self.test_user))

From 4cc6539f0c656020aa57add0a01ea7c24152e0ef Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Sat, 2 Feb 2013 10:24:28 +0100
Subject: [PATCH 54/88] Added get_allowed_actions to new motion app

---
 openslides/motion/models.py                   | 44 +++++++++++++++++--
 openslides/motion/signals.py                  |  1 +
 .../templates/motion/motion_detail.html       | 33 +++++---------
 openslides/motion/views.py                    |  5 +++
 openslides/motion/workflow.py                 | 31 ++++++++-----
 5 files changed, 76 insertions(+), 38 deletions(-)

diff --git a/openslides/motion/models.py b/openslides/motion/models.py
index fb252e2a8..8e777e1ee 100644
--- a/openslides/motion/models.py
+++ b/openslides/motion/models.py
@@ -30,7 +30,8 @@ from openslides.projector.api import register_slidemodel
 from openslides.projector.models import SlideMixin
 from openslides.agenda.models import Item
 
-from .workflow import motion_workflow_choices, get_state, State, WorkflowError
+from .workflow import (motion_workflow_choices, get_state, State, WorkflowError,
+                       DUMMY_STATE)
 
 
 # TODO: Save submitter and supporter in the same table
@@ -237,6 +238,9 @@ class Motion(SlideMixin, models.Model):
         except IndexError:
             return self.new_version
 
+    def is_submitter(self, person):
+        self.submitter.filter(person=person).exists()
+
     def is_supporter(self, person):
         return self.supporter.filter(person=person).exists()
 
@@ -266,7 +270,7 @@ class Motion(SlideMixin, models.Model):
         Create a new poll for this motion
         """
         # TODO: auto increment the poll_number in the Database
-        if self.state.poll:
+        if self.state.create_poll:
             poll_number = self.polls.aggregate(Max('poll_number'))['poll_number__max'] or 0
             poll = MotionPoll.objects.create(motion=self, poll_number=poll_number + 1)
             poll.set_options()
@@ -281,7 +285,7 @@ class Motion(SlideMixin, models.Model):
         try:
             return get_state(self.state_id)
         except WorkflowError:
-            return None
+            return DUMMY_STATE
 
     def set_state(self, next_state):
         """
@@ -321,6 +325,40 @@ class Motion(SlideMixin, models.Model):
         ## number = self.number or '<i>[%s]</i>' % ugettext('no number')
         ## return '(%s %s)' % (ugettext('motion'), number)
 
+    def get_allowed_actions(self, person):
+        """
+        Gets a dictonary with all allowed actions for a specific person.
+
+        The dictonary contains the following actions.
+
+        * edit
+        * delete
+        * create_poll
+        * support
+        * unsupport
+        * change_state
+        * reset_state
+        """
+        actions = {
+            'edit': (self.is_submitter(person) and
+                     self.state.edit_as_submitter) or
+                    person.has_perm('motion.can_manage_motion'),
+
+            'create_poll': person.has_perm('motion.can_manage_motion') and
+                           self.state.create_poll,
+
+            'support': self.state.support and
+                       config['motion_min_supporters'] > 0 and
+                       not self.is_submitter(person),
+
+            'change_state': person.has_perm('motion.can_manage_motion'),
+
+        }
+        actions['delete'] = actions['edit']  #TODO: Only if the motion has no number
+        actions['unsupport'] = actions['support']
+        actions['reset_state'] = 'change_state'
+        return actions
+
 
 class MotionVersion(models.Model):
     title = models.CharField(max_length=255, verbose_name=ugettext_lazy("Title"))
diff --git a/openslides/motion/signals.py b/openslides/motion/signals.py
index 5735545a8..b482cf38c 100644
--- a/openslides/motion/signals.py
+++ b/openslides/motion/signals.py
@@ -15,6 +15,7 @@ from django.utils.translation import ugettext as _
 
 from openslides.config.signals import default_config_value
 
+
 @receiver(default_config_value, dispatch_uid="motion_default_config")
 def default_config(sender, key, **kwargs):
     return {
diff --git a/openslides/motion/templates/motion/motion_detail.html b/openslides/motion/templates/motion/motion_detail.html
index ceae96d0d..234b057ca 100644
--- a/openslides/motion/templates/motion/motion_detail.html
+++ b/openslides/motion/templates/motion/motion_detail.html
@@ -35,26 +35,15 @@
 
 
 <h4>{% trans "Vote results" %}:</h4>
-        {% with motion.polls.all as polls %}
-        {% if not polls.exists %}
-            {% if perms.motion.can_manage_motion %}
-                <a href="{% url 'motion_poll_create' motion.id %}">
-                    <span class="button">
-                        <span class="icon statistics">{% trans 'New vote' %}</span>
-                    </span>
-                </a>
-            {% else %}
-            -
-            {% endif %}
-        {% endif %}
+    {% with motion.polls.all as polls %}
         <ul class="results">
         {% for poll in polls %}
-        {% if perms.motion.can_manage_motion or poll.has_votes %}
+            {% if perms.motion.can_manage_motion or poll.has_votes %}
             <li>
                 {% if perms.motion.can_manage_motion %}
                     <strong>{{ forloop.counter }}. {% trans "Vote" %} </strong>
                     <a class="icon edit" href="{% model_url poll 'edit' %}" title="{% trans 'Edit Vote' %}">
-                            <span></span>
+                        <span></span>
                     </a>
                     <a class="icon delete" href="{% model_url poll 'delete' %}" title="{% trans 'Delete Vote' %}">
                         <span></span>
@@ -73,13 +62,6 @@
                             <img src="{% static 'images/icons/voting-total.png' %}" title="{% trans 'Votes cast' %}"> {{ poll.print_votescast }}
                         </div>
                     {% endwith %}
-                    {% if perms.motion.can_manage_motion %}
-                        {% if forloop.last %}
-                        <a href="{% url 'motion_poll_create' motion.pk %}">
-                            <span class="button"><span class="icon statistics">{% trans 'New vote' %}</span></span>
-                        </a>
-                        {% endif %}
-                    {% endif %}
                 {% else %}
                     {% if perms.motion.can_manage_motion %}
                         <a href="{% model_url poll %}">
@@ -88,8 +70,13 @@
                      {% endif %}
                 {% endif %}
             </li>
-        {% endif %}
+            {% endif %}
         {% endfor %}
         </ul>
-        {% endwith %}
+        {% if allowed_actions.create_poll %}
+            <a href="{% url 'motion_poll_create' motion.pk %}">
+                <span class="button"><span class="icon statistics">{% trans 'New vote' %}</span></span>
+            </a>
+        {% endif %}
+    {% endwith %}
 {% endblock %}
diff --git a/openslides/motion/views.py b/openslides/motion/views.py
index bb7405629..3183d020d 100644
--- a/openslides/motion/views.py
+++ b/openslides/motion/views.py
@@ -64,6 +64,11 @@ class MotionDetailView(DetailView):
                 raise Http404
         return object
 
+    def get_context_data(self, **kwargs):
+        context = super(MotionDetailView, self).get_context_data(**kwargs)
+        context['allowed_actions'] = self.object.get_allowed_actions(self.request.user)
+        return context
+
 motion_detail = MotionDetailView.as_view()
 
 
diff --git a/openslides/motion/workflow.py b/openslides/motion/workflow.py
index 18348c756..d5533186a 100644
--- a/openslides/motion/workflow.py
+++ b/openslides/motion/workflow.py
@@ -8,12 +8,14 @@ ugettext = lambda s: s
 _workflow = None
 
 class State(object):
-    def __init__(self, id, name, next_states=[], poll=False, support=False):
+    def __init__(self, id, name, next_states=[], create_poll=False, support=False,
+            edit_as_submitter=False):
         self.id = id
         self.name = name
         self.next_states = next_states
-        self.poll = poll
+        self.create_poll = create_poll
         self.support = support
+        self.edit_as_submitter=edit_as_submitter
 
     def __unicode__(self):
         return self.name
@@ -61,6 +63,7 @@ def get_state(state='default'):
     populate_workflow(default_state, _workflow)
     return get_state(state)
 
+
 def populate_workflow(state, workflow):
     workflow[state.id] = state
     for s in state.next_states:
@@ -68,13 +71,17 @@ def populate_workflow(state, workflow):
             populate_workflow(s, workflow)
 
 
-default_workflow = State('pub', ugettext('Published'), support=True, next_states=[
-    State('per', ugettext('Permitted'), poll=True, next_states=[
-        State('acc', ugettext('Accepted')),
-        State('rej', ugettext('Rejected')),
-        State('wit', ugettext('Withdrawed')),
-        State('adj', ugettext('Adjourned')),
-        State('noc', ugettext('Not Concerned')),
-        State('com', ugettext('Commited a bill')),
-        State('rev', ugettext('Needs Review'))]),
-    State('nop', ugettext('Rejected (not authorized)'))])
+DUMMY_STATE = State('dummy', ugettext('Unknwon state'))
+
+default_workflow = State('pub', ugettext('Published'), support=True,
+                         edit_as_submitter=True, next_states=[
+        State('per', ugettext('Permitted'), create_poll=True,
+              edit_as_submitter=True, next_states=[
+            State('acc', ugettext('Accepted')),
+            State('rej', ugettext('Rejected')),
+            State('wit', ugettext('Withdrawed')),
+            State('adj', ugettext('Adjourned')),
+            State('noc', ugettext('Not Concerned')),
+            State('com', ugettext('Commited a bill')),
+            State('rev', ugettext('Needs Review'))]),
+        State('nop', ugettext('Rejected (not authorized)'))])

From 3ffb16d4d843f0bfc9c44c0581f747393e6c35ad Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Sat, 2 Feb 2013 10:52:13 +0100
Subject: [PATCH 55/88] Fixed pep8 errors

---
 .travis.yml                   |  2 +-
 openslides/motion/__init__.py |  1 -
 openslides/motion/models.py   | 18 +++++++++---------
 openslides/motion/views.py    |  7 ++++---
 openslides/motion/workflow.py | 28 ++++++++++++++--------------
 openslides/utils/views.py     |  5 +++--
 6 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3f9a362aa..4772bb138 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,4 +8,4 @@ install:
   - python extras/scripts/create_local_settings.py
 script:
   - coverage run ./manage.py test tests && coverage report -m
-  - pep8 --max-line-length=150 --exclude="urls.py,motion/" --statistics openslides
+  - pep8 --max-line-length=150 --exclude="urls.py," --statistics openslides
diff --git a/openslides/motion/__init__.py b/openslides/motion/__init__.py
index 092f9eb05..e1cf60db8 100644
--- a/openslides/motion/__init__.py
+++ b/openslides/motion/__init__.py
@@ -1,3 +1,2 @@
 import openslides.motion.signals
 import openslides.motion.slides
-
diff --git a/openslides/motion/models.py b/openslides/motion/models.py
index 8e777e1ee..e1f0eb9a1 100644
--- a/openslides/motion/models.py
+++ b/openslides/motion/models.py
@@ -340,21 +340,21 @@ class Motion(SlideMixin, models.Model):
         * reset_state
         """
         actions = {
-            'edit': (self.is_submitter(person) and
-                     self.state.edit_as_submitter) or
-                    person.has_perm('motion.can_manage_motion'),
+            'edit': ((self.is_submitter(person) and
+                      self.state.edit_as_submitter) or
+                     person.has_perm('motion.can_manage_motion')),
 
-            'create_poll': person.has_perm('motion.can_manage_motion') and
-                           self.state.create_poll,
+            'create_poll': (person.has_perm('motion.can_manage_motion') and
+                            self.state.create_poll),
 
-            'support': self.state.support and
-                       config['motion_min_supporters'] > 0 and
-                       not self.is_submitter(person),
+            'support': (self.state.support and
+                        config['motion_min_supporters'] > 0 and
+                        not self.is_submitter(person)),
 
             'change_state': person.has_perm('motion.can_manage_motion'),
 
         }
-        actions['delete'] = actions['edit']  #TODO: Only if the motion has no number
+        actions['delete'] = actions['edit']  # TODO: Only if the motion has no number
         actions['unsupport'] = actions['support']
         actions['reset_state'] = 'change_state'
         return actions
diff --git a/openslides/motion/views.py b/openslides/motion/views.py
index 3183d020d..74c9dd156 100644
--- a/openslides/motion/views.py
+++ b/openslides/motion/views.py
@@ -59,7 +59,7 @@ class MotionDetailView(DetailView):
         version_id = self.kwargs.get('version_id', None)
         if version_id is not None:
             try:
-                object.version = int(version_id) -1
+                object.version = int(version_id) - 1
             except IndexError:
                 raise Http404
         return object
@@ -161,7 +161,7 @@ class SupportView(SingleObjectMixin, QuestionMixin, RedirectView):
         Checks whether request.user can support or unsupport the motion.
         Returns True or False.
         """
-        return True #TODO
+        return True  # TODO
         allowed_actions = self.object.get_allowed_actions(request.user)
         if self.support and not 'support' in allowed_actions:
             messages.error(request, _('You can not support this motion.'))
@@ -267,7 +267,7 @@ class MotionSetStateView(SingleObjectMixin, RedirectView):
                 self.object.state = kwargs['state']
         except WorkflowError:
             messages.error(request, _('Can not set the state to: %s.')
-                                      % html_strong(kwargs['state']))
+                           % html_strong(kwargs['state']))
         else:
             self.object.save()
             messages.success(request, _('Motion status was set to: %s.'
@@ -338,6 +338,7 @@ def register_tab(request):
         selected=selected,
     )
 
+
 def get_widgets(request):
     return [Widget(
         name='motions',
diff --git a/openslides/motion/workflow.py b/openslides/motion/workflow.py
index d5533186a..51ddd65c2 100644
--- a/openslides/motion/workflow.py
+++ b/openslides/motion/workflow.py
@@ -7,19 +7,21 @@ ugettext = lambda s: s
 
 _workflow = None
 
+
 class State(object):
     def __init__(self, id, name, next_states=[], create_poll=False, support=False,
-            edit_as_submitter=False):
+                 edit_as_submitter=False):
         self.id = id
         self.name = name
         self.next_states = next_states
         self.create_poll = create_poll
         self.support = support
-        self.edit_as_submitter=edit_as_submitter
+        self.edit_as_submitter = edit_as_submitter
 
     def __unicode__(self):
         return self.name
 
+
 class WorkflowError(Exception):
     pass
 
@@ -73,15 +75,13 @@ def populate_workflow(state, workflow):
 
 DUMMY_STATE = State('dummy', ugettext('Unknwon state'))
 
-default_workflow = State('pub', ugettext('Published'), support=True,
-                         edit_as_submitter=True, next_states=[
-        State('per', ugettext('Permitted'), create_poll=True,
-              edit_as_submitter=True, next_states=[
-            State('acc', ugettext('Accepted')),
-            State('rej', ugettext('Rejected')),
-            State('wit', ugettext('Withdrawed')),
-            State('adj', ugettext('Adjourned')),
-            State('noc', ugettext('Not Concerned')),
-            State('com', ugettext('Commited a bill')),
-            State('rev', ugettext('Needs Review'))]),
-        State('nop', ugettext('Rejected (not authorized)'))])
+default_workflow = State('pub', ugettext('Published'), support=True, edit_as_submitter=True, next_states=[
+    State('per', ugettext('Permitted'), create_poll=True, edit_as_submitter=True, next_states=[
+        State('acc', ugettext('Accepted')),
+        State('rej', ugettext('Rejected')),
+        State('wit', ugettext('Withdrawed')),
+        State('adj', ugettext('Adjourned')),
+        State('noc', ugettext('Not Concerned')),
+        State('com', ugettext('Commited a bill')),
+        State('rev', ugettext('Needs Review'))]),
+    State('nop', ugettext('Rejected (not authorized)'))])
diff --git a/openslides/utils/views.py b/openslides/utils/views.py
index 3f048f532..5d0428ec0 100644
--- a/openslides/utils/views.py
+++ b/openslides/utils/views.py
@@ -212,6 +212,7 @@ class TemplateView(PermissionMixin, ExtraContextMixin, _TemplateView):
 class ListView(PermissionMixin, SetCookieMixin, ExtraContextMixin, _ListView):
     pass
 
+
 class AjaxView(PermissionMixin, AjaxMixin, View):
     def get(self, request, *args, **kwargs):
         return self.ajax_get(request, *args, **kwargs)
@@ -270,7 +271,7 @@ class ModelFormMixin(object):
 
 
 class UpdateView(PermissionMixin, UrlMixin, ExtraContextMixin,
-        ModelFormMixin, _UpdateView):
+                 ModelFormMixin, _UpdateView):
     def form_invalid(self, form):
         messages.error(self.request, _('Please check the form for errors.'))
         return super(UpdateView, self).form_invalid(form)
@@ -280,7 +281,7 @@ class UpdateView(PermissionMixin, UrlMixin, ExtraContextMixin,
 
 
 class CreateView(PermissionMixin, UrlMixin, ExtraContextMixin,
-        ModelFormMixin, _CreateView):
+                 ModelFormMixin, _CreateView):
     def form_invalid(self, form):
         messages.error(self.request, _('Please check the form for errors.'))
         return super(CreateView, self).form_invalid(form)

From 2e430b4406884321b6d194c52cf89627493df8fe Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Sat, 2 Feb 2013 10:59:07 +0100
Subject: [PATCH 56/88] check permission in motion view

---
 openslides/motion/views.py | 19 +++++++++++--------
 openslides/utils/views.py  |  8 +-------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/openslides/motion/views.py b/openslides/motion/views.py
index 74c9dd156..96242a3b1 100644
--- a/openslides/motion/views.py
+++ b/openslides/motion/views.py
@@ -126,9 +126,11 @@ class MotionUpdateView(MotionMixin, UpdateView):
     """
     Update a motion.
     """
-    # TODO: set permissions
     model = Motion
 
+    def has_permission(self, request, *args, **kwargs):
+        return self.get_object().get_allowed_actions(request.user)['edit']
+
 motion_edit = MotionUpdateView.as_view()
 
 
@@ -138,7 +140,9 @@ class MotionDeleteView(DeleteView):
     """
     model = Motion
     success_url_name = 'motion_list'
-    # TODO: Check permissions
+
+    def has_permission(self, request, *args, **kwargs):
+        return self.get_object().get_allowed_actions(request.user)['delete']
 
 motion_delete = MotionDeleteView.as_view()
 
@@ -156,24 +160,23 @@ class SupportView(SingleObjectMixin, QuestionMixin, RedirectView):
         self.object = self.get_object()
         return super(SupportView, self).get(request, *args, **kwargs)
 
-    def check_allowed_actions(self, request):
+    def check_permission(self, request):
         """
         Checks whether request.user can support or unsupport the motion.
         Returns True or False.
         """
-        return True  # TODO
         allowed_actions = self.object.get_allowed_actions(request.user)
-        if self.support and not 'support' in allowed_actions:
+        if self.support and not allowed_actions['support']:
             messages.error(request, _('You can not support this motion.'))
             return False
-        elif not self.support and not 'unsupport' in allowed_actions:
+        elif not self.support and not allowed_actions['unsupport']:
             messages.error(request, _('You can not unsupport this motion.'))
             return False
         else:
             return True
 
     def pre_redirect(self, request, *args, **kwargs):
-        if self.check_allowed_actions(request):
+        if self.check_permission(request):
             super(SupportView, self).pre_redirect(request, *args, **kwargs)
 
     def get_question(self):
@@ -183,7 +186,7 @@ class SupportView(SingleObjectMixin, QuestionMixin, RedirectView):
             return _('Do you really want to unsupport this motion?')
 
     def case_yes(self):
-        if self.check_allowed_actions(self.request):
+        if self.check_permission(self.request):
             if self.support:
                 self.object.support(person=self.request.user)
             else:
diff --git a/openslides/utils/views.py b/openslides/utils/views.py
index 5d0428ec0..91d33d2c7 100644
--- a/openslides/utils/views.py
+++ b/openslides/utils/views.py
@@ -11,13 +11,7 @@
 """
 
 import json
-
-try:
-    from cStringIO import StringIO
-except ImportError:
-    # Is this exception realy necessary?
-    from StringIO import StringIO
-
+from cStringIO import StringIO
 from reportlab.platypus import SimpleDocTemplate, Spacer
 from reportlab.lib.units import cm
 

From 15b13c2bcd3f492be5d4f47ed6990c6e9ea5d877 Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Sat, 2 Feb 2013 21:19:37 +0100
Subject: [PATCH 57/88] Handel null=True in PersonField

---
 openslides/utils/person/api.py    |  2 +-
 openslides/utils/person/models.py | 32 +++++++++++++++----------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/openslides/utils/person/api.py b/openslides/utils/person/api.py
index 1dff34d3d..24a759551 100644
--- a/openslides/utils/person/api.py
+++ b/openslides/utils/person/api.py
@@ -10,7 +10,7 @@
     :license: GNU GPL, see LICENSE for more details.
 """
 
-from openslides.utils.person.signals import receive_persons
+from .signals import receive_persons
 
 
 class Person(object):
diff --git a/openslides/utils/person/models.py b/openslides/utils/person/models.py
index cf16f7286..f22cdddc4 100644
--- a/openslides/utils/person/models.py
+++ b/openslides/utils/person/models.py
@@ -11,16 +11,16 @@
 """
 from django.db import models
 
-from openslides.utils.person.forms import PersonFormField
-from openslides.utils.person.api import get_person, generate_person_id
+from .forms import PersonFormField
+from .api import get_person, generate_person_id, Person
 
 
 class PersonField(models.fields.Field):
     __metaclass__ = models.SubfieldBase
 
     def __init__(self, *args, **kwargs):
-        super(PersonField, self).__init__(max_length=255, *args, **kwargs)
-        # TODO: Validate the uid
+        kwargs['max_length'] = 255
+        super(PersonField, self).__init__(*args, **kwargs)
 
     def get_internal_type(self):
         return "CharField"
@@ -29,21 +29,21 @@ class PersonField(models.fields.Field):
         """
         Convert string value to a User Object.
         """
-        if hasattr(value, 'person_id'):
-            person = value
+        if isinstance(value, Person):
+            return value
+        elif value is None:
+            return None
         else:
-            person = get_person(value)
-
-        person.prepare_database_save = (
-            lambda unused: PersonField().get_prep_value(person))
-        return person
+            return get_person(value)
 
     def get_prep_value(self, value):
-        return value.person_id
-
-    def value_to_string(self, obj):
-        value = self._get_val_from_obj(obj)
-        return self.get_prep_value(value)
+        """
+        Convert a person object to a string, to store it in the database.
+        """
+        if value is None:
+            return None
+        else:
+            return value.person_id
 
     def formfield(self, **kwargs):
         defaults = {'form_class': PersonFormField}

From 65a18953bd04827c0d30353f9ce2190546f6de4b Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Sat, 2 Feb 2013 21:40:23 +0100
Subject: [PATCH 58/88] Added translatable log to the new motion system

---
 openslides/motion/models.py                   | 28 ++++++++++++++++---
 .../templates/motion/motion_detail.html       |  9 ++++++
 openslides/motion/views.py                    | 17 ++++++++---
 3 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/openslides/motion/models.py b/openslides/motion/models.py
index e1f0eb9a1..61b719091 100644
--- a/openslides/motion/models.py
+++ b/openslides/motion/models.py
@@ -251,8 +251,7 @@ class Motion(SlideMixin, models.Model):
         if self.state.support:
             if not self.is_supporter(person):
                 MotionSupporter(motion=self, person=person).save()
-                #self.writelog(_("Supporter: +%s") % (person))
-            # TODO: Raise a precise exception for the view in else-clause
+                self.write_log(ugettext_noop("Supporter: +%s") % person)
         else:
             raise WorkflowError("You can not support a motion in state %s" % self.state.name)
 
@@ -262,6 +261,7 @@ class Motion(SlideMixin, models.Model):
         """
         if self.state.support:
             self.supporter.filter(person=person).delete()
+            self.write_log(ugettext_noop("Supporter: -%s") % person)
         else:
             raise WorkflowError("You can not unsupport a motion in state %s" % self.state.name)
 
@@ -269,8 +269,8 @@ class Motion(SlideMixin, models.Model):
         """
         Create a new poll for this motion
         """
-        # TODO: auto increment the poll_number in the Database
         if self.state.create_poll:
+            # TODO: auto increment the poll_number in the Database
             poll_number = self.polls.aggregate(Max('poll_number'))['poll_number__max'] or 0
             poll = MotionPoll.objects.create(motion=self, poll_number=poll_number + 1)
             poll.set_options()
@@ -293,7 +293,7 @@ class Motion(SlideMixin, models.Model):
 
         next_state has to be a valid state id or State object.
         """
-        if type(next_state) is not State:
+        if not isinstance(next_state, State):
             next_state = get_state(next_state)
         if next_state in self.state.next_states:
             self.state_id = next_state.id
@@ -359,6 +359,9 @@ class Motion(SlideMixin, models.Model):
         actions['reset_state'] = 'change_state'
         return actions
 
+    def write_log(self, message, person=None):
+        MotionLog.objects.create(motion=self, message=message, person=person)
+
 
 class MotionVersion(models.Model):
     title = models.CharField(max_length=255, verbose_name=ugettext_lazy("Title"))
@@ -401,6 +404,23 @@ class Comment(models.Model):
     creation_time = models.DateTimeField(auto_now=True)
 
 
+class MotionLog(models.Model):
+    motion = models.ForeignKey(Motion, related_name='log_messages')
+    message = models.CharField(max_length=255)
+    person = PersonField(null=True)
+    time = models.DateTimeField(auto_now=True)
+
+    class Meta:
+        ordering = ['-time']
+
+    def __unicode__(self):
+        # TODO: write time in the local time format.
+        if self.person is None:
+            return "%s %s" % (self.time, _(self.message))
+        else:
+            return "%s %s by %s" % (self.time, _(self.message), self.person)
+
+
 class MotionVote(BaseVote):
     option = models.ForeignKey('MotionOption')
 
diff --git a/openslides/motion/templates/motion/motion_detail.html b/openslides/motion/templates/motion/motion_detail.html
index 234b057ca..d671b472f 100644
--- a/openslides/motion/templates/motion/motion_detail.html
+++ b/openslides/motion/templates/motion/motion_detail.html
@@ -79,4 +79,13 @@
             </a>
         {% endif %}
     {% endwith %}
+
+
+<h4>log</h4>
+<ul>
+    {% for message in motion.log_messages.all %}
+    <li>{{ message }}</li>
+    {% endfor %}
+</ul>
+
 {% endblock %}
diff --git a/openslides/motion/views.py b/openslides/motion/views.py
index 96242a3b1..1f3330f3f 100644
--- a/openslides/motion/views.py
+++ b/openslides/motion/views.py
@@ -15,7 +15,7 @@ from django.core.urlresolvers import reverse
 from django.contrib import messages
 from django.db import transaction
 from django.db.models import Model
-from django.utils.translation import ugettext as _, ugettext_lazy
+from django.utils.translation import ugettext as _, ugettext_lazy, ugettext_noop
 from django.views.generic.detail import SingleObjectMixin
 from django.http import Http404
 
@@ -119,6 +119,11 @@ class MotionCreateView(MotionMixin, CreateView):
     permission_required = 'motion.can_create_motion'
     model = Motion
 
+    def form_valid(self, form):
+        value = super(MotionCreateView, self).form_valid(form)
+        self.object.write_log(ugettext_noop('Motion created'), self.request.user)
+        return value
+
 motion_create = MotionCreateView.as_view()
 
 
@@ -131,6 +136,11 @@ class MotionUpdateView(MotionMixin, UpdateView):
     def has_permission(self, request, *args, **kwargs):
         return self.get_object().get_allowed_actions(request.user)['edit']
 
+    def form_valid(self, form):
+        value = super(MotionUpdateView, self).form_valid(form)
+        self.object.write_log(ugettext_noop('Motion updated'), self.request.user)
+        return value
+
 motion_edit = MotionUpdateView.as_view()
 
 
@@ -268,9 +278,8 @@ class MotionSetStateView(SingleObjectMixin, RedirectView):
                 self.object.reset_state()
             else:
                 self.object.state = kwargs['state']
-        except WorkflowError:
-            messages.error(request, _('Can not set the state to: %s.')
-                           % html_strong(kwargs['state']))
+        except WorkflowError, e:
+            messages.error(request, e)
         else:
             self.object.save()
             messages.success(request, _('Motion status was set to: %s.'

From f4ea611fb8f34821cfb7d30dfc9d071132e4c8de Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Sun, 3 Feb 2013 10:02:06 +0100
Subject: [PATCH 59/88] Wrote log messages for motion changes

---
 openslides/motion/models.py |  2 --
 openslides/motion/views.py  | 21 +++++++++++++++++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/openslides/motion/models.py b/openslides/motion/models.py
index 61b719091..723ff4648 100644
--- a/openslides/motion/models.py
+++ b/openslides/motion/models.py
@@ -251,7 +251,6 @@ class Motion(SlideMixin, models.Model):
         if self.state.support:
             if not self.is_supporter(person):
                 MotionSupporter(motion=self, person=person).save()
-                self.write_log(ugettext_noop("Supporter: +%s") % person)
         else:
             raise WorkflowError("You can not support a motion in state %s" % self.state.name)
 
@@ -261,7 +260,6 @@ class Motion(SlideMixin, models.Model):
         """
         if self.state.support:
             self.supporter.filter(person=person).delete()
-            self.write_log(ugettext_noop("Supporter: -%s") % person)
         else:
             raise WorkflowError("You can not unsupport a motion in state %s" % self.state.name)
 
diff --git a/openslides/motion/views.py b/openslides/motion/views.py
index 1f3330f3f..a8f8f36c9 100644
--- a/openslides/motion/views.py
+++ b/openslides/motion/views.py
@@ -197,10 +197,13 @@ class SupportView(SingleObjectMixin, QuestionMixin, RedirectView):
 
     def case_yes(self):
         if self.check_permission(self.request):
+            user = self.request.user
             if self.support:
-                self.object.support(person=self.request.user)
+                self.object.support(person=user)
+                self.object.write_log(ugettext_noop("Supporter: +%s") % user, user)
             else:
-                self.object.unsupport(person=self.request.user)
+                self.object.unsupport(person=user)
+                self.object.write_log(ugettext_noop("Supporter: -%s") % user, user)
 
     def get_success_message(self):
         if self.support:
@@ -225,6 +228,7 @@ class PollCreateView(SingleObjectMixin, RedirectView):
 
     def pre_redirect(self, request, *args, **kwargs):
         self.poll = self.object.create_poll()
+        self.object.write_log(ugettext_noop("Poll created"), user)
         messages.success(request, _("New vote was successfully created."))
 
     def get_redirect_url(self, **kwargs):
@@ -256,12 +260,21 @@ class PollUpdateView(PollMixin, PollFormView):
             'motion': self.poll.motion})
         return context
 
+    def form_valid(self, form):
+        value = super(PollUpdateView, self).form_valid(form)
+        self.object.write_log(ugettext_noop('Poll updated'), self.request.user)
+        return value
+
 poll_edit = PollUpdateView.as_view()
 
 
 class PollDeleteView(PollMixin, DeleteView):
     model = MotionPoll
 
+    def case_yes(self):
+        super(PollDeleteView, self).case_yes()
+        self.object.write_log(ugettext_noop('Poll deleted'), self.request.user)
+
 poll_delete = PollDeleteView.as_view()
 
 
@@ -282,6 +295,9 @@ class MotionSetStateView(SingleObjectMixin, RedirectView):
             messages.error(request, e)
         else:
             self.object.save()
+            # TODO: the state is not translated
+            self.object.write_log(ugettext_noop('Changed state to %s') %
+                                  self.object.state.name, self.request.user)
             messages.success(request, _('Motion status was set to: %s.'
                                         % html_strong(self.object.state)))
 
@@ -303,6 +319,7 @@ class CreateAgendaItemView(SingleObjectMixin, RedirectView):
 
     def pre_redirect(self, request, *args, **kwargs):
         self.item = Item.objects.create(related_sid=self.object.sid)
+        self.object.write_log(ugettext_noop('Created Agenda Item'), self.request.user)
 
 create_agenda_item = CreateAgendaItemView.as_view()
 

From e7c65b3db13953350958c114e4f1b0d821ca2ef5 Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Sun, 3 Feb 2013 13:23:55 +0100
Subject: [PATCH 60/88] Moved some methodes from utils.views.DeleteView to
 QuestionMixin

---
 openslides/utils/views.py | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/openslides/utils/views.py b/openslides/utils/views.py
index 91d33d2c7..9eeed627c 100644
--- a/openslides/utils/views.py
+++ b/openslides/utils/views.py
@@ -144,6 +144,17 @@ class QuestionMixin(object):
     question = ugettext_lazy('Are you sure?')
     success_message = ugettext_lazy('Thank you for your answer')
     answer_options = [('yes', ugettext_lazy("Yes")), ('no', ugettext_lazy("No"))]
+    question_url_name = None
+    success_url_name = None
+
+    def get_redirect_url(self, **kwargs):
+        if self.request.method == 'GET':
+            return reverse(self.question_url_name, args=self.get_url_name_args())
+        else:
+            return reverse(self.success_url_name, args=self.get_url_name_args())
+
+    def get_url_name_args(self):
+        return []
 
     def pre_redirect(self, request, *args, **kwargs):
         # Prints the question in a GET request
@@ -293,16 +304,10 @@ class DeleteView(SingleObjectMixin, QuestionMixin, RedirectView):
         return super(DeleteView, self).get(request, *args, **kwargs)
 
     def get_redirect_url(self, **kwargs):
-        if self.request.method == 'GET':
-            if self.question_url_name is not None:
-                return reverse(self.question_url_name, args=self.get_url_name_args())
-            else:
-                return self.object.get_absolute_url()
+        if self.request.method == 'GET' and self.question_url_name is None:
+            return self.object.get_absolute_url()
         else:
-            return reverse(self.success_url_name, args=self.get_url_name_args())
-
-    def get_url_name_args(self):
-        return []
+            return super(DeleteView, self).get_redirect_url(**kwargs)
 
     def get_question(self):
         return _('Do you really want to delete %s?') % html_strong(self.object)

From ef7f6cf47621538ec0bcc46707e84dfbdfadaec0 Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Sun, 3 Feb 2013 13:24:29 +0100
Subject: [PATCH 61/88] Permission system for MotionVersions

---
 openslides/motion/models.py                   | 66 +++++++++++++----
 .../templates/motion/motion_detail.html       | 13 +++-
 openslides/motion/urls.py                     | 12 +++-
 openslides/motion/views.py                    | 70 +++++++++++++++----
 openslides/motion/workflow.py                 | 10 ++-
 5 files changed, 141 insertions(+), 30 deletions(-)

diff --git a/openslides/motion/models.py b/openslides/motion/models.py
index 723ff4648..8796d862a 100644
--- a/openslides/motion/models.py
+++ b/openslides/motion/models.py
@@ -57,10 +57,8 @@ class Motion(SlideMixin, models.Model):
     """
     prefix = "motion"
 
-    # TODO: Use this attribute for the default_version, if the permission system
-    #       is deactivated. Maybe it has to be renamed.
-    permitted_version = models.ForeignKey(
-        'MotionVersion', null=True, blank=True, related_name="permitted")
+    active_version = models.ForeignKey(
+        'MotionVersion', null=True, related_name="active_version")
     state_id = models.CharField(max_length=3)
     # Log (Translatable)
     identifier = models.CharField(max_length=255, null=True, blank=True,
@@ -110,6 +108,7 @@ class Motion(SlideMixin, models.Model):
         else:
             # We do not need to save the motion version
             return
+
         for attr in ['title', 'text', 'reason']:
             _attr = '_%s' % attr
             try:
@@ -118,8 +117,17 @@ class Motion(SlideMixin, models.Model):
             except AttributeError:
                 # If the _attr was not set, use the value from last_version
                 setattr(version, attr, getattr(self.last_version, attr))
+
+        if version.id is None:
+            # TODO: auto increment the version_number in the Database
+            version_number = self.versions.aggregate(Max('version_number'))['version_number__max'] or 0
+            version.version_number = version_number + 1
         version.save()
 
+        if not self.state.version_permission or self.active_version is None:
+            self.active_version = version
+            self.save()
+
     def get_absolute_url(self, link='detail'):
         if link == 'view' or link == 'detail':
             return reverse('motion_detail', args=[str(self.id)])
@@ -218,7 +226,7 @@ class Motion(SlideMixin, models.Model):
                 pass
         else:
             if type(version) is int:
-                version = self.versions.all()[version]
+                version = self.versions.get(version_number=version)
             elif type(version) is not MotionVersion:
                 raise ValueError('The argument \'version\' has to be int or '
                                  'MotionVersion, not %s' % type(version))
@@ -234,7 +242,7 @@ class Motion(SlideMixin, models.Model):
         """
         # TODO: Fix the case, that the motion has no Version
         try:
-            return self.versions.order_by('id').reverse()[0]
+            return self.versions.order_by('-version_number')[0]
         except IndexError:
             return self.new_version
 
@@ -360,8 +368,38 @@ class Motion(SlideMixin, models.Model):
     def write_log(self, message, person=None):
         MotionLog.objects.create(motion=self, message=message, person=person)
 
+    def activate_version(self, version):
+        """
+        Activate a version of this motion.
+
+        'version' can be a version object, or the version_number of a version.
+        """
+        if type(version) is int:
+            version = self.versions.get(version_number=version)
+        self.active_version = version
+
+        if version.rejected:
+            version.rejected = False
+            version.save()
+
+    def reject_version(self, version):
+        """
+        Reject a version of this motion.
+
+        'version' can be a version object, or the version_number of a version.
+        """
+        if type(version) is int:
+            version = self.versions.get(version_number=version)
+
+        if version.active:
+            raise MotionError('The active version can not be rejected')
+
+        version.rejected = True
+        version.save()
+
 
 class MotionVersion(models.Model):
+    version_number = models.PositiveIntegerField(default=1)
     title = models.CharField(max_length=255, verbose_name=ugettext_lazy("Title"))
     text = models.TextField(verbose_name=_("Text"))
     reason = models.TextField(null=True, blank=True, verbose_name=ugettext_lazy("Reason"))
@@ -371,8 +409,12 @@ class MotionVersion(models.Model):
     identifier = models.CharField(max_length=255, verbose_name=ugettext_lazy("Version identifier"))
     note = models.TextField(null=True, blank=True)
 
+    class Meta:
+        unique_together = ("motion", "version_number")
+
     def __unicode__(self):
-        return "%s Version %s" % (self.motion, self.version_number)
+        counter = self.version_number or _('new')
+        return "%s Version %s" % (self.motion, counter)
 
     def get_absolute_url(self, link='detail'):
         if link == 'view' or link == 'detail':
@@ -380,11 +422,8 @@ class MotionVersion(models.Model):
                                                           str(self.version_number)])
 
     @property
-    def version_number(self):
-        if self.pk is None:
-            return 'new'
-        return (MotionVersion.objects.filter(motion=self.motion)
-                                     .filter(id__lte=self.pk).count())
+    def active(self):
+        return self.active_version.exists()
 
 
 class Category(models.Model):
@@ -418,6 +457,9 @@ class MotionLog(models.Model):
         else:
             return "%s %s by %s" % (self.time, _(self.message), self.person)
 
+class MotionError(Exception):
+    pass
+
 
 class MotionVote(BaseVote):
     option = models.ForeignKey('MotionOption')
diff --git a/openslides/motion/templates/motion/motion_detail.html b/openslides/motion/templates/motion/motion_detail.html
index d671b472f..dcafd3878 100644
--- a/openslides/motion/templates/motion/motion_detail.html
+++ b/openslides/motion/templates/motion/motion_detail.html
@@ -12,6 +12,7 @@
 <p>Reason: {{ motion.reason }}</p>
 <p>Submitter: {% for submitter in motion.submitter.all %}{{ submitter.person }} {% endfor %}</p>
 <p>Supporter: {% for supporter in motion.supporter.all %}{{ supporter.person }} {% endfor %}</p>
+<p>Active Version: {{ motion.active_version }}</p>
 <p>State: {{ motion.state }}</p>
 <h4>possible stats:</h4>
 <ul>
@@ -25,11 +26,19 @@
 <h4>Versions</h4>
 <ol>
 {% for motion_version in motion.versions.all %}
+    <li>
     {% if motion_version.id == motion.version.id %}
-        <li><strong><a href="{% model_url motion_version %}">{{ motion_version }}</a></strong></li>
+        <strong><a href="{% model_url motion_version %}">{{ motion_version }}</a></strong>
     {% else %}
-        <li><a href="{% model_url motion_version %}">{{ motion_version }}</a></li>
+        <a href="{% model_url motion_version %}">{{ motion_version }}</a>
     {% endif %}
+    {% if motion_version.active %}
+        (active)
+    {% endif %}
+    {% if motion_version.rejected %}
+        (rejected)
+    {% endif %}
+    </li>
 {% endfor %}
 </ol>
 
diff --git a/openslides/motion/urls.py b/openslides/motion/urls.py
index f1781650c..6331439b0 100644
--- a/openslides/motion/urls.py
+++ b/openslides/motion/urls.py
@@ -38,11 +38,21 @@ urlpatterns = patterns('openslides.motion.views',
         name='motion_delete',
     ),
 
-    url(r'^(?P<pk>\d+)/version/(?P<version_id>[1-9]\d*)/$',
+    url(r'^(?P<pk>\d+)/version/(?P<version_number>\d+)/$',
         'motion_detail',
         name='motion_version_detail',
     ),
 
+    url(r'^(?P<pk>\d+)/version/(?P<version_number>\d+)/permit/$',
+        'version_permit',
+        name='motion_version_permit',
+    ),
+
+    url(r'^(?P<pk>\d+)/version/(?P<version_number>\d+)/reject/$',
+        'version_reject',
+        name='motion_version_reject',
+    ),
+
     url(r'^(?P<pk>\d+)/support/$',
         'motion_support',
         name='motion_support',
diff --git a/openslides/motion/views.py b/openslides/motion/views.py
index a8f8f36c9..3b13f9629 100644
--- a/openslides/motion/views.py
+++ b/openslides/motion/views.py
@@ -30,7 +30,7 @@ from openslides.projector.api import get_active_slide
 from openslides.projector.projector import Widget, SLIDE
 from openslides.config.models import config
 from openslides.agenda.models import Item
-from .models import Motion, MotionSubmitter, MotionSupporter, MotionPoll
+from .models import Motion, MotionSubmitter, MotionSupporter, MotionPoll, MotionVersion
 from .forms import (BaseMotionForm, MotionSubmitterMixin, MotionSupporterMixin,
                     MotionCreateNewVersionMixin, ConfigForm)
 from .workflow import WorkflowError
@@ -46,7 +46,19 @@ class MotionListView(ListView):
 motion_list = MotionListView.as_view()
 
 
-class MotionDetailView(DetailView):
+class GetVersionMixin(object):
+    def get_object(self):
+        object = super(GetVersionMixin, self).get_object()
+        version_number = self.kwargs.get('version_number', None)
+        if version_number is not None:
+            try:
+                object.version = int(version_number)
+            except MotionVersion.DoesNotExist:
+                raise Http404('Version %s not found' % version_number)
+        return object
+
+
+class MotionDetailView(GetVersionMixin, DetailView):
     """
     Show the details of one motion.
     """
@@ -54,16 +66,6 @@ class MotionDetailView(DetailView):
     model = Motion
     template_name = 'motion/motion_detail.html'
 
-    def get_object(self):
-        object = super(MotionDetailView, self).get_object()
-        version_id = self.kwargs.get('version_id', None)
-        if version_id is not None:
-            try:
-                object.version = int(version_id) - 1
-            except IndexError:
-                raise Http404
-        return object
-
     def get_context_data(self, **kwargs):
         context = super(MotionDetailView, self).get_context_data(**kwargs)
         context['allowed_actions'] = self.object.get_allowed_actions(self.request.user)
@@ -157,6 +159,50 @@ class MotionDeleteView(DeleteView):
 motion_delete = MotionDeleteView.as_view()
 
 
+class VersionPermitView(GetVersionMixin, SingleObjectMixin, QuestionMixin, RedirectView):
+    model = Motion
+    question_url_name = 'motion_version_detail'
+    success_url_name = 'motion_version_detail'
+
+    def get(self, *args, **kwargs):
+        self.object = self.get_object()
+        return super(VersionPermitView, self).get(*args, **kwargs)
+
+    def get_url_name_args(self):
+        return [self.object.pk, self.object.version.version_number]
+
+    def get_question(self):
+        return _('Are you sure you want permit Version %s?') % self.object.version.version_number
+
+    def case_yes(self):
+        self.object.activate_version(self.object.version)
+        self.object.save()
+
+version_permit = VersionPermitView.as_view()
+
+
+class VersionRejectView(GetVersionMixin, SingleObjectMixin, QuestionMixin, RedirectView):
+    model = Motion
+    question_url_name = 'motion_version_detail'
+    success_url_name = 'motion_version_detail'
+
+    def get(self, *args, **kwargs):
+        self.object = self.get_object()
+        return super(VersionRejectView, self).get(*args, **kwargs)
+
+    def get_url_name_args(self):
+        return [self.object.pk, self.object.version.version_number]
+
+    def get_question(self):
+        return _('Are you sure you want reject Version %s?') % self.object.version.version_number
+
+    def case_yes(self):
+        self.object.reject_version(self.object.version)
+        self.object.save()
+
+version_reject = VersionRejectView.as_view()
+
+
 class SupportView(SingleObjectMixin, QuestionMixin, RedirectView):
     """
     Classed based view to support or unsupport a motion. Use
diff --git a/openslides/motion/workflow.py b/openslides/motion/workflow.py
index 51ddd65c2..4e25fee7c 100644
--- a/openslides/motion/workflow.py
+++ b/openslides/motion/workflow.py
@@ -10,13 +10,14 @@ _workflow = None
 
 class State(object):
     def __init__(self, id, name, next_states=[], create_poll=False, support=False,
-                 edit_as_submitter=False):
+                 edit_as_submitter=False, version_permission=True):
         self.id = id
         self.name = name
         self.next_states = next_states
         self.create_poll = create_poll
         self.support = support
         self.edit_as_submitter = edit_as_submitter
+        self.version_permission = version_permission
 
     def __unicode__(self):
         return self.name
@@ -75,7 +76,10 @@ def populate_workflow(state, workflow):
 
 DUMMY_STATE = State('dummy', ugettext('Unknwon state'))
 
-default_workflow = State('pub', ugettext('Published'), support=True, edit_as_submitter=True, next_states=[
+default_workflow = State('pub', ugettext('Published'), support=True,
+                         edit_as_submitter=True, version_permission=False)
+
+default_workflow.next_states=[
     State('per', ugettext('Permitted'), create_poll=True, edit_as_submitter=True, next_states=[
         State('acc', ugettext('Accepted')),
         State('rej', ugettext('Rejected')),
@@ -84,4 +88,4 @@ default_workflow = State('pub', ugettext('Published'), support=True, edit_as_sub
         State('noc', ugettext('Not Concerned')),
         State('com', ugettext('Commited a bill')),
         State('rev', ugettext('Needs Review'))]),
-    State('nop', ugettext('Rejected (not authorized)'))])
+    State('nop', ugettext('Rejected (not authorized)'))]

From cbd4acbd4b121e2442b98572ebbc275354200005 Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Sun, 3 Feb 2013 13:54:01 +0100
Subject: [PATCH 62/88] fixed motion tests

---
 openslides/motion/models.py | 14 +++++++++++---
 tests/motion/test_models.py |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/openslides/motion/models.py b/openslides/motion/models.py
index 8796d862a..3179f8365 100644
--- a/openslides/motion/models.py
+++ b/openslides/motion/models.py
@@ -90,7 +90,11 @@ class Motion(SlideMixin, models.Model):
             self.reset_state()
 
         super(Motion, self).save(*args, **kwargs)
+        # Find out if the version data has changed
         for attr in ['title', 'text', 'reason']:
+            if not self.versions.exists():
+                new_data = True
+                break
             if getattr(self, attr) != getattr(self.last_version, attr):
                 new_data = True
                 break
@@ -103,27 +107,31 @@ class Motion(SlideMixin, models.Model):
             del self._new_version
             version.motion = self  # Test if this line is realy neccessary.
         elif new_data and not need_new_version:
-            # TODO: choose an explicit version
             version = self.last_version
         else:
             # We do not need to save the motion version
             return
 
+        # Save title, text and reason in the version object
         for attr in ['title', 'text', 'reason']:
             _attr = '_%s' % attr
             try:
                 setattr(version, attr, getattr(self, _attr))
                 delattr(self, _attr)
             except AttributeError:
-                # If the _attr was not set, use the value from last_version
-                setattr(version, attr, getattr(self.last_version, attr))
+                if self.versions.exists():
+                    # If the _attr was not set, use the value from last_version
+                    setattr(version, attr, getattr(self.last_version, attr))
 
+        # Set version_number of the new Version (if neccessary) and save it into the DB
         if version.id is None:
             # TODO: auto increment the version_number in the Database
             version_number = self.versions.aggregate(Max('version_number'))['version_number__max'] or 0
             version.version_number = version_number + 1
         version.save()
 
+        # Set the active Version of this motion. This has to be done after the
+        # version is saved to the db
         if not self.state.version_permission or self.active_version is None:
             self.active_version = version
             self.save()
diff --git a/tests/motion/test_models.py b/tests/motion/test_models.py
index ee4dc38be..64bb831f3 100644
--- a/tests/motion/test_models.py
+++ b/tests/motion/test_models.py
@@ -65,7 +65,7 @@ class ModelTest(TestCase):
             self._title
         self.assertEqual(motion.title, 'v3')
 
-        motion.version = 0
+        motion.version = 1
         self.assertEqual(motion.title, 'v1')
 
         motion.version = v2_version

From 42082ae3c22c4c63e55f8574c9fac58cdbd8b422 Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Sun, 3 Feb 2013 14:14:07 +0100
Subject: [PATCH 63/88] fixed pep8

---
 openslides/motion/models.py   | 1 +
 openslides/motion/workflow.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/openslides/motion/models.py b/openslides/motion/models.py
index 3179f8365..47aa9ad72 100644
--- a/openslides/motion/models.py
+++ b/openslides/motion/models.py
@@ -465,6 +465,7 @@ class MotionLog(models.Model):
         else:
             return "%s %s by %s" % (self.time, _(self.message), self.person)
 
+
 class MotionError(Exception):
     pass
 
diff --git a/openslides/motion/workflow.py b/openslides/motion/workflow.py
index 4e25fee7c..813e0c537 100644
--- a/openslides/motion/workflow.py
+++ b/openslides/motion/workflow.py
@@ -79,7 +79,7 @@ DUMMY_STATE = State('dummy', ugettext('Unknwon state'))
 default_workflow = State('pub', ugettext('Published'), support=True,
                          edit_as_submitter=True, version_permission=False)
 
-default_workflow.next_states=[
+default_workflow.next_states = [
     State('per', ugettext('Permitted'), create_poll=True, edit_as_submitter=True, next_states=[
         State('acc', ugettext('Accepted')),
         State('rej', ugettext('Rejected')),

From b8a353fa7ca0c714c69ab0ce4a6d82052f22e427 Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Sun, 3 Feb 2013 18:18:29 +0100
Subject: [PATCH 64/88] Added PDF view for the motions

---
 openslides/motion/pdf.py   | 146 +++++++++++++++++++++++++++++++++++++
 openslides/motion/urls.py  |  10 +++
 openslides/motion/views.py |  31 +++++++-
 3 files changed, 186 insertions(+), 1 deletion(-)
 create mode 100644 openslides/motion/pdf.py

diff --git a/openslides/motion/pdf.py b/openslides/motion/pdf.py
new file mode 100644
index 000000000..bf048649c
--- /dev/null
+++ b/openslides/motion/pdf.py
@@ -0,0 +1,146 @@
+from reportlab.lib import colors
+from reportlab.lib.units import cm
+from reportlab.platypus import (
+    SimpleDocTemplate, PageBreak, Paragraph, Spacer, Table, TableStyle)
+from django.utils.translation import ugettext as _
+
+from openslides.config.models import config
+from openslides.utils.pdf import stylesheet
+
+from .models import Motion
+
+
+def motions_to_pdf(pdf):
+    motions = Motion.objects.all()
+    all_motion_cover(pdf, motions)
+    for motion in motions:
+        pdf.append(PageBreak())
+        motion_to_pdf(pdf, motion)
+
+def motion_to_pdf(pdf, motion):
+    pdf.append(Paragraph(_("Motion: %s") % motion.title, stylesheet['Heading1']))
+
+    motion_data = []
+
+    # submitter
+    cell1a = []
+    cell1a.append(Spacer(0, 0.2 * cm))
+    cell1a.append(Paragraph("<font name='Ubuntu-Bold'>%s:</font>" % _("Submitter"), stylesheet['Heading4']))
+    cell1b = []
+    cell1b.append(Spacer(0, 0.2 * cm))
+    cell1b.append(Paragraph(unicode(motion.submitter), stylesheet['Normal']))
+    motion_data.append([cell1a, cell1b])
+
+    # TODO: choose this in workflow
+    if motion.state.edit_as_submitter:
+        # Cell for the signature
+        cell2a = []
+        cell2b = []
+        cell2a.append(Paragraph("<font name='Ubuntu-Bold'>%s:</font>" % _("Signature"), stylesheet['Heading4']))
+        cell2b.append(Paragraph(42 * "_", stylesheet['Signaturefield']))
+        cell2b.append(Spacer(0, 0.1 * cm))
+        cell2b.append(Spacer(0, 0.2 * cm))
+        motion_data.append([cell2a, cell2b])
+
+    # supporters
+    if config['motion_min_supporters']:
+        cell3a = []
+        cell3b = []
+        cell3a.append(Paragraph("<font name='Ubuntu-Bold'>%s:</font><seqreset id='counter'>" % _("Supporters"), stylesheet['Heading4']))
+        supporters = motion.supporter.all()
+        for supporter in supporters:
+            cell3b.append(Paragraph("<seq id='counter'/>.&nbsp; %s" % unicode(supporter), stylesheet['Signaturefield']))
+        if motion.state.support:
+            for count in range(config['motion_min_supporters'] - supporters.count()):
+                cell3b.append(Paragraph("<seq id='counter'/>.&nbsp;" + 42 * "_",stylesheet['Signaturefield']))
+        cell3b.append(Spacer(0, 0.2 * cm))
+        motion_data.append([cell3a, cell3b])
+
+    ## # status
+    ## cell4a = []
+    ## cell4b = []
+    ## note = " ".join(motion.notes)
+    ## cell4a.append(Paragraph("<font name='Ubuntu-Bold'>%s:</font>" % _("Status"), stylesheet['Heading4']))
+    ## if note != "":
+        ## if motion.status == "pub":
+            ## cell4b.append(Paragraph(note, stylesheet['Normal']))
+        ## else:
+            ## cell4b.append(Paragraph("%s | %s" % (motion.get_status_display(), note), stylesheet['Normal']))
+    ## else:
+        ## cell4b.append(Paragraph("%s" % motion.get_status_display(), stylesheet['Normal']))
+    ## data.append([cell4a, cell4b])
+
+    # Motion state
+    cell4a = []
+    cell4b = []
+    cell4a.append(Paragraph("<font name='Ubuntu-Bold'>%s:</font>" % _("State"), stylesheet['Heading4']))
+    cell4b.append(Paragraph(motion.state.name, stylesheet['Normal']))
+    motion_data.append([cell4a, cell4b])
+
+    # Version number (aid)
+    if motion.versions.count() > 1:
+        cell5a = []
+        cell5b = []
+        cell5a.append(Paragraph("<font name='Ubuntu-Bold'>%s:</font>" % _("Version"), stylesheet['Heading4']))
+        cell5b.append(Paragraph("%s" % motion.version.version_number, stylesheet['Normal']))
+        motion_data.append([cell5a, cell5b])
+
+    # voting results
+    polls = []
+    for poll in motion.polls.all():
+        if not poll.has_votes():
+            continue
+        polls.append(poll)
+
+    if polls:
+        cell6a = []
+        cell6b = []
+        cell6a.append(Paragraph("<font name='Ubuntu-Bold'>%s:</font>" % _("Vote results"), stylesheet['Heading4']))
+        ballotcounter = 0
+        for poll in polls:
+            ballotcounter += 1
+            option = poll.get_options()[0]
+            yes, no, abstain, invalid, votecast = (
+                option['Yes'], option['No'], option['Abstain'],
+                poll.print_voteinvalid(), poll.print_votecast())
+
+            if len(polls) > 1:
+                cell6b.append(Paragraph("%s. %s" % (ballotcounter, _("Vote")), stylesheet['Bold']))
+            cell6b.append(Paragraph(
+                "%s: %s <br/> %s: %s <br/> %s: %s <br/> %s: %s <br/> %s: %s" %
+                (_("Yes"), yes, _("No"), no, _("Abstention"), abstain, _("Invalid"),
+                 invalid, _("Votes cast"), votecast), stylesheet['Normal']))
+            cell6b.append(Spacer(0, 0.2 * cm))
+        motion_data.append([cell6a, cell6b])
+
+    # Creating Table
+    table = Table(motion_data)
+    table._argW[0] = 4.5 * cm
+    table._argW[1] = 11 * cm
+    table.setStyle(TableStyle([('BOX', (0, 0), (-1, -1), 1, colors.black),
+                               ('VALIGN', (0,0), (-1,-1), 'TOP')]))
+    pdf.append(table)
+    pdf.append(Spacer(0, 1 * cm))
+
+    pdf.append(Paragraph(motion.title, stylesheet['Heading3']))
+    pdf.append(Paragraph(motion.text.replace('\r\n','<br/>'), stylesheet['Paragraph']))
+    if motion.reason:
+        pdf.append(Paragraph(_("Reason:"), stylesheet['Heading3']))
+        pdf.append(Paragraph(motion.reason.replace('\r\n','<br/>'), stylesheet['Paragraph']))
+    return pdf
+
+
+def all_motion_cover(pdf, motions):
+    pdf.append(Paragraph(config["motion_pdf_title"], stylesheet['Heading1']))
+
+    preamble = config["motion_pdf_preamble"]
+    if preamble:
+        pdf.append(Paragraph("%s" % preamble.replace('\r\n','<br/>'), stylesheet['Paragraph']))
+
+    pdf.append(Spacer(0, 0.75 * cm))
+
+    if not motions:
+        pdf.append(Paragraph(_("No motions available."), stylesheet['Heading3']))
+    else:
+        for motion in motions:
+            pdf.append(Paragraph(motion.title, stylesheet['Heading3']))
diff --git a/openslides/motion/urls.py b/openslides/motion/urls.py
index 6331439b0..883b4c953 100644
--- a/openslides/motion/urls.py
+++ b/openslides/motion/urls.py
@@ -92,4 +92,14 @@ urlpatterns = patterns('openslides.motion.views',
         'create_agenda_item',
         name='motion_create_agenda',
     ),
+
+    url(r'^pdf/$',
+        'motion_list_pdf',
+        name='motion_list_pdf',
+    ),
+
+    url(r'^(?P<pk>\d+)/pdf/$',
+        'motion_detail_pdf',
+        name='motion_detail_pdf',
+    ),
 )
diff --git a/openslides/motion/views.py b/openslides/motion/views.py
index 3b13f9629..b562bf548 100644
--- a/openslides/motion/views.py
+++ b/openslides/motion/views.py
@@ -30,10 +30,12 @@ from openslides.projector.api import get_active_slide
 from openslides.projector.projector import Widget, SLIDE
 from openslides.config.models import config
 from openslides.agenda.models import Item
+
 from .models import Motion, MotionSubmitter, MotionSupporter, MotionPoll, MotionVersion
 from .forms import (BaseMotionForm, MotionSubmitterMixin, MotionSupporterMixin,
                     MotionCreateNewVersionMixin, ConfigForm)
 from .workflow import WorkflowError
+from .pdf import motions_to_pdf, motion_to_pdf
 
 
 class MotionListView(ListView):
@@ -274,7 +276,7 @@ class PollCreateView(SingleObjectMixin, RedirectView):
 
     def pre_redirect(self, request, *args, **kwargs):
         self.poll = self.object.create_poll()
-        self.object.write_log(ugettext_noop("Poll created"), user)
+        self.object.write_log(ugettext_noop("Poll created"), request.user)
         messages.success(request, _("New vote was successfully created."))
 
     def get_redirect_url(self, **kwargs):
@@ -370,6 +372,33 @@ class CreateAgendaItemView(SingleObjectMixin, RedirectView):
 create_agenda_item = CreateAgendaItemView.as_view()
 
 
+class MotionPDFView(SingleObjectMixin, PDFView):
+    permission_required = 'motion.can_manage_motion'
+    model = Motion
+    top_space = 0
+    print_all_motions = False
+
+    def get(self, request, *args, **kwargs):
+        if not self.print_all_motions:
+            self.object = self.get_object()
+        return super(MotionPDFView, self).get(request, *args, **kwargs)
+
+    def get_filename(self):
+        if self.print_all_motions:
+            return _("Motions")
+        else:
+            return _("Motion: %s") % unicode(self.object)
+
+    def append_to_pdf(self, pdf):
+        if self.print_all_motions:
+            motions_to_pdf(pdf)
+        else:
+            motion_to_pdf(pdf, self.object)
+
+motion_list_pdf = MotionPDFView.as_view(print_all_motions=True)
+motion_detail_pdf = MotionPDFView.as_view(print_all_motions=False)
+
+
 class Config(FormView):
     permission_required = 'config.can_manage_config'
     form_class = ConfigForm

From 90614cc637e58b080234ee8147f60eebbb3ec202 Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Sun, 3 Feb 2013 19:43:36 +0100
Subject: [PATCH 65/88] Updated some views for the new utils.views style

---
 openslides/agenda/views.py                    | 42 ++++++-------------
 openslides/assignment/views.py                | 14 +++----
 openslides/config/views.py                    |  1 +
 .../templates/participant/group_detail.html   |  2 +-
 .../templates/participant/user_detail.html    |  2 +-
 openslides/participant/views.py               |  5 +++
 openslides/projector/models.py                |  4 +-
 openslides/projector/views.py                 |  4 +-
 8 files changed, 33 insertions(+), 41 deletions(-)

diff --git a/openslides/agenda/views.py b/openslides/agenda/views.py
index f54903f0a..8da27311d 100644
--- a/openslides/agenda/views.py
+++ b/openslides/agenda/views.py
@@ -91,7 +91,7 @@ class SetClosed(RedirectView, SingleObjectMixin):
     """
     permission_required = 'agenda.can_manage_agenda'
     allow_ajax = True
-    url = 'item_overview'
+    url_name = 'item_overview'
     model = Item
 
     def get_ajax_context(self, **kwargs):
@@ -123,16 +123,7 @@ class ItemUpdate(UpdateView):
     model = Item
     context_object_name = 'item'
     form_class = ItemForm
-    success_url = 'item_overview'
-    apply_url = 'item_edit'
-
-    def get_success_url(self):
-        messages.success(
-            self.request, _("Item %s was successfully modified.")
-            % html_strong(self.request.POST['title']))
-        if 'apply' in self.request.POST:
-            return ''
-        return reverse(super(UpdateView, self).get_success_url())
+    success_url_name = 'item_overview'
 
 
 class ItemCreate(CreateView):
@@ -144,16 +135,7 @@ class ItemCreate(CreateView):
     model = Item
     context_object_name = 'item'
     form_class = ItemForm
-    success_url = 'item_overview'
-    apply_url = 'item_edit'
-
-    def get_success_url(self):
-        messages.success(
-            self.request, _("Item %s was successfully created.")
-            % html_strong(self.request.POST['title']))
-        if 'apply' in self.request.POST:
-            return reverse(self.get_apply_url(), args=[self.object.id])
-        return reverse(super(CreateView, self).get_success_url())
+    success_url_name = 'item_overview'
 
 
 class ItemDelete(DeleteView):
@@ -162,6 +144,7 @@ class ItemDelete(DeleteView):
     """
     permission_required = 'agenda.can_manage_agenda'
     model = Item
+    question_url_name = 'item_overview'
     success_url_name = 'item_overview'
 
     def get_answer_options(self):
@@ -221,12 +204,11 @@ def get_widgets(request):
     """
     return the agenda widget for the projector-tab.
     """
-    return [
-        Widget(
-            name='agenda',
-            display_name=_('Agenda'),
-            template='agenda/widget.html',
-            context={
-                'agenda': SLIDE['agenda'],
-                'items': Item.objects.all()},
-            permission_required='projector.can_manage_projector')]
+    return [Widget(
+        name='agenda',
+        display_name=_('Agenda'),
+        template='agenda/widget.html',
+        context={
+            'agenda': SLIDE['agenda'],
+            'items': Item.objects.all()},
+        permission_required='projector.can_manage_projector')]
diff --git a/openslides/assignment/views.py b/openslides/assignment/views.py
index 36c8fd30a..6de5509da 100644
--- a/openslides/assignment/views.py
+++ b/openslides/assignment/views.py
@@ -635,6 +635,7 @@ class Config(FormView):
     permission_required = 'config.can_manage_config'
     form_class = ConfigForm
     template_name = 'assignment/config.html'
+    success_url_name = 'config_assignment'
 
     def get_initial(self):
         return {
@@ -685,10 +686,9 @@ def register_tab(request):
 
 
 def get_widgets(request):
-    return [
-        Widget(
-            name='assignments',
-            display_name=_('Elections'),
-            template='assignment/widget.html',
-            context={'assignments': Assignment.objects.all()},
-            permission_required='projector.can_manage_projector')]
+    return [Widget(
+        name='assignments',
+        display_name=_('Elections'),
+        template='assignment/widget.html',
+        context={'assignments': Assignment.objects.all()},
+        permission_required='projector.can_manage_projector')]
diff --git a/openslides/config/views.py b/openslides/config/views.py
index 1c2ccdc4b..997527384 100644
--- a/openslides/config/views.py
+++ b/openslides/config/views.py
@@ -33,6 +33,7 @@ class GeneralConfig(FormView):
     permission_required = 'config.can_manage_config'
     form_class = GeneralConfigForm
     template_name = 'config/general.html'
+    success_url_name = 'config_general'
 
     def get_initial(self):
         return {
diff --git a/openslides/participant/templates/participant/group_detail.html b/openslides/participant/templates/participant/group_detail.html
index fb456c31c..3f8eff858 100644
--- a/openslides/participant/templates/participant/group_detail.html
+++ b/openslides/participant/templates/participant/group_detail.html
@@ -1,4 +1,4 @@
-{% extends "participant/base_participant.html" %}
+{% extends "base.html" %}
 
 {% load i18n %}
 {% load tags %}
diff --git a/openslides/participant/templates/participant/user_detail.html b/openslides/participant/templates/participant/user_detail.html
index af3b581c3..90aea2843 100644
--- a/openslides/participant/templates/participant/user_detail.html
+++ b/openslides/participant/templates/participant/user_detail.html
@@ -1,4 +1,4 @@
-{% extends "participant/base_participant.html" %}
+{% extends "base.html" %}
 
 {% load i18n %}
 {% load tags %}
diff --git a/openslides/participant/views.py b/openslides/participant/views.py
index 10704caca..479f1d00c 100644
--- a/openslides/participant/views.py
+++ b/openslides/participant/views.py
@@ -163,6 +163,7 @@ class UserCreateView(CreateView):
     model = User
     context_object_name = 'edit_user'
     form_class = UserCreateForm
+    success_url_name = 'user_overview'
 
     def manipulate_object(self, form):
         self.object.username = gen_username(
@@ -181,6 +182,7 @@ class UserUpdateView(UpdateView):
     model = User
     context_object_name = 'edit_user'
     form_class = UserUpdateForm
+    success_url_name = 'user_overview'
 
 
 class UserDeleteView(DeleteView):
@@ -396,6 +398,7 @@ class GroupCreateView(CreateView):
     context_object_name = 'group'
     model = Group
     form_class = GroupForm
+    success_url_name = 'user_group_overview'
 
     def get(self, request, *args, **kwargs):
         delete_default_permissions()
@@ -411,6 +414,7 @@ class GroupUpdateView(UpdateView):
     model = Group
     context_object_name = 'group'
     form_class = GroupForm
+    success_url_name = 'user_group_overview'
 
     def get(self, request, *args, **kwargs):
         delete_default_permissions()
@@ -439,6 +443,7 @@ class Config(FormView):
     permission_required = 'config.can_manage_config'
     form_class = ConfigForm
     template_name = 'participant/config.html'
+    success_url_name = 'config_participant'
 
     def get_initial(self):
         return {
diff --git a/openslides/projector/models.py b/openslides/projector/models.py
index f403b6395..c03c426cf 100644
--- a/openslides/projector/models.py
+++ b/openslides/projector/models.py
@@ -38,7 +38,9 @@ class ProjectorSlide(models.Model, SlideMixin):
         }
 
     @models.permalink
-    def get_absolute_url(self, link='delete'):
+    def get_absolute_url(self, link='edit'):
+        if link == 'edit':
+            return ('customslide_edit', [str(self.id)])
         if link == 'delete':
             return ('customslide_delete', [str(self.id)])
 
diff --git a/openslides/projector/views.py b/openslides/projector/views.py
index 68fd60e75..b70cd504d 100644
--- a/openslides/projector/views.py
+++ b/openslides/projector/views.py
@@ -341,6 +341,7 @@ class CustomSlideCreateView(CreateView):
     template_name = 'projector/new.html'
     model = ProjectorSlide
     context_object_name = 'customslide'
+    success_url_name = 'dashboard'
 
 
 class CustomSlideUpdateView(UpdateView):
@@ -351,6 +352,7 @@ class CustomSlideUpdateView(UpdateView):
     template_name = 'projector/new.html'
     model = ProjectorSlide
     context_object_name = 'customslide'
+    success_url_name = 'dashboard'
 
 
 class CustomSlideDeleteView(DeleteView):
@@ -359,7 +361,7 @@ class CustomSlideDeleteView(DeleteView):
     """
     permission_required = 'projector.can_manage_projector'
     model = ProjectorSlide
-    url_name = 'dashboard'
+    success_url_name = 'dashboard'
 
 
 def register_tab(request):

From 342404518b802ae73adecd163707a41bd31f296c Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Sun, 3 Feb 2013 20:06:00 +0100
Subject: [PATCH 66/88] fixed travis

---
 .travis.yml      | 2 +-
 requirements.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fdf57462c..4772bb138 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ python:
   - "2.6"
   - "2.7"
 install:
-  - easy_install https://www.djangoproject.com/download/1.5b2/tarball/
+  - easy_install https://www.djangoproject.com/download/1.5c1/tarball/
   - pip install -r requirements.txt --use-mirrors
   - python extras/scripts/create_local_settings.py
 script:
diff --git a/requirements.txt b/requirements.txt
index e9a9d7bd2..d020ab86f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-Django==1.5c2
+Django==1.5c1
 django-mptt==0.5.5
 reportlab==2.6
 PIL==1.1.7

From a34731c00e6429c72c9c0887b4718feaf0c7c007 Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Sun, 3 Feb 2013 20:12:44 +0100
Subject: [PATCH 67/88] fixed pep8 in motion.pdf

---
 openslides/motion/pdf.py | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/openslides/motion/pdf.py b/openslides/motion/pdf.py
index bf048649c..d6e3cb743 100644
--- a/openslides/motion/pdf.py
+++ b/openslides/motion/pdf.py
@@ -17,6 +17,7 @@ def motions_to_pdf(pdf):
         pdf.append(PageBreak())
         motion_to_pdf(pdf, motion)
 
+
 def motion_to_pdf(pdf, motion):
     pdf.append(Paragraph(_("Motion: %s") % motion.title, stylesheet['Heading1']))
 
@@ -25,7 +26,8 @@ def motion_to_pdf(pdf, motion):
     # submitter
     cell1a = []
     cell1a.append(Spacer(0, 0.2 * cm))
-    cell1a.append(Paragraph("<font name='Ubuntu-Bold'>%s:</font>" % _("Submitter"), stylesheet['Heading4']))
+    cell1a.append(Paragraph("<font name='Ubuntu-Bold'>%s:</font>" % _("Submitter"),
+                            stylesheet['Heading4']))
     cell1b = []
     cell1b.append(Spacer(0, 0.2 * cm))
     cell1b.append(Paragraph(unicode(motion.submitter), stylesheet['Normal']))
@@ -36,7 +38,8 @@ def motion_to_pdf(pdf, motion):
         # Cell for the signature
         cell2a = []
         cell2b = []
-        cell2a.append(Paragraph("<font name='Ubuntu-Bold'>%s:</font>" % _("Signature"), stylesheet['Heading4']))
+        cell2a.append(Paragraph("<font name='Ubuntu-Bold'>%s:</font>" %
+                                _("Signature"), stylesheet['Heading4']))
         cell2b.append(Paragraph(42 * "_", stylesheet['Signaturefield']))
         cell2b.append(Spacer(0, 0.1 * cm))
         cell2b.append(Spacer(0, 0.2 * cm))
@@ -46,13 +49,16 @@ def motion_to_pdf(pdf, motion):
     if config['motion_min_supporters']:
         cell3a = []
         cell3b = []
-        cell3a.append(Paragraph("<font name='Ubuntu-Bold'>%s:</font><seqreset id='counter'>" % _("Supporters"), stylesheet['Heading4']))
+        cell3a.append(Paragraph("<font name='Ubuntu-Bold'>%s:</font><seqreset id='counter'>"
+                                % _("Supporters"), stylesheet['Heading4']))
         supporters = motion.supporter.all()
         for supporter in supporters:
-            cell3b.append(Paragraph("<seq id='counter'/>.&nbsp; %s" % unicode(supporter), stylesheet['Signaturefield']))
+            cell3b.append(Paragraph("<seq id='counter'/>.&nbsp; %s" % unicode(supporter),
+                                    stylesheet['Signaturefield']))
         if motion.state.support:
             for count in range(config['motion_min_supporters'] - supporters.count()):
-                cell3b.append(Paragraph("<seq id='counter'/>.&nbsp;" + 42 * "_",stylesheet['Signaturefield']))
+                cell3b.append(Paragraph("<seq id='counter'/>.&nbsp;" + 42 * "_",
+                                        stylesheet['Signaturefield']))
         cell3b.append(Spacer(0, 0.2 * cm))
         motion_data.append([cell3a, cell3b])
 
@@ -73,7 +79,8 @@ def motion_to_pdf(pdf, motion):
     # Motion state
     cell4a = []
     cell4b = []
-    cell4a.append(Paragraph("<font name='Ubuntu-Bold'>%s:</font>" % _("State"), stylesheet['Heading4']))
+    cell4a.append(Paragraph("<font name='Ubuntu-Bold'>%s:</font>" % _("State"),
+                            stylesheet['Heading4']))
     cell4b.append(Paragraph(motion.state.name, stylesheet['Normal']))
     motion_data.append([cell4a, cell4b])
 
@@ -81,7 +88,8 @@ def motion_to_pdf(pdf, motion):
     if motion.versions.count() > 1:
         cell5a = []
         cell5b = []
-        cell5a.append(Paragraph("<font name='Ubuntu-Bold'>%s:</font>" % _("Version"), stylesheet['Heading4']))
+        cell5a.append(Paragraph("<font name='Ubuntu-Bold'>%s:</font>" % _("Version"),
+                                stylesheet['Heading4']))
         cell5b.append(Paragraph("%s" % motion.version.version_number, stylesheet['Normal']))
         motion_data.append([cell5a, cell5b])
 
@@ -95,7 +103,8 @@ def motion_to_pdf(pdf, motion):
     if polls:
         cell6a = []
         cell6b = []
-        cell6a.append(Paragraph("<font name='Ubuntu-Bold'>%s:</font>" % _("Vote results"), stylesheet['Heading4']))
+        cell6a.append(Paragraph("<font name='Ubuntu-Bold'>%s:</font>" %
+                                _("Vote results"), stylesheet['Heading4']))
         ballotcounter = 0
         for poll in polls:
             ballotcounter += 1
@@ -105,7 +114,8 @@ def motion_to_pdf(pdf, motion):
                 poll.print_voteinvalid(), poll.print_votecast())
 
             if len(polls) > 1:
-                cell6b.append(Paragraph("%s. %s" % (ballotcounter, _("Vote")), stylesheet['Bold']))
+                cell6b.append(Paragraph("%s. %s" % (ballotcounter, _("Vote")),
+                                        stylesheet['Bold']))
             cell6b.append(Paragraph(
                 "%s: %s <br/> %s: %s <br/> %s: %s <br/> %s: %s <br/> %s: %s" %
                 (_("Yes"), yes, _("No"), no, _("Abstention"), abstain, _("Invalid"),
@@ -118,15 +128,15 @@ def motion_to_pdf(pdf, motion):
     table._argW[0] = 4.5 * cm
     table._argW[1] = 11 * cm
     table.setStyle(TableStyle([('BOX', (0, 0), (-1, -1), 1, colors.black),
-                               ('VALIGN', (0,0), (-1,-1), 'TOP')]))
+                               ('VALIGN', (0, 0), (-1, -1), 'TOP')]))
     pdf.append(table)
     pdf.append(Spacer(0, 1 * cm))
 
     pdf.append(Paragraph(motion.title, stylesheet['Heading3']))
-    pdf.append(Paragraph(motion.text.replace('\r\n','<br/>'), stylesheet['Paragraph']))
+    pdf.append(Paragraph(motion.text.replace('\r\n', '<br/>'), stylesheet['Paragraph']))
     if motion.reason:
         pdf.append(Paragraph(_("Reason:"), stylesheet['Heading3']))
-        pdf.append(Paragraph(motion.reason.replace('\r\n','<br/>'), stylesheet['Paragraph']))
+        pdf.append(Paragraph(motion.reason.replace('\r\n',  '<br/>'), stylesheet['Paragraph']))
     return pdf
 
 
@@ -135,7 +145,7 @@ def all_motion_cover(pdf, motions):
 
     preamble = config["motion_pdf_preamble"]
     if preamble:
-        pdf.append(Paragraph("%s" % preamble.replace('\r\n','<br/>'), stylesheet['Paragraph']))
+        pdf.append(Paragraph("%s" % preamble.replace('\r\n', '<br/>'), stylesheet['Paragraph']))
 
     pdf.append(Spacer(0, 0.75 * cm))
 

From e822efdc81fec8666452a3a698b88c17389bc273 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Mon, 4 Feb 2013 13:06:36 +0100
Subject: [PATCH 68/88] Some template style work.

---
 .../templates/assignment/poll_view.html       |  5 +-
 .../assignment/templates/assignment/view.html |  2 +-
 .../motion/templates/motion/poll_view.html    | 85 ++++++++++---------
 openslides/static/styles/base.css             |  3 +
 4 files changed, 50 insertions(+), 45 deletions(-)

diff --git a/openslides/assignment/templates/assignment/poll_view.html b/openslides/assignment/templates/assignment/poll_view.html
index f7c90ad9f..6ac33793d 100644
--- a/openslides/assignment/templates/assignment/poll_view.html
+++ b/openslides/assignment/templates/assignment/poll_view.html
@@ -25,8 +25,9 @@
     <p><b>{% trans "Short description (for ballot paper)" %}:</b> {{ assignment.polldescription }}</p>
 {% endif %}
 
-<i class="helptext">{% trans "Special values" %}: -1 = {% trans 'majority' %}; -2 = {% trans 'undocumented' %}</i>
-
+<p>
+{% trans "Special values" %}: <span class="badge badge-success">-1</span> = {% trans 'majority' %} | <span class="badge">-2</span> = {% trans 'undocumented' %}
+</p>
 <form action="" method="post" class="small-form">{% csrf_token %}
     <table class="table table-striped table-bordered" style="width: auto;">
         <tr>
diff --git a/openslides/assignment/templates/assignment/view.html b/openslides/assignment/templates/assignment/view.html
index f7ab63059..c74623b39 100644
--- a/openslides/assignment/templates/assignment/view.html
+++ b/openslides/assignment/templates/assignment/view.html
@@ -98,7 +98,7 @@
 {% endif %}
 
 {% if perms.assignment.can_manage_assignments and blocked_candidates and assignment.status != "fin" %}
-    <h3>{% trans "Blocked Candidates" %}</h3>
+    <h4>{% trans "Blocked Candidates" %}</h4>
     <ul>
     {% for person in blocked_candidates %}
         <li>
diff --git a/openslides/motion/templates/motion/poll_view.html b/openslides/motion/templates/motion/poll_view.html
index 11c61baf6..e4d9c7465 100644
--- a/openslides/motion/templates/motion/poll_view.html
+++ b/openslides/motion/templates/motion/poll_view.html
@@ -39,49 +39,50 @@
     </small>
 </h1>
 
-<i class="helptext">{% trans "Special values" %}: -1 = {% trans 'majority' %}; -2 = {% trans 'undocumented' %}</i>
-
-    <form action="" method="post" class="small-form">{% csrf_token %}
-        {{ pre_form }}
-        <span id="poll_id" style="display:none">{{ poll.id }}</span>
-        <table class="table table-striped table-bordered" style="width: auto;">
+<p>
+{% trans "Special values" %}: <span class="badge badge-success">-1</span> = {% trans 'majority' %} | <span class="badge">-2</span> = {% trans 'undocumented' %}
+</p>
+<form action="" method="post" class="small-form">{% csrf_token %}
+    {{ pre_form }}
+    <span id="poll_id" style="display:none">{{ poll.id }}</span>
+    <table class="table table-striped table-bordered" style="width: auto;">
+        <tr>
+            <th>{% trans "Option" %}</th>
+            <th>{% trans "Votes" %}</th>
+        </tr>
+        {% for value in forms.0 %}
             <tr>
-                <th>{% trans "Option" %}</th>
-                <th>{% trans "Votes" %}</th>
+                <td>{{ value.label }}</td>
+                <td>{{ value.errors }}{{ value }}</td>
             </tr>
-            {% for value in forms.0 %}
-                <tr>
-                    <td>{{ value.label }}</td>
-                    <td>{{ value.errors }}{{ value }}</td>
-                </tr>
-            {% endfor %}
-            <tr>
-                <td>{% trans "Invalid votes" %}</td>
-                <td>{{ pollform.votesinvalid.errors }}{{ pollform.votesinvalid }}</td>
-            </tr>
-            <tr class="total warning">
-                <td>{% trans "Votes cast" %}</td>
-                <td>{{ pollform.votescast.errors }}{{ pollform.votescast }}</td>
-            </tr>
-        </table>
-        {{ post_form }}
-        <!-- ballot paper button -->
-        <p>
-        <a href="{% url 'print_motion_poll' poll.id %}" class="btn">
-            <i class="icon-print"></i> {% trans 'Ballot paper as PDF' %}
+        {% endfor %}
+        <tr>
+            <td>{% trans "Invalid votes" %}</td>
+            <td>{{ pollform.votesinvalid.errors }}{{ pollform.votesinvalid }}</td>
+        </tr>
+        <tr class="total warning">
+            <td>{% trans "Votes cast" %}</td>
+            <td>{{ pollform.votescast.errors }}{{ pollform.votescast }}</td>
+        </tr>
+    </table>
+    {{ post_form }}
+    <!-- ballot paper button -->
+    <p>
+    <a href="{% url 'print_motion_poll' poll.id %}" class="btn">
+        <i class="icon-print"></i> {% trans 'Ballot paper as PDF' %}
+    </a>
+    </p>
+    <!-- Control buttons -->
+    <div class="control-group">
+        <button type="submit" class="btn btn-primary">
+            {% trans 'Save' %}
+        </button>
+        <button type="submit" name="apply" class="btn">
+            {% trans 'Apply' %}
+        </button>
+        <a href="{% url 'motion_view' motion.id %}" class="btn">
+            {% trans 'Cancel' %}
         </a>
-        </p>
-        <!-- Control buttons -->
-        <div class="control-group">
-            <button type="submit" class="btn btn-primary">
-                {% trans 'Save' %}
-            </button>
-            <button type="submit" name="apply" class="btn">
-                {% trans 'Apply' %}
-            </button>
-            <a href="{% url 'motion_view' motion.id %}" class="btn">
-                {% trans 'Cancel' %}
-            </a>
-        </div>
-    </form>
+    </div>
+</form>
 {% endblock %}
diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css
index 771beedeb..51e2458de 100644
--- a/openslides/static/styles/base.css
+++ b/openslides/static/styles/base.css
@@ -116,6 +116,9 @@ tr.total td {
 input, textarea {
     width: 320px;
 }
+.small-form input {
+    width: 33px;
+}
 textarea {
     height: 100px;
 }

From 36f5c97dbeccbe1f3bb6ab77c34940c797ec346b Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Mon, 4 Feb 2013 13:18:10 +0100
Subject: [PATCH 69/88] Added assignment context menu (more actions). Fixed
 'back to election' link.

---
 .../templates/assignment/poll_view.html       |  2 +-
 .../assignment/templates/assignment/view.html | 24 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/openslides/assignment/templates/assignment/poll_view.html b/openslides/assignment/templates/assignment/poll_view.html
index 6ac33793d..7e99e4b40 100644
--- a/openslides/assignment/templates/assignment/poll_view.html
+++ b/openslides/assignment/templates/assignment/poll_view.html
@@ -11,7 +11,7 @@
     {{ ballotnumber }}. {% trans "ballot" %}
     </small>
     <small class="pull-right">
-    <a href="{% url 'assignment_overview' %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
+    <a href="{% url 'assignment_view' assignment.id %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to election" %}</a>
     <!-- activate projector -->
     {% if perms.projector.can_manage_projector %}
         <a href="{% url 'projector_activate_slide' assignment.sid  %}" class="activate_link btn {% if assignment.active %}btn-primary{% endif %} btn-mini" rel="tooltip" data-original-title="{% trans 'Show motion' %}">
diff --git a/openslides/assignment/templates/assignment/view.html b/openslides/assignment/templates/assignment/view.html
index c74623b39..cab84e86c 100644
--- a/openslides/assignment/templates/assignment/view.html
+++ b/openslides/assignment/templates/assignment/view.html
@@ -24,6 +24,30 @@
             <i class="icon-facetime-video {% if assignment.active %}icon-white{% endif %}"></i>
         </a>
     {% endif %}
+    <div class="btn-group">
+        <a data-toggle="dropdown" href="#" class="btn btn-mini dropdown-toggle">
+            {% trans 'More actions' %}
+            <span class="caret"></span>
+        </a>
+        <ul class="dropdown-menu pull-right">
+            <!-- edit -->
+            <li><a href="{% url 'assignment_edit' assignment.id  %}"><i class="icon-edit"></i> {% trans 'Edit election' %}</a></li>
+            <!-- delete -->
+            <li><a href="{% url 'assignment_delete' assignment.id  %}"><i class="icon-remove"></i> {% trans 'Delete election' %}</a></li>
+            <!-- edit poll -->
+            {% if perms.assignment.can_manage_assignment %}
+                {% for poll in motion.polls %}
+                    <li><a href="{% url 'assignment_poll_view' poll.id %}"><i class="icon-edit"></i> {{ forloop.counter }}. {% trans "Ballot" %}</a></li>
+                {% endfor %}
+            {% endif %}
+            <!-- create agenda item -->
+            {% if perms.agenda.can_manage_agenda %}
+            <li>
+                <a href="{% url 'assignment_create_agenda' assignment.id  %}"><i class="icon-plus"></i> {% trans 'New agenda item' %}</a>
+            </li>
+            {% endif %}
+        </ul>
+    </div>
     </small>
 </h1>
 

From 404bf7f0b5b946c1f4a3fef78f3a8c4bc4cf5b0e Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Mon, 4 Feb 2013 13:38:29 +0100
Subject: [PATCH 70/88] template: Added missing back link.

---
 .../templates/participant/group_detail.html   | 14 ++++++++----
 .../templates/participant/overview.html       |  4 ++--
 .../templates/participant/user_detail.html    | 22 +++++++++++--------
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/openslides/participant/templates/participant/group_detail.html b/openslides/participant/templates/participant/group_detail.html
index fb456c31c..ea3f5fab0 100644
--- a/openslides/participant/templates/participant/group_detail.html
+++ b/openslides/participant/templates/participant/group_detail.html
@@ -1,4 +1,4 @@
-{% extends "participant/base_participant.html" %}
+{% extends "base.html" %}
 
 {% load i18n %}
 {% load tags %}
@@ -7,16 +7,22 @@
 
 {% block content %}
 
-<h1>{{ group }}</h1>
+<h1>{{ group }}
+    <small class="pull-right">
+        <a href="{% url 'user_group_overview' %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
+    </small>
+</h1>
 
 <p>{{ group.description }}</p>
 
-<h2>{% trans "Members" %}</h2>
+<h4>{% trans "Members" %}</h4>
 
+<ol>
 {% for member in group.user_set.all %}
-    <p>{{ member }}</p>
+    <li>{{ member }}</li>
 {% empty %}
     <p>{% trans "No members available." %}</p>
 {% endfor %}
+</ol>
 
 {% endblock %}
diff --git a/openslides/participant/templates/participant/overview.html b/openslides/participant/templates/participant/overview.html
index cdd052767..56c7ac5bc 100644
--- a/openslides/participant/templates/participant/overview.html
+++ b/openslides/participant/templates/participant/overview.html
@@ -116,8 +116,8 @@
         </tr>
         {% for user in users %}
             <tr class="{% if user.active %}activeline{% endif %}">
-                <td>{{ user.first_name }}</td>
-                <td>{{ user.last_name }}</td>
+                <td><a href="{% url 'user_view' user.id %}">{{ user.first_name }}</a></td>
+                <td><a href="{% url 'user_view' user.id %}">{{ user.last_name }}</a></td>
                 <td class="optional">{{ user.structure_level }}</td>
                 <td class="optional">{{ user.get_type_display }}</td>
                 <td class="optional">{{ user.committee }}</td>
diff --git a/openslides/participant/templates/participant/user_detail.html b/openslides/participant/templates/participant/user_detail.html
index af3b581c3..e31502b29 100644
--- a/openslides/participant/templates/participant/user_detail.html
+++ b/openslides/participant/templates/participant/user_detail.html
@@ -1,4 +1,4 @@
-{% extends "participant/base_participant.html" %}
+{% extends "base.html" %}
 
 {% load i18n %}
 {% load tags %}
@@ -7,11 +7,15 @@
 
 {% block content %}
 
-<h1>{{ shown_user }}</h1>
+<h1>{{ shown_user }}
+    <small class="pull-right">
+        <a href="{% url 'user_overview' %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
+    </small>
+</h1>
 
 <p>{{ shown_user.email }}</p>
 
-<h2>{% trans "Groups" %}</h2>
+<h4>{% trans "Groups" %}</h4>
 <p>
     {% if shown_user.groups.all %}
         {{ shown_user.groups.all|join:", " }}
@@ -21,32 +25,32 @@
 </p>
 
 {% if shown_user.get_gender_display %}
-    <h2>{% trans "Gender" %}</h2>
+    <h4>{% trans "Gender" %}</h4>
     <p>{{ shown_user.get_gender_display }}</p>
 {% endif %}
 
 {% if shown_user.get_type_display %}
-<h2>{% trans "Type" %}</h2>
+<h4>{% trans "Type" %}</h4>
 <p>{{ shown_user.get_type_display }}</p>
 {% endif %}
 
 {% if shown_user.committee %}
-<h2>{% trans "Committee" %}</h2>
+<h4>{% trans "Committee" %}</h4>
 <p>{{ shown_user.committee }}</p>
 {% endif %}
 
 {% if shown_user.about_me %}
-    <h2>{% trans "About me" %}</h2>
+    <h4>{% trans "About me" %}</h4>
     <p>{{ shown_user.about_me }}</p>
 {% endif %}
 
 {% if perms.participant.can_manage_participant %}
     {% if shown_user.comment %}
-    <h2>{% trans "Comment" %}</h2>
+    <h4>{% trans "Comment" %}</h4>
     <p>{{ shown_user.comment }}</p>
     {% endif %}
 
-    <h2>{% trans "Last Login" %}</h2>
+    <h4>{% trans "Last Login" %}</h4>
     {% if shown_user.last_login > shown_user.date_joined %}
         <p>{{ shown_user.last_login }}</p>
     {% else %}

From 5e44bba941d441215de66b8b6aca8d9055d0c6c5 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Tue, 5 Feb 2013 11:15:23 +0100
Subject: [PATCH 71/88] Updated jquery from 1.9.0 to 1.9.1.

---
 openslides/static/javascript/jquery.min.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/openslides/static/javascript/jquery.min.js b/openslides/static/javascript/jquery.min.js
index 50d1b22f2..006e95310 100644
--- a/openslides/static/javascript/jquery.min.js
+++ b/openslides/static/javascript/jquery.min.js
@@ -1,4 +1,5 @@
-/*! jQuery v1.9.0 | (c) 2005, 2012 jQuery Foundation, Inc. | jquery.org/license */(function(e,t){"use strict";function n(e){var t=e.length,n=st.type(e);return st.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}function r(e){var t=Tt[e]={};return st.each(e.match(lt)||[],function(e,n){t[n]=!0}),t}function i(e,n,r,i){if(st.acceptData(e)){var o,a,s=st.expando,u="string"==typeof n,l=e.nodeType,c=l?st.cache:e,f=l?e[s]:e[s]&&s;if(f&&c[f]&&(i||c[f].data)||!u||r!==t)return f||(l?e[s]=f=K.pop()||st.guid++:f=s),c[f]||(c[f]={},l||(c[f].toJSON=st.noop)),("object"==typeof n||"function"==typeof n)&&(i?c[f]=st.extend(c[f],n):c[f].data=st.extend(c[f].data,n)),o=c[f],i||(o.data||(o.data={}),o=o.data),r!==t&&(o[st.camelCase(n)]=r),u?(a=o[n],null==a&&(a=o[st.camelCase(n)])):a=o,a}}function o(e,t,n){if(st.acceptData(e)){var r,i,o,a=e.nodeType,u=a?st.cache:e,l=a?e[st.expando]:st.expando;if(u[l]){if(t&&(r=n?u[l]:u[l].data)){st.isArray(t)?t=t.concat(st.map(t,st.camelCase)):t in r?t=[t]:(t=st.camelCase(t),t=t in r?[t]:t.split(" "));for(i=0,o=t.length;o>i;i++)delete r[t[i]];if(!(n?s:st.isEmptyObject)(r))return}(n||(delete u[l].data,s(u[l])))&&(a?st.cleanData([e],!0):st.support.deleteExpando||u!=u.window?delete u[l]:u[l]=null)}}}function a(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(Nt,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:wt.test(r)?st.parseJSON(r):r}catch(o){}st.data(e,n,r)}else r=t}return r}function s(e){var t;for(t in e)if(("data"!==t||!st.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}function u(){return!0}function l(){return!1}function c(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}function f(e,t,n){if(t=t||0,st.isFunction(t))return st.grep(e,function(e,r){var i=!!t.call(e,r,e);return i===n});if(t.nodeType)return st.grep(e,function(e){return e===t===n});if("string"==typeof t){var r=st.grep(e,function(e){return 1===e.nodeType});if(Wt.test(t))return st.filter(t,r,!n);t=st.filter(t,r)}return st.grep(e,function(e){return st.inArray(e,t)>=0===n})}function p(e){var t=zt.split("|"),n=e.createDocumentFragment();if(n.createElement)for(;t.length;)n.createElement(t.pop());return n}function d(e,t){return e.getElementsByTagName(t)[0]||e.appendChild(e.ownerDocument.createElement(t))}function h(e){var t=e.getAttributeNode("type");return e.type=(t&&t.specified)+"/"+e.type,e}function g(e){var t=nn.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function m(e,t){for(var n,r=0;null!=(n=e[r]);r++)st._data(n,"globalEval",!t||st._data(t[r],"globalEval"))}function y(e,t){if(1===t.nodeType&&st.hasData(e)){var n,r,i,o=st._data(e),a=st._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)st.event.add(t,n,s[n][r])}a.data&&(a.data=st.extend({},a.data))}}function v(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!st.support.noCloneEvent&&t[st.expando]){r=st._data(t);for(i in r.events)st.removeEvent(t,i,r.handle);t.removeAttribute(st.expando)}"script"===n&&t.text!==e.text?(h(t).text=e.text,g(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),st.support.html5Clone&&e.innerHTML&&!st.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Zt.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}function b(e,n){var r,i,o=0,a=e.getElementsByTagName!==t?e.getElementsByTagName(n||"*"):e.querySelectorAll!==t?e.querySelectorAll(n||"*"):t;if(!a)for(a=[],r=e.childNodes||e;null!=(i=r[o]);o++)!n||st.nodeName(i,n)?a.push(i):st.merge(a,b(i,n));return n===t||n&&st.nodeName(e,n)?st.merge([e],a):a}function x(e){Zt.test(e.type)&&(e.defaultChecked=e.checked)}function T(e,t){if(t in e)return t;for(var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=Nn.length;i--;)if(t=Nn[i]+n,t in e)return t;return r}function w(e,t){return e=t||e,"none"===st.css(e,"display")||!st.contains(e.ownerDocument,e)}function N(e,t){for(var n,r=[],i=0,o=e.length;o>i;i++)n=e[i],n.style&&(r[i]=st._data(n,"olddisplay"),t?(r[i]||"none"!==n.style.display||(n.style.display=""),""===n.style.display&&w(n)&&(r[i]=st._data(n,"olddisplay",S(n.nodeName)))):r[i]||w(n)||st._data(n,"olddisplay",st.css(n,"display")));for(i=0;o>i;i++)n=e[i],n.style&&(t&&"none"!==n.style.display&&""!==n.style.display||(n.style.display=t?r[i]||"":"none"));return e}function C(e,t,n){var r=mn.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function k(e,t,n,r,i){for(var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;4>o;o+=2)"margin"===n&&(a+=st.css(e,n+wn[o],!0,i)),r?("content"===n&&(a-=st.css(e,"padding"+wn[o],!0,i)),"margin"!==n&&(a-=st.css(e,"border"+wn[o]+"Width",!0,i))):(a+=st.css(e,"padding"+wn[o],!0,i),"padding"!==n&&(a+=st.css(e,"border"+wn[o]+"Width",!0,i)));return a}function E(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=ln(e),a=st.support.boxSizing&&"border-box"===st.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=un(e,t,o),(0>i||null==i)&&(i=e.style[t]),yn.test(i))return i;r=a&&(st.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+k(e,t,n||(a?"border":"content"),r,o)+"px"}function S(e){var t=V,n=bn[e];return n||(n=A(e,t),"none"!==n&&n||(cn=(cn||st("<iframe frameborder='0' width='0' height='0'/>").css("cssText","display:block !important")).appendTo(t.documentElement),t=(cn[0].contentWindow||cn[0].contentDocument).document,t.write("<!doctype html><html><body>"),t.close(),n=A(e,t),cn.detach()),bn[e]=n),n}function A(e,t){var n=st(t.createElement(e)).appendTo(t.body),r=st.css(n[0],"display");return n.remove(),r}function j(e,t,n,r){var i;if(st.isArray(t))st.each(t,function(t,i){n||kn.test(e)?r(e,i):j(e+"["+("object"==typeof i?t:"")+"]",i,n,r)});else if(n||"object"!==st.type(t))r(e,t);else for(i in t)j(e+"["+i+"]",t[i],n,r)}function D(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(lt)||[];if(st.isFunction(n))for(;r=o[i++];)"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function L(e,n,r,i){function o(u){var l;return a[u]=!0,st.each(e[u]||[],function(e,u){var c=u(n,r,i);return"string"!=typeof c||s||a[c]?s?!(l=c):t:(n.dataTypes.unshift(c),o(c),!1)}),l}var a={},s=e===$n;return o(n.dataTypes[0])||!a["*"]&&o("*")}function H(e,n){var r,i,o=st.ajaxSettings.flatOptions||{};for(r in n)n[r]!==t&&((o[r]?e:i||(i={}))[r]=n[r]);return i&&st.extend(!0,e,i),e}function M(e,n,r){var i,o,a,s,u=e.contents,l=e.dataTypes,c=e.responseFields;for(o in c)o in r&&(n[c[o]]=r[o]);for(;"*"===l[0];)l.shift(),i===t&&(i=e.mimeType||n.getResponseHeader("Content-Type"));if(i)for(o in u)if(u[o]&&u[o].test(i)){l.unshift(o);break}if(l[0]in r)a=l[0];else{for(o in r){if(!l[0]||e.converters[o+" "+l[0]]){a=o;break}s||(s=o)}a=a||s}return a?(a!==l[0]&&l.unshift(a),r[a]):t}function q(e,t){var n,r,i,o,a={},s=0,u=e.dataTypes.slice(),l=u[0];if(e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u[1])for(n in e.converters)a[n.toLowerCase()]=e.converters[n];for(;i=u[++s];)if("*"!==i){if("*"!==l&&l!==i){if(n=a[l+" "+i]||a["* "+i],!n)for(r in a)if(o=r.split(" "),o[1]===i&&(n=a[l+" "+o[0]]||a["* "+o[0]])){n===!0?n=a[r]:a[r]!==!0&&(i=o[0],u.splice(s--,0,i));break}if(n!==!0)if(n&&e["throws"])t=n(t);else try{t=n(t)}catch(c){return{state:"parsererror",error:n?c:"No conversion from "+l+" to "+i}}}l=i}return{state:"success",data:t}}function _(){try{return new e.XMLHttpRequest}catch(t){}}function F(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}function O(){return setTimeout(function(){Qn=t}),Qn=st.now()}function B(e,t){st.each(t,function(t,n){for(var r=(rr[t]||[]).concat(rr["*"]),i=0,o=r.length;o>i;i++)if(r[i].call(e,t,n))return})}function P(e,t,n){var r,i,o=0,a=nr.length,s=st.Deferred().always(function(){delete u.elem}),u=function(){if(i)return!1;for(var t=Qn||O(),n=Math.max(0,l.startTime+l.duration-t),r=n/l.duration||0,o=1-r,a=0,u=l.tweens.length;u>a;a++)l.tweens[a].run(o);return s.notifyWith(e,[l,o,n]),1>o&&u?n:(s.resolveWith(e,[l]),!1)},l=s.promise({elem:e,props:st.extend({},t),opts:st.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:Qn||O(),duration:n.duration,tweens:[],createTween:function(t,n){var r=st.Tween(e,l.opts,t,n,l.opts.specialEasing[t]||l.opts.easing);return l.tweens.push(r),r},stop:function(t){var n=0,r=t?l.tweens.length:0;if(i)return this;for(i=!0;r>n;n++)l.tweens[n].run(1);return t?s.resolveWith(e,[l,t]):s.rejectWith(e,[l,t]),this}}),c=l.props;for(R(c,l.opts.specialEasing);a>o;o++)if(r=nr[o].call(l,e,c,l.opts))return r;return B(l,c),st.isFunction(l.opts.start)&&l.opts.start.call(e,l),st.fx.timer(st.extend(u,{elem:e,anim:l,queue:l.opts.queue})),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always)}function R(e,t){var n,r,i,o,a;for(n in e)if(r=st.camelCase(n),i=t[r],o=e[n],st.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),a=st.cssHooks[r],a&&"expand"in a){o=a.expand(o),delete e[r];for(n in o)n in e||(e[n]=o[n],t[n]=i)}else t[r]=i}function W(e,t,n){var r,i,o,a,s,u,l,c,f,p=this,d=e.style,h={},g=[],m=e.nodeType&&w(e);n.queue||(c=st._queueHooks(e,"fx"),null==c.unqueued&&(c.unqueued=0,f=c.empty.fire,c.empty.fire=function(){c.unqueued||f()}),c.unqueued++,p.always(function(){p.always(function(){c.unqueued--,st.queue(e,"fx").length||c.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[d.overflow,d.overflowX,d.overflowY],"inline"===st.css(e,"display")&&"none"===st.css(e,"float")&&(st.support.inlineBlockNeedsLayout&&"inline"!==S(e.nodeName)?d.zoom=1:d.display="inline-block")),n.overflow&&(d.overflow="hidden",st.support.shrinkWrapBlocks||p.done(function(){d.overflow=n.overflow[0],d.overflowX=n.overflow[1],d.overflowY=n.overflow[2]}));for(r in t)if(o=t[r],Zn.exec(o)){if(delete t[r],u=u||"toggle"===o,o===(m?"hide":"show"))continue;g.push(r)}if(a=g.length){s=st._data(e,"fxshow")||st._data(e,"fxshow",{}),"hidden"in s&&(m=s.hidden),u&&(s.hidden=!m),m?st(e).show():p.done(function(){st(e).hide()}),p.done(function(){var t;st._removeData(e,"fxshow");for(t in h)st.style(e,t,h[t])});for(r=0;a>r;r++)i=g[r],l=p.createTween(i,m?s[i]:0),h[i]=s[i]||st.style(e,i),i in s||(s[i]=l.start,m&&(l.end=l.start,l.start="width"===i||"height"===i?1:0))}}function $(e,t,n,r,i){return new $.prototype.init(e,t,n,r,i)}function I(e,t){var n,r={height:e},i=0;for(t=t?1:0;4>i;i+=2-t)n=wn[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}function z(e){return st.isWindow(e)?e:9===e.nodeType?e.defaultView||e.parentWindow:!1}var X,U,V=e.document,Y=e.location,J=e.jQuery,G=e.$,Q={},K=[],Z="1.9.0",et=K.concat,tt=K.push,nt=K.slice,rt=K.indexOf,it=Q.toString,ot=Q.hasOwnProperty,at=Z.trim,st=function(e,t){return new st.fn.init(e,t,X)},ut=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,lt=/\S+/g,ct=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,ft=/^(?:(<[\w\W]+>)[^>]*|#([\w-]*))$/,pt=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,dt=/^[\],:{}\s]*$/,ht=/(?:^|:|,)(?:\s*\[)+/g,gt=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,mt=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,yt=/^-ms-/,vt=/-([\da-z])/gi,bt=function(e,t){return t.toUpperCase()},xt=function(){V.addEventListener?(V.removeEventListener("DOMContentLoaded",xt,!1),st.ready()):"complete"===V.readyState&&(V.detachEvent("onreadystatechange",xt),st.ready())};st.fn=st.prototype={jquery:Z,constructor:st,init:function(e,n,r){var i,o;if(!e)return this;if("string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:ft.exec(e),!i||!i[1]&&n)return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e);if(i[1]){if(n=n instanceof st?n[0]:n,st.merge(this,st.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:V,!0)),pt.test(i[1])&&st.isPlainObject(n))for(i in n)st.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(o=V.getElementById(i[2]),o&&o.parentNode){if(o.id!==i[2])return r.find(e);this.length=1,this[0]=o}return this.context=V,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):st.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),st.makeArray(e,this))},selector:"",length:0,size:function(){return this.length},toArray:function(){return nt.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=st.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return st.each(this,e,t)},ready:function(e){return st.ready.promise().done(e),this},slice:function(){return this.pushStack(nt.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(st.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:tt,sort:[].sort,splice:[].splice},st.fn.init.prototype=st.fn,st.extend=st.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},u=1,l=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},u=2),"object"==typeof s||st.isFunction(s)||(s={}),l===u&&(s=this,--u);l>u;u++)if(null!=(e=arguments[u]))for(n in e)r=s[n],i=e[n],s!==i&&(c&&i&&(st.isPlainObject(i)||(o=st.isArray(i)))?(o?(o=!1,a=r&&st.isArray(r)?r:[]):a=r&&st.isPlainObject(r)?r:{},s[n]=st.extend(c,a,i)):i!==t&&(s[n]=i));return s},st.extend({noConflict:function(t){return e.$===st&&(e.$=G),t&&e.jQuery===st&&(e.jQuery=J),st},isReady:!1,readyWait:1,holdReady:function(e){e?st.readyWait++:st.ready(!0)},ready:function(e){if(e===!0?!--st.readyWait:!st.isReady){if(!V.body)return setTimeout(st.ready);st.isReady=!0,e!==!0&&--st.readyWait>0||(U.resolveWith(V,[st]),st.fn.trigger&&st(V).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===st.type(e)},isArray:Array.isArray||function(e){return"array"===st.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?Q[it.call(e)]||"object":typeof e},isPlainObject:function(e){if(!e||"object"!==st.type(e)||e.nodeType||st.isWindow(e))return!1;try{if(e.constructor&&!ot.call(e,"constructor")&&!ot.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}var r;for(r in e);return r===t||ot.call(e,r)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||V;var r=pt.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=st.buildFragment([e],t,i),i&&st(i).remove(),st.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=st.trim(n),n&&dt.test(n.replace(gt,"@").replace(mt,"]").replace(ht,"")))?Function("return "+n)():(st.error("Invalid JSON: "+n),t)},parseXML:function(n){var r,i;if(!n||"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return r&&r.documentElement&&!r.getElementsByTagName("parsererror").length||st.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&st.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(yt,"ms-").replace(vt,bt)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,r){var i,o=0,a=e.length,s=n(e);if(r){if(s)for(;a>o&&(i=t.apply(e[o],r),i!==!1);o++);else for(o in e)if(i=t.apply(e[o],r),i===!1)break}else if(s)for(;a>o&&(i=t.call(e[o],o,e[o]),i!==!1);o++);else for(o in e)if(i=t.call(e[o],o,e[o]),i===!1)break;return e},trim:at&&!at.call("\ufeff\u00a0")?function(e){return null==e?"":at.call(e)}:function(e){return null==e?"":(e+"").replace(ct,"")},makeArray:function(e,t){var r=t||[];return null!=e&&(n(Object(e))?st.merge(r,"string"==typeof e?[e]:e):tt.call(r,e)),r},inArray:function(e,t,n){var r;if(t){if(rt)return rt.call(t,e,n);for(r=t.length,n=n?0>n?Math.max(0,r+n):n:0;r>n;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,o=0;if("number"==typeof r)for(;r>o;o++)e[i++]=n[o];else for(;n[o]!==t;)e[i++]=n[o++];return e.length=i,e},grep:function(e,t,n){var r,i=[],o=0,a=e.length;for(n=!!n;a>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,r){var i,o=0,a=e.length,s=n(e),u=[];if(s)for(;a>o;o++)i=t(e[o],o,r),null!=i&&(u[u.length]=i);else for(o in e)i=t(e[o],o,r),null!=i&&(u[u.length]=i);return et.apply([],u)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(r=e[n],n=e,e=r),st.isFunction(e)?(i=nt.call(arguments,2),o=function(){return e.apply(n||this,i.concat(nt.call(arguments)))},o.guid=e.guid=e.guid||st.guid++,o):t},access:function(e,n,r,i,o,a,s){var u=0,l=e.length,c=null==r;if("object"===st.type(r)){o=!0;for(u in r)st.access(e,n,u,r[u],!0,a,s)}else if(i!==t&&(o=!0,st.isFunction(i)||(s=!0),c&&(s?(n.call(e,i),n=null):(c=n,n=function(e,t,n){return c.call(st(e),n)})),n))for(;l>u;u++)n(e[u],r,s?i:i.call(e[u],u,n(e[u],r)));return o?e:c?n.call(e):l?n(e[0],r):a},now:function(){return(new Date).getTime()}}),st.ready.promise=function(t){if(!U)if(U=st.Deferred(),"complete"===V.readyState)setTimeout(st.ready);else if(V.addEventListener)V.addEventListener("DOMContentLoaded",xt,!1),e.addEventListener("load",st.ready,!1);else{V.attachEvent("onreadystatechange",xt),e.attachEvent("onload",st.ready);var n=!1;try{n=null==e.frameElement&&V.documentElement}catch(r){}n&&n.doScroll&&function i(){if(!st.isReady){try{n.doScroll("left")}catch(e){return setTimeout(i,50)}st.ready()}}()}return U.promise(t)},st.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){Q["[object "+t+"]"]=t.toLowerCase()}),X=st(V);var Tt={};st.Callbacks=function(e){e="string"==typeof e?Tt[e]||r(e):st.extend({},e);var n,i,o,a,s,u,l=[],c=!e.once&&[],f=function(t){for(n=e.memory&&t,i=!0,u=a||0,a=0,s=l.length,o=!0;l&&s>u;u++)if(l[u].apply(t[0],t[1])===!1&&e.stopOnFalse){n=!1;break}o=!1,l&&(c?c.length&&f(c.shift()):n?l=[]:p.disable())},p={add:function(){if(l){var t=l.length;(function r(t){st.each(t,function(t,n){var i=st.type(n);"function"===i?e.unique&&p.has(n)||l.push(n):n&&n.length&&"string"!==i&&r(n)})})(arguments),o?s=l.length:n&&(a=t,f(n))}return this},remove:function(){return l&&st.each(arguments,function(e,t){for(var n;(n=st.inArray(t,l,n))>-1;)l.splice(n,1),o&&(s>=n&&s--,u>=n&&u--)}),this},has:function(e){return st.inArray(e,l)>-1},empty:function(){return l=[],this},disable:function(){return l=c=n=t,this},disabled:function(){return!l},lock:function(){return c=t,n||p.disable(),this},locked:function(){return!c},fireWith:function(e,t){return t=t||[],t=[e,t.slice?t.slice():t],!l||i&&!c||(o?c.push(t):f(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},st.extend({Deferred:function(e){var t=[["resolve","done",st.Callbacks("once memory"),"resolved"],["reject","fail",st.Callbacks("once memory"),"rejected"],["notify","progress",st.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return st.Deferred(function(n){st.each(t,function(t,o){var a=o[0],s=st.isFunction(e[t])&&e[t];i[o[1]](function(){var e=s&&s.apply(this,arguments);e&&st.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[a+"With"](this===r?n.promise():this,s?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?st.extend(e,r):r}},i={};return r.pipe=r.then,st.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t,n,r,i=0,o=nt.call(arguments),a=o.length,s=1!==a||e&&st.isFunction(e.promise)?a:0,u=1===s?e:st.Deferred(),l=function(e,n,r){return function(i){n[e]=this,r[e]=arguments.length>1?nt.call(arguments):i,r===t?u.notifyWith(n,r):--s||u.resolveWith(n,r)}};if(a>1)for(t=Array(a),n=Array(a),r=Array(a);a>i;i++)o[i]&&st.isFunction(o[i].promise)?o[i].promise().done(l(i,r,o)).fail(u.reject).progress(l(i,n,t)):--s;return s||u.resolveWith(r,o),u.promise()}}),st.support=function(){var n,r,i,o,a,s,u,l,c,f,p=V.createElement("div");if(p.setAttribute("className","t"),p.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",r=p.getElementsByTagName("*"),i=p.getElementsByTagName("a")[0],!r||!i||!r.length)return{};o=V.createElement("select"),a=o.appendChild(V.createElement("option")),s=p.getElementsByTagName("input")[0],i.style.cssText="top:1px;float:left;opacity:.5",n={getSetAttribute:"t"!==p.className,leadingWhitespace:3===p.firstChild.nodeType,tbody:!p.getElementsByTagName("tbody").length,htmlSerialize:!!p.getElementsByTagName("link").length,style:/top/.test(i.getAttribute("style")),hrefNormalized:"/a"===i.getAttribute("href"),opacity:/^0.5/.test(i.style.opacity),cssFloat:!!i.style.cssFloat,checkOn:!!s.value,optSelected:a.selected,enctype:!!V.createElement("form").enctype,html5Clone:"<:nav></:nav>"!==V.createElement("nav").cloneNode(!0).outerHTML,boxModel:"CSS1Compat"===V.compatMode,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},s.checked=!0,n.noCloneChecked=s.cloneNode(!0).checked,o.disabled=!0,n.optDisabled=!a.disabled;try{delete p.test}catch(d){n.deleteExpando=!1}s=V.createElement("input"),s.setAttribute("value",""),n.input=""===s.getAttribute("value"),s.value="t",s.setAttribute("type","radio"),n.radioValue="t"===s.value,s.setAttribute("checked","t"),s.setAttribute("name","t"),u=V.createDocumentFragment(),u.appendChild(s),n.appendChecked=s.checked,n.checkClone=u.cloneNode(!0).cloneNode(!0).lastChild.checked,p.attachEvent&&(p.attachEvent("onclick",function(){n.noCloneEvent=!1}),p.cloneNode(!0).click());for(f in{submit:!0,change:!0,focusin:!0})p.setAttribute(l="on"+f,"t"),n[f+"Bubbles"]=l in e||p.attributes[l].expando===!1;return p.style.backgroundClip="content-box",p.cloneNode(!0).style.backgroundClip="",n.clearCloneStyle="content-box"===p.style.backgroundClip,st(function(){var r,i,o,a="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",s=V.getElementsByTagName("body")[0];s&&(r=V.createElement("div"),r.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",s.appendChild(r).appendChild(p),p.innerHTML="<table><tr><td></td><td>t</td></tr></table>",o=p.getElementsByTagName("td"),o[0].style.cssText="padding:0;margin:0;border:0;display:none",c=0===o[0].offsetHeight,o[0].style.display="",o[1].style.display="none",n.reliableHiddenOffsets=c&&0===o[0].offsetHeight,p.innerHTML="",p.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",n.boxSizing=4===p.offsetWidth,n.doesNotIncludeMarginInBodyOffset=1!==s.offsetTop,e.getComputedStyle&&(n.pixelPosition="1%"!==(e.getComputedStyle(p,null)||{}).top,n.boxSizingReliable="4px"===(e.getComputedStyle(p,null)||{width:"4px"}).width,i=p.appendChild(V.createElement("div")),i.style.cssText=p.style.cssText=a,i.style.marginRight=i.style.width="0",p.style.width="1px",n.reliableMarginRight=!parseFloat((e.getComputedStyle(i,null)||{}).marginRight)),p.style.zoom!==t&&(p.innerHTML="",p.style.cssText=a+"width:1px;padding:1px;display:inline;zoom:1",n.inlineBlockNeedsLayout=3===p.offsetWidth,p.style.display="block",p.innerHTML="<div></div>",p.firstChild.style.width="5px",n.shrinkWrapBlocks=3!==p.offsetWidth,s.style.zoom=1),s.removeChild(r),r=p=o=i=null)}),r=o=u=a=i=s=null,n}();var wt=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,Nt=/([A-Z])/g;st.extend({cache:{},expando:"jQuery"+(Z+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(e){return e=e.nodeType?st.cache[e[st.expando]]:e[st.expando],!!e&&!s(e)},data:function(e,t,n){return i(e,t,n,!1)},removeData:function(e,t){return o(e,t,!1)},_data:function(e,t,n){return i(e,t,n,!0)},_removeData:function(e,t){return o(e,t,!0)},acceptData:function(e){var t=e.nodeName&&st.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),st.fn.extend({data:function(e,n){var r,i,o=this[0],s=0,u=null;if(e===t){if(this.length&&(u=st.data(o),1===o.nodeType&&!st._data(o,"parsedAttrs"))){for(r=o.attributes;r.length>s;s++)i=r[s].name,i.indexOf("data-")||(i=st.camelCase(i.substring(5)),a(o,i,u[i]));st._data(o,"parsedAttrs",!0)}return u}return"object"==typeof e?this.each(function(){st.data(this,e)}):st.access(this,function(n){return n===t?o?a(o,e,st.data(o,e)):null:(this.each(function(){st.data(this,e,n)}),t)},null,n,arguments.length>1,null,!0)},removeData:function(e){return this.each(function(){st.removeData(this,e)})}}),st.extend({queue:function(e,n,r){var i;return e?(n=(n||"fx")+"queue",i=st._data(e,n),r&&(!i||st.isArray(r)?i=st._data(e,n,st.makeArray(r)):i.push(r)),i||[]):t},dequeue:function(e,t){t=t||"fx";var n=st.queue(e,t),r=n.length,i=n.shift(),o=st._queueHooks(e,t),a=function(){st.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),o.cur=i,i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return st._data(e,n)||st._data(e,n,{empty:st.Callbacks("once memory").add(function(){st._removeData(e,t+"queue"),st._removeData(e,n)})})}}),st.fn.extend({queue:function(e,n){var r=2;return"string"!=typeof e&&(n=e,e="fx",r--),r>arguments.length?st.queue(this[0],e):n===t?this:this.each(function(){var t=st.queue(this,e,n);st._queueHooks(this,e),"fx"===e&&"inprogress"!==t[0]&&st.dequeue(this,e)})},dequeue:function(e){return this.each(function(){st.dequeue(this,e)})},delay:function(e,t){return e=st.fx?st.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,o=st.Deferred(),a=this,s=this.length,u=function(){--i||o.resolveWith(a,[a])};for("string"!=typeof e&&(n=e,e=t),e=e||"fx";s--;)r=st._data(a[s],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(u));return u(),o.promise(n)}});var Ct,kt,Et=/[\t\r\n]/g,St=/\r/g,At=/^(?:input|select|textarea|button|object)$/i,jt=/^(?:a|area)$/i,Dt=/^(?:checked|selected|autofocus|autoplay|async|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped)$/i,Lt=/^(?:checked|selected)$/i,Ht=st.support.getSetAttribute,Mt=st.support.input;st.fn.extend({attr:function(e,t){return st.access(this,st.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){st.removeAttr(this,e)})},prop:function(e,t){return st.access(this,st.prop,e,t,arguments.length>1)},removeProp:function(e){return e=st.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,o,a=0,s=this.length,u="string"==typeof e&&e;if(st.isFunction(e))return this.each(function(t){st(this).addClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(lt)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(Et," "):" ")){for(o=0;i=t[o++];)0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=st.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,a=0,s=this.length,u=0===arguments.length||"string"==typeof e&&e;if(st.isFunction(e))return this.each(function(t){st(this).removeClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(lt)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(Et," "):"")){for(o=0;i=t[o++];)for(;r.indexOf(" "+i+" ")>=0;)r=r.replace(" "+i+" "," ");n.className=e?st.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e,r="boolean"==typeof t;return st.isFunction(e)?this.each(function(n){st(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n)for(var i,o=0,a=st(this),s=t,u=e.match(lt)||[];i=u[o++];)s=r?s:!a.hasClass(i),a[s?"addClass":"removeClass"](i);else("undefined"===n||"boolean"===n)&&(this.className&&st._data(this,"__className__",this.className),this.className=this.className||e===!1?"":st._data(this,"__className__")||"")})},hasClass:function(e){for(var t=" "+e+" ",n=0,r=this.length;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(Et," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,o=this[0];{if(arguments.length)return i=st.isFunction(e),this.each(function(r){var o,a=st(this);1===this.nodeType&&(o=i?e.call(this,r,a.val()):e,null==o?o="":"number"==typeof o?o+="":st.isArray(o)&&(o=st.map(o,function(e){return null==e?"":e+""})),n=st.valHooks[this.type]||st.valHooks[this.nodeName.toLowerCase()],n&&"set"in n&&n.set(this,o,"value")!==t||(this.value=o))});if(o)return n=st.valHooks[o.type]||st.valHooks[o.nodeName.toLowerCase()],n&&"get"in n&&(r=n.get(o,"value"))!==t?r:(r=o.value,"string"==typeof r?r.replace(St,""):null==r?"":r)}}}),st.extend({valHooks:{option:{get:function(e){var t=e.attributes.value;return!t||t.specified?e.value:e.text}},select:{get:function(e){for(var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,a=o?null:[],s=o?i+1:r.length,u=0>i?s:o?i:0;s>u;u++)if(n=r[u],!(!n.selected&&u!==i||(st.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&st.nodeName(n.parentNode,"optgroup"))){if(t=st(n).val(),o)return t;a.push(t)}return a},set:function(e,t){var n=st.makeArray(t);return st(e).find("option").each(function(){this.selected=st.inArray(st(this).val(),n)>=0}),n.length||(e.selectedIndex=-1),n}}},attr:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return e.getAttribute===t?st.prop(e,n,r):(a=1!==s||!st.isXMLDoc(e),a&&(n=n.toLowerCase(),o=st.attrHooks[n]||(Dt.test(n)?kt:Ct)),r===t?o&&a&&"get"in o&&null!==(i=o.get(e,n))?i:(e.getAttribute!==t&&(i=e.getAttribute(n)),null==i?t:i):null!==r?o&&a&&"set"in o&&(i=o.set(e,r,n))!==t?i:(e.setAttribute(n,r+""),r):(st.removeAttr(e,n),t))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(lt);if(o&&1===e.nodeType)for(;n=o[i++];)r=st.propFix[n]||n,Dt.test(n)?!Ht&&Lt.test(n)?e[st.camelCase("default-"+n)]=e[r]=!1:e[r]=!1:st.attr(e,n,""),e.removeAttribute(Ht?n:r)},attrHooks:{type:{set:function(e,t){if(!st.support.radioValue&&"radio"===t&&st.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return a=1!==s||!st.isXMLDoc(e),a&&(n=st.propFix[n]||n,o=st.propHooks[n]),r!==t?o&&"set"in o&&(i=o.set(e,r,n))!==t?i:e[n]=r:o&&"get"in o&&null!==(i=o.get(e,n))?i:e[n]},propHooks:{tabIndex:{get:function(e){var n=e.getAttributeNode("tabindex");return n&&n.specified?parseInt(n.value,10):At.test(e.nodeName)||jt.test(e.nodeName)&&e.href?0:t}}}}),kt={get:function(e,n){var r=st.prop(e,n),i="boolean"==typeof r&&e.getAttribute(n),o="boolean"==typeof r?Mt&&Ht?null!=i:Lt.test(n)?e[st.camelCase("default-"+n)]:!!i:e.getAttributeNode(n);return o&&o.value!==!1?n.toLowerCase():t},set:function(e,t,n){return t===!1?st.removeAttr(e,n):Mt&&Ht||!Lt.test(n)?e.setAttribute(!Ht&&st.propFix[n]||n,n):e[st.camelCase("default-"+n)]=e[n]=!0,n}},Mt&&Ht||(st.attrHooks.value={get:function(e,n){var r=e.getAttributeNode(n);return st.nodeName(e,"input")?e.defaultValue:r&&r.specified?r.value:t
-},set:function(e,n,r){return st.nodeName(e,"input")?(e.defaultValue=n,t):Ct&&Ct.set(e,n,r)}}),Ht||(Ct=st.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&("id"===n||"name"===n||"coords"===n?""!==r.value:r.specified)?r.value:t},set:function(e,n,r){var i=e.getAttributeNode(r);return i||e.setAttributeNode(i=e.ownerDocument.createAttribute(r)),i.value=n+="","value"===r||n===e.getAttribute(r)?n:t}},st.attrHooks.contenteditable={get:Ct.get,set:function(e,t,n){Ct.set(e,""===t?!1:t,n)}},st.each(["width","height"],function(e,n){st.attrHooks[n]=st.extend(st.attrHooks[n],{set:function(e,r){return""===r?(e.setAttribute(n,"auto"),r):t}})})),st.support.hrefNormalized||(st.each(["href","src","width","height"],function(e,n){st.attrHooks[n]=st.extend(st.attrHooks[n],{get:function(e){var r=e.getAttribute(n,2);return null==r?t:r}})}),st.each(["href","src"],function(e,t){st.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}})),st.support.style||(st.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}),st.support.optSelected||(st.propHooks.selected=st.extend(st.propHooks.selected,{get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}})),st.support.enctype||(st.propFix.enctype="encoding"),st.support.checkOn||st.each(["radio","checkbox"],function(){st.valHooks[this]={get:function(e){return null===e.getAttribute("value")?"on":e.value}}}),st.each(["radio","checkbox"],function(){st.valHooks[this]=st.extend(st.valHooks[this],{set:function(e,n){return st.isArray(n)?e.checked=st.inArray(st(e).val(),n)>=0:t}})});var qt=/^(?:input|select|textarea)$/i,_t=/^key/,Ft=/^(?:mouse|contextmenu)|click/,Ot=/^(?:focusinfocus|focusoutblur)$/,Bt=/^([^.]*)(?:\.(.+)|)$/;st.event={global:{},add:function(e,n,r,i,o){var a,s,u,l,c,f,p,d,h,g,m,y=3!==e.nodeType&&8!==e.nodeType&&st._data(e);if(y){for(r.handler&&(a=r,r=a.handler,o=a.selector),r.guid||(r.guid=st.guid++),(l=y.events)||(l=y.events={}),(s=y.handle)||(s=y.handle=function(e){return st===t||e&&st.event.triggered===e.type?t:st.event.dispatch.apply(s.elem,arguments)},s.elem=e),n=(n||"").match(lt)||[""],c=n.length;c--;)u=Bt.exec(n[c])||[],h=m=u[1],g=(u[2]||"").split(".").sort(),p=st.event.special[h]||{},h=(o?p.delegateType:p.bindType)||h,p=st.event.special[h]||{},f=st.extend({type:h,origType:m,data:i,handler:r,guid:r.guid,selector:o,needsContext:o&&st.expr.match.needsContext.test(o),namespace:g.join(".")},a),(d=l[h])||(d=l[h]=[],d.delegateCount=0,p.setup&&p.setup.call(e,i,g,s)!==!1||(e.addEventListener?e.addEventListener(h,s,!1):e.attachEvent&&e.attachEvent("on"+h,s))),p.add&&(p.add.call(e,f),f.handler.guid||(f.handler.guid=r.guid)),o?d.splice(d.delegateCount++,0,f):d.push(f),st.event.global[h]=!0;e=null}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,m=st.hasData(e)&&st._data(e);if(m&&(u=m.events)){for(t=(t||"").match(lt)||[""],l=t.length;l--;)if(s=Bt.exec(t[l])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){for(f=st.event.special[d]||{},d=(r?f.delegateType:f.bindType)||d,p=u[d]||[],s=s[2]&&RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;o--;)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&f.teardown.call(e,h,m.handle)!==!1||st.removeEvent(e,d,m.handle),delete u[d])}else for(d in u)st.event.remove(e,d+t[l],n,r,!0);st.isEmptyObject(u)&&(delete m.handle,st._removeData(e,"events"))}},trigger:function(n,r,i,o){var a,s,u,l,c,f,p,d=[i||V],h=n.type||n,g=n.namespace?n.namespace.split("."):[];if(s=u=i=i||V,3!==i.nodeType&&8!==i.nodeType&&!Ot.test(h+st.event.triggered)&&(h.indexOf(".")>=0&&(g=h.split("."),h=g.shift(),g.sort()),c=0>h.indexOf(":")&&"on"+h,n=n[st.expando]?n:new st.Event(h,"object"==typeof n&&n),n.isTrigger=!0,n.namespace=g.join("."),n.namespace_re=n.namespace?RegExp("(^|\\.)"+g.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,n.result=t,n.target||(n.target=i),r=null==r?[n]:st.makeArray(r,[n]),p=st.event.special[h]||{},o||!p.trigger||p.trigger.apply(i,r)!==!1)){if(!o&&!p.noBubble&&!st.isWindow(i)){for(l=p.delegateType||h,Ot.test(l+h)||(s=s.parentNode);s;s=s.parentNode)d.push(s),u=s;u===(i.ownerDocument||V)&&d.push(u.defaultView||u.parentWindow||e)}for(a=0;(s=d[a++])&&!n.isPropagationStopped();)n.type=a>1?l:p.bindType||h,f=(st._data(s,"events")||{})[n.type]&&st._data(s,"handle"),f&&f.apply(s,r),f=c&&s[c],f&&st.acceptData(s)&&f.apply&&f.apply(s,r)===!1&&n.preventDefault();if(n.type=h,!(o||n.isDefaultPrevented()||p._default&&p._default.apply(i.ownerDocument,r)!==!1||"click"===h&&st.nodeName(i,"a")||!st.acceptData(i)||!c||!i[h]||st.isWindow(i))){u=i[c],u&&(i[c]=null),st.event.triggered=h;try{i[h]()}catch(m){}st.event.triggered=t,u&&(i[c]=u)}return n.result}},dispatch:function(e){e=st.event.fix(e);var n,r,i,o,a,s=[],u=nt.call(arguments),l=(st._data(this,"events")||{})[e.type]||[],c=st.event.special[e.type]||{};if(u[0]=e,e.delegateTarget=this,!c.preDispatch||c.preDispatch.call(this,e)!==!1){for(s=st.event.handlers.call(this,e,l),n=0;(o=s[n++])&&!e.isPropagationStopped();)for(e.currentTarget=o.elem,r=0;(a=o.handlers[r++])&&!e.isImmediatePropagationStopped();)(!e.namespace_re||e.namespace_re.test(a.namespace))&&(e.handleObj=a,e.data=a.data,i=((st.event.special[a.origType]||{}).handle||a.handler).apply(o.elem,u),i!==t&&(e.result=i)===!1&&(e.preventDefault(),e.stopPropagation()));return c.postDispatch&&c.postDispatch.call(this,e),e.result}},handlers:function(e,n){var r,i,o,a,s=[],u=n.delegateCount,l=e.target;if(u&&l.nodeType&&(!e.button||"click"!==e.type))for(;l!=this;l=l.parentNode||this)if(l.disabled!==!0||"click"!==e.type){for(i=[],r=0;u>r;r++)a=n[r],o=a.selector+" ",i[o]===t&&(i[o]=a.needsContext?st(o,this).index(l)>=0:st.find(o,this,null,[l]).length),i[o]&&i.push(a);i.length&&s.push({elem:l,handlers:i})}return n.length>u&&s.push({elem:this,handlers:n.slice(u)}),s},fix:function(e){if(e[st.expando])return e;var t,n,r=e,i=st.event.fixHooks[e.type]||{},o=i.props?this.props.concat(i.props):this.props;for(e=new st.Event(r),t=o.length;t--;)n=o[t],e[n]=r[n];return e.target||(e.target=r.srcElement||V),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,i.filter?i.filter(e,r):e},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,i,o,a=n.button,s=n.fromElement;return null==e.pageX&&null!=n.clientX&&(r=e.target.ownerDocument||V,i=r.documentElement,o=r.body,e.pageX=n.clientX+(i&&i.scrollLeft||o&&o.scrollLeft||0)-(i&&i.clientLeft||o&&o.clientLeft||0),e.pageY=n.clientY+(i&&i.scrollTop||o&&o.scrollTop||0)-(i&&i.clientTop||o&&o.clientTop||0)),!e.relatedTarget&&s&&(e.relatedTarget=s===e.target?n.toElement:s),e.which||a===t||(e.which=1&a?1:2&a?3:4&a?2:0),e}},special:{load:{noBubble:!0},click:{trigger:function(){return st.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):t}},focus:{trigger:function(){if(this!==V.activeElement&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){return this===V.activeElement&&this.blur?(this.blur(),!1):t},delegateType:"focusout"},beforeunload:{postDispatch:function(e){e.result!==t&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=st.extend(new st.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?st.event.trigger(i,null,t):st.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},st.removeEvent=V.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,n,r){var i="on"+n;e.detachEvent&&(e[i]===t&&(e[i]=null),e.detachEvent(i,r))},st.Event=function(e,n){return this instanceof st.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?u:l):this.type=e,n&&st.extend(this,n),this.timeStamp=e&&e.timeStamp||st.now(),this[st.expando]=!0,t):new st.Event(e,n)},st.Event.prototype={isDefaultPrevented:l,isPropagationStopped:l,isImmediatePropagationStopped:l,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=u,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=u,e&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=u,this.stopPropagation()}},st.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){st.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return(!i||i!==r&&!st.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),st.support.submitBubbles||(st.event.special.submit={setup:function(){return st.nodeName(this,"form")?!1:(st.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=st.nodeName(n,"input")||st.nodeName(n,"button")?n.form:t;r&&!st._data(r,"submitBubbles")&&(st.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),st._data(r,"submitBubbles",!0))}),t)},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&st.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){return st.nodeName(this,"form")?!1:(st.event.remove(this,"._submit"),t)}}),st.support.changeBubbles||(st.event.special.change={setup:function(){return qt.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(st.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._just_changed=!0)}),st.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),st.event.simulate("change",this,e,!0)})),!1):(st.event.add(this,"beforeactivate._change",function(e){var t=e.target;qt.test(t.nodeName)&&!st._data(t,"changeBubbles")&&(st.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||st.event.simulate("change",this.parentNode,e,!0)}),st._data(t,"changeBubbles",!0))}),t)},handle:function(e){var n=e.target;return this!==n||e.isSimulated||e.isTrigger||"radio"!==n.type&&"checkbox"!==n.type?e.handleObj.handler.apply(this,arguments):t},teardown:function(){return st.event.remove(this,"._change"),!qt.test(this.nodeName)}}),st.support.focusinBubbles||st.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){st.event.simulate(t,e.target,st.event.fix(e),!0)};st.event.special[t]={setup:function(){0===n++&&V.addEventListener(e,r,!0)},teardown:function(){0===--n&&V.removeEventListener(e,r,!0)}}}),st.fn.extend({on:function(e,n,r,i,o){var a,s;if("object"==typeof e){"string"!=typeof n&&(r=r||n,n=t);for(s in e)this.on(s,n,r,e[s],o);return this}if(null==r&&null==i?(i=n,r=n=t):null==i&&("string"==typeof n?(i=r,r=t):(i=r,r=n,n=t)),i===!1)i=l;else if(!i)return this;return 1===o&&(a=i,i=function(e){return st().off(e),a.apply(this,arguments)},i.guid=a.guid||(a.guid=st.guid++)),this.each(function(){st.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,o;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,st(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if("object"==typeof e){for(o in e)this.off(o,n,e[o]);return this}return(n===!1||"function"==typeof n)&&(r=n,n=t),r===!1&&(r=l),this.each(function(){st.event.remove(this,e,r,n)})},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},trigger:function(e,t){return this.each(function(){st.event.trigger(e,t,this)})},triggerHandler:function(e,n){var r=this[0];return r?st.event.trigger(e,n,r,!0):t},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),st.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){st.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)},_t.test(t)&&(st.event.fixHooks[t]=st.event.keyHooks),Ft.test(t)&&(st.event.fixHooks[t]=st.event.mouseHooks)}),function(e,t){function n(e){return ht.test(e+"")}function r(){var e,t=[];return e=function(n,r){return t.push(n+=" ")>C.cacheLength&&delete e[t.shift()],e[n]=r}}function i(e){return e[P]=!0,e}function o(e){var t=L.createElement("div");try{return e(t)}catch(n){return!1}finally{t=null}}function a(e,t,n,r){var i,o,a,s,u,l,c,d,h,g;if((t?t.ownerDocument||t:R)!==L&&D(t),t=t||L,n=n||[],!e||"string"!=typeof e)return n;if(1!==(s=t.nodeType)&&9!==s)return[];if(!M&&!r){if(i=gt.exec(e))if(a=i[1]){if(9===s){if(o=t.getElementById(a),!o||!o.parentNode)return n;if(o.id===a)return n.push(o),n}else if(t.ownerDocument&&(o=t.ownerDocument.getElementById(a))&&O(t,o)&&o.id===a)return n.push(o),n}else{if(i[2])return Q.apply(n,K.call(t.getElementsByTagName(e),0)),n;if((a=i[3])&&W.getByClassName&&t.getElementsByClassName)return Q.apply(n,K.call(t.getElementsByClassName(a),0)),n}if(W.qsa&&!q.test(e)){if(c=!0,d=P,h=t,g=9===s&&e,1===s&&"object"!==t.nodeName.toLowerCase()){for(l=f(e),(c=t.getAttribute("id"))?d=c.replace(vt,"\\$&"):t.setAttribute("id",d),d="[id='"+d+"'] ",u=l.length;u--;)l[u]=d+p(l[u]);h=dt.test(e)&&t.parentNode||t,g=l.join(",")}if(g)try{return Q.apply(n,K.call(h.querySelectorAll(g),0)),n}catch(m){}finally{c||t.removeAttribute("id")}}}return x(e.replace(at,"$1"),t,n,r)}function s(e,t){for(var n=e&&t&&e.nextSibling;n;n=n.nextSibling)if(n===t)return-1;return e?1:-1}function u(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function l(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function c(e){return i(function(t){return t=+t,i(function(n,r){for(var i,o=e([],n.length,t),a=o.length;a--;)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}function f(e,t){var n,r,i,o,s,u,l,c=X[e+" "];if(c)return t?0:c.slice(0);for(s=e,u=[],l=C.preFilter;s;){(!n||(r=ut.exec(s)))&&(r&&(s=s.slice(r[0].length)||s),u.push(i=[])),n=!1,(r=lt.exec(s))&&(n=r.shift(),i.push({value:n,type:r[0].replace(at," ")}),s=s.slice(n.length));for(o in C.filter)!(r=pt[o].exec(s))||l[o]&&!(r=l[o](r))||(n=r.shift(),i.push({value:n,type:o,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?a.error(e):X(e,u).slice(0)}function p(e){for(var t=0,n=e.length,r="";n>t;t++)r+=e[t].value;return r}function d(e,t,n){var r=t.dir,i=n&&"parentNode"===t.dir,o=I++;return t.first?function(t,n,o){for(;t=t[r];)if(1===t.nodeType||i)return e(t,n,o)}:function(t,n,a){var s,u,l,c=$+" "+o;if(a){for(;t=t[r];)if((1===t.nodeType||i)&&e(t,n,a))return!0}else for(;t=t[r];)if(1===t.nodeType||i)if(l=t[P]||(t[P]={}),(u=l[r])&&u[0]===c){if((s=u[1])===!0||s===N)return s===!0}else if(u=l[r]=[c],u[1]=e(t,n,a)||N,u[1]===!0)return!0}}function h(e){return e.length>1?function(t,n,r){for(var i=e.length;i--;)if(!e[i](t,n,r))return!1;return!0}:e[0]}function g(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;u>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),l&&t.push(s));return a}function m(e,t,n,r,o,a){return r&&!r[P]&&(r=m(r)),o&&!o[P]&&(o=m(o,a)),i(function(i,a,s,u){var l,c,f,p=[],d=[],h=a.length,m=i||b(t||"*",s.nodeType?[s]:s,[]),y=!e||!i&&t?m:g(m,p,e,s,u),v=n?o||(i?e:h||r)?[]:a:y;if(n&&n(y,v,s,u),r)for(l=g(v,d),r(l,[],s,u),c=l.length;c--;)(f=l[c])&&(v[d[c]]=!(y[d[c]]=f));if(i){if(o||e){if(o){for(l=[],c=v.length;c--;)(f=v[c])&&l.push(y[c]=f);o(null,v=[],l,u)}for(c=v.length;c--;)(f=v[c])&&(l=o?Z.call(i,f):p[c])>-1&&(i[l]=!(a[l]=f))}}else v=g(v===a?v.splice(h,v.length):v),o?o(null,a,v,u):Q.apply(a,v)})}function y(e){for(var t,n,r,i=e.length,o=C.relative[e[0].type],a=o||C.relative[" "],s=o?1:0,u=d(function(e){return e===t},a,!0),l=d(function(e){return Z.call(t,e)>-1},a,!0),c=[function(e,n,r){return!o&&(r||n!==j)||((t=n).nodeType?u(e,n,r):l(e,n,r))}];i>s;s++)if(n=C.relative[e[s].type])c=[d(h(c),n)];else{if(n=C.filter[e[s].type].apply(null,e[s].matches),n[P]){for(r=++s;i>r&&!C.relative[e[r].type];r++);return m(s>1&&h(c),s>1&&p(e.slice(0,s-1)).replace(at,"$1"),n,r>s&&y(e.slice(s,r)),i>r&&y(e=e.slice(r)),i>r&&p(e))}c.push(n)}return h(c)}function v(e,t){var n=0,r=t.length>0,o=e.length>0,s=function(i,s,u,l,c){var f,p,d,h=[],m=0,y="0",v=i&&[],b=null!=c,x=j,T=i||o&&C.find.TAG("*",c&&s.parentNode||s),w=$+=null==x?1:Math.E;for(b&&(j=s!==L&&s,N=n);null!=(f=T[y]);y++){if(o&&f){for(p=0;d=e[p];p++)if(d(f,s,u)){l.push(f);break}b&&($=w,N=++n)}r&&((f=!d&&f)&&m--,i&&v.push(f))}if(m+=y,r&&y!==m){for(p=0;d=t[p];p++)d(v,h,s,u);if(i){if(m>0)for(;y--;)v[y]||h[y]||(h[y]=G.call(l));h=g(h)}Q.apply(l,h),b&&!i&&h.length>0&&m+t.length>1&&a.uniqueSort(l)}return b&&($=w,j=x),v};return r?i(s):s}function b(e,t,n){for(var r=0,i=t.length;i>r;r++)a(e,t[r],n);return n}function x(e,t,n,r){var i,o,a,s,u,l=f(e);if(!r&&1===l.length){if(o=l[0]=l[0].slice(0),o.length>2&&"ID"===(a=o[0]).type&&9===t.nodeType&&!M&&C.relative[o[1].type]){if(t=C.find.ID(a.matches[0].replace(xt,Tt),t)[0],!t)return n;e=e.slice(o.shift().value.length)}for(i=pt.needsContext.test(e)?-1:o.length-1;i>=0&&(a=o[i],!C.relative[s=a.type]);i--)if((u=C.find[s])&&(r=u(a.matches[0].replace(xt,Tt),dt.test(o[0].type)&&t.parentNode||t))){if(o.splice(i,1),e=r.length&&p(o),!e)return Q.apply(n,K.call(r,0)),n;break}}return S(e,l)(r,t,M,n,dt.test(e)),n}function T(){}var w,N,C,k,E,S,A,j,D,L,H,M,q,_,F,O,B,P="sizzle"+-new Date,R=e.document,W={},$=0,I=0,z=r(),X=r(),U=r(),V=typeof t,Y=1<<31,J=[],G=J.pop,Q=J.push,K=J.slice,Z=J.indexOf||function(e){for(var t=0,n=this.length;n>t;t++)if(this[t]===e)return t;return-1},et="[\\x20\\t\\r\\n\\f]",tt="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",nt=tt.replace("w","w#"),rt="([*^$|!~]?=)",it="\\["+et+"*("+tt+")"+et+"*(?:"+rt+et+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+nt+")|)|)"+et+"*\\]",ot=":("+tt+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+it.replace(3,8)+")*)|.*)\\)|)",at=RegExp("^"+et+"+|((?:^|[^\\\\])(?:\\\\.)*)"+et+"+$","g"),ut=RegExp("^"+et+"*,"+et+"*"),lt=RegExp("^"+et+"*([\\x20\\t\\r\\n\\f>+~])"+et+"*"),ct=RegExp(ot),ft=RegExp("^"+nt+"$"),pt={ID:RegExp("^#("+tt+")"),CLASS:RegExp("^\\.("+tt+")"),NAME:RegExp("^\\[name=['\"]?("+tt+")['\"]?\\]"),TAG:RegExp("^("+tt.replace("w","w*")+")"),ATTR:RegExp("^"+it),PSEUDO:RegExp("^"+ot),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+et+"*(even|odd|(([+-]|)(\\d*)n|)"+et+"*(?:([+-]|)"+et+"*(\\d+)|))"+et+"*\\)|)","i"),needsContext:RegExp("^"+et+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+et+"*((?:-\\d)?\\d*)"+et+"*\\)|)(?=[^-]|$)","i")},dt=/[\x20\t\r\n\f]*[+~]/,ht=/\{\s*\[native code\]\s*\}/,gt=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,mt=/^(?:input|select|textarea|button)$/i,yt=/^h\d$/i,vt=/'|\\/g,bt=/\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,xt=/\\([\da-fA-F]{1,6}[\x20\t\r\n\f]?|.)/g,Tt=function(e,t){var n="0x"+t-65536;return n!==n?t:0>n?String.fromCharCode(n+65536):String.fromCharCode(55296|n>>10,56320|1023&n)};try{K.call(H.childNodes,0)[0].nodeType}catch(wt){K=function(e){for(var t,n=[];t=this[e];e++)n.push(t);return n}}E=a.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},D=a.setDocument=function(e){var r=e?e.ownerDocument||e:R;return r!==L&&9===r.nodeType&&r.documentElement?(L=r,H=r.documentElement,M=E(r),W.tagNameNoComments=o(function(e){return e.appendChild(r.createComment("")),!e.getElementsByTagName("*").length}),W.attributes=o(function(e){e.innerHTML="<select></select>";var t=typeof e.lastChild.getAttribute("multiple");return"boolean"!==t&&"string"!==t}),W.getByClassName=o(function(e){return e.innerHTML="<div class='hidden e'></div><div class='hidden'></div>",e.getElementsByClassName&&e.getElementsByClassName("e").length?(e.lastChild.className="e",2===e.getElementsByClassName("e").length):!1}),W.getByName=o(function(e){e.id=P+0,e.innerHTML="<a name='"+P+"'></a><div name='"+P+"'></div>",H.insertBefore(e,H.firstChild);var t=r.getElementsByName&&r.getElementsByName(P).length===2+r.getElementsByName(P+0).length;return W.getIdNotName=!r.getElementById(P),H.removeChild(e),t}),C.attrHandle=o(function(e){return e.innerHTML="<a href='#'></a>",e.firstChild&&typeof e.firstChild.getAttribute!==V&&"#"===e.firstChild.getAttribute("href")})?{}:{href:function(e){return e.getAttribute("href",2)},type:function(e){return e.getAttribute("type")}},W.getIdNotName?(C.find.ID=function(e,t){if(typeof t.getElementById!==V&&!M){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},C.filter.ID=function(e){var t=e.replace(xt,Tt);return function(e){return e.getAttribute("id")===t}}):(C.find.ID=function(e,n){if(typeof n.getElementById!==V&&!M){var r=n.getElementById(e);return r?r.id===e||typeof r.getAttributeNode!==V&&r.getAttributeNode("id").value===e?[r]:t:[]}},C.filter.ID=function(e){var t=e.replace(xt,Tt);return function(e){var n=typeof e.getAttributeNode!==V&&e.getAttributeNode("id");return n&&n.value===t}}),C.find.TAG=W.tagNameNoComments?function(e,n){return typeof n.getElementsByTagName!==V?n.getElementsByTagName(e):t}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){for(;n=o[i];i++)1===n.nodeType&&r.push(n);return r}return o},C.find.NAME=W.getByName&&function(e,n){return typeof n.getElementsByName!==V?n.getElementsByName(name):t},C.find.CLASS=W.getByClassName&&function(e,n){return typeof n.getElementsByClassName===V||M?t:n.getElementsByClassName(e)},_=[],q=[":focus"],(W.qsa=n(r.querySelectorAll))&&(o(function(e){e.innerHTML="<select><option selected=''></option></select>",e.querySelectorAll("[selected]").length||q.push("\\["+et+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),e.querySelectorAll(":checked").length||q.push(":checked")}),o(function(e){e.innerHTML="<input type='hidden' i=''/>",e.querySelectorAll("[i^='']").length&&q.push("[*^$]="+et+"*(?:\"\"|'')"),e.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),q.push(",.*:")})),(W.matchesSelector=n(F=H.matchesSelector||H.mozMatchesSelector||H.webkitMatchesSelector||H.oMatchesSelector||H.msMatchesSelector))&&o(function(e){W.disconnectedMatch=F.call(e,"div"),F.call(e,"[s!='']:x"),_.push("!=",ot)}),q=RegExp(q.join("|")),_=RegExp(_.join("|")),O=n(H.contains)||H.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)for(;t=t.parentNode;)if(t===e)return!0;return!1},B=H.compareDocumentPosition?function(e,t){var n;return e===t?(A=!0,0):(n=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t))?1&n||e.parentNode&&11===e.parentNode.nodeType?e===r||O(R,e)?-1:t===r||O(R,t)?1:0:4&n?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var n,i=0,o=e.parentNode,a=t.parentNode,u=[e],l=[t];if(e===t)return A=!0,0;if(e.sourceIndex&&t.sourceIndex)return(~t.sourceIndex||Y)-(O(R,e)&&~e.sourceIndex||Y);if(!o||!a)return e===r?-1:t===r?1:o?-1:a?1:0;if(o===a)return s(e,t);for(n=e;n=n.parentNode;)u.unshift(n);for(n=t;n=n.parentNode;)l.unshift(n);for(;u[i]===l[i];)i++;return i?s(u[i],l[i]):u[i]===R?-1:l[i]===R?1:0},A=!1,[0,0].sort(B),W.detectDuplicates=A,L):L},a.matches=function(e,t){return a(e,null,null,t)},a.matchesSelector=function(e,t){if((e.ownerDocument||e)!==L&&D(e),t=t.replace(bt,"='$1']"),!(!W.matchesSelector||M||_&&_.test(t)||q.test(t)))try{var n=F.call(e,t);if(n||W.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(r){}return a(t,L,null,[e]).length>0},a.contains=function(e,t){return(e.ownerDocument||e)!==L&&D(e),O(e,t)},a.attr=function(e,t){var n;return(e.ownerDocument||e)!==L&&D(e),M||(t=t.toLowerCase()),(n=C.attrHandle[t])?n(e):M||W.attributes?e.getAttribute(t):((n=e.getAttributeNode(t))||e.getAttribute(t))&&e[t]===!0?t:n&&n.specified?n.value:null},a.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},a.uniqueSort=function(e){var t,n=[],r=1,i=0;if(A=!W.detectDuplicates,e.sort(B),A){for(;t=e[r];r++)t===e[r-1]&&(i=n.push(r));for(;i--;)e.splice(n[i],1)}return e},k=a.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=k(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=k(t);return n},C=a.selectors={cacheLength:50,createPseudo:i,match:pt,find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(xt,Tt),e[3]=(e[4]||e[5]||"").replace(xt,Tt),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||a.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&a.error(e[0]),e},PSEUDO:function(e){var t,n=!e[5]&&e[2];return pt.CHILD.test(e[0])?null:(e[4]?e[2]=e[4]:n&&ct.test(n)&&(t=f(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){return"*"===e?function(){return!0}:(e=e.replace(xt,Tt).toLowerCase(),function(t){return t.nodeName&&t.nodeName.toLowerCase()===e})},CLASS:function(e){var t=z[e+" "];return t||(t=RegExp("(^|"+et+")"+e+"("+et+"|$)"))&&z(e,function(e){return t.test(e.className||typeof e.getAttribute!==V&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=a.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.substr(i.length-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.substr(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,f,p,d,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!u&&!s;if(m){if(o){for(;g;){for(f=t;f=f[g];)if(s?f.nodeName.toLowerCase()===y:1===f.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){for(c=m[P]||(m[P]={}),l=c[e]||[],d=l[0]===$&&l[1],p=l[0]===$&&l[2],f=d&&m.childNodes[d];f=++d&&f&&f[g]||(p=d=0)||h.pop();)if(1===f.nodeType&&++p&&f===t){c[e]=[$,d,p];break}}else if(v&&(l=(t[P]||(t[P]={}))[e])&&l[0]===$)p=l[1];else for(;(f=++d&&f&&f[g]||(p=d=0)||h.pop())&&((s?f.nodeName.toLowerCase()!==y:1!==f.nodeType)||!++p||(v&&((f[P]||(f[P]={}))[e]=[$,p]),f!==t)););return p-=i,p===r||0===p%r&&p/r>=0}}},PSEUDO:function(e,t){var n,r=C.pseudos[e]||C.setFilters[e.toLowerCase()]||a.error("unsupported pseudo: "+e);return r[P]?r(t):r.length>1?(n=[e,e,"",t],C.setFilters.hasOwnProperty(e.toLowerCase())?i(function(e,n){for(var i,o=r(e,t),a=o.length;a--;)i=Z.call(e,o[a]),e[i]=!(n[i]=o[a])}):function(e){return r(e,0,n)}):r}},pseudos:{not:i(function(e){var t=[],n=[],r=S(e.replace(at,"$1"));return r[P]?i(function(e,t,n,i){for(var o,a=r(e,null,i,[]),s=e.length;s--;)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:i(function(e){return function(t){return a(e,t).length>0}}),contains:i(function(e){return function(t){return(t.textContent||t.innerText||k(t)).indexOf(e)>-1}}),lang:i(function(e){return ft.test(e||"")||a.error("unsupported lang: "+e),e=e.replace(xt,Tt).toLowerCase(),function(t){var n;do if(n=M?t.getAttribute("xml:lang")||t.getAttribute("lang"):t.lang)return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===H},focus:function(e){return e===L.activeElement&&(!L.hasFocus||L.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!C.pseudos.empty(e)},header:function(e){return yt.test(e.nodeName)},input:function(e){return mt.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:c(function(){return[0]}),last:c(function(e,t){return[t-1]}),eq:c(function(e,t,n){return[0>n?n+t:n]}),even:c(function(e,t){for(var n=0;t>n;n+=2)e.push(n);return e}),odd:c(function(e,t){for(var n=1;t>n;n+=2)e.push(n);return e}),lt:c(function(e,t,n){for(var r=0>n?n+t:n;--r>=0;)e.push(r);return e}),gt:c(function(e,t,n){for(var r=0>n?n+t:n;t>++r;)e.push(r);return e})}};for(w in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})C.pseudos[w]=u(w);for(w in{submit:!0,reset:!0})C.pseudos[w]=l(w);S=a.compile=function(e,t){var n,r=[],i=[],o=U[e+" "];if(!o){for(t||(t=f(e)),n=t.length;n--;)o=y(t[n]),o[P]?r.push(o):i.push(o);o=U(e,v(i,r))}return o},C.pseudos.nth=C.pseudos.eq,C.filters=T.prototype=C.pseudos,C.setFilters=new T,D(),a.attr=st.attr,st.find=a,st.expr=a.selectors,st.expr[":"]=st.expr.pseudos,st.unique=a.uniqueSort,st.text=a.getText,st.isXMLDoc=a.isXML,st.contains=a.contains}(e);var Pt=/Until$/,Rt=/^(?:parents|prev(?:Until|All))/,Wt=/^.[^:#\[\.,]*$/,$t=st.expr.match.needsContext,It={children:!0,contents:!0,next:!0,prev:!0};st.fn.extend({find:function(e){var t,n,r;if("string"!=typeof e)return r=this,this.pushStack(st(e).filter(function(){for(t=0;r.length>t;t++)if(st.contains(r[t],this))return!0}));for(n=[],t=0;this.length>t;t++)st.find(e,this[t],n);return n=this.pushStack(st.unique(n)),n.selector=(this.selector?this.selector+" ":"")+e,n},has:function(e){var t,n=st(e,this),r=n.length;return this.filter(function(){for(t=0;r>t;t++)if(st.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(f(this,e,!1))},filter:function(e){return this.pushStack(f(this,e,!0))},is:function(e){return!!e&&("string"==typeof e?$t.test(e)?st(e,this.context).index(this[0])>=0:st.filter(e,this).length>0:this.filter(e).length>0)},closest:function(e,t){for(var n,r=0,i=this.length,o=[],a=$t.test(e)||"string"!=typeof e?st(e,t||this.context):0;i>r;r++)for(n=this[r];n&&n.ownerDocument&&n!==t&&11!==n.nodeType;){if(a?a.index(n)>-1:st.find.matchesSelector(n,e)){o.push(n);break}n=n.parentNode}return this.pushStack(o.length>1?st.unique(o):o)},index:function(e){return e?"string"==typeof e?st.inArray(this[0],st(e)):st.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?st(e,t):st.makeArray(e&&e.nodeType?[e]:e),r=st.merge(this.get(),n);return this.pushStack(st.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),st.fn.andSelf=st.fn.addBack,st.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return st.dir(e,"parentNode")},parentsUntil:function(e,t,n){return st.dir(e,"parentNode",n)},next:function(e){return c(e,"nextSibling")},prev:function(e){return c(e,"previousSibling")
-},nextAll:function(e){return st.dir(e,"nextSibling")},prevAll:function(e){return st.dir(e,"previousSibling")},nextUntil:function(e,t,n){return st.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return st.dir(e,"previousSibling",n)},siblings:function(e){return st.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return st.sibling(e.firstChild)},contents:function(e){return st.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:st.merge([],e.childNodes)}},function(e,t){st.fn[e]=function(n,r){var i=st.map(this,t,n);return Pt.test(e)||(r=n),r&&"string"==typeof r&&(i=st.filter(r,i)),i=this.length>1&&!It[e]?st.unique(i):i,this.length>1&&Rt.test(e)&&(i=i.reverse()),this.pushStack(i)}}),st.extend({filter:function(e,t,n){return n&&(e=":not("+e+")"),1===t.length?st.find.matchesSelector(t[0],e)?[t[0]]:[]:st.find.matches(e,t)},dir:function(e,n,r){for(var i=[],o=e[n];o&&9!==o.nodeType&&(r===t||1!==o.nodeType||!st(o).is(r));)1===o.nodeType&&i.push(o),o=o[n];return i},sibling:function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});var zt="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",Xt=/ jQuery\d+="(?:null|\d+)"/g,Ut=RegExp("<(?:"+zt+")[\\s/>]","i"),Vt=/^\s+/,Yt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,Jt=/<([\w:]+)/,Gt=/<tbody/i,Qt=/<|&#?\w+;/,Kt=/<(?:script|style|link)/i,Zt=/^(?:checkbox|radio)$/i,en=/checked\s*(?:[^=]|=\s*.checked.)/i,tn=/^$|\/(?:java|ecma)script/i,nn=/^true\/(.*)/,rn=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,on={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:st.support.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},an=p(V),sn=an.appendChild(V.createElement("div"));on.optgroup=on.option,on.tbody=on.tfoot=on.colgroup=on.caption=on.thead,on.th=on.td,st.fn.extend({text:function(e){return st.access(this,function(e){return e===t?st.text(this):this.empty().append((this[0]&&this[0].ownerDocument||V).createTextNode(e))},null,e,arguments.length)},wrapAll:function(e){if(st.isFunction(e))return this.each(function(t){st(this).wrapAll(e.call(this,t))});if(this[0]){var t=st(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){for(var e=this;e.firstChild&&1===e.firstChild.nodeType;)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return st.isFunction(e)?this.each(function(t){st(this).wrapInner(e.call(this,t))}):this.each(function(){var t=st(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=st.isFunction(e);return this.each(function(n){st(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){st.nodeName(this,"body")||st(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(e){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&this.appendChild(e)})},prepend:function(){return this.domManip(arguments,!0,function(e){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&this.insertBefore(e,this.firstChild)})},before:function(){return this.domManip(arguments,!1,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,!1,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){for(var n,r=0;null!=(n=this[r]);r++)(!e||st.filter(e,[n]).length>0)&&(t||1!==n.nodeType||st.cleanData(b(n)),n.parentNode&&(t&&st.contains(n.ownerDocument,n)&&m(b(n,"script")),n.parentNode.removeChild(n)));return this},empty:function(){for(var e,t=0;null!=(e=this[t]);t++){for(1===e.nodeType&&st.cleanData(b(e,!1));e.firstChild;)e.removeChild(e.firstChild);e.options&&st.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return st.clone(this,e,t)})},html:function(e){return st.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return 1===n.nodeType?n.innerHTML.replace(Xt,""):t;if(!("string"!=typeof e||Kt.test(e)||!st.support.htmlSerialize&&Ut.test(e)||!st.support.leadingWhitespace&&Vt.test(e)||on[(Jt.exec(e)||["",""])[1].toLowerCase()])){e=e.replace(Yt,"<$1></$2>");try{for(;i>r;r++)n=this[r]||{},1===n.nodeType&&(st.cleanData(b(n,!1)),n.innerHTML=e);n=0}catch(o){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(e){var t=st.isFunction(e);return t||"string"==typeof e||(e=st(e).not(this).detach()),this.domManip([e],!0,function(e){var t=this.nextSibling,n=this.parentNode;(n&&1===this.nodeType||11===this.nodeType)&&(st(this).remove(),t?t.parentNode.insertBefore(e,t):n.appendChild(e))})},detach:function(e){return this.remove(e,!0)},domManip:function(e,n,r){e=et.apply([],e);var i,o,a,s,u,l,c=0,f=this.length,p=this,m=f-1,y=e[0],v=st.isFunction(y);if(v||!(1>=f||"string"!=typeof y||st.support.checkClone)&&en.test(y))return this.each(function(i){var o=p.eq(i);v&&(e[0]=y.call(this,i,n?o.html():t)),o.domManip(e,n,r)});if(f&&(i=st.buildFragment(e,this[0].ownerDocument,!1,this),o=i.firstChild,1===i.childNodes.length&&(i=o),o)){for(n=n&&st.nodeName(o,"tr"),a=st.map(b(i,"script"),h),s=a.length;f>c;c++)u=i,c!==m&&(u=st.clone(u,!0,!0),s&&st.merge(a,b(u,"script"))),r.call(n&&st.nodeName(this[c],"table")?d(this[c],"tbody"):this[c],u,c);if(s)for(l=a[a.length-1].ownerDocument,st.map(a,g),c=0;s>c;c++)u=a[c],tn.test(u.type||"")&&!st._data(u,"globalEval")&&st.contains(l,u)&&(u.src?st.ajax({url:u.src,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0}):st.globalEval((u.text||u.textContent||u.innerHTML||"").replace(rn,"")));i=o=null}return this}}),st.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){st.fn[e]=function(e){for(var n,r=0,i=[],o=st(e),a=o.length-1;a>=r;r++)n=r===a?this:this.clone(!0),st(o[r])[t](n),tt.apply(i,n.get());return this.pushStack(i)}}),st.extend({clone:function(e,t,n){var r,i,o,a,s,u=st.contains(e.ownerDocument,e);if(st.support.html5Clone||st.isXMLDoc(e)||!Ut.test("<"+e.nodeName+">")?s=e.cloneNode(!0):(sn.innerHTML=e.outerHTML,sn.removeChild(s=sn.firstChild)),!(st.support.noCloneEvent&&st.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||st.isXMLDoc(e)))for(r=b(s),i=b(e),a=0;null!=(o=i[a]);++a)r[a]&&v(o,r[a]);if(t)if(n)for(i=i||b(e),r=r||b(s),a=0;null!=(o=i[a]);a++)y(o,r[a]);else y(e,s);return r=b(s,"script"),r.length>0&&m(r,!u&&b(e,"script")),r=i=o=null,s},buildFragment:function(e,t,n,r){for(var i,o,a,s,u,l,c,f=e.length,d=p(t),h=[],g=0;f>g;g++)if(o=e[g],o||0===o)if("object"===st.type(o))st.merge(h,o.nodeType?[o]:o);else if(Qt.test(o)){for(s=s||d.appendChild(t.createElement("div")),a=(Jt.exec(o)||["",""])[1].toLowerCase(),u=on[a]||on._default,s.innerHTML=u[1]+o.replace(Yt,"<$1></$2>")+u[2],c=u[0];c--;)s=s.lastChild;if(!st.support.leadingWhitespace&&Vt.test(o)&&h.push(t.createTextNode(Vt.exec(o)[0])),!st.support.tbody)for(o="table"!==a||Gt.test(o)?"<table>"!==u[1]||Gt.test(o)?0:s:s.firstChild,c=o&&o.childNodes.length;c--;)st.nodeName(l=o.childNodes[c],"tbody")&&!l.childNodes.length&&o.removeChild(l);for(st.merge(h,s.childNodes),s.textContent="";s.firstChild;)s.removeChild(s.firstChild);s=d.lastChild}else h.push(t.createTextNode(o));for(s&&d.removeChild(s),st.support.appendChecked||st.grep(b(h,"input"),x),g=0;o=h[g++];)if((!r||-1===st.inArray(o,r))&&(i=st.contains(o.ownerDocument,o),s=b(d.appendChild(o),"script"),i&&m(s),n))for(c=0;o=s[c++];)tn.test(o.type||"")&&n.push(o);return s=null,d},cleanData:function(e,n){for(var r,i,o,a,s=0,u=st.expando,l=st.cache,c=st.support.deleteExpando,f=st.event.special;null!=(o=e[s]);s++)if((n||st.acceptData(o))&&(i=o[u],r=i&&l[i])){if(r.events)for(a in r.events)f[a]?st.event.remove(o,a):st.removeEvent(o,a,r.handle);l[i]&&(delete l[i],c?delete o[u]:o.removeAttribute!==t?o.removeAttribute(u):o[u]=null,K.push(i))}}});var un,ln,cn,fn=/alpha\([^)]*\)/i,pn=/opacity\s*=\s*([^)]*)/,dn=/^(top|right|bottom|left)$/,hn=/^(none|table(?!-c[ea]).+)/,gn=/^margin/,mn=RegExp("^("+ut+")(.*)$","i"),yn=RegExp("^("+ut+")(?!px)[a-z%]+$","i"),vn=RegExp("^([+-])=("+ut+")","i"),bn={BODY:"block"},xn={position:"absolute",visibility:"hidden",display:"block"},Tn={letterSpacing:0,fontWeight:400},wn=["Top","Right","Bottom","Left"],Nn=["Webkit","O","Moz","ms"];st.fn.extend({css:function(e,n){return st.access(this,function(e,n,r){var i,o,a={},s=0;if(st.isArray(n)){for(i=ln(e),o=n.length;o>s;s++)a[n[s]]=st.css(e,n[s],!1,i);return a}return r!==t?st.style(e,n,r):st.css(e,n)},e,n,arguments.length>1)},show:function(){return N(this,!0)},hide:function(){return N(this)},toggle:function(e){var t="boolean"==typeof e;return this.each(function(){(t?e:w(this))?st(this).show():st(this).hide()})}}),st.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=un(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":st.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var o,a,s,u=st.camelCase(n),l=e.style;if(n=st.cssProps[u]||(st.cssProps[u]=T(l,u)),s=st.cssHooks[n]||st.cssHooks[u],r===t)return s&&"get"in s&&(o=s.get(e,!1,i))!==t?o:l[n];if(a=typeof r,"string"===a&&(o=vn.exec(r))&&(r=(o[1]+1)*o[2]+parseFloat(st.css(e,n)),a="number"),!(null==r||"number"===a&&isNaN(r)||("number"!==a||st.cssNumber[u]||(r+="px"),st.support.clearCloneStyle||""!==r||0!==n.indexOf("background")||(l[n]="inherit"),s&&"set"in s&&(r=s.set(e,r,i))===t)))try{l[n]=r}catch(c){}}},css:function(e,n,r,i){var o,a,s,u=st.camelCase(n);return n=st.cssProps[u]||(st.cssProps[u]=T(e.style,u)),s=st.cssHooks[n]||st.cssHooks[u],s&&"get"in s&&(o=s.get(e,!0,r)),o===t&&(o=un(e,n,i)),"normal"===o&&n in Tn&&(o=Tn[n]),r?(a=parseFloat(o),r===!0||st.isNumeric(a)?a||0:o):o},swap:function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i}}),e.getComputedStyle?(ln=function(t){return e.getComputedStyle(t,null)},un=function(e,n,r){var i,o,a,s=r||ln(e),u=s?s.getPropertyValue(n)||s[n]:t,l=e.style;return s&&(""!==u||st.contains(e.ownerDocument,e)||(u=st.style(e,n)),yn.test(u)&&gn.test(n)&&(i=l.width,o=l.minWidth,a=l.maxWidth,l.minWidth=l.maxWidth=l.width=u,u=s.width,l.width=i,l.minWidth=o,l.maxWidth=a)),u}):V.documentElement.currentStyle&&(ln=function(e){return e.currentStyle},un=function(e,n,r){var i,o,a,s=r||ln(e),u=s?s[n]:t,l=e.style;return null==u&&l&&l[n]&&(u=l[n]),yn.test(u)&&!dn.test(n)&&(i=l.left,o=e.runtimeStyle,a=o&&o.left,a&&(o.left=e.currentStyle.left),l.left="fontSize"===n?"1em":u,u=l.pixelLeft+"px",l.left=i,a&&(o.left=a)),""===u?"auto":u}),st.each(["height","width"],function(e,n){st.cssHooks[n]={get:function(e,r,i){return r?0===e.offsetWidth&&hn.test(st.css(e,"display"))?st.swap(e,xn,function(){return E(e,n,i)}):E(e,n,i):t},set:function(e,t,r){var i=r&&ln(e);return C(e,t,r?k(e,n,r,st.support.boxSizing&&"border-box"===st.css(e,"boxSizing",!1,i),i):0)}}}),st.support.opacity||(st.cssHooks.opacity={get:function(e,t){return pn.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=st.isNumeric(t)?"alpha(opacity="+100*t+")":"",o=r&&r.filter||n.filter||"";n.zoom=1,(t>=1||""===t)&&""===st.trim(o.replace(fn,""))&&n.removeAttribute&&(n.removeAttribute("filter"),""===t||r&&!r.filter)||(n.filter=fn.test(o)?o.replace(fn,i):o+" "+i)}}),st(function(){st.support.reliableMarginRight||(st.cssHooks.marginRight={get:function(e,n){return n?st.swap(e,{display:"inline-block"},un,[e,"marginRight"]):t}}),!st.support.pixelPosition&&st.fn.position&&st.each(["top","left"],function(e,n){st.cssHooks[n]={get:function(e,r){return r?(r=un(e,n),yn.test(r)?st(e).position()[n]+"px":r):t}}})}),st.expr&&st.expr.filters&&(st.expr.filters.hidden=function(e){return 0===e.offsetWidth&&0===e.offsetHeight||!st.support.reliableHiddenOffsets&&"none"===(e.style&&e.style.display||st.css(e,"display"))},st.expr.filters.visible=function(e){return!st.expr.filters.hidden(e)}),st.each({margin:"",padding:"",border:"Width"},function(e,t){st.cssHooks[e+t]={expand:function(n){for(var r=0,i={},o="string"==typeof n?n.split(" "):[n];4>r;r++)i[e+wn[r]+t]=o[r]||o[r-2]||o[0];return i}},gn.test(e)||(st.cssHooks[e+t].set=C)});var Cn=/%20/g,kn=/\[\]$/,En=/\r?\n/g,Sn=/^(?:submit|button|image|reset)$/i,An=/^(?:input|select|textarea|keygen)/i;st.fn.extend({serialize:function(){return st.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=st.prop(this,"elements");return e?st.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!st(this).is(":disabled")&&An.test(this.nodeName)&&!Sn.test(e)&&(this.checked||!Zt.test(e))}).map(function(e,t){var n=st(this).val();return null==n?null:st.isArray(n)?st.map(n,function(e){return{name:t.name,value:e.replace(En,"\r\n")}}):{name:t.name,value:n.replace(En,"\r\n")}}).get()}}),st.param=function(e,n){var r,i=[],o=function(e,t){t=st.isFunction(t)?t():null==t?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(n===t&&(n=st.ajaxSettings&&st.ajaxSettings.traditional),st.isArray(e)||e.jquery&&!st.isPlainObject(e))st.each(e,function(){o(this.name,this.value)});else for(r in e)j(r,e[r],n,o);return i.join("&").replace(Cn,"+")};var jn,Dn,Ln=st.now(),Hn=/\?/,Mn=/#.*$/,qn=/([?&])_=[^&]*/,_n=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Fn=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,On=/^(?:GET|HEAD)$/,Bn=/^\/\//,Pn=/^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,Rn=st.fn.load,Wn={},$n={},In="*/".concat("*");try{Dn=Y.href}catch(zn){Dn=V.createElement("a"),Dn.href="",Dn=Dn.href}jn=Pn.exec(Dn.toLowerCase())||[],st.fn.load=function(e,n,r){if("string"!=typeof e&&Rn)return Rn.apply(this,arguments);var i,o,a,s=this,u=e.indexOf(" ");return u>=0&&(i=e.slice(u,e.length),e=e.slice(0,u)),st.isFunction(n)?(r=n,n=t):n&&"object"==typeof n&&(o="POST"),s.length>0&&st.ajax({url:e,type:o,dataType:"html",data:n}).done(function(e){a=arguments,s.html(i?st("<div>").append(st.parseHTML(e)).find(i):e)}).complete(r&&function(e,t){s.each(r,a||[e.responseText,t,e])}),this},st.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){st.fn[t]=function(e){return this.on(t,e)}}),st.each(["get","post"],function(e,n){st[n]=function(e,r,i,o){return st.isFunction(r)&&(o=o||i,i=r,r=t),st.ajax({url:e,type:n,dataType:o,data:r,success:i})}}),st.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Dn,type:"GET",isLocal:Fn.test(jn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":In,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":e.String,"text html":!0,"text json":st.parseJSON,"text xml":st.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?H(H(e,st.ajaxSettings),t):H(st.ajaxSettings,e)},ajaxPrefilter:D(Wn),ajaxTransport:D($n),ajax:function(e,n){function r(e,n,r,s){var l,f,v,b,T,N=n;2!==x&&(x=2,u&&clearTimeout(u),i=t,a=s||"",w.readyState=e>0?4:0,r&&(b=M(p,w,r)),e>=200&&300>e||304===e?(p.ifModified&&(T=w.getResponseHeader("Last-Modified"),T&&(st.lastModified[o]=T),T=w.getResponseHeader("etag"),T&&(st.etag[o]=T)),304===e?(l=!0,N="notmodified"):(l=q(p,b),N=l.state,f=l.data,v=l.error,l=!v)):(v=N,(e||!N)&&(N="error",0>e&&(e=0))),w.status=e,w.statusText=(n||N)+"",l?g.resolveWith(d,[f,N,w]):g.rejectWith(d,[w,N,v]),w.statusCode(y),y=t,c&&h.trigger(l?"ajaxSuccess":"ajaxError",[w,p,l?f:v]),m.fireWith(d,[w,N]),c&&(h.trigger("ajaxComplete",[w,p]),--st.active||st.event.trigger("ajaxStop")))}"object"==typeof e&&(n=e,e=t),n=n||{};var i,o,a,s,u,l,c,f,p=st.ajaxSetup({},n),d=p.context||p,h=p.context&&(d.nodeType||d.jquery)?st(d):st.event,g=st.Deferred(),m=st.Callbacks("once memory"),y=p.statusCode||{},v={},b={},x=0,T="canceled",w={readyState:0,getResponseHeader:function(e){var t;if(2===x){if(!s)for(s={};t=_n.exec(a);)s[t[1].toLowerCase()]=t[2];t=s[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===x?a:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return x||(e=b[n]=b[n]||e,v[e]=t),this},overrideMimeType:function(e){return x||(p.mimeType=e),this},statusCode:function(e){var t;if(e)if(2>x)for(t in e)y[t]=[y[t],e[t]];else w.always(e[w.status]);return this},abort:function(e){var t=e||T;return i&&i.abort(t),r(0,t),this}};if(g.promise(w).complete=m.add,w.success=w.done,w.error=w.fail,p.url=((e||p.url||Dn)+"").replace(Mn,"").replace(Bn,jn[1]+"//"),p.type=n.method||n.type||p.method||p.type,p.dataTypes=st.trim(p.dataType||"*").toLowerCase().match(lt)||[""],null==p.crossDomain&&(l=Pn.exec(p.url.toLowerCase()),p.crossDomain=!(!l||l[1]===jn[1]&&l[2]===jn[2]&&(l[3]||("http:"===l[1]?80:443))==(jn[3]||("http:"===jn[1]?80:443)))),p.data&&p.processData&&"string"!=typeof p.data&&(p.data=st.param(p.data,p.traditional)),L(Wn,p,n,w),2===x)return w;c=p.global,c&&0===st.active++&&st.event.trigger("ajaxStart"),p.type=p.type.toUpperCase(),p.hasContent=!On.test(p.type),o=p.url,p.hasContent||(p.data&&(o=p.url+=(Hn.test(o)?"&":"?")+p.data,delete p.data),p.cache===!1&&(p.url=qn.test(o)?o.replace(qn,"$1_="+Ln++):o+(Hn.test(o)?"&":"?")+"_="+Ln++)),p.ifModified&&(st.lastModified[o]&&w.setRequestHeader("If-Modified-Since",st.lastModified[o]),st.etag[o]&&w.setRequestHeader("If-None-Match",st.etag[o])),(p.data&&p.hasContent&&p.contentType!==!1||n.contentType)&&w.setRequestHeader("Content-Type",p.contentType),w.setRequestHeader("Accept",p.dataTypes[0]&&p.accepts[p.dataTypes[0]]?p.accepts[p.dataTypes[0]]+("*"!==p.dataTypes[0]?", "+In+"; q=0.01":""):p.accepts["*"]);for(f in p.headers)w.setRequestHeader(f,p.headers[f]);if(p.beforeSend&&(p.beforeSend.call(d,w,p)===!1||2===x))return w.abort();T="abort";for(f in{success:1,error:1,complete:1})w[f](p[f]);if(i=L($n,p,n,w)){w.readyState=1,c&&h.trigger("ajaxSend",[w,p]),p.async&&p.timeout>0&&(u=setTimeout(function(){w.abort("timeout")},p.timeout));try{x=1,i.send(v,r)}catch(N){if(!(2>x))throw N;r(-1,N)}}else r(-1,"No Transport");return w},getScript:function(e,n){return st.get(e,t,n,"script")},getJSON:function(e,t,n){return st.get(e,t,n,"json")}}),st.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(e){return st.globalEval(e),e}}}),st.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),st.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=V.head||st("head")[0]||V.documentElement;return{send:function(t,i){n=V.createElement("script"),n.async=!0,e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,t){(t||!n.readyState||/loaded|complete/.test(n.readyState))&&(n.onload=n.onreadystatechange=null,n.parentNode&&n.parentNode.removeChild(n),n=null,t||i(200,"success"))},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(t,!0)}}}});var Xn=[],Un=/(=)\?(?=&|$)|\?\?/;st.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Xn.pop()||st.expando+"_"+Ln++;return this[e]=!0,e}}),st.ajaxPrefilter("json jsonp",function(n,r,i){var o,a,s,u=n.jsonp!==!1&&(Un.test(n.url)?"url":"string"==typeof n.data&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Un.test(n.data)&&"data");return u||"jsonp"===n.dataTypes[0]?(o=n.jsonpCallback=st.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,u?n[u]=n[u].replace(Un,"$1"+o):n.jsonp!==!1&&(n.url+=(Hn.test(n.url)?"&":"?")+n.jsonp+"="+o),n.converters["script json"]=function(){return s||st.error(o+" was not called"),s[0]},n.dataTypes[0]="json",a=e[o],e[o]=function(){s=arguments},i.always(function(){e[o]=a,n[o]&&(n.jsonpCallback=r.jsonpCallback,Xn.push(o)),s&&st.isFunction(a)&&a(s[0]),s=a=t}),"script"):t});var Vn,Yn,Jn=0,Gn=e.ActiveXObject&&function(){var e;for(e in Vn)Vn[e](t,!0)};st.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&_()||F()}:_,Yn=st.ajaxSettings.xhr(),st.support.cors=!!Yn&&"withCredentials"in Yn,Yn=st.support.ajax=!!Yn,Yn&&st.ajaxTransport(function(n){if(!n.crossDomain||st.support.cors){var r;return{send:function(i,o){var a,s,u=n.xhr();if(n.username?u.open(n.type,n.url,n.async,n.username,n.password):u.open(n.type,n.url,n.async),n.xhrFields)for(s in n.xhrFields)u[s]=n.xhrFields[s];n.mimeType&&u.overrideMimeType&&u.overrideMimeType(n.mimeType),n.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");try{for(s in i)u.setRequestHeader(s,i[s])}catch(l){}u.send(n.hasContent&&n.data||null),r=function(e,i){var s,l,c,f,p;try{if(r&&(i||4===u.readyState))if(r=t,a&&(u.onreadystatechange=st.noop,Gn&&delete Vn[a]),i)4!==u.readyState&&u.abort();else{f={},s=u.status,p=u.responseXML,c=u.getAllResponseHeaders(),p&&p.documentElement&&(f.xml=p),"string"==typeof u.responseText&&(f.text=u.responseText);try{l=u.statusText}catch(d){l=""}s||!n.isLocal||n.crossDomain?1223===s&&(s=204):s=f.text?200:404}}catch(h){i||o(-1,h)}f&&o(s,l,f,c)},n.async?4===u.readyState?setTimeout(r):(a=++Jn,Gn&&(Vn||(Vn={},st(e).unload(Gn)),Vn[a]=r),u.onreadystatechange=r):r()},abort:function(){r&&r(t,!0)}}}});var Qn,Kn,Zn=/^(?:toggle|show|hide)$/,er=RegExp("^(?:([+-])=|)("+ut+")([a-z%]*)$","i"),tr=/queueHooks$/,nr=[W],rr={"*":[function(e,t){var n,r,i=this.createTween(e,t),o=er.exec(t),a=i.cur(),s=+a||0,u=1,l=20;if(o){if(n=+o[2],r=o[3]||(st.cssNumber[e]?"":"px"),"px"!==r&&s){s=st.css(i.elem,e,!0)||n||1;do u=u||".5",s/=u,st.style(i.elem,e,s+r);while(u!==(u=i.cur()/a)&&1!==u&&--l)}i.unit=r,i.start=s,i.end=o[1]?s+(o[1]+1)*n:n}return i}]};st.Animation=st.extend(P,{tweener:function(e,t){st.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");for(var n,r=0,i=e.length;i>r;r++)n=e[r],rr[n]=rr[n]||[],rr[n].unshift(t)},prefilter:function(e,t){t?nr.unshift(e):nr.push(e)}}),st.Tween=$,$.prototype={constructor:$,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(st.cssNumber[n]?"":"px")},cur:function(){var e=$.propHooks[this.prop];return e&&e.get?e.get(this):$.propHooks._default.get(this)},run:function(e){var t,n=$.propHooks[this.prop];return this.pos=t=this.options.duration?st.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):$.propHooks._default.set(this),this}},$.prototype.init.prototype=$.prototype,$.propHooks={_default:{get:function(e){var t;return null==e.elem[e.prop]||e.elem.style&&null!=e.elem.style[e.prop]?(t=st.css(e.elem,e.prop,"auto"),t&&"auto"!==t?t:0):e.elem[e.prop]},set:function(e){st.fx.step[e.prop]?st.fx.step[e.prop](e):e.elem.style&&(null!=e.elem.style[st.cssProps[e.prop]]||st.cssHooks[e.prop])?st.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},$.propHooks.scrollTop=$.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},st.each(["toggle","show","hide"],function(e,t){var n=st.fn[t];st.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(I(t,!0),e,r,i)}}),st.fn.extend({fadeTo:function(e,t,n,r){return this.filter(w).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=st.isEmptyObject(e),o=st.speed(t,n,r),a=function(){var t=P(this,st.extend({},e),o);a.finish=function(){t.stop(!0)},(i||st._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,n,r){var i=function(e){var t=e.stop;delete e.stop,t(r)};return"string"!=typeof e&&(r=n,n=e,e=t),n&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,n=null!=e&&e+"queueHooks",o=st.timers,a=st._data(this);if(n)a[n]&&a[n].stop&&i(a[n]);else for(n in a)a[n]&&a[n].stop&&tr.test(n)&&i(a[n]);for(n=o.length;n--;)o[n].elem!==this||null!=e&&o[n].queue!==e||(o[n].anim.stop(r),t=!1,o.splice(n,1));(t||!r)&&st.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=st._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=st.timers,a=r?r.length:0;for(n.finish=!0,st.queue(this,e,[]),i&&i.cur&&i.cur.finish&&i.cur.finish.call(this),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;a>t;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}}),st.each({slideDown:I("show"),slideUp:I("hide"),slideToggle:I("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){st.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),st.speed=function(e,t,n){var r=e&&"object"==typeof e?st.extend({},e):{complete:n||!n&&t||st.isFunction(e)&&e,duration:e,easing:n&&t||t&&!st.isFunction(t)&&t};return r.duration=st.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in st.fx.speeds?st.fx.speeds[r.duration]:st.fx.speeds._default,(null==r.queue||r.queue===!0)&&(r.queue="fx"),r.old=r.complete,r.complete=function(){st.isFunction(r.old)&&r.old.call(this),r.queue&&st.dequeue(this,r.queue)},r},st.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2}},st.timers=[],st.fx=$.prototype.init,st.fx.tick=function(){var e,n=st.timers,r=0;for(Qn=st.now();n.length>r;r++)e=n[r],e()||n[r]!==e||n.splice(r--,1);n.length||st.fx.stop(),Qn=t},st.fx.timer=function(e){e()&&st.timers.push(e)&&st.fx.start()},st.fx.interval=13,st.fx.start=function(){Kn||(Kn=setInterval(st.fx.tick,st.fx.interval))},st.fx.stop=function(){clearInterval(Kn),Kn=null},st.fx.speeds={slow:600,fast:200,_default:400},st.fx.step={},st.expr&&st.expr.filters&&(st.expr.filters.animated=function(e){return st.grep(st.timers,function(t){return e===t.elem}).length}),st.fn.offset=function(e){if(arguments.length)return e===t?this:this.each(function(t){st.offset.setOffset(this,e,t)});var n,r,i={top:0,left:0},o=this[0],a=o&&o.ownerDocument;if(a)return n=a.documentElement,st.contains(n,o)?(o.getBoundingClientRect!==t&&(i=o.getBoundingClientRect()),r=z(a),{top:i.top+(r.pageYOffset||n.scrollTop)-(n.clientTop||0),left:i.left+(r.pageXOffset||n.scrollLeft)-(n.clientLeft||0)}):i},st.offset={setOffset:function(e,t,n){var r=st.css(e,"position");"static"===r&&(e.style.position="relative");var i,o,a=st(e),s=a.offset(),u=st.css(e,"top"),l=st.css(e,"left"),c=("absolute"===r||"fixed"===r)&&st.inArray("auto",[u,l])>-1,f={},p={};c?(p=a.position(),i=p.top,o=p.left):(i=parseFloat(u)||0,o=parseFloat(l)||0),st.isFunction(t)&&(t=t.call(e,n,s)),null!=t.top&&(f.top=t.top-s.top+i),null!=t.left&&(f.left=t.left-s.left+o),"using"in t?t.using.call(e,f):a.css(f)}},st.fn.extend({position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===st.css(r,"position")?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),st.nodeName(e[0],"html")||(n=e.offset()),n.top+=st.css(e[0],"borderTopWidth",!0),n.left+=st.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-st.css(r,"marginTop",!0),left:t.left-n.left-st.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){for(var e=this.offsetParent||V.documentElement;e&&!st.nodeName(e,"html")&&"static"===st.css(e,"position");)e=e.offsetParent;return e||V.documentElement})}}),st.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);st.fn[e]=function(i){return st.access(this,function(e,i,o){var a=z(e);return o===t?a?n in a?a[n]:a.document.documentElement[i]:e[i]:(a?a.scrollTo(r?st(a).scrollLeft():o,r?o:st(a).scrollTop()):e[i]=o,t)},e,i,arguments.length,null)}}),st.each({Height:"height",Width:"width"},function(e,n){st.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){st.fn[i]=function(i,o){var a=arguments.length&&(r||"boolean"!=typeof i),s=r||(i===!0||o===!0?"margin":"border");return st.access(this,function(n,r,i){var o;return st.isWindow(n)?n.document.documentElement["client"+e]:9===n.nodeType?(o=n.documentElement,Math.max(n.body["scroll"+e],o["scroll"+e],n.body["offset"+e],o["offset"+e],o["client"+e])):i===t?st.css(n,r,s):st.style(n,r,i,s)},n,a?i:t,a,null)}})}),e.jQuery=e.$=st,"function"==typeof define&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return st})})(window);
-//@ sourceMappingURL=jquery.min.map
\ No newline at end of file
+/*! jQuery v1.9.1 | (c) 2005, 2012 jQuery Foundation, Inc. | jquery.org/license
+//@ sourceMappingURL=jquery.min.map
+*/(function(e,t){var n,r,i=typeof t,o=e.document,a=e.location,s=e.jQuery,u=e.$,l={},c=[],p="1.9.1",f=c.concat,d=c.push,h=c.slice,g=c.indexOf,m=l.toString,y=l.hasOwnProperty,v=p.trim,b=function(e,t){return new b.fn.init(e,t,r)},x=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,w=/\S+/g,T=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,N=/^(?:(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,k=/^[\],:{}\s]*$/,E=/(?:^|:|,)(?:\s*\[)+/g,S=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,A=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,j=/^-ms-/,D=/-([\da-z])/gi,L=function(e,t){return t.toUpperCase()},H=function(e){(o.addEventListener||"load"===e.type||"complete"===o.readyState)&&(q(),b.ready())},q=function(){o.addEventListener?(o.removeEventListener("DOMContentLoaded",H,!1),e.removeEventListener("load",H,!1)):(o.detachEvent("onreadystatechange",H),e.detachEvent("onload",H))};b.fn=b.prototype={jquery:p,constructor:b,init:function(e,n,r){var i,a;if(!e)return this;if("string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:N.exec(e),!i||!i[1]&&n)return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e);if(i[1]){if(n=n instanceof b?n[0]:n,b.merge(this,b.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:o,!0)),C.test(i[1])&&b.isPlainObject(n))for(i in n)b.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(a=o.getElementById(i[2]),a&&a.parentNode){if(a.id!==i[2])return r.find(e);this.length=1,this[0]=a}return this.context=o,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):b.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),b.makeArray(e,this))},selector:"",length:0,size:function(){return this.length},toArray:function(){return h.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=b.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return b.each(this,e,t)},ready:function(e){return b.ready.promise().done(e),this},slice:function(){return this.pushStack(h.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(b.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:d,sort:[].sort,splice:[].splice},b.fn.init.prototype=b.fn,b.extend=b.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},u=1,l=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},u=2),"object"==typeof s||b.isFunction(s)||(s={}),l===u&&(s=this,--u);l>u;u++)if(null!=(o=arguments[u]))for(i in o)e=s[i],r=o[i],s!==r&&(c&&r&&(b.isPlainObject(r)||(n=b.isArray(r)))?(n?(n=!1,a=e&&b.isArray(e)?e:[]):a=e&&b.isPlainObject(e)?e:{},s[i]=b.extend(c,a,r)):r!==t&&(s[i]=r));return s},b.extend({noConflict:function(t){return e.$===b&&(e.$=u),t&&e.jQuery===b&&(e.jQuery=s),b},isReady:!1,readyWait:1,holdReady:function(e){e?b.readyWait++:b.ready(!0)},ready:function(e){if(e===!0?!--b.readyWait:!b.isReady){if(!o.body)return setTimeout(b.ready);b.isReady=!0,e!==!0&&--b.readyWait>0||(n.resolveWith(o,[b]),b.fn.trigger&&b(o).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===b.type(e)},isArray:Array.isArray||function(e){return"array"===b.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?l[m.call(e)]||"object":typeof e},isPlainObject:function(e){if(!e||"object"!==b.type(e)||e.nodeType||b.isWindow(e))return!1;try{if(e.constructor&&!y.call(e,"constructor")&&!y.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}var r;for(r in e);return r===t||y.call(e,r)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||o;var r=C.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=b.buildFragment([e],t,i),i&&b(i).remove(),b.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=b.trim(n),n&&k.test(n.replace(S,"@").replace(A,"]").replace(E,"")))?Function("return "+n)():(b.error("Invalid JSON: "+n),t)},parseXML:function(n){var r,i;if(!n||"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return r&&r.documentElement&&!r.getElementsByTagName("parsererror").length||b.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&b.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(j,"ms-").replace(D,L)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,a=M(e);if(n){if(a){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(a){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:v&&!v.call("\ufeff\u00a0")?function(e){return null==e?"":v.call(e)}:function(e){return null==e?"":(e+"").replace(T,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(M(Object(e))?b.merge(n,"string"==typeof e?[e]:e):d.call(n,e)),n},inArray:function(e,t,n){var r;if(t){if(g)return g.call(t,e,n);for(r=t.length,n=n?0>n?Math.max(0,r+n):n:0;r>n;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,o=0;if("number"==typeof r)for(;r>o;o++)e[i++]=n[o];else while(n[o]!==t)e[i++]=n[o++];return e.length=i,e},grep:function(e,t,n){var r,i=[],o=0,a=e.length;for(n=!!n;a>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,n){var r,i=0,o=e.length,a=M(e),s=[];if(a)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(s[s.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(s[s.length]=r);return f.apply([],s)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(o=e[n],n=e,e=o),b.isFunction(e)?(r=h.call(arguments,2),i=function(){return e.apply(n||this,r.concat(h.call(arguments)))},i.guid=e.guid=e.guid||b.guid++,i):t},access:function(e,n,r,i,o,a,s){var u=0,l=e.length,c=null==r;if("object"===b.type(r)){o=!0;for(u in r)b.access(e,n,u,r[u],!0,a,s)}else if(i!==t&&(o=!0,b.isFunction(i)||(s=!0),c&&(s?(n.call(e,i),n=null):(c=n,n=function(e,t,n){return c.call(b(e),n)})),n))for(;l>u;u++)n(e[u],r,s?i:i.call(e[u],u,n(e[u],r)));return o?e:c?n.call(e):l?n(e[0],r):a},now:function(){return(new Date).getTime()}}),b.ready.promise=function(t){if(!n)if(n=b.Deferred(),"complete"===o.readyState)setTimeout(b.ready);else if(o.addEventListener)o.addEventListener("DOMContentLoaded",H,!1),e.addEventListener("load",H,!1);else{o.attachEvent("onreadystatechange",H),e.attachEvent("onload",H);var r=!1;try{r=null==e.frameElement&&o.documentElement}catch(i){}r&&r.doScroll&&function a(){if(!b.isReady){try{r.doScroll("left")}catch(e){return setTimeout(a,50)}q(),b.ready()}}()}return n.promise(t)},b.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){l["[object "+t+"]"]=t.toLowerCase()});function M(e){var t=e.length,n=b.type(e);return b.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}r=b(o);var _={};function F(e){var t=_[e]={};return b.each(e.match(w)||[],function(e,n){t[n]=!0}),t}b.Callbacks=function(e){e="string"==typeof e?_[e]||F(e):b.extend({},e);var n,r,i,o,a,s,u=[],l=!e.once&&[],c=function(t){for(r=e.memory&&t,i=!0,a=s||0,s=0,o=u.length,n=!0;u&&o>a;a++)if(u[a].apply(t[0],t[1])===!1&&e.stopOnFalse){r=!1;break}n=!1,u&&(l?l.length&&c(l.shift()):r?u=[]:p.disable())},p={add:function(){if(u){var t=u.length;(function i(t){b.each(t,function(t,n){var r=b.type(n);"function"===r?e.unique&&p.has(n)||u.push(n):n&&n.length&&"string"!==r&&i(n)})})(arguments),n?o=u.length:r&&(s=t,c(r))}return this},remove:function(){return u&&b.each(arguments,function(e,t){var r;while((r=b.inArray(t,u,r))>-1)u.splice(r,1),n&&(o>=r&&o--,a>=r&&a--)}),this},has:function(e){return e?b.inArray(e,u)>-1:!(!u||!u.length)},empty:function(){return u=[],this},disable:function(){return u=l=r=t,this},disabled:function(){return!u},lock:function(){return l=t,r||p.disable(),this},locked:function(){return!l},fireWith:function(e,t){return t=t||[],t=[e,t.slice?t.slice():t],!u||i&&!l||(n?l.push(t):c(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},b.extend({Deferred:function(e){var t=[["resolve","done",b.Callbacks("once memory"),"resolved"],["reject","fail",b.Callbacks("once memory"),"rejected"],["notify","progress",b.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return b.Deferred(function(n){b.each(t,function(t,o){var a=o[0],s=b.isFunction(e[t])&&e[t];i[o[1]](function(){var e=s&&s.apply(this,arguments);e&&b.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[a+"With"](this===r?n.promise():this,s?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?b.extend(e,r):r}},i={};return r.pipe=r.then,b.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=h.call(arguments),r=n.length,i=1!==r||e&&b.isFunction(e.promise)?r:0,o=1===i?e:b.Deferred(),a=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?h.call(arguments):r,n===s?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},s,u,l;if(r>1)for(s=Array(r),u=Array(r),l=Array(r);r>t;t++)n[t]&&b.isFunction(n[t].promise)?n[t].promise().done(a(t,l,n)).fail(o.reject).progress(a(t,u,s)):--i;return i||o.resolveWith(l,n),o.promise()}}),b.support=function(){var t,n,r,a,s,u,l,c,p,f,d=o.createElement("div");if(d.setAttribute("className","t"),d.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",n=d.getElementsByTagName("*"),r=d.getElementsByTagName("a")[0],!n||!r||!n.length)return{};s=o.createElement("select"),l=s.appendChild(o.createElement("option")),a=d.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t={getSetAttribute:"t"!==d.className,leadingWhitespace:3===d.firstChild.nodeType,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/top/.test(r.getAttribute("style")),hrefNormalized:"/a"===r.getAttribute("href"),opacity:/^0.5/.test(r.style.opacity),cssFloat:!!r.style.cssFloat,checkOn:!!a.value,optSelected:l.selected,enctype:!!o.createElement("form").enctype,html5Clone:"<:nav></:nav>"!==o.createElement("nav").cloneNode(!0).outerHTML,boxModel:"CSS1Compat"===o.compatMode,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},a.checked=!0,t.noCloneChecked=a.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!l.disabled;try{delete d.test}catch(h){t.deleteExpando=!1}a=o.createElement("input"),a.setAttribute("value",""),t.input=""===a.getAttribute("value"),a.value="t",a.setAttribute("type","radio"),t.radioValue="t"===a.value,a.setAttribute("checked","t"),a.setAttribute("name","t"),u=o.createDocumentFragment(),u.appendChild(a),t.appendChecked=a.checked,t.checkClone=u.cloneNode(!0).cloneNode(!0).lastChild.checked,d.attachEvent&&(d.attachEvent("onclick",function(){t.noCloneEvent=!1}),d.cloneNode(!0).click());for(f in{submit:!0,change:!0,focusin:!0})d.setAttribute(c="on"+f,"t"),t[f+"Bubbles"]=c in e||d.attributes[c].expando===!1;return d.style.backgroundClip="content-box",d.cloneNode(!0).style.backgroundClip="",t.clearCloneStyle="content-box"===d.style.backgroundClip,b(function(){var n,r,a,s="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",u=o.getElementsByTagName("body")[0];u&&(n=o.createElement("div"),n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",u.appendChild(n).appendChild(d),d.innerHTML="<table><tr><td></td><td>t</td></tr></table>",a=d.getElementsByTagName("td"),a[0].style.cssText="padding:0;margin:0;border:0;display:none",p=0===a[0].offsetHeight,a[0].style.display="",a[1].style.display="none",t.reliableHiddenOffsets=p&&0===a[0].offsetHeight,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",t.boxSizing=4===d.offsetWidth,t.doesNotIncludeMarginInBodyOffset=1!==u.offsetTop,e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(d,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(d,null)||{width:"4px"}).width,r=d.appendChild(o.createElement("div")),r.style.cssText=d.style.cssText=s,r.style.marginRight=r.style.width="0",d.style.width="1px",t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)),typeof d.style.zoom!==i&&(d.innerHTML="",d.style.cssText=s+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=3===d.offsetWidth,d.style.display="block",d.innerHTML="<div></div>",d.firstChild.style.width="5px",t.shrinkWrapBlocks=3!==d.offsetWidth,t.inlineBlockNeedsLayout&&(u.style.zoom=1)),u.removeChild(n),n=d=a=r=null)}),n=s=u=l=r=a=null,t}();var O=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,B=/([A-Z])/g;function P(e,n,r,i){if(b.acceptData(e)){var o,a,s=b.expando,u="string"==typeof n,l=e.nodeType,p=l?b.cache:e,f=l?e[s]:e[s]&&s;if(f&&p[f]&&(i||p[f].data)||!u||r!==t)return f||(l?e[s]=f=c.pop()||b.guid++:f=s),p[f]||(p[f]={},l||(p[f].toJSON=b.noop)),("object"==typeof n||"function"==typeof n)&&(i?p[f]=b.extend(p[f],n):p[f].data=b.extend(p[f].data,n)),o=p[f],i||(o.data||(o.data={}),o=o.data),r!==t&&(o[b.camelCase(n)]=r),u?(a=o[n],null==a&&(a=o[b.camelCase(n)])):a=o,a}}function R(e,t,n){if(b.acceptData(e)){var r,i,o,a=e.nodeType,s=a?b.cache:e,u=a?e[b.expando]:b.expando;if(s[u]){if(t&&(o=n?s[u]:s[u].data)){b.isArray(t)?t=t.concat(b.map(t,b.camelCase)):t in o?t=[t]:(t=b.camelCase(t),t=t in o?[t]:t.split(" "));for(r=0,i=t.length;i>r;r++)delete o[t[r]];if(!(n?$:b.isEmptyObject)(o))return}(n||(delete s[u].data,$(s[u])))&&(a?b.cleanData([e],!0):b.support.deleteExpando||s!=s.window?delete s[u]:s[u]=null)}}}b.extend({cache:{},expando:"jQuery"+(p+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(e){return e=e.nodeType?b.cache[e[b.expando]]:e[b.expando],!!e&&!$(e)},data:function(e,t,n){return P(e,t,n)},removeData:function(e,t){return R(e,t)},_data:function(e,t,n){return P(e,t,n,!0)},_removeData:function(e,t){return R(e,t,!0)},acceptData:function(e){if(e.nodeType&&1!==e.nodeType&&9!==e.nodeType)return!1;var t=e.nodeName&&b.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),b.fn.extend({data:function(e,n){var r,i,o=this[0],a=0,s=null;if(e===t){if(this.length&&(s=b.data(o),1===o.nodeType&&!b._data(o,"parsedAttrs"))){for(r=o.attributes;r.length>a;a++)i=r[a].name,i.indexOf("data-")||(i=b.camelCase(i.slice(5)),W(o,i,s[i]));b._data(o,"parsedAttrs",!0)}return s}return"object"==typeof e?this.each(function(){b.data(this,e)}):b.access(this,function(n){return n===t?o?W(o,e,b.data(o,e)):null:(this.each(function(){b.data(this,e,n)}),t)},null,n,arguments.length>1,null,!0)},removeData:function(e){return this.each(function(){b.removeData(this,e)})}});function W(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(B,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:O.test(r)?b.parseJSON(r):r}catch(o){}b.data(e,n,r)}else r=t}return r}function $(e){var t;for(t in e)if(("data"!==t||!b.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}b.extend({queue:function(e,n,r){var i;return e?(n=(n||"fx")+"queue",i=b._data(e,n),r&&(!i||b.isArray(r)?i=b._data(e,n,b.makeArray(r)):i.push(r)),i||[]):t},dequeue:function(e,t){t=t||"fx";var n=b.queue(e,t),r=n.length,i=n.shift(),o=b._queueHooks(e,t),a=function(){b.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),o.cur=i,i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return b._data(e,n)||b._data(e,n,{empty:b.Callbacks("once memory").add(function(){b._removeData(e,t+"queue"),b._removeData(e,n)})})}}),b.fn.extend({queue:function(e,n){var r=2;return"string"!=typeof e&&(n=e,e="fx",r--),r>arguments.length?b.queue(this[0],e):n===t?this:this.each(function(){var t=b.queue(this,e,n);b._queueHooks(this,e),"fx"===e&&"inprogress"!==t[0]&&b.dequeue(this,e)})},dequeue:function(e){return this.each(function(){b.dequeue(this,e)})},delay:function(e,t){return e=b.fx?b.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,o=b.Deferred(),a=this,s=this.length,u=function(){--i||o.resolveWith(a,[a])};"string"!=typeof e&&(n=e,e=t),e=e||"fx";while(s--)r=b._data(a[s],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(u));return u(),o.promise(n)}});var I,z,X=/[\t\r\n]/g,U=/\r/g,V=/^(?:input|select|textarea|button|object)$/i,Y=/^(?:a|area)$/i,J=/^(?:checked|selected|autofocus|autoplay|async|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped)$/i,G=/^(?:checked|selected)$/i,Q=b.support.getSetAttribute,K=b.support.input;b.fn.extend({attr:function(e,t){return b.access(this,b.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){b.removeAttr(this,e)})},prop:function(e,t){return b.access(this,b.prop,e,t,arguments.length>1)},removeProp:function(e){return e=b.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,o,a=0,s=this.length,u="string"==typeof e&&e;if(b.isFunction(e))return this.each(function(t){b(this).addClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(w)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(X," "):" ")){o=0;while(i=t[o++])0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=b.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,a=0,s=this.length,u=0===arguments.length||"string"==typeof e&&e;if(b.isFunction(e))return this.each(function(t){b(this).removeClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(w)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(X," "):"")){o=0;while(i=t[o++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");n.className=e?b.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e,r="boolean"==typeof t;return b.isFunction(e)?this.each(function(n){b(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n){var o,a=0,s=b(this),u=t,l=e.match(w)||[];while(o=l[a++])u=r?u:!s.hasClass(o),s[u?"addClass":"removeClass"](o)}else(n===i||"boolean"===n)&&(this.className&&b._data(this,"__className__",this.className),this.className=this.className||e===!1?"":b._data(this,"__className__")||"")})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(X," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,o=this[0];{if(arguments.length)return i=b.isFunction(e),this.each(function(n){var o,a=b(this);1===this.nodeType&&(o=i?e.call(this,n,a.val()):e,null==o?o="":"number"==typeof o?o+="":b.isArray(o)&&(o=b.map(o,function(e){return null==e?"":e+""})),r=b.valHooks[this.type]||b.valHooks[this.nodeName.toLowerCase()],r&&"set"in r&&r.set(this,o,"value")!==t||(this.value=o))});if(o)return r=b.valHooks[o.type]||b.valHooks[o.nodeName.toLowerCase()],r&&"get"in r&&(n=r.get(o,"value"))!==t?n:(n=o.value,"string"==typeof n?n.replace(U,""):null==n?"":n)}}}),b.extend({valHooks:{option:{get:function(e){var t=e.attributes.value;return!t||t.specified?e.value:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,a=o?null:[],s=o?i+1:r.length,u=0>i?s:o?i:0;for(;s>u;u++)if(n=r[u],!(!n.selected&&u!==i||(b.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&b.nodeName(n.parentNode,"optgroup"))){if(t=b(n).val(),o)return t;a.push(t)}return a},set:function(e,t){var n=b.makeArray(t);return b(e).find("option").each(function(){this.selected=b.inArray(b(this).val(),n)>=0}),n.length||(e.selectedIndex=-1),n}}},attr:function(e,n,r){var o,a,s,u=e.nodeType;if(e&&3!==u&&8!==u&&2!==u)return typeof e.getAttribute===i?b.prop(e,n,r):(a=1!==u||!b.isXMLDoc(e),a&&(n=n.toLowerCase(),o=b.attrHooks[n]||(J.test(n)?z:I)),r===t?o&&a&&"get"in o&&null!==(s=o.get(e,n))?s:(typeof e.getAttribute!==i&&(s=e.getAttribute(n)),null==s?t:s):null!==r?o&&a&&"set"in o&&(s=o.set(e,r,n))!==t?s:(e.setAttribute(n,r+""),r):(b.removeAttr(e,n),t))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(w);if(o&&1===e.nodeType)while(n=o[i++])r=b.propFix[n]||n,J.test(n)?!Q&&G.test(n)?e[b.camelCase("default-"+n)]=e[r]=!1:e[r]=!1:b.attr(e,n,""),e.removeAttribute(Q?n:r)},attrHooks:{type:{set:function(e,t){if(!b.support.radioValue&&"radio"===t&&b.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return a=1!==s||!b.isXMLDoc(e),a&&(n=b.propFix[n]||n,o=b.propHooks[n]),r!==t?o&&"set"in o&&(i=o.set(e,r,n))!==t?i:e[n]=r:o&&"get"in o&&null!==(i=o.get(e,n))?i:e[n]},propHooks:{tabIndex:{get:function(e){var n=e.getAttributeNode("tabindex");return n&&n.specified?parseInt(n.value,10):V.test(e.nodeName)||Y.test(e.nodeName)&&e.href?0:t}}}}),z={get:function(e,n){var r=b.prop(e,n),i="boolean"==typeof r&&e.getAttribute(n),o="boolean"==typeof r?K&&Q?null!=i:G.test(n)?e[b.camelCase("default-"+n)]:!!i:e.getAttributeNode(n);return o&&o.value!==!1?n.toLowerCase():t},set:function(e,t,n){return t===!1?b.removeAttr(e,n):K&&Q||!G.test(n)?e.setAttribute(!Q&&b.propFix[n]||n,n):e[b.camelCase("default-"+n)]=e[n]=!0,n}},K&&Q||(b.attrHooks.value={get:function(e,n){var r=e.getAttributeNode(n);return b.nodeName(e,"input")?e.defaultValue:r&&r.specified?r.value:t},set:function(e,n,r){return b.nodeName(e,"input")?(e.defaultValue=n,t):I&&I.set(e,n,r)}}),Q||(I=b.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&("id"===n||"name"===n||"coords"===n?""!==r.value:r.specified)?r.value:t},set:function(e,n,r){var i=e.getAttributeNode(r);return i||e.setAttributeNode(i=e.ownerDocument.createAttribute(r)),i.value=n+="","value"===r||n===e.getAttribute(r)?n:t}},b.attrHooks.contenteditable={get:I.get,set:function(e,t,n){I.set(e,""===t?!1:t,n)}},b.each(["width","height"],function(e,n){b.attrHooks[n]=b.extend(b.attrHooks[n],{set:function(e,r){return""===r?(e.setAttribute(n,"auto"),r):t}})})),b.support.hrefNormalized||(b.each(["href","src","width","height"],function(e,n){b.attrHooks[n]=b.extend(b.attrHooks[n],{get:function(e){var r=e.getAttribute(n,2);return null==r?t:r}})}),b.each(["href","src"],function(e,t){b.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}})),b.support.style||(b.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}),b.support.optSelected||(b.propHooks.selected=b.extend(b.propHooks.selected,{get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}})),b.support.enctype||(b.propFix.enctype="encoding"),b.support.checkOn||b.each(["radio","checkbox"],function(){b.valHooks[this]={get:function(e){return null===e.getAttribute("value")?"on":e.value}}}),b.each(["radio","checkbox"],function(){b.valHooks[this]=b.extend(b.valHooks[this],{set:function(e,n){return b.isArray(n)?e.checked=b.inArray(b(e).val(),n)>=0:t}})});var Z=/^(?:input|select|textarea)$/i,et=/^key/,tt=/^(?:mouse|contextmenu)|click/,nt=/^(?:focusinfocus|focusoutblur)$/,rt=/^([^.]*)(?:\.(.+)|)$/;function it(){return!0}function ot(){return!1}b.event={global:{},add:function(e,n,r,o,a){var s,u,l,c,p,f,d,h,g,m,y,v=b._data(e);if(v){r.handler&&(c=r,r=c.handler,a=c.selector),r.guid||(r.guid=b.guid++),(u=v.events)||(u=v.events={}),(f=v.handle)||(f=v.handle=function(e){return typeof b===i||e&&b.event.triggered===e.type?t:b.event.dispatch.apply(f.elem,arguments)},f.elem=e),n=(n||"").match(w)||[""],l=n.length;while(l--)s=rt.exec(n[l])||[],g=y=s[1],m=(s[2]||"").split(".").sort(),p=b.event.special[g]||{},g=(a?p.delegateType:p.bindType)||g,p=b.event.special[g]||{},d=b.extend({type:g,origType:y,data:o,handler:r,guid:r.guid,selector:a,needsContext:a&&b.expr.match.needsContext.test(a),namespace:m.join(".")},c),(h=u[g])||(h=u[g]=[],h.delegateCount=0,p.setup&&p.setup.call(e,o,m,f)!==!1||(e.addEventListener?e.addEventListener(g,f,!1):e.attachEvent&&e.attachEvent("on"+g,f))),p.add&&(p.add.call(e,d),d.handler.guid||(d.handler.guid=r.guid)),a?h.splice(h.delegateCount++,0,d):h.push(d),b.event.global[g]=!0;e=null}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,p,f,d,h,g,m=b.hasData(e)&&b._data(e);if(m&&(c=m.events)){t=(t||"").match(w)||[""],l=t.length;while(l--)if(s=rt.exec(t[l])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){p=b.event.special[d]||{},d=(r?p.delegateType:p.bindType)||d,f=c[d]||[],s=s[2]&&RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),u=o=f.length;while(o--)a=f[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(f.splice(o,1),a.selector&&f.delegateCount--,p.remove&&p.remove.call(e,a));u&&!f.length&&(p.teardown&&p.teardown.call(e,h,m.handle)!==!1||b.removeEvent(e,d,m.handle),delete c[d])}else for(d in c)b.event.remove(e,d+t[l],n,r,!0);b.isEmptyObject(c)&&(delete m.handle,b._removeData(e,"events"))}},trigger:function(n,r,i,a){var s,u,l,c,p,f,d,h=[i||o],g=y.call(n,"type")?n.type:n,m=y.call(n,"namespace")?n.namespace.split("."):[];if(l=f=i=i||o,3!==i.nodeType&&8!==i.nodeType&&!nt.test(g+b.event.triggered)&&(g.indexOf(".")>=0&&(m=g.split("."),g=m.shift(),m.sort()),u=0>g.indexOf(":")&&"on"+g,n=n[b.expando]?n:new b.Event(g,"object"==typeof n&&n),n.isTrigger=!0,n.namespace=m.join("."),n.namespace_re=n.namespace?RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,n.result=t,n.target||(n.target=i),r=null==r?[n]:b.makeArray(r,[n]),p=b.event.special[g]||{},a||!p.trigger||p.trigger.apply(i,r)!==!1)){if(!a&&!p.noBubble&&!b.isWindow(i)){for(c=p.delegateType||g,nt.test(c+g)||(l=l.parentNode);l;l=l.parentNode)h.push(l),f=l;f===(i.ownerDocument||o)&&h.push(f.defaultView||f.parentWindow||e)}d=0;while((l=h[d++])&&!n.isPropagationStopped())n.type=d>1?c:p.bindType||g,s=(b._data(l,"events")||{})[n.type]&&b._data(l,"handle"),s&&s.apply(l,r),s=u&&l[u],s&&b.acceptData(l)&&s.apply&&s.apply(l,r)===!1&&n.preventDefault();if(n.type=g,!(a||n.isDefaultPrevented()||p._default&&p._default.apply(i.ownerDocument,r)!==!1||"click"===g&&b.nodeName(i,"a")||!b.acceptData(i)||!u||!i[g]||b.isWindow(i))){f=i[u],f&&(i[u]=null),b.event.triggered=g;try{i[g]()}catch(v){}b.event.triggered=t,f&&(i[u]=f)}return n.result}},dispatch:function(e){e=b.event.fix(e);var n,r,i,o,a,s=[],u=h.call(arguments),l=(b._data(this,"events")||{})[e.type]||[],c=b.event.special[e.type]||{};if(u[0]=e,e.delegateTarget=this,!c.preDispatch||c.preDispatch.call(this,e)!==!1){s=b.event.handlers.call(this,e,l),n=0;while((o=s[n++])&&!e.isPropagationStopped()){e.currentTarget=o.elem,a=0;while((i=o.handlers[a++])&&!e.isImmediatePropagationStopped())(!e.namespace_re||e.namespace_re.test(i.namespace))&&(e.handleObj=i,e.data=i.data,r=((b.event.special[i.origType]||{}).handle||i.handler).apply(o.elem,u),r!==t&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,e),e.result}},handlers:function(e,n){var r,i,o,a,s=[],u=n.delegateCount,l=e.target;if(u&&l.nodeType&&(!e.button||"click"!==e.type))for(;l!=this;l=l.parentNode||this)if(1===l.nodeType&&(l.disabled!==!0||"click"!==e.type)){for(o=[],a=0;u>a;a++)i=n[a],r=i.selector+" ",o[r]===t&&(o[r]=i.needsContext?b(r,this).index(l)>=0:b.find(r,this,null,[l]).length),o[r]&&o.push(i);o.length&&s.push({elem:l,handlers:o})}return n.length>u&&s.push({elem:this,handlers:n.slice(u)}),s},fix:function(e){if(e[b.expando])return e;var t,n,r,i=e.type,a=e,s=this.fixHooks[i];s||(this.fixHooks[i]=s=tt.test(i)?this.mouseHooks:et.test(i)?this.keyHooks:{}),r=s.props?this.props.concat(s.props):this.props,e=new b.Event(a),t=r.length;while(t--)n=r[t],e[n]=a[n];return e.target||(e.target=a.srcElement||o),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,a):e},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,i,a,s=n.button,u=n.fromElement;return null==e.pageX&&null!=n.clientX&&(i=e.target.ownerDocument||o,a=i.documentElement,r=i.body,e.pageX=n.clientX+(a&&a.scrollLeft||r&&r.scrollLeft||0)-(a&&a.clientLeft||r&&r.clientLeft||0),e.pageY=n.clientY+(a&&a.scrollTop||r&&r.scrollTop||0)-(a&&a.clientTop||r&&r.clientTop||0)),!e.relatedTarget&&u&&(e.relatedTarget=u===e.target?n.toElement:u),e.which||s===t||(e.which=1&s?1:2&s?3:4&s?2:0),e}},special:{load:{noBubble:!0},click:{trigger:function(){return b.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):t}},focus:{trigger:function(){if(this!==o.activeElement&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){return this===o.activeElement&&this.blur?(this.blur(),!1):t},delegateType:"focusout"},beforeunload:{postDispatch:function(e){e.result!==t&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=b.extend(new b.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?b.event.trigger(i,null,t):b.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},b.removeEvent=o.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]===i&&(e[r]=null),e.detachEvent(r,n))},b.Event=function(e,n){return this instanceof b.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?it:ot):this.type=e,n&&b.extend(this,n),this.timeStamp=e&&e.timeStamp||b.now(),this[b.expando]=!0,t):new b.Event(e,n)},b.Event.prototype={isDefaultPrevented:ot,isPropagationStopped:ot,isImmediatePropagationStopped:ot,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=it,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=it,e&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=it,this.stopPropagation()}},b.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){b.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;
+return(!i||i!==r&&!b.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),b.support.submitBubbles||(b.event.special.submit={setup:function(){return b.nodeName(this,"form")?!1:(b.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=b.nodeName(n,"input")||b.nodeName(n,"button")?n.form:t;r&&!b._data(r,"submitBubbles")&&(b.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),b._data(r,"submitBubbles",!0))}),t)},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&b.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){return b.nodeName(this,"form")?!1:(b.event.remove(this,"._submit"),t)}}),b.support.changeBubbles||(b.event.special.change={setup:function(){return Z.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(b.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._just_changed=!0)}),b.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),b.event.simulate("change",this,e,!0)})),!1):(b.event.add(this,"beforeactivate._change",function(e){var t=e.target;Z.test(t.nodeName)&&!b._data(t,"changeBubbles")&&(b.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||b.event.simulate("change",this.parentNode,e,!0)}),b._data(t,"changeBubbles",!0))}),t)},handle:function(e){var n=e.target;return this!==n||e.isSimulated||e.isTrigger||"radio"!==n.type&&"checkbox"!==n.type?e.handleObj.handler.apply(this,arguments):t},teardown:function(){return b.event.remove(this,"._change"),!Z.test(this.nodeName)}}),b.support.focusinBubbles||b.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){b.event.simulate(t,e.target,b.event.fix(e),!0)};b.event.special[t]={setup:function(){0===n++&&o.addEventListener(e,r,!0)},teardown:function(){0===--n&&o.removeEventListener(e,r,!0)}}}),b.fn.extend({on:function(e,n,r,i,o){var a,s;if("object"==typeof e){"string"!=typeof n&&(r=r||n,n=t);for(a in e)this.on(a,n,r,e[a],o);return this}if(null==r&&null==i?(i=n,r=n=t):null==i&&("string"==typeof n?(i=r,r=t):(i=r,r=n,n=t)),i===!1)i=ot;else if(!i)return this;return 1===o&&(s=i,i=function(e){return b().off(e),s.apply(this,arguments)},i.guid=s.guid||(s.guid=b.guid++)),this.each(function(){b.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,o;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,b(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if("object"==typeof e){for(o in e)this.off(o,n,e[o]);return this}return(n===!1||"function"==typeof n)&&(r=n,n=t),r===!1&&(r=ot),this.each(function(){b.event.remove(this,e,r,n)})},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},trigger:function(e,t){return this.each(function(){b.event.trigger(e,t,this)})},triggerHandler:function(e,n){var r=this[0];return r?b.event.trigger(e,n,r,!0):t}}),function(e,t){var n,r,i,o,a,s,u,l,c,p,f,d,h,g,m,y,v,x="sizzle"+-new Date,w=e.document,T={},N=0,C=0,k=it(),E=it(),S=it(),A=typeof t,j=1<<31,D=[],L=D.pop,H=D.push,q=D.slice,M=D.indexOf||function(e){var t=0,n=this.length;for(;n>t;t++)if(this[t]===e)return t;return-1},_="[\\x20\\t\\r\\n\\f]",F="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",O=F.replace("w","w#"),B="([*^$|!~]?=)",P="\\["+_+"*("+F+")"+_+"*(?:"+B+_+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+O+")|)|)"+_+"*\\]",R=":("+F+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+P.replace(3,8)+")*)|.*)\\)|)",W=RegExp("^"+_+"+|((?:^|[^\\\\])(?:\\\\.)*)"+_+"+$","g"),$=RegExp("^"+_+"*,"+_+"*"),I=RegExp("^"+_+"*([\\x20\\t\\r\\n\\f>+~])"+_+"*"),z=RegExp(R),X=RegExp("^"+O+"$"),U={ID:RegExp("^#("+F+")"),CLASS:RegExp("^\\.("+F+")"),NAME:RegExp("^\\[name=['\"]?("+F+")['\"]?\\]"),TAG:RegExp("^("+F.replace("w","w*")+")"),ATTR:RegExp("^"+P),PSEUDO:RegExp("^"+R),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+_+"*(even|odd|(([+-]|)(\\d*)n|)"+_+"*(?:([+-]|)"+_+"*(\\d+)|))"+_+"*\\)|)","i"),needsContext:RegExp("^"+_+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+_+"*((?:-\\d)?\\d*)"+_+"*\\)|)(?=[^-]|$)","i")},V=/[\x20\t\r\n\f]*[+~]/,Y=/^[^{]+\{\s*\[native code/,J=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,G=/^(?:input|select|textarea|button)$/i,Q=/^h\d$/i,K=/'|\\/g,Z=/\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,et=/\\([\da-fA-F]{1,6}[\x20\t\r\n\f]?|.)/g,tt=function(e,t){var n="0x"+t-65536;return n!==n?t:0>n?String.fromCharCode(n+65536):String.fromCharCode(55296|n>>10,56320|1023&n)};try{q.call(w.documentElement.childNodes,0)[0].nodeType}catch(nt){q=function(e){var t,n=[];while(t=this[e++])n.push(t);return n}}function rt(e){return Y.test(e+"")}function it(){var e,t=[];return e=function(n,r){return t.push(n+=" ")>i.cacheLength&&delete e[t.shift()],e[n]=r}}function ot(e){return e[x]=!0,e}function at(e){var t=p.createElement("div");try{return e(t)}catch(n){return!1}finally{t=null}}function st(e,t,n,r){var i,o,a,s,u,l,f,g,m,v;if((t?t.ownerDocument||t:w)!==p&&c(t),t=t||p,n=n||[],!e||"string"!=typeof e)return n;if(1!==(s=t.nodeType)&&9!==s)return[];if(!d&&!r){if(i=J.exec(e))if(a=i[1]){if(9===s){if(o=t.getElementById(a),!o||!o.parentNode)return n;if(o.id===a)return n.push(o),n}else if(t.ownerDocument&&(o=t.ownerDocument.getElementById(a))&&y(t,o)&&o.id===a)return n.push(o),n}else{if(i[2])return H.apply(n,q.call(t.getElementsByTagName(e),0)),n;if((a=i[3])&&T.getByClassName&&t.getElementsByClassName)return H.apply(n,q.call(t.getElementsByClassName(a),0)),n}if(T.qsa&&!h.test(e)){if(f=!0,g=x,m=t,v=9===s&&e,1===s&&"object"!==t.nodeName.toLowerCase()){l=ft(e),(f=t.getAttribute("id"))?g=f.replace(K,"\\$&"):t.setAttribute("id",g),g="[id='"+g+"'] ",u=l.length;while(u--)l[u]=g+dt(l[u]);m=V.test(e)&&t.parentNode||t,v=l.join(",")}if(v)try{return H.apply(n,q.call(m.querySelectorAll(v),0)),n}catch(b){}finally{f||t.removeAttribute("id")}}}return wt(e.replace(W,"$1"),t,n,r)}a=st.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},c=st.setDocument=function(e){var n=e?e.ownerDocument||e:w;return n!==p&&9===n.nodeType&&n.documentElement?(p=n,f=n.documentElement,d=a(n),T.tagNameNoComments=at(function(e){return e.appendChild(n.createComment("")),!e.getElementsByTagName("*").length}),T.attributes=at(function(e){e.innerHTML="<select></select>";var t=typeof e.lastChild.getAttribute("multiple");return"boolean"!==t&&"string"!==t}),T.getByClassName=at(function(e){return e.innerHTML="<div class='hidden e'></div><div class='hidden'></div>",e.getElementsByClassName&&e.getElementsByClassName("e").length?(e.lastChild.className="e",2===e.getElementsByClassName("e").length):!1}),T.getByName=at(function(e){e.id=x+0,e.innerHTML="<a name='"+x+"'></a><div name='"+x+"'></div>",f.insertBefore(e,f.firstChild);var t=n.getElementsByName&&n.getElementsByName(x).length===2+n.getElementsByName(x+0).length;return T.getIdNotName=!n.getElementById(x),f.removeChild(e),t}),i.attrHandle=at(function(e){return e.innerHTML="<a href='#'></a>",e.firstChild&&typeof e.firstChild.getAttribute!==A&&"#"===e.firstChild.getAttribute("href")})?{}:{href:function(e){return e.getAttribute("href",2)},type:function(e){return e.getAttribute("type")}},T.getIdNotName?(i.find.ID=function(e,t){if(typeof t.getElementById!==A&&!d){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},i.filter.ID=function(e){var t=e.replace(et,tt);return function(e){return e.getAttribute("id")===t}}):(i.find.ID=function(e,n){if(typeof n.getElementById!==A&&!d){var r=n.getElementById(e);return r?r.id===e||typeof r.getAttributeNode!==A&&r.getAttributeNode("id").value===e?[r]:t:[]}},i.filter.ID=function(e){var t=e.replace(et,tt);return function(e){var n=typeof e.getAttributeNode!==A&&e.getAttributeNode("id");return n&&n.value===t}}),i.find.TAG=T.tagNameNoComments?function(e,n){return typeof n.getElementsByTagName!==A?n.getElementsByTagName(e):t}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},i.find.NAME=T.getByName&&function(e,n){return typeof n.getElementsByName!==A?n.getElementsByName(name):t},i.find.CLASS=T.getByClassName&&function(e,n){return typeof n.getElementsByClassName===A||d?t:n.getElementsByClassName(e)},g=[],h=[":focus"],(T.qsa=rt(n.querySelectorAll))&&(at(function(e){e.innerHTML="<select><option selected=''></option></select>",e.querySelectorAll("[selected]").length||h.push("\\["+_+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),e.querySelectorAll(":checked").length||h.push(":checked")}),at(function(e){e.innerHTML="<input type='hidden' i=''/>",e.querySelectorAll("[i^='']").length&&h.push("[*^$]="+_+"*(?:\"\"|'')"),e.querySelectorAll(":enabled").length||h.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),h.push(",.*:")})),(T.matchesSelector=rt(m=f.matchesSelector||f.mozMatchesSelector||f.webkitMatchesSelector||f.oMatchesSelector||f.msMatchesSelector))&&at(function(e){T.disconnectedMatch=m.call(e,"div"),m.call(e,"[s!='']:x"),g.push("!=",R)}),h=RegExp(h.join("|")),g=RegExp(g.join("|")),y=rt(f.contains)||f.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},v=f.compareDocumentPosition?function(e,t){var r;return e===t?(u=!0,0):(r=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t))?1&r||e.parentNode&&11===e.parentNode.nodeType?e===n||y(w,e)?-1:t===n||y(w,t)?1:0:4&r?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var r,i=0,o=e.parentNode,a=t.parentNode,s=[e],l=[t];if(e===t)return u=!0,0;if(!o||!a)return e===n?-1:t===n?1:o?-1:a?1:0;if(o===a)return ut(e,t);r=e;while(r=r.parentNode)s.unshift(r);r=t;while(r=r.parentNode)l.unshift(r);while(s[i]===l[i])i++;return i?ut(s[i],l[i]):s[i]===w?-1:l[i]===w?1:0},u=!1,[0,0].sort(v),T.detectDuplicates=u,p):p},st.matches=function(e,t){return st(e,null,null,t)},st.matchesSelector=function(e,t){if((e.ownerDocument||e)!==p&&c(e),t=t.replace(Z,"='$1']"),!(!T.matchesSelector||d||g&&g.test(t)||h.test(t)))try{var n=m.call(e,t);if(n||T.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(r){}return st(t,p,null,[e]).length>0},st.contains=function(e,t){return(e.ownerDocument||e)!==p&&c(e),y(e,t)},st.attr=function(e,t){var n;return(e.ownerDocument||e)!==p&&c(e),d||(t=t.toLowerCase()),(n=i.attrHandle[t])?n(e):d||T.attributes?e.getAttribute(t):((n=e.getAttributeNode(t))||e.getAttribute(t))&&e[t]===!0?t:n&&n.specified?n.value:null},st.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},st.uniqueSort=function(e){var t,n=[],r=1,i=0;if(u=!T.detectDuplicates,e.sort(v),u){for(;t=e[r];r++)t===e[r-1]&&(i=n.push(r));while(i--)e.splice(n[i],1)}return e};function ut(e,t){var n=t&&e,r=n&&(~t.sourceIndex||j)-(~e.sourceIndex||j);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function lt(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function ct(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function pt(e){return ot(function(t){return t=+t,ot(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}o=st.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=o(t);return n},i=st.selectors={cacheLength:50,createPseudo:ot,match:U,find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(et,tt),e[3]=(e[4]||e[5]||"").replace(et,tt),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||st.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&st.error(e[0]),e},PSEUDO:function(e){var t,n=!e[5]&&e[2];return U.CHILD.test(e[0])?null:(e[4]?e[2]=e[4]:n&&z.test(n)&&(t=ft(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){return"*"===e?function(){return!0}:(e=e.replace(et,tt).toLowerCase(),function(t){return t.nodeName&&t.nodeName.toLowerCase()===e})},CLASS:function(e){var t=k[e+" "];return t||(t=RegExp("(^|"+_+")"+e+"("+_+"|$)"))&&k(e,function(e){return t.test(e.className||typeof e.getAttribute!==A&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=st.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,p,f,d,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!u&&!s;if(m){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===y:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){c=m[x]||(m[x]={}),l=c[e]||[],d=l[0]===N&&l[1],f=l[0]===N&&l[2],p=d&&m.childNodes[d];while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if(1===p.nodeType&&++f&&p===t){c[e]=[N,d,f];break}}else if(v&&(l=(t[x]||(t[x]={}))[e])&&l[0]===N)f=l[1];else while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===y:1===p.nodeType)&&++f&&(v&&((p[x]||(p[x]={}))[e]=[N,f]),p===t))break;return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,r=i.pseudos[e]||i.setFilters[e.toLowerCase()]||st.error("unsupported pseudo: "+e);return r[x]?r(t):r.length>1?(n=[e,e,"",t],i.setFilters.hasOwnProperty(e.toLowerCase())?ot(function(e,n){var i,o=r(e,t),a=o.length;while(a--)i=M.call(e,o[a]),e[i]=!(n[i]=o[a])}):function(e){return r(e,0,n)}):r}},pseudos:{not:ot(function(e){var t=[],n=[],r=s(e.replace(W,"$1"));return r[x]?ot(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:ot(function(e){return function(t){return st(e,t).length>0}}),contains:ot(function(e){return function(t){return(t.textContent||t.innerText||o(t)).indexOf(e)>-1}}),lang:ot(function(e){return X.test(e||"")||st.error("unsupported lang: "+e),e=e.replace(et,tt).toLowerCase(),function(t){var n;do if(n=d?t.getAttribute("xml:lang")||t.getAttribute("lang"):t.lang)return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===f},focus:function(e){return e===p.activeElement&&(!p.hasFocus||p.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!i.pseudos.empty(e)},header:function(e){return Q.test(e.nodeName)},input:function(e){return G.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:pt(function(){return[0]}),last:pt(function(e,t){return[t-1]}),eq:pt(function(e,t,n){return[0>n?n+t:n]}),even:pt(function(e,t){var n=0;for(;t>n;n+=2)e.push(n);return e}),odd:pt(function(e,t){var n=1;for(;t>n;n+=2)e.push(n);return e}),lt:pt(function(e,t,n){var r=0>n?n+t:n;for(;--r>=0;)e.push(r);return e}),gt:pt(function(e,t,n){var r=0>n?n+t:n;for(;t>++r;)e.push(r);return e})}};for(n in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})i.pseudos[n]=lt(n);for(n in{submit:!0,reset:!0})i.pseudos[n]=ct(n);function ft(e,t){var n,r,o,a,s,u,l,c=E[e+" "];if(c)return t?0:c.slice(0);s=e,u=[],l=i.preFilter;while(s){(!n||(r=$.exec(s)))&&(r&&(s=s.slice(r[0].length)||s),u.push(o=[])),n=!1,(r=I.exec(s))&&(n=r.shift(),o.push({value:n,type:r[0].replace(W," ")}),s=s.slice(n.length));for(a in i.filter)!(r=U[a].exec(s))||l[a]&&!(r=l[a](r))||(n=r.shift(),o.push({value:n,type:a,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?st.error(e):E(e,u).slice(0)}function dt(e){var t=0,n=e.length,r="";for(;n>t;t++)r+=e[t].value;return r}function ht(e,t,n){var i=t.dir,o=n&&"parentNode"===i,a=C++;return t.first?function(t,n,r){while(t=t[i])if(1===t.nodeType||o)return e(t,n,r)}:function(t,n,s){var u,l,c,p=N+" "+a;if(s){while(t=t[i])if((1===t.nodeType||o)&&e(t,n,s))return!0}else while(t=t[i])if(1===t.nodeType||o)if(c=t[x]||(t[x]={}),(l=c[i])&&l[0]===p){if((u=l[1])===!0||u===r)return u===!0}else if(l=c[i]=[p],l[1]=e(t,n,s)||r,l[1]===!0)return!0}}function gt(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function mt(e,t,n,r,i){var o,a=[],s=0,u=e.length,l=null!=t;for(;u>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),l&&t.push(s));return a}function yt(e,t,n,r,i,o){return r&&!r[x]&&(r=yt(r)),i&&!i[x]&&(i=yt(i,o)),ot(function(o,a,s,u){var l,c,p,f=[],d=[],h=a.length,g=o||xt(t||"*",s.nodeType?[s]:s,[]),m=!e||!o&&t?g:mt(g,f,e,s,u),y=n?i||(o?e:h||r)?[]:a:m;if(n&&n(m,y,s,u),r){l=mt(y,d),r(l,[],s,u),c=l.length;while(c--)(p=l[c])&&(y[d[c]]=!(m[d[c]]=p))}if(o){if(i||e){if(i){l=[],c=y.length;while(c--)(p=y[c])&&l.push(m[c]=p);i(null,y=[],l,u)}c=y.length;while(c--)(p=y[c])&&(l=i?M.call(o,p):f[c])>-1&&(o[l]=!(a[l]=p))}}else y=mt(y===a?y.splice(h,y.length):y),i?i(null,a,y,u):H.apply(a,y)})}function vt(e){var t,n,r,o=e.length,a=i.relative[e[0].type],s=a||i.relative[" "],u=a?1:0,c=ht(function(e){return e===t},s,!0),p=ht(function(e){return M.call(t,e)>-1},s,!0),f=[function(e,n,r){return!a&&(r||n!==l)||((t=n).nodeType?c(e,n,r):p(e,n,r))}];for(;o>u;u++)if(n=i.relative[e[u].type])f=[ht(gt(f),n)];else{if(n=i.filter[e[u].type].apply(null,e[u].matches),n[x]){for(r=++u;o>r;r++)if(i.relative[e[r].type])break;return yt(u>1&&gt(f),u>1&&dt(e.slice(0,u-1)).replace(W,"$1"),n,r>u&&vt(e.slice(u,r)),o>r&&vt(e=e.slice(r)),o>r&&dt(e))}f.push(n)}return gt(f)}function bt(e,t){var n=0,o=t.length>0,a=e.length>0,s=function(s,u,c,f,d){var h,g,m,y=[],v=0,b="0",x=s&&[],w=null!=d,T=l,C=s||a&&i.find.TAG("*",d&&u.parentNode||u),k=N+=null==T?1:Math.random()||.1;for(w&&(l=u!==p&&u,r=n);null!=(h=C[b]);b++){if(a&&h){g=0;while(m=e[g++])if(m(h,u,c)){f.push(h);break}w&&(N=k,r=++n)}o&&((h=!m&&h)&&v--,s&&x.push(h))}if(v+=b,o&&b!==v){g=0;while(m=t[g++])m(x,y,u,c);if(s){if(v>0)while(b--)x[b]||y[b]||(y[b]=L.call(f));y=mt(y)}H.apply(f,y),w&&!s&&y.length>0&&v+t.length>1&&st.uniqueSort(f)}return w&&(N=k,l=T),x};return o?ot(s):s}s=st.compile=function(e,t){var n,r=[],i=[],o=S[e+" "];if(!o){t||(t=ft(e)),n=t.length;while(n--)o=vt(t[n]),o[x]?r.push(o):i.push(o);o=S(e,bt(i,r))}return o};function xt(e,t,n){var r=0,i=t.length;for(;i>r;r++)st(e,t[r],n);return n}function wt(e,t,n,r){var o,a,u,l,c,p=ft(e);if(!r&&1===p.length){if(a=p[0]=p[0].slice(0),a.length>2&&"ID"===(u=a[0]).type&&9===t.nodeType&&!d&&i.relative[a[1].type]){if(t=i.find.ID(u.matches[0].replace(et,tt),t)[0],!t)return n;e=e.slice(a.shift().value.length)}o=U.needsContext.test(e)?0:a.length;while(o--){if(u=a[o],i.relative[l=u.type])break;if((c=i.find[l])&&(r=c(u.matches[0].replace(et,tt),V.test(a[0].type)&&t.parentNode||t))){if(a.splice(o,1),e=r.length&&dt(a),!e)return H.apply(n,q.call(r,0)),n;break}}}return s(e,p)(r,t,d,n,V.test(e)),n}i.pseudos.nth=i.pseudos.eq;function Tt(){}i.filters=Tt.prototype=i.pseudos,i.setFilters=new Tt,c(),st.attr=b.attr,b.find=st,b.expr=st.selectors,b.expr[":"]=b.expr.pseudos,b.unique=st.uniqueSort,b.text=st.getText,b.isXMLDoc=st.isXML,b.contains=st.contains}(e);var at=/Until$/,st=/^(?:parents|prev(?:Until|All))/,ut=/^.[^:#\[\.,]*$/,lt=b.expr.match.needsContext,ct={children:!0,contents:!0,next:!0,prev:!0};b.fn.extend({find:function(e){var t,n,r,i=this.length;if("string"!=typeof e)return r=this,this.pushStack(b(e).filter(function(){for(t=0;i>t;t++)if(b.contains(r[t],this))return!0}));for(n=[],t=0;i>t;t++)b.find(e,this[t],n);return n=this.pushStack(i>1?b.unique(n):n),n.selector=(this.selector?this.selector+" ":"")+e,n},has:function(e){var t,n=b(e,this),r=n.length;return this.filter(function(){for(t=0;r>t;t++)if(b.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(ft(this,e,!1))},filter:function(e){return this.pushStack(ft(this,e,!0))},is:function(e){return!!e&&("string"==typeof e?lt.test(e)?b(e,this.context).index(this[0])>=0:b.filter(e,this).length>0:this.filter(e).length>0)},closest:function(e,t){var n,r=0,i=this.length,o=[],a=lt.test(e)||"string"!=typeof e?b(e,t||this.context):0;for(;i>r;r++){n=this[r];while(n&&n.ownerDocument&&n!==t&&11!==n.nodeType){if(a?a.index(n)>-1:b.find.matchesSelector(n,e)){o.push(n);break}n=n.parentNode}}return this.pushStack(o.length>1?b.unique(o):o)},index:function(e){return e?"string"==typeof e?b.inArray(this[0],b(e)):b.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?b(e,t):b.makeArray(e&&e.nodeType?[e]:e),r=b.merge(this.get(),n);return this.pushStack(b.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),b.fn.andSelf=b.fn.addBack;function pt(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}b.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return b.dir(e,"parentNode")},parentsUntil:function(e,t,n){return b.dir(e,"parentNode",n)},next:function(e){return pt(e,"nextSibling")},prev:function(e){return pt(e,"previousSibling")},nextAll:function(e){return b.dir(e,"nextSibling")},prevAll:function(e){return b.dir(e,"previousSibling")},nextUntil:function(e,t,n){return b.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return b.dir(e,"previousSibling",n)},siblings:function(e){return b.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return b.sibling(e.firstChild)},contents:function(e){return b.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:b.merge([],e.childNodes)}},function(e,t){b.fn[e]=function(n,r){var i=b.map(this,t,n);return at.test(e)||(r=n),r&&"string"==typeof r&&(i=b.filter(r,i)),i=this.length>1&&!ct[e]?b.unique(i):i,this.length>1&&st.test(e)&&(i=i.reverse()),this.pushStack(i)}}),b.extend({filter:function(e,t,n){return n&&(e=":not("+e+")"),1===t.length?b.find.matchesSelector(t[0],e)?[t[0]]:[]:b.find.matches(e,t)},dir:function(e,n,r){var i=[],o=e[n];while(o&&9!==o.nodeType&&(r===t||1!==o.nodeType||!b(o).is(r)))1===o.nodeType&&i.push(o),o=o[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});function ft(e,t,n){if(t=t||0,b.isFunction(t))return b.grep(e,function(e,r){var i=!!t.call(e,r,e);return i===n});if(t.nodeType)return b.grep(e,function(e){return e===t===n});if("string"==typeof t){var r=b.grep(e,function(e){return 1===e.nodeType});if(ut.test(t))return b.filter(t,r,!n);t=b.filter(t,r)}return b.grep(e,function(e){return b.inArray(e,t)>=0===n})}function dt(e){var t=ht.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}var ht="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gt=/ jQuery\d+="(?:null|\d+)"/g,mt=RegExp("<(?:"+ht+")[\\s/>]","i"),yt=/^\s+/,vt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bt=/<([\w:]+)/,xt=/<tbody/i,wt=/<|&#?\w+;/,Tt=/<(?:script|style|link)/i,Nt=/^(?:checkbox|radio)$/i,Ct=/checked\s*(?:[^=]|=\s*.checked.)/i,kt=/^$|\/(?:java|ecma)script/i,Et=/^true\/(.*)/,St=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,At={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:b.support.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},jt=dt(o),Dt=jt.appendChild(o.createElement("div"));At.optgroup=At.option,At.tbody=At.tfoot=At.colgroup=At.caption=At.thead,At.th=At.td,b.fn.extend({text:function(e){return b.access(this,function(e){return e===t?b.text(this):this.empty().append((this[0]&&this[0].ownerDocument||o).createTextNode(e))},null,e,arguments.length)},wrapAll:function(e){if(b.isFunction(e))return this.each(function(t){b(this).wrapAll(e.call(this,t))});if(this[0]){var t=b(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&1===e.firstChild.nodeType)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return b.isFunction(e)?this.each(function(t){b(this).wrapInner(e.call(this,t))}):this.each(function(){var t=b(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=b.isFunction(e);return this.each(function(n){b(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){b.nodeName(this,"body")||b(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(e){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&this.appendChild(e)})},prepend:function(){return this.domManip(arguments,!0,function(e){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&this.insertBefore(e,this.firstChild)})},before:function(){return this.domManip(arguments,!1,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,!1,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=0;for(;null!=(n=this[r]);r++)(!e||b.filter(e,[n]).length>0)&&(t||1!==n.nodeType||b.cleanData(Ot(n)),n.parentNode&&(t&&b.contains(n.ownerDocument,n)&&Mt(Ot(n,"script")),n.parentNode.removeChild(n)));return this},empty:function(){var e,t=0;for(;null!=(e=this[t]);t++){1===e.nodeType&&b.cleanData(Ot(e,!1));while(e.firstChild)e.removeChild(e.firstChild);e.options&&b.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return b.clone(this,e,t)})},html:function(e){return b.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return 1===n.nodeType?n.innerHTML.replace(gt,""):t;if(!("string"!=typeof e||Tt.test(e)||!b.support.htmlSerialize&&mt.test(e)||!b.support.leadingWhitespace&&yt.test(e)||At[(bt.exec(e)||["",""])[1].toLowerCase()])){e=e.replace(vt,"<$1></$2>");try{for(;i>r;r++)n=this[r]||{},1===n.nodeType&&(b.cleanData(Ot(n,!1)),n.innerHTML=e);n=0}catch(o){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(e){var t=b.isFunction(e);return t||"string"==typeof e||(e=b(e).not(this).detach()),this.domManip([e],!0,function(e){var t=this.nextSibling,n=this.parentNode;n&&(b(this).remove(),n.insertBefore(e,t))})},detach:function(e){return this.remove(e,!0)},domManip:function(e,n,r){e=f.apply([],e);var i,o,a,s,u,l,c=0,p=this.length,d=this,h=p-1,g=e[0],m=b.isFunction(g);if(m||!(1>=p||"string"!=typeof g||b.support.checkClone)&&Ct.test(g))return this.each(function(i){var o=d.eq(i);m&&(e[0]=g.call(this,i,n?o.html():t)),o.domManip(e,n,r)});if(p&&(l=b.buildFragment(e,this[0].ownerDocument,!1,this),i=l.firstChild,1===l.childNodes.length&&(l=i),i)){for(n=n&&b.nodeName(i,"tr"),s=b.map(Ot(l,"script"),Ht),a=s.length;p>c;c++)o=l,c!==h&&(o=b.clone(o,!0,!0),a&&b.merge(s,Ot(o,"script"))),r.call(n&&b.nodeName(this[c],"table")?Lt(this[c],"tbody"):this[c],o,c);if(a)for(u=s[s.length-1].ownerDocument,b.map(s,qt),c=0;a>c;c++)o=s[c],kt.test(o.type||"")&&!b._data(o,"globalEval")&&b.contains(u,o)&&(o.src?b.ajax({url:o.src,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0}):b.globalEval((o.text||o.textContent||o.innerHTML||"").replace(St,"")));l=i=null}return this}});function Lt(e,t){return e.getElementsByTagName(t)[0]||e.appendChild(e.ownerDocument.createElement(t))}function Ht(e){var t=e.getAttributeNode("type");return e.type=(t&&t.specified)+"/"+e.type,e}function qt(e){var t=Et.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function Mt(e,t){var n,r=0;for(;null!=(n=e[r]);r++)b._data(n,"globalEval",!t||b._data(t[r],"globalEval"))}function _t(e,t){if(1===t.nodeType&&b.hasData(e)){var n,r,i,o=b._data(e),a=b._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)b.event.add(t,n,s[n][r])}a.data&&(a.data=b.extend({},a.data))}}function Ft(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!b.support.noCloneEvent&&t[b.expando]){i=b._data(t);for(r in i.events)b.removeEvent(t,r,i.handle);t.removeAttribute(b.expando)}"script"===n&&t.text!==e.text?(Ht(t).text=e.text,qt(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),b.support.html5Clone&&e.innerHTML&&!b.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Nt.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}b.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){b.fn[e]=function(e){var n,r=0,i=[],o=b(e),a=o.length-1;for(;a>=r;r++)n=r===a?this:this.clone(!0),b(o[r])[t](n),d.apply(i,n.get());return this.pushStack(i)}});function Ot(e,n){var r,o,a=0,s=typeof e.getElementsByTagName!==i?e.getElementsByTagName(n||"*"):typeof e.querySelectorAll!==i?e.querySelectorAll(n||"*"):t;if(!s)for(s=[],r=e.childNodes||e;null!=(o=r[a]);a++)!n||b.nodeName(o,n)?s.push(o):b.merge(s,Ot(o,n));return n===t||n&&b.nodeName(e,n)?b.merge([e],s):s}function Bt(e){Nt.test(e.type)&&(e.defaultChecked=e.checked)}b.extend({clone:function(e,t,n){var r,i,o,a,s,u=b.contains(e.ownerDocument,e);if(b.support.html5Clone||b.isXMLDoc(e)||!mt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(Dt.innerHTML=e.outerHTML,Dt.removeChild(o=Dt.firstChild)),!(b.support.noCloneEvent&&b.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||b.isXMLDoc(e)))for(r=Ot(o),s=Ot(e),a=0;null!=(i=s[a]);++a)r[a]&&Ft(i,r[a]);if(t)if(n)for(s=s||Ot(e),r=r||Ot(o),a=0;null!=(i=s[a]);a++)_t(i,r[a]);else _t(e,o);return r=Ot(o,"script"),r.length>0&&Mt(r,!u&&Ot(e,"script")),r=s=i=null,o},buildFragment:function(e,t,n,r){var i,o,a,s,u,l,c,p=e.length,f=dt(t),d=[],h=0;for(;p>h;h++)if(o=e[h],o||0===o)if("object"===b.type(o))b.merge(d,o.nodeType?[o]:o);else if(wt.test(o)){s=s||f.appendChild(t.createElement("div")),u=(bt.exec(o)||["",""])[1].toLowerCase(),c=At[u]||At._default,s.innerHTML=c[1]+o.replace(vt,"<$1></$2>")+c[2],i=c[0];while(i--)s=s.lastChild;if(!b.support.leadingWhitespace&&yt.test(o)&&d.push(t.createTextNode(yt.exec(o)[0])),!b.support.tbody){o="table"!==u||xt.test(o)?"<table>"!==c[1]||xt.test(o)?0:s:s.firstChild,i=o&&o.childNodes.length;while(i--)b.nodeName(l=o.childNodes[i],"tbody")&&!l.childNodes.length&&o.removeChild(l)
+}b.merge(d,s.childNodes),s.textContent="";while(s.firstChild)s.removeChild(s.firstChild);s=f.lastChild}else d.push(t.createTextNode(o));s&&f.removeChild(s),b.support.appendChecked||b.grep(Ot(d,"input"),Bt),h=0;while(o=d[h++])if((!r||-1===b.inArray(o,r))&&(a=b.contains(o.ownerDocument,o),s=Ot(f.appendChild(o),"script"),a&&Mt(s),n)){i=0;while(o=s[i++])kt.test(o.type||"")&&n.push(o)}return s=null,f},cleanData:function(e,t){var n,r,o,a,s=0,u=b.expando,l=b.cache,p=b.support.deleteExpando,f=b.event.special;for(;null!=(n=e[s]);s++)if((t||b.acceptData(n))&&(o=n[u],a=o&&l[o])){if(a.events)for(r in a.events)f[r]?b.event.remove(n,r):b.removeEvent(n,r,a.handle);l[o]&&(delete l[o],p?delete n[u]:typeof n.removeAttribute!==i?n.removeAttribute(u):n[u]=null,c.push(o))}}});var Pt,Rt,Wt,$t=/alpha\([^)]*\)/i,It=/opacity\s*=\s*([^)]*)/,zt=/^(top|right|bottom|left)$/,Xt=/^(none|table(?!-c[ea]).+)/,Ut=/^margin/,Vt=RegExp("^("+x+")(.*)$","i"),Yt=RegExp("^("+x+")(?!px)[a-z%]+$","i"),Jt=RegExp("^([+-])=("+x+")","i"),Gt={BODY:"block"},Qt={position:"absolute",visibility:"hidden",display:"block"},Kt={letterSpacing:0,fontWeight:400},Zt=["Top","Right","Bottom","Left"],en=["Webkit","O","Moz","ms"];function tn(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=en.length;while(i--)if(t=en[i]+n,t in e)return t;return r}function nn(e,t){return e=t||e,"none"===b.css(e,"display")||!b.contains(e.ownerDocument,e)}function rn(e,t){var n,r,i,o=[],a=0,s=e.length;for(;s>a;a++)r=e[a],r.style&&(o[a]=b._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&nn(r)&&(o[a]=b._data(r,"olddisplay",un(r.nodeName)))):o[a]||(i=nn(r),(n&&"none"!==n||!i)&&b._data(r,"olddisplay",i?n:b.css(r,"display"))));for(a=0;s>a;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}b.fn.extend({css:function(e,n){return b.access(this,function(e,n,r){var i,o,a={},s=0;if(b.isArray(n)){for(o=Rt(e),i=n.length;i>s;s++)a[n[s]]=b.css(e,n[s],!1,o);return a}return r!==t?b.style(e,n,r):b.css(e,n)},e,n,arguments.length>1)},show:function(){return rn(this,!0)},hide:function(){return rn(this)},toggle:function(e){var t="boolean"==typeof e;return this.each(function(){(t?e:nn(this))?b(this).show():b(this).hide()})}}),b.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Wt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":b.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var o,a,s,u=b.camelCase(n),l=e.style;if(n=b.cssProps[u]||(b.cssProps[u]=tn(l,u)),s=b.cssHooks[n]||b.cssHooks[u],r===t)return s&&"get"in s&&(o=s.get(e,!1,i))!==t?o:l[n];if(a=typeof r,"string"===a&&(o=Jt.exec(r))&&(r=(o[1]+1)*o[2]+parseFloat(b.css(e,n)),a="number"),!(null==r||"number"===a&&isNaN(r)||("number"!==a||b.cssNumber[u]||(r+="px"),b.support.clearCloneStyle||""!==r||0!==n.indexOf("background")||(l[n]="inherit"),s&&"set"in s&&(r=s.set(e,r,i))===t)))try{l[n]=r}catch(c){}}},css:function(e,n,r,i){var o,a,s,u=b.camelCase(n);return n=b.cssProps[u]||(b.cssProps[u]=tn(e.style,u)),s=b.cssHooks[n]||b.cssHooks[u],s&&"get"in s&&(a=s.get(e,!0,r)),a===t&&(a=Wt(e,n,i)),"normal"===a&&n in Kt&&(a=Kt[n]),""===r||r?(o=parseFloat(a),r===!0||b.isNumeric(o)?o||0:a):a},swap:function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i}}),e.getComputedStyle?(Rt=function(t){return e.getComputedStyle(t,null)},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),u=s?s.getPropertyValue(n)||s[n]:t,l=e.style;return s&&(""!==u||b.contains(e.ownerDocument,e)||(u=b.style(e,n)),Yt.test(u)&&Ut.test(n)&&(i=l.width,o=l.minWidth,a=l.maxWidth,l.minWidth=l.maxWidth=l.width=u,u=s.width,l.width=i,l.minWidth=o,l.maxWidth=a)),u}):o.documentElement.currentStyle&&(Rt=function(e){return e.currentStyle},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),u=s?s[n]:t,l=e.style;return null==u&&l&&l[n]&&(u=l[n]),Yt.test(u)&&!zt.test(n)&&(i=l.left,o=e.runtimeStyle,a=o&&o.left,a&&(o.left=e.currentStyle.left),l.left="fontSize"===n?"1em":u,u=l.pixelLeft+"px",l.left=i,a&&(o.left=a)),""===u?"auto":u});function on(e,t,n){var r=Vt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function an(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;for(;4>o;o+=2)"margin"===n&&(a+=b.css(e,n+Zt[o],!0,i)),r?("content"===n&&(a-=b.css(e,"padding"+Zt[o],!0,i)),"margin"!==n&&(a-=b.css(e,"border"+Zt[o]+"Width",!0,i))):(a+=b.css(e,"padding"+Zt[o],!0,i),"padding"!==n&&(a+=b.css(e,"border"+Zt[o]+"Width",!0,i)));return a}function sn(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=Rt(e),a=b.support.boxSizing&&"border-box"===b.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=Wt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Yt.test(i))return i;r=a&&(b.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+an(e,t,n||(a?"border":"content"),r,o)+"px"}function un(e){var t=o,n=Gt[e];return n||(n=ln(e,t),"none"!==n&&n||(Pt=(Pt||b("<iframe frameborder='0' width='0' height='0'/>").css("cssText","display:block !important")).appendTo(t.documentElement),t=(Pt[0].contentWindow||Pt[0].contentDocument).document,t.write("<!doctype html><html><body>"),t.close(),n=ln(e,t),Pt.detach()),Gt[e]=n),n}function ln(e,t){var n=b(t.createElement(e)).appendTo(t.body),r=b.css(n[0],"display");return n.remove(),r}b.each(["height","width"],function(e,n){b.cssHooks[n]={get:function(e,r,i){return r?0===e.offsetWidth&&Xt.test(b.css(e,"display"))?b.swap(e,Qt,function(){return sn(e,n,i)}):sn(e,n,i):t},set:function(e,t,r){var i=r&&Rt(e);return on(e,t,r?an(e,n,r,b.support.boxSizing&&"border-box"===b.css(e,"boxSizing",!1,i),i):0)}}}),b.support.opacity||(b.cssHooks.opacity={get:function(e,t){return It.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=b.isNumeric(t)?"alpha(opacity="+100*t+")":"",o=r&&r.filter||n.filter||"";n.zoom=1,(t>=1||""===t)&&""===b.trim(o.replace($t,""))&&n.removeAttribute&&(n.removeAttribute("filter"),""===t||r&&!r.filter)||(n.filter=$t.test(o)?o.replace($t,i):o+" "+i)}}),b(function(){b.support.reliableMarginRight||(b.cssHooks.marginRight={get:function(e,n){return n?b.swap(e,{display:"inline-block"},Wt,[e,"marginRight"]):t}}),!b.support.pixelPosition&&b.fn.position&&b.each(["top","left"],function(e,n){b.cssHooks[n]={get:function(e,r){return r?(r=Wt(e,n),Yt.test(r)?b(e).position()[n]+"px":r):t}}})}),b.expr&&b.expr.filters&&(b.expr.filters.hidden=function(e){return 0>=e.offsetWidth&&0>=e.offsetHeight||!b.support.reliableHiddenOffsets&&"none"===(e.style&&e.style.display||b.css(e,"display"))},b.expr.filters.visible=function(e){return!b.expr.filters.hidden(e)}),b.each({margin:"",padding:"",border:"Width"},function(e,t){b.cssHooks[e+t]={expand:function(n){var r=0,i={},o="string"==typeof n?n.split(" "):[n];for(;4>r;r++)i[e+Zt[r]+t]=o[r]||o[r-2]||o[0];return i}},Ut.test(e)||(b.cssHooks[e+t].set=on)});var cn=/%20/g,pn=/\[\]$/,fn=/\r?\n/g,dn=/^(?:submit|button|image|reset|file)$/i,hn=/^(?:input|select|textarea|keygen)/i;b.fn.extend({serialize:function(){return b.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=b.prop(this,"elements");return e?b.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!b(this).is(":disabled")&&hn.test(this.nodeName)&&!dn.test(e)&&(this.checked||!Nt.test(e))}).map(function(e,t){var n=b(this).val();return null==n?null:b.isArray(n)?b.map(n,function(e){return{name:t.name,value:e.replace(fn,"\r\n")}}):{name:t.name,value:n.replace(fn,"\r\n")}}).get()}}),b.param=function(e,n){var r,i=[],o=function(e,t){t=b.isFunction(t)?t():null==t?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(n===t&&(n=b.ajaxSettings&&b.ajaxSettings.traditional),b.isArray(e)||e.jquery&&!b.isPlainObject(e))b.each(e,function(){o(this.name,this.value)});else for(r in e)gn(r,e[r],n,o);return i.join("&").replace(cn,"+")};function gn(e,t,n,r){var i;if(b.isArray(t))b.each(t,function(t,i){n||pn.test(e)?r(e,i):gn(e+"["+("object"==typeof i?t:"")+"]",i,n,r)});else if(n||"object"!==b.type(t))r(e,t);else for(i in t)gn(e+"["+i+"]",t[i],n,r)}b.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){b.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),b.fn.hover=function(e,t){return this.mouseenter(e).mouseleave(t||e)};var mn,yn,vn=b.now(),bn=/\?/,xn=/#.*$/,wn=/([?&])_=[^&]*/,Tn=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Nn=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Cn=/^(?:GET|HEAD)$/,kn=/^\/\//,En=/^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,Sn=b.fn.load,An={},jn={},Dn="*/".concat("*");try{yn=a.href}catch(Ln){yn=o.createElement("a"),yn.href="",yn=yn.href}mn=En.exec(yn.toLowerCase())||[];function Hn(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(w)||[];if(b.isFunction(n))while(r=o[i++])"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function qn(e,n,r,i){var o={},a=e===jn;function s(u){var l;return o[u]=!0,b.each(e[u]||[],function(e,u){var c=u(n,r,i);return"string"!=typeof c||a||o[c]?a?!(l=c):t:(n.dataTypes.unshift(c),s(c),!1)}),l}return s(n.dataTypes[0])||!o["*"]&&s("*")}function Mn(e,n){var r,i,o=b.ajaxSettings.flatOptions||{};for(i in n)n[i]!==t&&((o[i]?e:r||(r={}))[i]=n[i]);return r&&b.extend(!0,e,r),e}b.fn.load=function(e,n,r){if("string"!=typeof e&&Sn)return Sn.apply(this,arguments);var i,o,a,s=this,u=e.indexOf(" ");return u>=0&&(i=e.slice(u,e.length),e=e.slice(0,u)),b.isFunction(n)?(r=n,n=t):n&&"object"==typeof n&&(a="POST"),s.length>0&&b.ajax({url:e,type:a,dataType:"html",data:n}).done(function(e){o=arguments,s.html(i?b("<div>").append(b.parseHTML(e)).find(i):e)}).complete(r&&function(e,t){s.each(r,o||[e.responseText,t,e])}),this},b.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){b.fn[t]=function(e){return this.on(t,e)}}),b.each(["get","post"],function(e,n){b[n]=function(e,r,i,o){return b.isFunction(r)&&(o=o||i,i=r,r=t),b.ajax({url:e,type:n,dataType:o,data:r,success:i})}}),b.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:yn,type:"GET",isLocal:Nn.test(mn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Dn,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":e.String,"text html":!0,"text json":b.parseJSON,"text xml":b.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?Mn(Mn(e,b.ajaxSettings),t):Mn(b.ajaxSettings,e)},ajaxPrefilter:Hn(An),ajaxTransport:Hn(jn),ajax:function(e,n){"object"==typeof e&&(n=e,e=t),n=n||{};var r,i,o,a,s,u,l,c,p=b.ajaxSetup({},n),f=p.context||p,d=p.context&&(f.nodeType||f.jquery)?b(f):b.event,h=b.Deferred(),g=b.Callbacks("once memory"),m=p.statusCode||{},y={},v={},x=0,T="canceled",N={readyState:0,getResponseHeader:function(e){var t;if(2===x){if(!c){c={};while(t=Tn.exec(a))c[t[1].toLowerCase()]=t[2]}t=c[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===x?a:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return x||(e=v[n]=v[n]||e,y[e]=t),this},overrideMimeType:function(e){return x||(p.mimeType=e),this},statusCode:function(e){var t;if(e)if(2>x)for(t in e)m[t]=[m[t],e[t]];else N.always(e[N.status]);return this},abort:function(e){var t=e||T;return l&&l.abort(t),k(0,t),this}};if(h.promise(N).complete=g.add,N.success=N.done,N.error=N.fail,p.url=((e||p.url||yn)+"").replace(xn,"").replace(kn,mn[1]+"//"),p.type=n.method||n.type||p.method||p.type,p.dataTypes=b.trim(p.dataType||"*").toLowerCase().match(w)||[""],null==p.crossDomain&&(r=En.exec(p.url.toLowerCase()),p.crossDomain=!(!r||r[1]===mn[1]&&r[2]===mn[2]&&(r[3]||("http:"===r[1]?80:443))==(mn[3]||("http:"===mn[1]?80:443)))),p.data&&p.processData&&"string"!=typeof p.data&&(p.data=b.param(p.data,p.traditional)),qn(An,p,n,N),2===x)return N;u=p.global,u&&0===b.active++&&b.event.trigger("ajaxStart"),p.type=p.type.toUpperCase(),p.hasContent=!Cn.test(p.type),o=p.url,p.hasContent||(p.data&&(o=p.url+=(bn.test(o)?"&":"?")+p.data,delete p.data),p.cache===!1&&(p.url=wn.test(o)?o.replace(wn,"$1_="+vn++):o+(bn.test(o)?"&":"?")+"_="+vn++)),p.ifModified&&(b.lastModified[o]&&N.setRequestHeader("If-Modified-Since",b.lastModified[o]),b.etag[o]&&N.setRequestHeader("If-None-Match",b.etag[o])),(p.data&&p.hasContent&&p.contentType!==!1||n.contentType)&&N.setRequestHeader("Content-Type",p.contentType),N.setRequestHeader("Accept",p.dataTypes[0]&&p.accepts[p.dataTypes[0]]?p.accepts[p.dataTypes[0]]+("*"!==p.dataTypes[0]?", "+Dn+"; q=0.01":""):p.accepts["*"]);for(i in p.headers)N.setRequestHeader(i,p.headers[i]);if(p.beforeSend&&(p.beforeSend.call(f,N,p)===!1||2===x))return N.abort();T="abort";for(i in{success:1,error:1,complete:1})N[i](p[i]);if(l=qn(jn,p,n,N)){N.readyState=1,u&&d.trigger("ajaxSend",[N,p]),p.async&&p.timeout>0&&(s=setTimeout(function(){N.abort("timeout")},p.timeout));try{x=1,l.send(y,k)}catch(C){if(!(2>x))throw C;k(-1,C)}}else k(-1,"No Transport");function k(e,n,r,i){var c,y,v,w,T,C=n;2!==x&&(x=2,s&&clearTimeout(s),l=t,a=i||"",N.readyState=e>0?4:0,r&&(w=_n(p,N,r)),e>=200&&300>e||304===e?(p.ifModified&&(T=N.getResponseHeader("Last-Modified"),T&&(b.lastModified[o]=T),T=N.getResponseHeader("etag"),T&&(b.etag[o]=T)),204===e?(c=!0,C="nocontent"):304===e?(c=!0,C="notmodified"):(c=Fn(p,w),C=c.state,y=c.data,v=c.error,c=!v)):(v=C,(e||!C)&&(C="error",0>e&&(e=0))),N.status=e,N.statusText=(n||C)+"",c?h.resolveWith(f,[y,C,N]):h.rejectWith(f,[N,C,v]),N.statusCode(m),m=t,u&&d.trigger(c?"ajaxSuccess":"ajaxError",[N,p,c?y:v]),g.fireWith(f,[N,C]),u&&(d.trigger("ajaxComplete",[N,p]),--b.active||b.event.trigger("ajaxStop")))}return N},getScript:function(e,n){return b.get(e,t,n,"script")},getJSON:function(e,t,n){return b.get(e,t,n,"json")}});function _n(e,n,r){var i,o,a,s,u=e.contents,l=e.dataTypes,c=e.responseFields;for(s in c)s in r&&(n[c[s]]=r[s]);while("*"===l[0])l.shift(),o===t&&(o=e.mimeType||n.getResponseHeader("Content-Type"));if(o)for(s in u)if(u[s]&&u[s].test(o)){l.unshift(s);break}if(l[0]in r)a=l[0];else{for(s in r){if(!l[0]||e.converters[s+" "+l[0]]){a=s;break}i||(i=s)}a=a||i}return a?(a!==l[0]&&l.unshift(a),r[a]):t}function Fn(e,t){var n,r,i,o,a={},s=0,u=e.dataTypes.slice(),l=u[0];if(e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u[1])for(i in e.converters)a[i.toLowerCase()]=e.converters[i];for(;r=u[++s];)if("*"!==r){if("*"!==l&&l!==r){if(i=a[l+" "+r]||a["* "+r],!i)for(n in a)if(o=n.split(" "),o[1]===r&&(i=a[l+" "+o[0]]||a["* "+o[0]])){i===!0?i=a[n]:a[n]!==!0&&(r=o[0],u.splice(s--,0,r));break}if(i!==!0)if(i&&e["throws"])t=i(t);else try{t=i(t)}catch(c){return{state:"parsererror",error:i?c:"No conversion from "+l+" to "+r}}}l=r}return{state:"success",data:t}}b.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(e){return b.globalEval(e),e}}}),b.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),b.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=o.head||b("head")[0]||o.documentElement;return{send:function(t,i){n=o.createElement("script"),n.async=!0,e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,t){(t||!n.readyState||/loaded|complete/.test(n.readyState))&&(n.onload=n.onreadystatechange=null,n.parentNode&&n.parentNode.removeChild(n),n=null,t||i(200,"success"))},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(t,!0)}}}});var On=[],Bn=/(=)\?(?=&|$)|\?\?/;b.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=On.pop()||b.expando+"_"+vn++;return this[e]=!0,e}}),b.ajaxPrefilter("json jsonp",function(n,r,i){var o,a,s,u=n.jsonp!==!1&&(Bn.test(n.url)?"url":"string"==typeof n.data&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Bn.test(n.data)&&"data");return u||"jsonp"===n.dataTypes[0]?(o=n.jsonpCallback=b.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,u?n[u]=n[u].replace(Bn,"$1"+o):n.jsonp!==!1&&(n.url+=(bn.test(n.url)?"&":"?")+n.jsonp+"="+o),n.converters["script json"]=function(){return s||b.error(o+" was not called"),s[0]},n.dataTypes[0]="json",a=e[o],e[o]=function(){s=arguments},i.always(function(){e[o]=a,n[o]&&(n.jsonpCallback=r.jsonpCallback,On.push(o)),s&&b.isFunction(a)&&a(s[0]),s=a=t}),"script"):t});var Pn,Rn,Wn=0,$n=e.ActiveXObject&&function(){var e;for(e in Pn)Pn[e](t,!0)};function In(){try{return new e.XMLHttpRequest}catch(t){}}function zn(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}b.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&In()||zn()}:In,Rn=b.ajaxSettings.xhr(),b.support.cors=!!Rn&&"withCredentials"in Rn,Rn=b.support.ajax=!!Rn,Rn&&b.ajaxTransport(function(n){if(!n.crossDomain||b.support.cors){var r;return{send:function(i,o){var a,s,u=n.xhr();if(n.username?u.open(n.type,n.url,n.async,n.username,n.password):u.open(n.type,n.url,n.async),n.xhrFields)for(s in n.xhrFields)u[s]=n.xhrFields[s];n.mimeType&&u.overrideMimeType&&u.overrideMimeType(n.mimeType),n.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");try{for(s in i)u.setRequestHeader(s,i[s])}catch(l){}u.send(n.hasContent&&n.data||null),r=function(e,i){var s,l,c,p;try{if(r&&(i||4===u.readyState))if(r=t,a&&(u.onreadystatechange=b.noop,$n&&delete Pn[a]),i)4!==u.readyState&&u.abort();else{p={},s=u.status,l=u.getAllResponseHeaders(),"string"==typeof u.responseText&&(p.text=u.responseText);try{c=u.statusText}catch(f){c=""}s||!n.isLocal||n.crossDomain?1223===s&&(s=204):s=p.text?200:404}}catch(d){i||o(-1,d)}p&&o(s,c,p,l)},n.async?4===u.readyState?setTimeout(r):(a=++Wn,$n&&(Pn||(Pn={},b(e).unload($n)),Pn[a]=r),u.onreadystatechange=r):r()},abort:function(){r&&r(t,!0)}}}});var Xn,Un,Vn=/^(?:toggle|show|hide)$/,Yn=RegExp("^(?:([+-])=|)("+x+")([a-z%]*)$","i"),Jn=/queueHooks$/,Gn=[nr],Qn={"*":[function(e,t){var n,r,i=this.createTween(e,t),o=Yn.exec(t),a=i.cur(),s=+a||0,u=1,l=20;if(o){if(n=+o[2],r=o[3]||(b.cssNumber[e]?"":"px"),"px"!==r&&s){s=b.css(i.elem,e,!0)||n||1;do u=u||".5",s/=u,b.style(i.elem,e,s+r);while(u!==(u=i.cur()/a)&&1!==u&&--l)}i.unit=r,i.start=s,i.end=o[1]?s+(o[1]+1)*n:n}return i}]};function Kn(){return setTimeout(function(){Xn=t}),Xn=b.now()}function Zn(e,t){b.each(t,function(t,n){var r=(Qn[t]||[]).concat(Qn["*"]),i=0,o=r.length;for(;o>i;i++)if(r[i].call(e,t,n))return})}function er(e,t,n){var r,i,o=0,a=Gn.length,s=b.Deferred().always(function(){delete u.elem}),u=function(){if(i)return!1;var t=Xn||Kn(),n=Math.max(0,l.startTime+l.duration-t),r=n/l.duration||0,o=1-r,a=0,u=l.tweens.length;for(;u>a;a++)l.tweens[a].run(o);return s.notifyWith(e,[l,o,n]),1>o&&u?n:(s.resolveWith(e,[l]),!1)},l=s.promise({elem:e,props:b.extend({},t),opts:b.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:Xn||Kn(),duration:n.duration,tweens:[],createTween:function(t,n){var r=b.Tween(e,l.opts,t,n,l.opts.specialEasing[t]||l.opts.easing);return l.tweens.push(r),r},stop:function(t){var n=0,r=t?l.tweens.length:0;if(i)return this;for(i=!0;r>n;n++)l.tweens[n].run(1);return t?s.resolveWith(e,[l,t]):s.rejectWith(e,[l,t]),this}}),c=l.props;for(tr(c,l.opts.specialEasing);a>o;o++)if(r=Gn[o].call(l,e,c,l.opts))return r;return Zn(l,c),b.isFunction(l.opts.start)&&l.opts.start.call(e,l),b.fx.timer(b.extend(u,{elem:e,anim:l,queue:l.opts.queue})),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always)}function tr(e,t){var n,r,i,o,a;for(i in e)if(r=b.camelCase(i),o=t[r],n=e[i],b.isArray(n)&&(o=n[1],n=e[i]=n[0]),i!==r&&(e[r]=n,delete e[i]),a=b.cssHooks[r],a&&"expand"in a){n=a.expand(n),delete e[r];for(i in n)i in e||(e[i]=n[i],t[i]=o)}else t[r]=o}b.Animation=b.extend(er,{tweener:function(e,t){b.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;i>r;r++)n=e[r],Qn[n]=Qn[n]||[],Qn[n].unshift(t)},prefilter:function(e,t){t?Gn.unshift(e):Gn.push(e)}});function nr(e,t,n){var r,i,o,a,s,u,l,c,p,f=this,d=e.style,h={},g=[],m=e.nodeType&&nn(e);n.queue||(c=b._queueHooks(e,"fx"),null==c.unqueued&&(c.unqueued=0,p=c.empty.fire,c.empty.fire=function(){c.unqueued||p()}),c.unqueued++,f.always(function(){f.always(function(){c.unqueued--,b.queue(e,"fx").length||c.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[d.overflow,d.overflowX,d.overflowY],"inline"===b.css(e,"display")&&"none"===b.css(e,"float")&&(b.support.inlineBlockNeedsLayout&&"inline"!==un(e.nodeName)?d.zoom=1:d.display="inline-block")),n.overflow&&(d.overflow="hidden",b.support.shrinkWrapBlocks||f.always(function(){d.overflow=n.overflow[0],d.overflowX=n.overflow[1],d.overflowY=n.overflow[2]}));for(i in t)if(a=t[i],Vn.exec(a)){if(delete t[i],u=u||"toggle"===a,a===(m?"hide":"show"))continue;g.push(i)}if(o=g.length){s=b._data(e,"fxshow")||b._data(e,"fxshow",{}),"hidden"in s&&(m=s.hidden),u&&(s.hidden=!m),m?b(e).show():f.done(function(){b(e).hide()}),f.done(function(){var t;b._removeData(e,"fxshow");for(t in h)b.style(e,t,h[t])});for(i=0;o>i;i++)r=g[i],l=f.createTween(r,m?s[r]:0),h[r]=s[r]||b.style(e,r),r in s||(s[r]=l.start,m&&(l.end=l.start,l.start="width"===r||"height"===r?1:0))}}function rr(e,t,n,r,i){return new rr.prototype.init(e,t,n,r,i)}b.Tween=rr,rr.prototype={constructor:rr,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(b.cssNumber[n]?"":"px")},cur:function(){var e=rr.propHooks[this.prop];return e&&e.get?e.get(this):rr.propHooks._default.get(this)},run:function(e){var t,n=rr.propHooks[this.prop];return this.pos=t=this.options.duration?b.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):rr.propHooks._default.set(this),this}},rr.prototype.init.prototype=rr.prototype,rr.propHooks={_default:{get:function(e){var t;return null==e.elem[e.prop]||e.elem.style&&null!=e.elem.style[e.prop]?(t=b.css(e.elem,e.prop,""),t&&"auto"!==t?t:0):e.elem[e.prop]},set:function(e){b.fx.step[e.prop]?b.fx.step[e.prop](e):e.elem.style&&(null!=e.elem.style[b.cssProps[e.prop]]||b.cssHooks[e.prop])?b.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},rr.propHooks.scrollTop=rr.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},b.each(["toggle","show","hide"],function(e,t){var n=b.fn[t];b.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(ir(t,!0),e,r,i)}}),b.fn.extend({fadeTo:function(e,t,n,r){return this.filter(nn).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=b.isEmptyObject(e),o=b.speed(t,n,r),a=function(){var t=er(this,b.extend({},e),o);a.finish=function(){t.stop(!0)},(i||b._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,n,r){var i=function(e){var t=e.stop;delete e.stop,t(r)};return"string"!=typeof e&&(r=n,n=e,e=t),n&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,n=null!=e&&e+"queueHooks",o=b.timers,a=b._data(this);if(n)a[n]&&a[n].stop&&i(a[n]);else for(n in a)a[n]&&a[n].stop&&Jn.test(n)&&i(a[n]);for(n=o.length;n--;)o[n].elem!==this||null!=e&&o[n].queue!==e||(o[n].anim.stop(r),t=!1,o.splice(n,1));(t||!r)&&b.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=b._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=b.timers,a=r?r.length:0;for(n.finish=!0,b.queue(this,e,[]),i&&i.cur&&i.cur.finish&&i.cur.finish.call(this),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;a>t;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}});function ir(e,t){var n,r={height:e},i=0;for(t=t?1:0;4>i;i+=2-t)n=Zt[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}b.each({slideDown:ir("show"),slideUp:ir("hide"),slideToggle:ir("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){b.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),b.speed=function(e,t,n){var r=e&&"object"==typeof e?b.extend({},e):{complete:n||!n&&t||b.isFunction(e)&&e,duration:e,easing:n&&t||t&&!b.isFunction(t)&&t};return r.duration=b.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in b.fx.speeds?b.fx.speeds[r.duration]:b.fx.speeds._default,(null==r.queue||r.queue===!0)&&(r.queue="fx"),r.old=r.complete,r.complete=function(){b.isFunction(r.old)&&r.old.call(this),r.queue&&b.dequeue(this,r.queue)},r},b.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2}},b.timers=[],b.fx=rr.prototype.init,b.fx.tick=function(){var e,n=b.timers,r=0;for(Xn=b.now();n.length>r;r++)e=n[r],e()||n[r]!==e||n.splice(r--,1);n.length||b.fx.stop(),Xn=t},b.fx.timer=function(e){e()&&b.timers.push(e)&&b.fx.start()},b.fx.interval=13,b.fx.start=function(){Un||(Un=setInterval(b.fx.tick,b.fx.interval))},b.fx.stop=function(){clearInterval(Un),Un=null},b.fx.speeds={slow:600,fast:200,_default:400},b.fx.step={},b.expr&&b.expr.filters&&(b.expr.filters.animated=function(e){return b.grep(b.timers,function(t){return e===t.elem}).length}),b.fn.offset=function(e){if(arguments.length)return e===t?this:this.each(function(t){b.offset.setOffset(this,e,t)});var n,r,o={top:0,left:0},a=this[0],s=a&&a.ownerDocument;if(s)return n=s.documentElement,b.contains(n,a)?(typeof a.getBoundingClientRect!==i&&(o=a.getBoundingClientRect()),r=or(s),{top:o.top+(r.pageYOffset||n.scrollTop)-(n.clientTop||0),left:o.left+(r.pageXOffset||n.scrollLeft)-(n.clientLeft||0)}):o},b.offset={setOffset:function(e,t,n){var r=b.css(e,"position");"static"===r&&(e.style.position="relative");var i=b(e),o=i.offset(),a=b.css(e,"top"),s=b.css(e,"left"),u=("absolute"===r||"fixed"===r)&&b.inArray("auto",[a,s])>-1,l={},c={},p,f;u?(c=i.position(),p=c.top,f=c.left):(p=parseFloat(a)||0,f=parseFloat(s)||0),b.isFunction(t)&&(t=t.call(e,n,o)),null!=t.top&&(l.top=t.top-o.top+p),null!=t.left&&(l.left=t.left-o.left+f),"using"in t?t.using.call(e,l):i.css(l)}},b.fn.extend({position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===b.css(r,"position")?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),b.nodeName(e[0],"html")||(n=e.offset()),n.top+=b.css(e[0],"borderTopWidth",!0),n.left+=b.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-b.css(r,"marginTop",!0),left:t.left-n.left-b.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||o.documentElement;while(e&&!b.nodeName(e,"html")&&"static"===b.css(e,"position"))e=e.offsetParent;return e||o.documentElement})}}),b.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);b.fn[e]=function(i){return b.access(this,function(e,i,o){var a=or(e);return o===t?a?n in a?a[n]:a.document.documentElement[i]:e[i]:(a?a.scrollTo(r?b(a).scrollLeft():o,r?o:b(a).scrollTop()):e[i]=o,t)},e,i,arguments.length,null)}});function or(e){return b.isWindow(e)?e:9===e.nodeType?e.defaultView||e.parentWindow:!1}b.each({Height:"height",Width:"width"},function(e,n){b.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){b.fn[i]=function(i,o){var a=arguments.length&&(r||"boolean"!=typeof i),s=r||(i===!0||o===!0?"margin":"border");return b.access(this,function(n,r,i){var o;return b.isWindow(n)?n.document.documentElement["client"+e]:9===n.nodeType?(o=n.documentElement,Math.max(n.body["scroll"+e],o["scroll"+e],n.body["offset"+e],o["offset"+e],o["client"+e])):i===t?b.css(n,r,s):b.style(n,r,i,s)},n,a?i:t,a,null)}})}),e.jQuery=e.$=b,"function"==typeof define&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return b})})(window);
\ No newline at end of file

From 6db0210ef34a50186b77a393d5ee274660056584 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Tue, 5 Feb 2013 11:22:01 +0100
Subject: [PATCH 72/88] Updated jquery form plugin to v3.26.0-2013.01.28

---
 .../static/javascript/jquery.form.js          | 163 ++++++++++++------
 1 file changed, 107 insertions(+), 56 deletions(-)

diff --git a/openslides/projector/static/javascript/jquery.form.js b/openslides/projector/static/javascript/jquery.form.js
index 796db12fb..64a916062 100644
--- a/openslides/projector/static/javascript/jquery.form.js
+++ b/openslides/projector/static/javascript/jquery.form.js
@@ -1,7 +1,7 @@
 /*!
  * jQuery Form Plugin
- * version: 3.09 (16-APR-2012)
- * @requires jQuery v1.3.2 or later
+ * version: 3.26.0-2013.01.28
+ * @requires jQuery v1.5 or later
  *
  * Examples and documentation at: http://malsup.com/jquery/form/
  * Project repository: https://github.com/malsup/form
@@ -37,7 +37,7 @@
             target: '#output'
         });
     });
-    
+
     You can also use ajaxForm with delegation (requires jQuery v1.7+), so the
     form does not have to exist when you invoke ajaxForm:
 
@@ -45,7 +45,7 @@
         delegation: true,
         target: '#output'
     });
-    
+
     When using ajaxForm, the ajaxSubmit function will be invoked for you
     at the appropriate time.
 */
@@ -69,7 +69,7 @@ $.fn.ajaxSubmit = function(options) {
         log('ajaxSubmit: skipping submit process - no element selected');
         return this;
     }
-    
+
     var method, action, url, $form = this;
 
     if (typeof options == 'function') {
@@ -111,7 +111,7 @@ $.fn.ajaxSubmit = function(options) {
     if ( traditional === undefined ) {
         traditional = $.ajaxSettings.traditional;
     }
-    
+
     var elements = [];
     var qx, a = this.formToArray(options.semantic, elements);
     if (options.data) {
@@ -135,7 +135,7 @@ $.fn.ajaxSubmit = function(options) {
     var q = $.param(a, traditional);
     if (qx) {
         q = ( q ? (q + '&' + qx) : qx );
-    }    
+    }
     if (options.type.toUpperCase() == 'GET') {
         options.url += (options.url.indexOf('?') >= 0 ? '&' : '?') + q;
         options.data = null;  // data is null for 'get'
@@ -165,14 +165,18 @@ $.fn.ajaxSubmit = function(options) {
     }
 
     options.success = function(data, status, xhr) { // jQuery 1.4+ passes xhr as 3rd arg
-        var context = options.context || options;    // jQuery 1.4+ supports scope context 
+        var context = options.context || this ;    // jQuery 1.4+ supports scope context
         for (var i=0, max=callbacks.length; i < max; i++) {
             callbacks[i].apply(context, [data, status, xhr || $form, $form]);
         }
     };
 
     // are there files to upload?
-    var fileInputs = $('input:file:enabled[value]', this); // [value] (issue #113)
+
+    // [value] (issue #113), also see comment:
+    // https://github.com/malsup/form/commit/588306aedba1de01388032d5f42a60159eea9228#commitcomment-2180219
+    var fileInputs = $('input[type=file]:enabled[value!=""]', this);
+
     var hasFileInputs = fileInputs.length > 0;
     var mp = 'multipart/form-data';
     var multipart = ($form.attr('enctype') == mp || $form.attr('encoding') == mp);
@@ -181,6 +185,8 @@ $.fn.ajaxSubmit = function(options) {
     log("fileAPI :" + fileAPI);
     var shouldUseFrame = (hasFileInputs || multipart) && !fileAPI;
 
+    var jqxhr;
+
     // options.iframe allows user to force iframe mode
     // 06-NOV-09: now defaulting to iframe mode if file input is detected
     if (options.iframe !== false && (options.iframe || shouldUseFrame)) {
@@ -188,20 +194,22 @@ $.fn.ajaxSubmit = function(options) {
         // see:  http://groups.google.com/group/jquery-dev/browse_thread/thread/36395b7ab510dd5d
         if (options.closeKeepAlive) {
             $.get(options.closeKeepAlive, function() {
-                fileUploadIframe(a);
+                jqxhr = fileUploadIframe(a);
             });
         }
-          else {
-            fileUploadIframe(a);
-          }
+        else {
+            jqxhr = fileUploadIframe(a);
+        }
     }
     else if ((hasFileInputs || multipart) && fileAPI) {
-        fileUploadXhr(a);
+        jqxhr = fileUploadXhr(a);
     }
     else {
-        $.ajax(options);
+        jqxhr = $.ajax(options);
     }
 
+    $form.removeData('jqxhr').data('jqxhr', jqxhr);
+
     // clear element array
     for (var k=0; k < elements.length; k++)
         elements[k] = null;
@@ -210,6 +218,22 @@ $.fn.ajaxSubmit = function(options) {
     this.trigger('form-submit-notify', [this, options]);
     return this;
 
+    // utility fn for deep serialization
+    function deepSerialize(extraData){
+        var serialized = $.param(extraData).split('&');
+        var len = serialized.length;
+        var result = [];
+        var i, part;
+        for (i=0; i < len; i++) {
+            // #252; undo param space replacement
+            serialized[i] = serialized[i].replace(/\+/g,' ');
+            part = serialized[i].split('=');
+            // #278; use array instead of object storage, favoring array serializations
+            result.push([decodeURIComponent(part[0]), decodeURIComponent(part[1])]);
+        }
+        return result;
+    }
+
      // XMLHttpRequest Level 2 file uploads (big hat tip to francois2metz)
     function fileUploadXhr(a) {
         var formdata = new FormData();
@@ -219,9 +243,10 @@ $.fn.ajaxSubmit = function(options) {
         }
 
         if (options.extraData) {
-            for (var p in options.extraData)
-                if (options.extraData.hasOwnProperty(p))
-                    formdata.append(p, options.extraData[p]);
+            var serializedData = deepSerialize(options.extraData);
+            for (i=0; i < serializedData.length; i++)
+                if (serializedData[i])
+                    formdata.append(serializedData[i][0], serializedData[i][1]);
         }
 
         options.data = null;
@@ -230,9 +255,9 @@ $.fn.ajaxSubmit = function(options) {
             contentType: false,
             processData: false,
             cache: false,
-            type: 'POST'
+            type: method || 'POST'
         });
-        
+
         if (options.uploadProgress) {
             // workaround because jqXHR does not expose upload property
             s.xhr = function() {
@@ -253,27 +278,21 @@ $.fn.ajaxSubmit = function(options) {
         }
 
         s.data = null;
-          var beforeSend = s.beforeSend;
-          s.beforeSend = function(xhr, o) {
-              o.data = formdata;
-            if(beforeSend)
-                beforeSend.call(o, xhr, options);
+            var beforeSend = s.beforeSend;
+            s.beforeSend = function(xhr, o) {
+                o.data = formdata;
+                if(beforeSend)
+                    beforeSend.call(this, xhr, o);
         };
-        $.ajax(s);
+        return $.ajax(s);
     }
 
     // private function for handling file uploads (hat tip to YAHOO!)
     function fileUploadIframe(a) {
         var form = $form[0], el, i, s, g, id, $io, io, xhr, sub, n, timedOut, timeoutHandle;
         var useProp = !!$.fn.prop;
+        var deferred = $.Deferred();
 
-        if ($(':input[name=submit],:input[id=submit]', form).length) {
-            // if there is an input with a name or id of 'submit' then we won't be
-            // able to invoke the submit fn on the form (at least not x-browser)
-            alert('Error: Form elements must not have name or id of "submit".');
-            return;
-        }
-        
         if (a) {
             // ensure that every serialized input is still enabled
             for (i=0; i < elements.length; i++) {
@@ -316,6 +335,14 @@ $.fn.ajaxSubmit = function(options) {
                 var e = (status === 'timeout' ? 'timeout' : 'aborted');
                 log('aborting upload... ' + e);
                 this.aborted = 1;
+
+                try { // #214, #257
+                    if (io.contentWindow.document.execCommand) {
+                        io.contentWindow.document.execCommand('Stop');
+                    }
+                }
+                catch(ignore) {}
+
                 $io.attr('src', s.iframeSrc); // abort op in progress
                 xhr.error = e;
                 if (s.error)
@@ -340,10 +367,12 @@ $.fn.ajaxSubmit = function(options) {
             if (s.global) {
                 $.active--;
             }
-            return;
+            deferred.reject();
+            return deferred;
         }
         if (xhr.aborted) {
-            return;
+            deferred.reject();
+            return deferred;
         }
 
         // add submitting element to data if we know it
@@ -359,7 +388,7 @@ $.fn.ajaxSubmit = function(options) {
                 }
             }
         }
-        
+
         var CLIENT_TIMEOUT_ABORT = 1;
         var SERVER_ABORT = 2;
 
@@ -367,7 +396,7 @@ $.fn.ajaxSubmit = function(options) {
             var doc = frame.contentWindow ? frame.contentWindow.document : frame.contentDocument ? frame.contentDocument : frame.document;
             return doc;
         }
-        
+
         // Rails CSRF hack (thanks to Yvan Barthelemy)
         var csrf_token = $('meta[name=csrf-token]').attr('content');
         var csrf_param = $('meta[name=csrf-param]').attr('content');
@@ -402,7 +431,7 @@ $.fn.ajaxSubmit = function(options) {
             if (s.timeout) {
                 timeoutHandle = setTimeout(function() { timedOut = true; cb(CLIENT_TIMEOUT_ABORT); }, s.timeout);
             }
-            
+
             // look for server aborts
             function checkState() {
                 try {
@@ -426,9 +455,16 @@ $.fn.ajaxSubmit = function(options) {
                 if (s.extraData) {
                     for (var n in s.extraData) {
                         if (s.extraData.hasOwnProperty(n)) {
-                            extraInputs.push(
-                                $('<input type="hidden" name="'+n+'">').attr('value',s.extraData[n])
-                                    .appendTo(form)[0]);
+                           // if using the $.param format that allows for multiple values with the same name
+                           if($.isPlainObject(s.extraData[n]) && s.extraData[n].hasOwnProperty('name') && s.extraData[n].hasOwnProperty('value')) {
+                               extraInputs.push(
+                               $('<input type="hidden" name="'+s.extraData[n].name+'">').val(s.extraData[n].value)
+                                   .appendTo(form)[0]);
+                           } else {
+                               extraInputs.push(
+                               $('<input type="hidden" name="'+n+'">').val(s.extraData[n])
+                                   .appendTo(form)[0]);
+                           }
                         }
                     }
                 }
@@ -442,7 +478,9 @@ $.fn.ajaxSubmit = function(options) {
                         io.addEventListener('load', cb, false);
                 }
                 setTimeout(checkState,15);
-                form.submit();
+                // just in case form has element with name/id of 'submit'
+                var submitFn = document.createElement('form').submit;
+                submitFn.apply(form);
             }
             finally {
                 // reset attrs and remove "extra" input elements
@@ -478,10 +516,12 @@ $.fn.ajaxSubmit = function(options) {
             }
             if (e === CLIENT_TIMEOUT_ABORT && xhr) {
                 xhr.abort('timeout');
+                deferred.reject(xhr, 'timeout');
                 return;
             }
             else if (e == SERVER_ABORT && xhr) {
                 xhr.abort('server abort');
+                deferred.reject(xhr, 'error', 'server abort');
                 return;
             }
 
@@ -492,7 +532,7 @@ $.fn.ajaxSubmit = function(options) {
             }
             if (io.detachEvent)
                 io.detachEvent('onload', cb);
-            else    
+            else
                 io.removeEventListener('load', cb, false);
 
             var status = 'success', errMsg;
@@ -586,6 +626,7 @@ $.fn.ajaxSubmit = function(options) {
             if (status === 'success') {
                 if (s.success)
                     s.success.call(s.context, data, 'success', xhr);
+                deferred.resolve(xhr.responseText, 'success', xhr);
                 if (g)
                     $.event.trigger("ajaxSuccess", [xhr, s]);
             }
@@ -594,6 +635,7 @@ $.fn.ajaxSubmit = function(options) {
                     errMsg = xhr.statusText;
                 if (s.error)
                     s.error.call(s.context, xhr, status, errMsg);
+                deferred.reject(xhr, 'error', errMsg);
                 if (g)
                     $.event.trigger("ajaxError", [xhr, s, errMsg]);
             }
@@ -658,6 +700,8 @@ $.fn.ajaxSubmit = function(options) {
             }
             return data;
         };
+
+        return deferred;
     }
 };
 
@@ -679,7 +723,7 @@ $.fn.ajaxSubmit = function(options) {
 $.fn.ajaxForm = function(options) {
     options = options || {};
     options.delegation = options.delegation && $.isFunction($.fn.on);
-    
+
     // in jQuery 1.3+ we can fix mistakes with the ready state
     if (!options.delegation && this.length === 0) {
         var o = { s: this.selector, c: this.context };
@@ -709,7 +753,7 @@ $.fn.ajaxForm = function(options) {
         .bind('click.form-plugin', options, captureSubmittingElement);
 };
 
-// private event handlers    
+// private event handlers
 function doAjaxSubmit(e) {
     /*jshint validthis:true */
     var options = e.data;
@@ -718,14 +762,14 @@ function doAjaxSubmit(e) {
         $(this).ajaxSubmit(options);
     }
 }
-    
+
 function captureSubmittingElement(e) {
     /*jshint validthis:true */
     var target = e.target;
     var $el = $(target);
-    if (!($el.is(":submit,input:image"))) {
+    if (!($el.is("[type=submit],[type=image]"))) {
         // is this a child element of the submit el?  (ex: a span within a button)
-        var t = $el.closest(':submit');
+        var t = $el.closest('[type=submit]');
         if (t.length === 0) {
             return;
         }
@@ -798,14 +842,14 @@ $.fn.formToArray = function(semantic, elements) {
 
         v = $.fieldValue(el, true);
         if (v && v.constructor == Array) {
-            if (elements) 
+            if (elements)
                 elements.push(el);
             for(j=0, jmax=v.length; j < jmax; j++) {
                 a.push({name: n, value: v[j]});
             }
         }
         else if (feature.fileapi && el.type == 'file' && !el.disabled) {
-            if (elements) 
+            if (elements)
                 elements.push(el);
             var files = el.files;
             if (files.length) {
@@ -819,7 +863,7 @@ $.fn.formToArray = function(semantic, elements) {
             }
         }
         else if (v !== null && typeof v != 'undefined') {
-            if (elements) 
+            if (elements)
                 elements.push(el);
             a.push({name: n, value: v, type: el.type, required: el.required});
         }
@@ -883,19 +927,19 @@ $.fn.fieldSerialize = function(successful) {
  *      <input name="C" type="radio" value="C2" />
  *  </fieldset></form>
  *
- *  var v = $(':text').fieldValue();
+ *  var v = $('input[type=text]').fieldValue();
  *  // if no values are entered into the text inputs
  *  v == ['','']
  *  // if values entered into the text inputs are 'foo' and 'bar'
  *  v == ['foo','bar']
  *
- *  var v = $(':checkbox').fieldValue();
+ *  var v = $('input[type=checkbox]').fieldValue();
  *  // if neither checkbox is checked
  *  v === undefined
  *  // if both checkboxes are checked
  *  v == ['B1', 'B2']
  *
- *  var v = $(':radio').fieldValue();
+ *  var v = $('input[type=radio]').fieldValue();
  *  // if neither radio is checked
  *  v === undefined
  *  // if first radio is checked
@@ -996,8 +1040,15 @@ $.fn.clearFields = $.fn.clearInputs = function(includeHidden) {
         else if (tag == 'select') {
             this.selectedIndex = -1;
         }
+		else if (t == "file") {
+			if (/MSIE/.test(navigator.userAgent)) {
+				$(this).replaceWith($(this).clone());
+			} else {
+				$(this).val('');
+			}
+		}
         else if (includeHidden) {
-            // includeHidden can be the valud true, or it can be a selector string
+            // includeHidden can be the value true, or it can be a selector string
             // indicating a special test; for example:
             //  $('#myForm').clearForm('.special:hidden')
             // the above would clean hidden inputs that have the class of 'special'
@@ -1062,7 +1113,7 @@ $.fn.ajaxSubmit.debug = false;
 
 // helper fn for console logging
 function log() {
-    if (!$.fn.ajaxSubmit.debug) 
+    if (!$.fn.ajaxSubmit.debug)
         return;
     var msg = '[jquery.form] ' + Array.prototype.join.call(arguments,'');
     if (window.console && window.console.log) {

From 80b0ab5252a83d41d0d4822756048c12d3ef6c1e Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Tue, 5 Feb 2013 11:24:41 +0100
Subject: [PATCH 73/88] template: Updated dashboard. Fixed ajax functionality.
 Adapted style.

---
 .../projector/static/javascript/dashboard.js  |  67 +++++++-----------
 .../projector/static/styles/dashboard.css     |  47 ++----------
 .../projector/control_countdown.html          |  37 +++++-----
 .../projector/control_overlay_message.html    |  19 +++--
 .../projector/custom_slide_widget.html        |   1 -
 .../templates/projector/dashboard.html        |   2 +-
 .../templates/projector/live_view_widget.html |   1 -
 .../templates/projector/overlay_widget.html   |  23 +++---
 .../static/img/glyphicons_256_delete.png      | Bin 0 -> 992 bytes
 openslides/static/styles/base.css             |   7 +-
 10 files changed, 80 insertions(+), 124 deletions(-)
 create mode 100644 openslides/static/img/glyphicons_256_delete.png

diff --git a/openslides/projector/static/javascript/dashboard.js b/openslides/projector/static/javascript/dashboard.js
index 02eb44d4e..454accbff 100644
--- a/openslides/projector/static/javascript/dashboard.js
+++ b/openslides/projector/static/javascript/dashboard.js
@@ -15,11 +15,12 @@ function saveOrder() {
         $.cookie(cookieName, order, { path: "/", expiry: new Date(2012, 1, 1)});
     });
 }
+
 // function that restores the widget list order from a cookie
 function restoreOrder() {
     $(".column").each(function(index, value) {
         var colid = value.id;
-        var cookieName = "cookie-" + colid
+        var cookieName = "cookie-" + colid;
         var cookie = $.cookie(cookieName);
         if ( cookie == null ) { return; }
         var IDs = cookie.split(",");
@@ -38,38 +39,7 @@ $(function() {
         stop: function() { saveOrder(); }
     });
 
-    restoreOrder();
-
-    if ($.browser.msie) {
-        if ($.browser.version >= 8.0 && $.browser.version < 9.0)
-        {
-            /* scaling bug in IE8.. iframe has to be 4 times bigger */
-            $( "#iframe" ).css('width', 1024 * 4);
-            $( "#iframe" ).css('height', 768 * 4);
-        }
-        $( "#iframe" ).css('zoom', '0.25');
-    }
-
-    $('a.overlay').click(function(event) {
-        event.preventDefault();
-        var link = $(this);
-        $.ajax({
-            type: 'GET',
-            url: $(this).attr('href'),
-            dataType: 'json',
-            success: function(data) {
-                if (data['active']) {
-                    $('#' + data['def_name'] + '_active').show();
-                    $('#' + data['def_name'] + '_inactive').hide();
-                } else {
-                    $('#' + data['def_name'] + '_active').hide();
-                    $('#' + data['def_name'] + '_inactive').show();
-                }
-            },
-        });
-    });
-
-    // control the projector
+    // control the projector view
     $('.projector_edit').click(function(event) {
         event.preventDefault();
         var link = $(this);
@@ -87,7 +57,6 @@ $(function() {
         event.preventDefault();
         var link = $(this);
         var requestData = {};
-
         if (link.attr('id') == "countdown_set") {
             requestData = { "countdown_time" : $( "#countdown_time" ).val() };
         }
@@ -109,7 +78,8 @@ $(function() {
         });
     });
 
-    $('.countdown_visible_link').click(function(event) {
+    // activate/deactivate overlay
+    $('.overlay_activate_link').click(function(event) {
         event.preventDefault();
         var link = $(this);
         $.ajax({
@@ -117,13 +87,13 @@ $(function() {
             url: link.attr('href'),
             dataType: 'json',
             success: function(data) {
-                if (data.countdown_visible == "True") {
-                    newclass = 'open';
+                if (data['active']) {
+                    $('#' + data['def_name'] + '_active').show();
+                    $('#' + data['def_name'] + '_inactive').hide();
                 } else {
-                    newclass = 'closed';
+                    $('#' + data['def_name'] + '_active').hide();
+                    $('#' + data['def_name'] + '_inactive').show();
                 }
-                link.removeClass('closed open').addClass(newclass);
-                link.attr('href', data.link);
             }
         });
     });
@@ -134,4 +104,21 @@ $(function() {
             $('#overlay_message_text').val(data['overlay_message']);
         }
     });
+
+/* comment out this function because '$.browser' has been removed from jquery 1.9, see:
+   http://blog.jquery.com/2013/01/15/jquery-1-9-final-jquery-2-0-beta-migrate-final-released/
+   TODO: use jquery migrate to have $.browser support for IE8;
+
+    if ($.browser.msie) {
+        if ($.browser.version >= 8.0 && $.browser.version < 9.0)
+        {
+            // scaling bug in IE8.. iframe has to be 4 times bigger
+            $( "#iframe" ).css('width', 1024 * 4);
+            $( "#iframe" ).css('height', 768 * 4);
+        }
+        $( "#iframe" ).css('zoom', '0.25');
+    }
+*/
+
+    restoreOrder();
 });
diff --git a/openslides/projector/static/styles/dashboard.css b/openslides/projector/static/styles/dashboard.css
index 0266e64c2..fd5134bdb 100644
--- a/openslides/projector/static/styles/dashboard.css
+++ b/openslides/projector/static/styles/dashboard.css
@@ -54,9 +54,12 @@
     -moz-border-radius: 0 0 5px 5px;
     -webkit-border-radius: 0 0 5px 5px;
 }
-.widget-content li{
+.widget-content li {
     padding: 4px 0;
 }
+.widget-content .overlay_list li {
+    padding-bottom: 10px;
+}
 .widget-content ul {
     list-style: none inside none;
     margin: 0;
@@ -74,15 +77,13 @@
     visibility: hidden;
 }
 
-/*.projector_countdown_spinval {*/
+.overlay_list .form-inline {
+    margin: 5px 0 0 31px;
+}
 
 #countdown_time {
     width: 40px;
 }
-#overlay_message_text {
-    width: 90%;
-    height: 12px;
-}
 
 /* iframe */
 #iframe {
@@ -95,7 +96,6 @@
     width: 1024px;
     height: 768px;
 }
-
 #iframewrapper {
     width: 256px;/*100%;*/
     height: 192px;/*230px;*/
@@ -103,7 +103,6 @@
     overflow: hidden;
     border: 1px solid #D5D5D5;
 }
-
 #iframeoverlay {
     width: 256px;
     height: 192px;
@@ -113,35 +112,3 @@
     display: block;
     z-index: 1;
 }
-
-/* activate link */
-a.activate_link div {
-    background-image: url(../images/icons/accept-grey.png);
-    background-repeat: no-repeat;
-    float: left;
-    width: 16px;
-    height: 16px;
-    padding-right: 12px;
-    position: relative;
-    top: 4px;
-    left: 4px;
-}
-a.activate_link.active div {
-    background-image: url(../images/icons/accept.png);
-}
-
-a.overlay div {
-    background-image: url(../images/icons/accept-grey.png);
-    background-repeat: no-repeat;
-    float: left;
-    width: 16px;
-    height: 16px;
-    padding-right: 16px;
-    position: relative;
-    top: 4px;
-    left: 4px;
-}
-
-a.overlay.active div {
-    background-image: url(../images/icons/accept.png);
-}
diff --git a/openslides/projector/templates/projector/control_countdown.html b/openslides/projector/templates/projector/control_countdown.html
index a2c93248a..837666093 100644
--- a/openslides/projector/templates/projector/control_countdown.html
+++ b/openslides/projector/templates/projector/control_countdown.html
@@ -1,24 +1,21 @@
-{% load staticfiles %}
 {% load i18n %}
 {% load tags %}
 
-<span class="projector_countdown_spinbox">
-    <div class="form-inline" style="display:inline-block;">
-        <div class="input-append">
-            <input class="projector_countdown_spinval" id="countdown_time" name="countdown_time" type="number" min="0" value="{{ countdown_time }}">
-            <span class="add-on">{% trans "s" context "seconds" %}</span>
-        </div>
-        <a id="countdown_set" class="countdown_control btn btn-small" href="{% url 'countdown_set_default' %}" title="{% trans 'Save time as default' %}">
-            <i class="icon-refresh"></i>
-        </a>
-        <a id="countdown_reset" class="countdown_control btn btn-small" href="{% url 'countdown_reset' %}" title="{% trans 'Reset countdown' %}">
-            <i class="icon-fast-backward"></i>
-        </a>
-        <a id="countdown_play" class="countdown_control btn btn-small" href="{% url 'countdown_start' %}" title="{% trans 'Start countdown' %}"{% if countdown_state == 'active' %} style="display:none"{% endif %}>
-            <i class="icon-play"></i>
-        </a>
-        <a id="countdown_stop" class="countdown_control btn btn-small" href="{% url 'countdown_stop' %}" title="{% trans 'Stop countdown' %}"{% if countdown_state == 'inactive' or countdown_state == 'paused' or countdown_state == 'expired' %} style="display:none"{% endif %}>
-            <i class="icon-pause"></i>
-        </a>
+<div class="form-inline">
+    <div class="input-append">
+        <input class="projector_countdown_spinval" id="countdown_time" name="countdown_time" type="number" min="0" value="{{ countdown_time }}">
+        <span class="add-on">{% trans "s" context "seconds" %}</span>
     </div>
-</span>
+    <a id="countdown_set" class="countdown_control btn btn-mini" href="{% url 'countdown_set_default' %}" title="{% trans 'Save time as default' %}">
+        <i class="icon-refresh"></i>
+    </a>
+    <a id="countdown_reset" class="countdown_control btn" href="{% url 'countdown_reset' %}" title="{% trans 'Reset countdown' %}">
+        <i class="icon-fast-backward"></i>
+    </a>
+    <a id="countdown_play" class="countdown_control btn" href="{% url 'countdown_start' %}" title="{% trans 'Start countdown' %}"{% if countdown_state == 'active' %} style="display:none"{% endif %}>
+        <i class="icon-play"></i>
+    </a>
+    <a id="countdown_stop" class="countdown_control btn" href="{% url 'countdown_stop' %}" title="{% trans 'Stop countdown' %}"{% if countdown_state == 'inactive' or countdown_state == 'paused' or countdown_state == 'expired' %} style="display:none"{% endif %}>
+        <i class="icon-pause"></i>
+    </a>
+</div>
diff --git a/openslides/projector/templates/projector/control_overlay_message.html b/openslides/projector/templates/projector/control_overlay_message.html
index 5c9c205ed..ee10ace99 100644
--- a/openslides/projector/templates/projector/control_overlay_message.html
+++ b/openslides/projector/templates/projector/control_overlay_message.html
@@ -1,15 +1,14 @@
-{% load staticfiles %}
 {% load i18n %}
 {% load tags %}
 
-<form id="overlay_message" action="{% url 'projector_overlay_message' %}" method="post" style="display:inline-block;">{% csrf_token %}
-    <div class="input-append">
-        <input id="overlay_message_text" name='message_text' type='text' value="{% get_config 'projector_message' %}">
-        <button type="submit" class="btn btn-mini btn-primary" name="message" title="{% trans 'Apply' %}">
-            <i class="icon-ok icon-white"></i>
-        </button>
-        <button type="submit" class="btn btn-mini" name='message-clean' title="{% trans 'Clean message' %}">
-            <i class="icon-remove"></i>
-        </button>
+<form class="form-inline" id="overlay_message" action="{% url 'projector_overlay_message' %}" method="post">{% csrf_token %}
+    <div class="input-append" style="width: 85%;">
+    <input class="input-block-level" id="overlay_message_text" name='message_text' type='text' value="{% get_config 'projector_message' %}">
+    <button type="submit" class="btn btn-primary" name="message" title="{% trans 'Apply' %}" style="width: 16px;">
+        <i class="icon-ok icon-white"></i>
+    </button>
+    <button type="submit" class="btn" name='message-clean' title="{% trans 'Clean message' %}" style="width: 16px;">
+        <i class="icon-delete"></i>
+    </button>
     </div>
 </form>
diff --git a/openslides/projector/templates/projector/custom_slide_widget.html b/openslides/projector/templates/projector/custom_slide_widget.html
index 64445a72c..f4c805047 100644
--- a/openslides/projector/templates/projector/custom_slide_widget.html
+++ b/openslides/projector/templates/projector/custom_slide_widget.html
@@ -1,4 +1,3 @@
-{% load staticfiles %}
 {% load i18n %}
 {% load tags %}
 
diff --git a/openslides/projector/templates/projector/dashboard.html b/openslides/projector/templates/projector/dashboard.html
index 76e50a0c8..11d5f3a7b 100644
--- a/openslides/projector/templates/projector/dashboard.html
+++ b/openslides/projector/templates/projector/dashboard.html
@@ -9,9 +9,9 @@
 {% endblock %}
 {% block javascript %}
     <script type="text/javascript" src="{% static 'javascript/jquery-ui.min.js' %}"></script>
-    <script type="text/javascript" src="{% static 'javascript/dashboard.js' %}"></script>
     <script type="text/javascript" src="{% static 'javascript/jquery.cookie.js' %}"></script>
     <script type="text/javascript" src="{% static 'javascript/jquery.form.js' %}"></script>
+    <script type="text/javascript" src="{% static 'javascript/dashboard.js' %}"></script>
 {% endblock %}
 
 {% block content %}
diff --git a/openslides/projector/templates/projector/live_view_widget.html b/openslides/projector/templates/projector/live_view_widget.html
index fbcb4cb95..cd49a453f 100644
--- a/openslides/projector/templates/projector/live_view_widget.html
+++ b/openslides/projector/templates/projector/live_view_widget.html
@@ -1,6 +1,5 @@
 {% load i18n %}
 {% load tags %}
-{% load staticfiles %}
 
 <!-- projector control buttons -->
 {% if perms.projector.can_manage_projector %}
diff --git a/openslides/projector/templates/projector/overlay_widget.html b/openslides/projector/templates/projector/overlay_widget.html
index 51d68f8da..415590221 100644
--- a/openslides/projector/templates/projector/overlay_widget.html
+++ b/openslides/projector/templates/projector/overlay_widget.html
@@ -1,24 +1,29 @@
 {% load i18n %}
 {% load tags %}
 
-<ul>
+<ul class="overlay_list">
     {% for overlay in overlays %}
         <li>
-            <a id="{{ overlay.def_name }}"
-              href="{% if overlay.active %}{% url 'projector_overlay_deactivate' overlay.def_name %}{% else %}{% url 'projector_overlay_activate' overlay.def_name %}{% endif %}"
-              class="overlay btn btn-mini">
-                <i class="{% if overlay.active %}icon-checked-new{% else %}icon-unchecked-new{% endif %}"></i>
+            <a id="{{ overlay.def_name }}_active"
+                href="{% url 'projector_overlay_deactivate' overlay.def_name %}"
+                class="overlay_activate_link btn btn-mini btn-success"
+                style="{% if not overlay.active %}display:none;{% endif %}">
+                <i class="active icon-checked-new"></i>
+            </a>
+            <a id="{{ overlay.def_name }}_inactive"
+                href="{% url 'projector_overlay_activate' overlay.def_name %}"
+                class="overlay_activate_link btn btn-mini"
+                style="{% if overlay.active %}display:none;{% endif %}">
+                <i class="inactive icon-unchecked-new"></i>
             </a>
-
 
             {# TODO: Call the html via overlay.html #}
             {% if overlay.def_name == "Countdown" %}
-                <p>{{ overlay }}:<br>
+                {% trans "Countdown" %}:<br>
                 {% include 'projector/control_countdown.html' %}
-                </p>
             {% endif %}
             {% if overlay.def_name == "Message" %}
-                {{ overlay }}:<br>
+                {% trans "Message" %}:<br>
                 {% include 'projector/control_overlay_message.html' %}
             {% endif %}
         </li>
diff --git a/openslides/static/img/glyphicons_256_delete.png b/openslides/static/img/glyphicons_256_delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..81282f990032b88eb44001fe50f21e83d4e851ed
GIT binary patch
literal 992
zcmV<610Vc}P)<h;3K|Lk000e1NJLTq000gE000RH1^@s60!<xh0008fX+uL$Nkc;*
zP;zf(X>4Tx04R}-l+Q~PVHn51vyB)iL11Qkh@nGBs7w}RMCGo(*tBg~f0Po$?CiU{
zle4qa%<P&X5neiG(LE{;9{K}3c<7Xu!oVy7>26U(f|ru*d1uDm5$(qdGxK?$AK&MB
z-{F0M8d)(-JtP5n!?BWmQR({Vm{j`_Asj&+!l+YJ+l(X<1E9fUv1@F;hrqupt$X|b
zI_lE4ng@jaK<G!B*($K_7ugG0Y6K9uUc-cAI>h%lTb}(f=ak3uu6-!kMZ8FSKs7BM
z|C+c%%_(W1MkH>@24YeH&g(_h@8=*r^~@L^r0;R+=`OQ-d=_TXN_RhT8}a8f>+a#2
z#Pb=gH%8n{&sxUn9rjo_p*gW3k3%Dd9v|?z$w<Yo`kJEYM3dY4c4@F@+kQ*AoFEPp
zC&vr@Jf@LyJEw9(*E|;Vsa#jw=XX{y$?G1Ym^o8-{}=TZdWBKwV9;RD+kk{5`Vd7c
zOjsx&LmrJHG_o=`#v-;czGtM4M1UpouT##tn{yjQ%H~-kh{iF~Qc;lP5As)eRembZ
z$zNu}#pbGK#=5Dg%MZSjF0Z_;>wEp4JbjhwM#!rpOV)g4O?IHuKzA8qHe6NWHQ4?5
zW?+>pP^lFuS83d>RC0Yby(58Yf7(5YU7B8Os@7T+7jCT7FHP^*tHQ2TvC67;&Z}|3
zd?p?hPl_?ILp%pbyd-vt7sYOxofiix8N;NaVZv3ip-`5AN%ERI{+SmG@2t6_p^q8N
z(o~6`|AbY@XgUiV(SNxAbMSk`qp>3J!UhhXuG%(|?j0gDE>~^N72v`*x)0t~ZOwEZ
z4m|-D&ZtGJ<Vy>}8;WLk96sqPn3I;4%{fxLET5GkbR{t<W~gl~lA`O9>#`+_*~}`j
zbQ|o<sdi7Lo_3|?Q@OlB=dbn=u=TK9{`st2-g-_wtN}0e-@v^6MNSwoNdN!<32;bR
za{vGf6951U69E94oEQKA0JTX(K~yM_b<wd(gHa3x;E&pZ_yX-%3T}M>pTV)z)wgo(
z>e{6^v><|mOUEv*f~%W@{c9YWzuf;~FN70L63)4ah=6|L9D4)~1s*Eyqa2!{sT#`o
z?O+bw70o}1PZ(p19j>v=S_AiIY`x$TLyR!Mrs(rnDV6ym;^gWfxpoJx@K%tm;%lYY
z$8)RLi->RB;ysIv<GaXzt+2)vy{vUkF~MhL=fCJ|b&z<2uVQm&@AwD!qI3z6ibGWZ
O0000<MNUMnLSTZtrrNOp

literal 0
HcmV?d00001

diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css
index 51e2458de..c0b3d3cc5 100644
--- a/openslides/static/styles/base.css
+++ b/openslides/static/styles/base.css
@@ -264,7 +264,7 @@ legend + .control-group {
 
 
 /** More glyphicons free icons **/
-.icon-on, .icon-checked-new {
+.status_link .icon-on, .icon-checked-new {
     background-image: url("../img/glyphicons_152_check.png");
     background-position: 0;
 }
@@ -292,7 +292,10 @@ legend + .control-group {
     background-image: url("../img/glyphicons_358_file_import.png");
     background-position: 0;
 }
-
+.icon-delete {
+    background-image: url("../img/glyphicons_256_delete.png");
+    background-position: 0;
+}
 
 /** Responsive **/
 @media (max-width: 767px) {

From 8f05ada6a1ac47bcc02f74b5f5832ad13dafa496 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Tue, 5 Feb 2013 17:05:40 +0100
Subject: [PATCH 74/88] template style and new icons

---
 .../projector/templates/base-projector.html     |   2 +-
 .../templates/projector/overlay_widget.html     |   6 +++---
 openslides/static/img/glyphicons_041_charts.png | Bin 0 -> 1029 bytes
 .../static/img/glyphicons_041_charts_white.png  | Bin 0 -> 1059 bytes
 .../static/img/glyphicons_056_projector.png     | Bin 452 -> 0 bytes
 .../img/glyphicons_056_projector_small.png      | Bin 341 -> 0 bytes
 .../static/img/glyphicons_152_check_white.png   | Bin 0 -> 333 bytes
 openslides/static/styles/base.css               |  16 ++++++++++++----
 8 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 openslides/static/img/glyphicons_041_charts.png
 create mode 100644 openslides/static/img/glyphicons_041_charts_white.png
 delete mode 100644 openslides/static/img/glyphicons_056_projector.png
 delete mode 100644 openslides/static/img/glyphicons_056_projector_small.png
 create mode 100644 openslides/static/img/glyphicons_152_check_white.png

diff --git a/openslides/projector/templates/base-projector.html b/openslides/projector/templates/base-projector.html
index e86cd52d6..b291d2419 100644
--- a/openslides/projector/templates/base-projector.html
+++ b/openslides/projector/templates/base-projector.html
@@ -10,7 +10,7 @@
         <link rel="shortcut icon" href="{% static 'images/favicon.png' %}" type="image/png" />
         <script type="text/javascript" src="{% static 'javascript/jquery.min.js' %}"></script>
         <script type="text/javascript" src="{% static 'javascript/projector.js' %}"></script>
-        <title>XX{% block title %} {% get_config 'event_name' %} {% endblock %}</title>
+        <title>{% block title %} {% get_config 'event_name' %} {% endblock %}</title>
         {% block header %}
         {% endblock %}
     </head>
diff --git a/openslides/projector/templates/projector/overlay_widget.html b/openslides/projector/templates/projector/overlay_widget.html
index 415590221..d904021f7 100644
--- a/openslides/projector/templates/projector/overlay_widget.html
+++ b/openslides/projector/templates/projector/overlay_widget.html
@@ -6,15 +6,15 @@
         <li>
             <a id="{{ overlay.def_name }}_active"
                 href="{% url 'projector_overlay_deactivate' overlay.def_name %}"
-                class="overlay_activate_link btn btn-mini btn-success"
+                class="overlay_activate_link btn btn-mini btn-primary"
                 style="{% if not overlay.active %}display:none;{% endif %}">
-                <i class="active icon-checked-new"></i>
+                <i class="icon-checked-new_white"></i>
             </a>
             <a id="{{ overlay.def_name }}_inactive"
                 href="{% url 'projector_overlay_activate' overlay.def_name %}"
                 class="overlay_activate_link btn btn-mini"
                 style="{% if overlay.active %}display:none;{% endif %}">
-                <i class="inactive icon-unchecked-new"></i>
+                <i class="icon-unchecked-new"></i>
             </a>
 
             {# TODO: Call the html via overlay.html #}
diff --git a/openslides/static/img/glyphicons_041_charts.png b/openslides/static/img/glyphicons_041_charts.png
new file mode 100644
index 0000000000000000000000000000000000000000..556b7cce5a2ee6dab0952153470c028fdfc44424
GIT binary patch
literal 1029
zcmV+g1p51lP)<h;3K|Lk000e1NJLTq000gE000aK1^@s6Qh<!w0008fX+uL$Nkc;*
zP;zf(X>4Tx04R}-l+Q~PVHn51vyB)iL11Qkh@nGBs7w}RMCGo(*tBg~f0Po$?CiU{
zle4qa%<P&X5neiG(LE{;9{K}3c<7Xu!oVy7>26U(f|ru*d1uDm5$(qdGxK?$AK&MB
z-{F0M8d)(-JtP5n!?BWmQR({Vm{j`_Asj&+!l+YJ+l(X<1E9fUv1@F;hrqupt$X|b
zI_lE4ng@jaK<G!B*($K_7ugG0Y6K9uUc-cAI>h%lTb}(f=ak3uu6-!kMZ8FSKs7BM
z|C+c%%_(W1MkH>@24YeH&g(_h@8=*r^~@L^r0;R+=`OQ-d=_TXN_RhT8}a8f>+a#2
z#Pb=gH%8n{&sxUn9rjo_p*gW3k3%Dd9v|?z$w<Yo`kJEYM3dY4c4@F@+kQ*AoFEPp
zC&vr@Jf@LyJEw9(*E|;Vsa#jw=XX{y$?G1Ym^o8-{}=TZdWBKwV9;RD+kk{5`Vd7c
zOjsx&LmrJHG_o=`#v-;czGtM4M1UpouT##tn{yjQ%H~-kh{iF~Qc;lP5As)eRembZ
z$zNu}#pbGK#=5Dg%MZSjF0Z_;>wEp4JbjhwM#!rpOV)g4O?IHuKzA8qHe6NWHQ4?5
zW?+>pP^lFuS83d>RC0Yby(58Yf7(5YU7B8Os@7T+7jCT7FHP^*tHQ2TvC67;&Z}|3
zd?p?hPl_?ILp%pbyd-vt7sYOxofiix8N;NaVZv3ip-`5AN%ERI{+SmG@2t6_p^q8N
z(o~6`|AbY@XgUiV(SNxAbMSk`qp>3J!UhhXuG%(|?j0gDE>~^N72v`*x)0t~ZOwEZ
z4m|-D&ZtGJ<Vy>}8;WLk96sqPn3I;4%{fxLET5GkbR{t<W~gl~lA`O9>#`+_*~}`j
zbQ|o<sdi7Lo_3|?Q@OlB=dbn=u=TK9{`st2-g-_wtN}0e-@v^6MNSwoNdN!<32;bR
za{vGf6951U69E94oEQKA0NP1JK~yM_ebBp2LtzXB;Ln$vkP=!%L5)}gF$o<LumA(F
z1QXBz8!!eHk&uW4galz4=jzXuf+fqxuj7ZzG*)zF?~!;O*L41uzO@lCiHJ#?*d<vu
zAT!rv#z7*Y#~!|$@MlC^;2bZw9p4rs|DmQn;jZu(W?K_8Gb7>>r&YYHREPJ%uUkhq
zH(cWcXHBtMf9UBp4b9<ijg9dShUe5Xu5gS;tXk$B5`D4WV1^@nRPwhe%*IcwI~-tM
z!6l}Jrw#70U%0~|EQ&2_&7TcxX;y62OkVr}c!zNbyU!G%00000NkvXXu0mjfYti5t

literal 0
HcmV?d00001

diff --git a/openslides/static/img/glyphicons_041_charts_white.png b/openslides/static/img/glyphicons_041_charts_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..83cd93b8c403ecb67d8bb43e1888c0fbedd9a03e
GIT binary patch
literal 1059
zcmV+;1l;?HP)<h;3K|Lk000e1NJLTq000gE000aK1^@s6Qh<!w0008cX+uL$Nkc;*
zP;zf(X>4Tx0C?Jslgn!qSrmuA>fE4^APlsxUJRF6NRT9y4>Te^(n)Nhv2DsklORZ^
z`gV7jo9dcd)o~ON$;PG5FnjT_aN!@|!i6i{C=q-ih<g=96x^t^i|TY&@Of5W{m!|+
zbIvU;blSxr&?yOXeq@|nR!&Y$%N5T^v7Rn6bQRq&7%UXV0E$7N`6fO-!2)>L_x=1&
zqpK9Ub6~B6)ccYOUFi4>)GCux(;zgEJ{biOh;u;N#QOh0dM4)UK-!EuLm+MetK7gu
zAnpMJZnao~P66~*5;Zdkp3`-=InN(JxAG?r0~;W9R)r%?wiZgo;R8TFSg%TIcm(JL
z>w4MSHwyFs&&y`tM9kJkFB%<>Id#O>`LQOi^Jnshnw}zvvd)r!IDdF#Nk38CUjQ;-
zIkU9`4zLDNdrw!#kH&22)77DTlOLJ7GXeYsscV5QjK#C1?l6T$;o+n3kvQbY(no-y
zMi~zejYkfJkHX*)GW*?1O(DUO953;CiNWJ<>L?@*N66+`=xsSj`>FlLer#X1ui39J
zX6ild%z`=Yxr-OxQ9xl@zRhfNrr6)5#vmF^1;t!zr!X;TV!E<_G1GQ(7cab1=kp&E
zTdG8-K4wsa%wq7EN1+K(3?{n$==K!)?wMQb+Pxl&o5vn@-#xSJu4><GrCM7p|8CbM
z&nxk#*d#{9fY^Z)d&FL`TMUZ<u~Uq-PE6qAaT0|gq=?4n6mr@BTdE~~YXGEk%2&p7
zrIX9bf~l1~trAc47wO-O$*E}>({vqfgs^sNTl?T(0oIzuwiX?PU2mb|L0jv|!0JnI
zbDLW?^G$2Zx(|{1CjuC%1*eQxsYY_MZEu%@L7<f!_1*qnS=3q@uTqUdX;i4pyejn*
zmbYw<UAnW-`J&PIumM*52VeeeG(KHvG`?Jgj^}V&e+9t2{Y5{fPvigq00v@9M??Vs
z0RI60puMM)00009a7bBm000XU000XU0RWnu7ytkO2XskIMF-si1qv?_T2Y%y0002i
zNkl<ZD9?S+y-fo_5C!1x&S&F*08&IijA#Q<2^kg800qzl6_9{CpbR3AkU;zx4m<?R
zS*w+~kw)+B?EJkE5jJ?6cpZOsSLd|Gt*daFz7G6nk=P{mb;o+j1fNCh9Va-(JuYi)
zP4&J>jf;r5O8yZM^KQdxr#Qp{%Z#^pPX17f9yFZe07pf#Tz_5D76pUwrvjU?b9Xqy
zK5p?fa=5{oF1ub}jy=5P=c>}aDtO;w2ag$CVwQYX@D5wWp>~^yc)@l~?(<`U@1p1@
dCr)$X>o2)af)S~ec`yI~002ovPDHLkV1gBa=ZydW

literal 0
HcmV?d00001

diff --git a/openslides/static/img/glyphicons_056_projector.png b/openslides/static/img/glyphicons_056_projector.png
deleted file mode 100644
index 4d644db309dd23ba8d0d6d6e08aaf312c40f8953..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 452
zcmV;#0XzPQP)<h;3K|Lk000e1NJLTq000~S000>X1^@s6BEU{300009a7bBm000XU
z000XU0RWnu7ytkPc1c7*R7i=%mA_KLKoEz&bu7|hNl9y$(oXHH9Nxgt`3@Gq8~6zL
z0*>PgK#3J}wv={aN4FNY7cVD6$OZ8?b92e<UcT&~OHfq~HGol_&j|?<kz7Rb6yGGE
zsb2>*dp}$|O(Ci3QbaryRbB3Yy;STiYnB7|KxX$nn=@O_<2_;yM^mGeipa<=H^4+y
zKSX2*6hJR<U739>B3-j*Kzd4n4zK`p$5;TJXdlCxP5X=~a0gu4JdNzbvWB+MMiW&X
zh)5sTL>pjk;KDnpszAGQ2ryICfnEF7&wwl737Ewj+D2FaUk1AYx`AyCd;$~ri7@Qa
zci<U#+XM7!^9s1er83qTu4yU?f#<-(9<We7T+OmAwhh&z@(Xy|0OTVqfHAISvF5lF
zP|-oU6xSdZxJcKynr`jV5SS97*UZ2xTpA0asJ8+CREO%)#yWb0ZND^)^)JBD5jZ8I
u{NsyASxcYqRPB0Jm{R{1k8NOe&-w<8>{iGS^aN!90000<MNUMnLSTYoe7w&9

diff --git a/openslides/static/img/glyphicons_056_projector_small.png b/openslides/static/img/glyphicons_056_projector_small.png
deleted file mode 100644
index ba0ec42829c109166b6d8d5d21f7f8a7d3de52e1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 341
zcmeAS@N?(olHy`uVBq!ia0vp^d>}Rl8<3oNC%zs?u_bxCyD<C*!3BGlPX>x`7I;J!
zGca%qgD@k*tT_@uLG}_)Usv|KjI1K+W@)nmnt?)(JY5_^G|u;4I<Ms#D8lyP{=URV
z=QI}f^t_AcT-nIzD(5io0Qa3v@dtq}p9D0L5+1NlNm*91OJ;IuR%y|@tyx>IZ~yjd
z`~Iyjr`at#bkFl2>x*7bnTHl{URqq=_)OlY`)G@~)Z*2TZMH3bZTjj0<FrDS?ScWS
ze~-Ac*eA*#KF}Y)RB|$ULSe^Ljf%EQDt3=;CVuGEz4O>ss^>$4_mpS7;*N)6E=j(5
zsCF$VajUQ2=Jk`d924>@5dXeBD4|z8W~<xXp1r9*JJV8yEK5c5A748Bdd87Y?Eg;n
jaj^^6UCf)c?hliujiIa~o5u#AZy7vY{an^LB{Ts5ZKjOa

diff --git a/openslides/static/img/glyphicons_152_check_white.png b/openslides/static/img/glyphicons_152_check_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c4f5fd1a51be544437a62c82032359bb0618572
GIT binary patch
literal 333
zcmeAS@N?(olHy`uVBq!ia0vp^d_c_2!3HG#TlXXZDYhhUcNd2LAh=-f^2tCE&H|6f
zVxTHv5N2eUHAey{$X?><>&kwYiIvNmHBWU0Narn27sn8d^SzT6`Z+s_xSV(LG>A~K
z|KQ}2<z>&{*t9CQ%Vn`a%K`%qk^2G7M;>#0s$~?NI%6BxM+Np`^P4(PT4(2&8CR#5
z6_p3_U*-S(TF#+1DEw7j&~*oHpGMod@aaKOE6yK?ESTSt?Cif%KeVY`N5=hd=7U7V
zD(-dNf7Rqyn7s;oY84c({m#lHI?^Jf{Ob34jImdKo?hXZ+x)w4sa5dytCOQDVrFhV
z>ihhl?$z5-H~tu&+-ap*uskl+hQaK>;#v0%8RHMAZdfeGu=qvnv~&M|TCOTjT_j&p
Wm&)xYrI8NwC4;A{pUXO@geCy>4Se+g

literal 0
HcmV?d00001

diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css
index c0b3d3cc5..c40f7dc8b 100644
--- a/openslides/static/styles/base.css
+++ b/openslides/static/styles/base.css
@@ -233,14 +233,17 @@ legend + .control-group {
     background-image: url("../img/glyphicons_045_calendar.png");
 }
 .leftmenu ul li.active a span.ico i.icon-agenda {
-    background-position: 0;
     background-image: url("../img/glyphicons_045_calendar_white.png");
 }
 .icon-motion, .icon-motions {
     background-position: -24px -24px;
 }
 .icon-assignment, .icon-assignments {
-    background-position: -144px -72px;
+    background-image: url("../img/glyphicons_041_charts.png");
+    background-position: 0;
+}
+.leftmenu ul li.active a span.ico i.icon-assignment {
+    background-image: url("../img/glyphicons_041_charts_white.png");
 }
 .icon-participant, .icon-participants {
     background-position: -168px 0;
@@ -260,14 +263,19 @@ legend + .control-group {
 .icon-custom_slide {
     background-position: -120px 0px;
 }
-
-
+.icon-personal_info {
+    background-position: -312px -24px;
+}
 
 /** More glyphicons free icons **/
 .status_link .icon-on, .icon-checked-new {
     background-image: url("../img/glyphicons_152_check.png");
     background-position: 0;
 }
+.icon-checked-new_white {
+    background-image: url("../img/glyphicons_152_check_white.png");
+    background-position: 0;
+}
 .status_link .icon-off, .icon-unchecked-new {
     background-image: url("../img/glyphicons_153_unchecked.png");
     background-position: 0;

From a08cf84ab88dedf66804fc28e5a6d00b525ec09a Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Tue, 5 Feb 2013 18:46:46 +0100
Subject: [PATCH 75/88] Wrote docstrings to the motion app

---
 openslides/motion/__init__.py |  12 ++
 openslides/motion/forms.py    |  50 +++--
 openslides/motion/models.py   | 355 +++++++++++++++++++++++-----------
 openslides/motion/pdf.py      |  14 ++
 openslides/motion/signals.py  |   3 +-
 openslides/motion/slides.py   |  12 ++
 openslides/motion/urls.py     |   6 +-
 openslides/motion/views.py    | 144 ++++++++++----
 openslides/motion/workflow.py |  77 ++++++--
 9 files changed, 500 insertions(+), 173 deletions(-)

diff --git a/openslides/motion/__init__.py b/openslides/motion/__init__.py
index e1cf60db8..d9b4927bc 100644
--- a/openslides/motion/__init__.py
+++ b/openslides/motion/__init__.py
@@ -1,2 +1,14 @@
+# -*- coding: utf-8 -*-
+"""
+    openslides.motion
+    ~~~~~~~~~~~~~~~~~
+
+    The OpenSlides motion app appends the functionality to OpenSlides, to
+    manage motions.
+
+    :copyright: (c) 2011-2013 by the OpenSlides team, see AUTHORS.
+    :license: GNU GPL, see LICENSE for more details.
+"""
+
 import openslides.motion.signals
 import openslides.motion.slides
diff --git a/openslides/motion/forms.py b/openslides/motion/forms.py
index b488a7a2a..ed1b02155 100644
--- a/openslides/motion/forms.py
+++ b/openslides/motion/forms.py
@@ -2,11 +2,11 @@
 # -*- coding: utf-8 -*-
 """
     openslides.motion.forms
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    ~~~~~~~~~~~~~~~~~~~~~~~
 
-    Forms for the motion app.
+    Defines the DjangoForms for the motion app.
 
-    :copyright: 2011, 2012 by OpenSlides team, see AUTHORS.
+    :copyright: (c) 2011-2013 by the OpenSlides team, see AUTHORS.
     :license: GNU GPL, see LICENSE for more details.
 """
 
@@ -20,14 +20,30 @@ from .workflow import motion_workflow_choices
 
 
 class BaseMotionForm(forms.ModelForm, CssClassMixin):
+    """Base FormClass for a Motion.
+
+    For it's own, it append the version data es fields.
+
+    The Class can be mixed with the following Mixins to add fields for the
+    submitter, supporters etc.
     """
-    Form to automaticly save the version data for a motion.
-    """
+
+    title = forms.CharField(widget=forms.TextInput(), label=_("Title"))
+    """Title of the Motion. Will be saved in a MotionVersion object."""
+
+    text = forms.CharField(widget=forms.Textarea(), label=_("Text"))
+    """Text of the Motion. Will be saved in a MotionVersion object."""
+
+    reason = forms.CharField(
+        widget=forms.Textarea(), required=False, label=_("Reason"))
+    """Reason of the Motion. will be saved in a MotionVersion object."""
+
     class Meta:
         model = Motion
         fields = ()
 
     def __init__(self, *args, **kwargs):
+        """Fill the FormFields releated to the version data with initial data."""
         self.motion = kwargs.get('instance', None)
         self.initial = kwargs.setdefault('initial', {})
         if self.motion is not None:
@@ -36,16 +52,15 @@ class BaseMotionForm(forms.ModelForm, CssClassMixin):
             self.initial['reason'] = self.motion.reason
         super(BaseMotionForm, self).__init__(*args, **kwargs)
 
-    title = forms.CharField(widget=forms.TextInput(), label=_("Title"))
-    text = forms.CharField(widget=forms.Textarea(), label=_("Text"))
-    reason = forms.CharField(
-        widget=forms.Textarea(), required=False, label=_("Reason"))
-
 
 class MotionSubmitterMixin(forms.ModelForm):
+    """Mixin to append the submitter field to a MotionForm."""
+
     submitter = MultiplePersonFormField(label=_("Submitter"))
+    """Submitter of the Motion. Can be one or more persons."""
 
     def __init__(self, *args, **kwargs):
+        """Fill in the submitter of the motion as default value."""
         if self.motion is not None:
             submitter = [submitter.person.person_id for submitter in self.motion.submitter.all()]
             self.initial['submitter'] = submitter
@@ -53,9 +68,13 @@ class MotionSubmitterMixin(forms.ModelForm):
 
 
 class MotionSupporterMixin(forms.ModelForm):
+    """Mixin to append the supporter field to a Motionform."""
+
     supporter = MultiplePersonFormField(required=False, label=_("Supporters"))
+    """Supporter of the Motion. Can be one or more persons."""
 
     def __init__(self, *args, **kwargs):
+        """Fill in the supporter of the motions as default value."""
         if self.motion is not None:
             supporter = [supporter.person.person_id for supporter in self.motion.supporter.all()]
             self.initial['supporter'] = supporter
@@ -63,18 +82,21 @@ class MotionSupporterMixin(forms.ModelForm):
 
 
 class MotionCreateNewVersionMixin(forms.ModelForm):
+    """Mixin to add the option to the form, to choose, to create a new version."""
+
     new_version = forms.BooleanField(
         required=False, label=_("Create new version"), initial=True,
         help_text=_("Trivial changes don't create a new version."))
+    """BooleanField to decide, if a new version will be created, or the
+    last_version will be used."""
 
 
-class ConfigForm(forms.Form, CssClassMixin):
+class ConfigForm(CssClassMixin, forms.Form):
+    """Form for the configuration tab of OpenSlides."""
     motion_min_supporters = forms.IntegerField(
         widget=forms.TextInput(attrs={'class': 'small-input'}),
         label=_("Number of (minimum) required supporters for a motion"),
-        initial=4,
-        min_value=0,
-        max_value=8,
+        initial=4, min_value=0, max_value=8,
         help_text=_("Choose 0 to disable the supporting system"),
     )
     motion_preamble = forms.CharField(
diff --git a/openslides/motion/models.py b/openslides/motion/models.py
index 47aa9ad72..cf39e3410 100644
--- a/openslides/motion/models.py
+++ b/openslides/motion/models.py
@@ -6,7 +6,10 @@
 
     Models for the motion app.
 
-    :copyright: 2011, 2012 by OpenSlides team, see AUTHORS.
+    To use a motion object, you only have to import the Motion class. Any
+    functionality can be reached from a motion object.
+
+    :copyright: (c) 2011-2013 by the OpenSlides team, see AUTHORS.
     :license: GNU GPL, see LICENSE for more details.
 """
 
@@ -34,39 +37,38 @@ from .workflow import (motion_workflow_choices, get_state, State, WorkflowError,
                        DUMMY_STATE)
 
 
-# TODO: Save submitter and supporter in the same table
-class MotionSubmitter(models.Model):
-    person = PersonField()
-    motion = models.ForeignKey('Motion', related_name="submitter")
-
-    def __unicode__(self):
-        return unicode(self.person)
-
-
-class MotionSupporter(models.Model):
-    person = PersonField()
-    motion = models.ForeignKey('Motion', related_name="supporter")
-
-    def __unicode__(self):
-        return unicode(self.person)
-
-
 class Motion(SlideMixin, models.Model):
-    """
-    The Motion-Model.
-    """
-    prefix = "motion"
+    """The Motion Class.
+
+    This class is the main entry point to all other classes related to a motion.
+    """
+
+    prefix = "motion"
+    """Prefix for the slide system."""
+
+    active_version = models.ForeignKey('MotionVersion', null=True,
+                                       related_name="active_version")
+    """Points to a specific version.
+
+    Used be the permitted-version-system to deside witch version is the active
+    Version. Could also be used to only choose a specific version as a default
+    version. Like the Sighted versions on Wikipedia.
+    """
 
-    active_version = models.ForeignKey(
-        'MotionVersion', null=True, related_name="active_version")
     state_id = models.CharField(max_length=3)
-    # Log (Translatable)
+    """The id of a state object.
+
+    This Attribute is used be motion.state to identify the current state of the
+    motion.
+    """
+
     identifier = models.CharField(max_length=255, null=True, blank=True,
                                   unique=True)
-    category = models.ForeignKey('Category', null=True, blank=True)
-    # TODO proposal
-    # Maybe rename to master_copy
-    master = models.ForeignKey('self', null=True, blank=True)
+    """A string as human readable identifier for the motion."""
+
+    # category = models.ForeignKey('Category', null=True, blank=True)
+    # TODO: proposal
+    #master = models.ForeignKey('self', null=True, blank=True)
 
     class Meta:
         permissions = (
@@ -79,17 +81,35 @@ class Motion(SlideMixin, models.Model):
         # ordering = ('number',)
 
     def __unicode__(self):
+        """Return a human readable name of this motion."""
         return self.get_title()
 
     # TODO: Use transaction
     def save(self, *args, **kwargs):
-        """
-        Saves the motion. Create or update a motion_version object
+        """Save the motion.
+
+        1. Set the state of a new motion to the default motion.
+        2. Save the motion object.
+        3. Save the version Data.
+        4. Set the active version for the motion.
+
+        A new version will be saved if motion.new_version was called
+        between the creation of this object and the last call of motion.save()
+
+            or
+
+        If the motion has new version data (title, text, reason)
+
+            and
+
+        the config 'motion_create_new_version' is set to
+        'ALLWASY_CREATE_NEW_VERSION'.
         """
         if not self.state_id:
             self.reset_state()
 
         super(Motion, self).save(*args, **kwargs)
+
         # Find out if the version data has changed
         for attr in ['title', 'text', 'reason']:
             if not self.versions.exists():
@@ -109,7 +129,7 @@ class Motion(SlideMixin, models.Model):
         elif new_data and not need_new_version:
             version = self.last_version
         else:
-            # We do not need to save the motion version
+            # We do not need to save the motion version.
             return
 
         # Save title, text and reason in the version object
@@ -137,6 +157,10 @@ class Motion(SlideMixin, models.Model):
             self.save()
 
     def get_absolute_url(self, link='detail'):
+        """Return an URL for this version.
+
+        The keywordargument 'link' can be 'detail', 'view', 'edit' or 'delete'.
+        """
         if link == 'view' or link == 'detail':
             return reverse('motion_detail', args=[str(self.id)])
         if link == 'edit':
@@ -145,8 +169,9 @@ class Motion(SlideMixin, models.Model):
             return reverse('motion_delete', args=[str(self.id)])
 
     def get_title(self):
-        """
-        Get the title of the motion. The titel is taken from motion.version
+        """Get the title of the motion.
+
+        The titel is taken from motion.version.
         """
         try:
             return self._title
@@ -154,16 +179,23 @@ class Motion(SlideMixin, models.Model):
             return self.version.title
 
     def set_title(self, title):
-        """
-        Set the titel of the motion. The titel will me saved in motion.save()
+        """Set the titel of the motion.
+
+        The titel will me saved into the version object, wenn motion.save() is
+        called.
         """
         self._title = title
 
     title = property(get_title, set_title)
+    """The title of the motion.
+
+    Is saved in a MotionVersion object.
+    """
 
     def get_text(self):
-        """
-        Get the text of the motion. Simular to get_title()
+        """Get the text of the motion.
+
+        Simular to get_title().
         """
         try:
             return self._text
@@ -171,16 +203,22 @@ class Motion(SlideMixin, models.Model):
             return self.version.text
 
     def set_text(self, text):
-        """
-        Set the text of the motion. Simular to set_title()
+        """ Set the text of the motion.
+
+        Simular to set_title().
         """
         self._text = text
 
     text = property(get_text, set_text)
+    """The text of a motin.
+
+    Is saved in a MotionVersion object.
+    """
 
     def get_reason(self):
-        """
-        Get the reason of the motion. Simular to get_title()
+        """Get the reason of the motion.
+
+        Simular to get_title().
         """
         try:
             return self._reason
@@ -188,20 +226,26 @@ class Motion(SlideMixin, models.Model):
             return self.version.reason
 
     def set_reason(self, reason):
-        """
-        Set the reason of the motion. Simular to set_title()
+        """Set the reason of the motion.
+
+        Simular to set_title().
         """
         self._reason = reason
 
     reason = property(get_reason, set_reason)
+    """The reason for the motion.
+
+    Is saved in a MotionVersion object.
+    """
 
     @property
     def new_version(self):
-        """
+        """Return a Version object, not saved in the database.
+
         On the first call, it creates a new version. On any later call, it
         use the existing new version.
 
-        The new_version object will be deleted when it is saved into the db
+        The new_version object will be deleted when it is saved into the db.
         """
         try:
             return self._new_version
@@ -210,9 +254,9 @@ class Motion(SlideMixin, models.Model):
             return self._new_version
 
     def get_version(self):
-        """
-        Get the "active" version object. This version will be used to get the
-        data for this motion.
+        """Get the 'active' version object.
+
+        This version will be used to get the data for this motion.
         """
         try:
             return self._version
@@ -220,12 +264,12 @@ class Motion(SlideMixin, models.Model):
             return self.last_version
 
     def set_version(self, version):
-        """
-        Set the "active" version object.
+        """Set the 'active' version object.
 
-        If version is None, the last_version will be used.
-        If version is a version object, this object will be used.
-        If version is Int, the N version of this motion will be used.
+        The keyargument 'version' can be a MotionVersion object or the
+        version_number of a VersionObject or None.
+
+        If the argument is None, the newest version will be used.
         """
         if version is None:
             try:
@@ -242,12 +286,11 @@ class Motion(SlideMixin, models.Model):
             self._version = version
 
     version = property(get_version, set_version)
+    """The active version of this motion."""
 
     @property
     def last_version(self):
-        """
-        Get the newest version of the motion
-        """
+        """Return the newest version of the motion."""
         # TODO: Fix the case, that the motion has no Version
         try:
             return self.versions.order_by('-version_number')[0]
@@ -255,15 +298,15 @@ class Motion(SlideMixin, models.Model):
             return self.new_version
 
     def is_submitter(self, person):
+        """Return True, if person is a submitter of this motion. Else: False."""
         self.submitter.filter(person=person).exists()
 
     def is_supporter(self, person):
+        """Return True, if person is a supporter of this motion. Else: False."""
         return self.supporter.filter(person=person).exists()
 
     def support(self, person):
-        """
-        Add a Supporter to the list of supporters of the motion.
-        """
+        """Add 'person' as a supporter of this motion."""
         if self.state.support:
             if not self.is_supporter(person):
                 MotionSupporter(motion=self, person=person).save()
@@ -271,17 +314,16 @@ class Motion(SlideMixin, models.Model):
             raise WorkflowError("You can not support a motion in state %s" % self.state.name)
 
     def unsupport(self, person):
-        """
-        Remove a supporter from the list of supporters of the motion
-        """
+        """Remove 'person' as supporter from this motion."""
         if self.state.support:
             self.supporter.filter(person=person).delete()
         else:
             raise WorkflowError("You can not unsupport a motion in state %s" % self.state.name)
 
     def create_poll(self):
-        """
-        Create a new poll for this motion
+        """Create a new poll for this motion.
+
+        Return the new poll object.
         """
         if self.state.create_poll:
             # TODO: auto increment the poll_number in the Database
@@ -293,8 +335,9 @@ class Motion(SlideMixin, models.Model):
             raise WorkflowError("You can not create a poll in state %s" % self.state.name)
 
     def get_state(self):
-        """
-        Get the state of this motion. Return a State object.
+        """Return the state of the motion.
+
+        State is a State object. See openslides.motion.workflow for more informations.
         """
         try:
             return get_state(self.state_id)
@@ -302,10 +345,10 @@ class Motion(SlideMixin, models.Model):
             return DUMMY_STATE
 
     def set_state(self, next_state):
-        """
-        Set the state of this motion.
+        """Set the state of this motion.
 
-        next_state has to be a valid state id or State object.
+        The keyargument 'next_state' has to be a State object or an id of a
+        State object.
         """
         if not isinstance(next_state, State):
             next_state = get_state(next_state)
@@ -315,17 +358,14 @@ class Motion(SlideMixin, models.Model):
             raise WorkflowError('%s is not a valid next_state' % next_state)
 
     state = property(get_state, set_state)
+    """The state of the motion as Ste object."""
 
     def reset_state(self):
-        """
-        Set the state to the default state.
-        """
+        """Set the state to the default state."""
         self.state_id = get_state('default').id
 
     def slide(self):
-        """
-        return the slide dict
-        """
+        """Return the slide dict."""
         data = super(Motion, self).slide()
         data['motion'] = self
         data['title'] = self.title
@@ -333,6 +373,7 @@ class Motion(SlideMixin, models.Model):
         return data
 
     def get_agenda_title(self):
+        """Return a title for the Agenda."""
         return self.last_version.title
 
     ## def get_agenda_title_supplement(self):
@@ -340,8 +381,7 @@ class Motion(SlideMixin, models.Model):
         ## return '(%s %s)' % (ugettext('motion'), number)
 
     def get_allowed_actions(self, person):
-        """
-        Gets a dictonary with all allowed actions for a specific person.
+        """Return a dictonary with all allowed actions for a specific person.
 
         The dictonary contains the following actions.
 
@@ -374,11 +414,16 @@ class Motion(SlideMixin, models.Model):
         return actions
 
     def write_log(self, message, person=None):
+        """Write a log message.
+
+        Message should be in english and translatable.
+
+        e.G: motion.write_log(ugettext_noob('Message Text'))
+        """
         MotionLog.objects.create(motion=self, message=message, person=person)
 
     def activate_version(self, version):
-        """
-        Activate a version of this motion.
+        """Set the active state of a version to True.
 
         'version' can be a version object, or the version_number of a version.
         """
@@ -391,8 +436,7 @@ class Motion(SlideMixin, models.Model):
             version.save()
 
     def reject_version(self, version):
-        """
-        Reject a version of this motion.
+        """Reject a version of this motion.
 
         'version' can be a version object, or the version_number of a version.
         """
@@ -407,58 +451,126 @@ class Motion(SlideMixin, models.Model):
 
 
 class MotionVersion(models.Model):
-    version_number = models.PositiveIntegerField(default=1)
-    title = models.CharField(max_length=255, verbose_name=ugettext_lazy("Title"))
-    text = models.TextField(verbose_name=_("Text"))
-    reason = models.TextField(null=True, blank=True, verbose_name=ugettext_lazy("Reason"))
-    rejected = models.BooleanField(default=False)
-    creation_time = models.DateTimeField(auto_now=True)
+    """
+    A MotionVersion object saves some date of the motion."""
+
     motion = models.ForeignKey(Motion, related_name='versions')
-    identifier = models.CharField(max_length=255, verbose_name=ugettext_lazy("Version identifier"))
-    note = models.TextField(null=True, blank=True)
+    """The Motion, to witch the version belongs."""
+
+    version_number = models.PositiveIntegerField(default=1)
+    """An id for this version in realation to a motion.
+
+    Is unique for each motion.
+    """
+
+    title = models.CharField(max_length=255, verbose_name=ugettext_lazy("Title"))
+    """The Title of a motion."""
+
+    text = models.TextField(verbose_name=_("Text"))
+    """The text of a motion."""
+
+    reason = models.TextField(null=True, blank=True, verbose_name=ugettext_lazy("Reason"))
+    """The reason for a motion."""
+
+    rejected = models.BooleanField(default=False)
+    """Saves, if the version is rejected."""
+
+    creation_time = models.DateTimeField(auto_now=True)
+    """Time, when the version was saved."""
+
+    #identifier = models.CharField(max_length=255, verbose_name=ugettext_lazy("Version identifier"))
+    #note = models.TextField(null=True, blank=True)
 
     class Meta:
         unique_together = ("motion", "version_number")
 
     def __unicode__(self):
+        """Return a string, representing this object."""
         counter = self.version_number or _('new')
         return "%s Version %s" % (self.motion, counter)
 
     def get_absolute_url(self, link='detail'):
+        """Return the URL of this Version.
+
+        The keyargument link can be 'view' or 'detail'.
+        """
         if link == 'view' or link == 'detail':
             return reverse('motion_version_detail', args=[str(self.motion.id),
                                                           str(self.version_number)])
 
     @property
     def active(self):
+        """Return True, if the version is the active version of a motion. Else: False."""
         return self.active_version.exists()
 
 
-class Category(models.Model):
-    name = models.CharField(max_length=255, verbose_name=ugettext_lazy("Category name"))
-    prefix = models.CharField(max_length=32, verbose_name=ugettext_lazy("Category prefix"))
+class MotionSubmitter(models.Model):
+    """Save the submitter of a Motion."""
+
+    motion = models.ForeignKey('Motion', related_name="submitter")
+    """The motion to witch the object belongs."""
+
+    person = PersonField()
+    """The person, who is the submitter."""
 
     def __unicode__(self):
-        return self.name
+        """Return the name of the submitter as string."""
+        return unicode(self.person)
 
 
-class Comment(models.Model):
-    motion_version = models.ForeignKey(MotionVersion)
-    text = models.TextField()
-    author = PersonField()
-    creation_time = models.DateTimeField(auto_now=True)
+class MotionSupporter(models.Model):
+    """Save the submitter of a Motion."""
+
+    motion = models.ForeignKey('Motion', related_name="supporter")
+    """The motion to witch the object belongs."""
+
+    person = PersonField()
+    """The person, who is the supporter."""
+
+
+    def __unicode__(self):
+        """Return the name of the supporter as string."""
+        return unicode(self.person)
+
+
+## class Category(models.Model):
+    ## name = models.CharField(max_length=255, verbose_name=ugettext_lazy("Category name"))
+    ## prefix = models.CharField(max_length=32, verbose_name=ugettext_lazy("Category prefix"))
+
+    ## def __unicode__(self):
+        ## return self.name
+
+
+## class Comment(models.Model):
+    ## motion_version = models.ForeignKey(MotionVersion)
+    ## text = models.TextField()
+    ## author = PersonField()
+    ## creation_time = models.DateTimeField(auto_now=True)
 
 
 class MotionLog(models.Model):
+    """Save a logmessage for a motion."""
+
     motion = models.ForeignKey(Motion, related_name='log_messages')
+    """The motion to witch the object belongs."""
+
     message = models.CharField(max_length=255)
+    """The log message.
+
+    Should be in english.
+    """
+
     person = PersonField(null=True)
+    """A person object, who created the log message. Optional."""
+
     time = models.DateTimeField(auto_now=True)
+    """The Time, when the loged action was performed."""
 
     class Meta:
         ordering = ['-time']
 
     def __unicode__(self):
+        """Return a string, representing the log message."""
         # TODO: write time in the local time format.
         if self.person is None:
             return "%s %s" % (self.time, _(self.message))
@@ -467,33 +579,63 @@ class MotionLog(models.Model):
 
 
 class MotionError(Exception):
+    """Exception raised when errors in the motion accure."""
     pass
 
 
 class MotionVote(BaseVote):
+    """Saves the votes for a MotionPoll.
+
+    There should allways be three MotionVote objects for each poll,
+    one for 'yes', 'no', and 'abstain'."""
+
     option = models.ForeignKey('MotionOption')
+    """The option object, to witch the vote belongs."""
 
 
 class MotionOption(BaseOption):
+    """Links between the MotionPollClass and the MotionVoteClass.
+
+    There should be one MotionOption object for each poll."""
+
     poll = models.ForeignKey('MotionPoll')
+    """The poll object, to witch the object belongs."""
+
     vote_class = MotionVote
+    """The VoteClass, to witch this Class links."""
 
 
 class MotionPoll(CountInvalid, CountVotesCast, BasePoll):
-    option_class = MotionOption
-    vote_values = [
-        ugettext_noop('Yes'), ugettext_noop('No'), ugettext_noop('Abstain')]
+    """The Class to saves the poll results for a motion poll."""
 
     motion = models.ForeignKey(Motion, related_name='polls')
+    """The motion to witch the object belongs."""
+
+    option_class = MotionOption
+    """The option class, witch links between this object the the votes."""
+
+    vote_values = [
+        ugettext_noop('Yes'), ugettext_noop('No'), ugettext_noop('Abstain')]
+    """The possible anwers for the poll. 'Yes, 'No' and 'Abstain'."""
+
     poll_number = models.PositiveIntegerField(default=1)
+    """An id for this poll in realation to a motion.
+
+    Is unique for each motion.
+    """
 
     class Meta:
         unique_together = ("motion", "poll_number")
 
     def __unicode__(self):
+        """Return a string, representing the poll."""
         return _('Ballot %d') % self.poll_number
 
     def get_absolute_url(self, link='edit'):
+        """Return an URL for the poll.
+
+        The keyargument 'link' can be 'edit' or 'delete'.
+        """
         if link == 'edit':
             return reverse('motion_poll_edit', args=[str(self.motion.pk),
                                                      str(self.poll_number)])
@@ -501,16 +643,13 @@ class MotionPoll(CountInvalid, CountVotesCast, BasePoll):
             return reverse('motion_poll_delete', args=[str(self.motion.pk),
                                                        str(self.poll_number)])
 
-    def get_motion(self):
-        return self.motion
-
     def set_options(self):
+        """Create the option class for this poll."""
         #TODO: maybe it is possible with .create() to call this without poll=self
+        #      or call this in save()
         self.get_option_class()(poll=self).save()
 
     def append_pollform_fields(self, fields):
+        """Apend the fields for invalid and votecast to the ModelForm."""
         CountInvalid.append_pollform_fields(self, fields)
         CountVotesCast.append_pollform_fields(self, fields)
-
-    def get_ballot(self):
-        return self.motion.motionpoll_set.filter(id__lte=self.id).count()
diff --git a/openslides/motion/pdf.py b/openslides/motion/pdf.py
index d6e3cb743..fcee6c2e7 100644
--- a/openslides/motion/pdf.py
+++ b/openslides/motion/pdf.py
@@ -1,3 +1,12 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+    openslides.motion.pdf
+    ~~~~~~~~~~~~~~~~~~~~~
+
+    Functions to generate the PDFs for the motion app.
+"""
+
 from reportlab.lib import colors
 from reportlab.lib.units import cm
 from reportlab.platypus import (
@@ -11,6 +20,8 @@ from .models import Motion
 
 
 def motions_to_pdf(pdf):
+    """Create a PDF with all motions."""
+
     motions = Motion.objects.all()
     all_motion_cover(pdf, motions)
     for motion in motions:
@@ -19,6 +30,8 @@ def motions_to_pdf(pdf):
 
 
 def motion_to_pdf(pdf, motion):
+    """Create a PDF for one motion."""
+
     pdf.append(Paragraph(_("Motion: %s") % motion.title, stylesheet['Heading1']))
 
     motion_data = []
@@ -141,6 +154,7 @@ def motion_to_pdf(pdf, motion):
 
 
 def all_motion_cover(pdf, motions):
+    """Create a coverpage for all motions."""
     pdf.append(Paragraph(config["motion_pdf_title"], stylesheet['Heading1']))
 
     preamble = config["motion_pdf_preamble"]
diff --git a/openslides/motion/signals.py b/openslides/motion/signals.py
index b482cf38c..fb1dffd9a 100644
--- a/openslides/motion/signals.py
+++ b/openslides/motion/signals.py
@@ -6,7 +6,7 @@
 
     Signals for the motion app.
 
-    :copyright: 2011, 2012 by OpenSlides team, see AUTHORS.
+    :copyright: (c) 2011-2013 by the OpenSlides team, see AUTHORS.
     :license: GNU GPL, see LICENSE for more details.
 """
 
@@ -18,6 +18,7 @@ from openslides.config.signals import default_config_value
 
 @receiver(default_config_value, dispatch_uid="motion_default_config")
 def default_config(sender, key, **kwargs):
+    """Return the default config values for the motion app."""
     return {
         'motion_min_supporters': 0,
         'motion_preamble': _('The assembly may decide,'),
diff --git a/openslides/motion/slides.py b/openslides/motion/slides.py
index 9f93fdd38..e269dc243 100644
--- a/openslides/motion/slides.py
+++ b/openslides/motion/slides.py
@@ -1,3 +1,15 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+    openslides.motion.slides
+    ~~~~~~~~~~~~~~~~~~~~~~~~
+
+    Defines the Slides for the motion app.
+
+    :copyright: (c) 2011-2013 by the OpenSlides team, see AUTHORS.
+    :license: GNU GPL, see LICENSE for more details.
+"""
+
 from openslides.projector.api import register_slidemodel
 from .models import Motion
 
diff --git a/openslides/motion/urls.py b/openslides/motion/urls.py
index 883b4c953..8ff7c0d33 100644
--- a/openslides/motion/urls.py
+++ b/openslides/motion/urls.py
@@ -2,11 +2,11 @@
 # -*- coding: utf-8 -*-
 """
     openslides.motion.urls
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    ~~~~~~~~~~~~~~~~~~~~~~
 
-    URL list for the motion app.
+    Defines the URL patterns for the motion app.
 
-    :copyright: 2011, 2012 by OpenSlides team, see AUTHORS.
+    :copyright: (c) 2011-2013 by the OpenSlides team, see AUTHORS.
     :license: GNU GPL, see LICENSE for more details.
 """
 
diff --git a/openslides/motion/views.py b/openslides/motion/views.py
index 2b7e89784..9f26faec1 100644
--- a/openslides/motion/views.py
+++ b/openslides/motion/views.py
@@ -6,10 +6,11 @@
 
     Views for the motion app.
 
-    :copyright: 2011, 2012 by the OpenSlides team, see AUTHORS.
+    Will automaticly imported from openslides.motion.urls.py
+
+    :copyright: (c) 2011-2013 by the OpenSlides team, see AUTHORS.
     :license: GNU GPL, see LICENSE for more details.
 """
-from reportlab.platypus import Paragraph
 
 from django.core.urlresolvers import reverse
 from django.contrib import messages
@@ -39,9 +40,7 @@ from .pdf import motions_to_pdf, motion_to_pdf
 
 
 class MotionListView(ListView):
-    """
-    List all motion.
-    """
+    """View, to list all motions."""
     permission_required = 'motion.can_see_motion'
     model = Motion
 
@@ -49,7 +48,11 @@ motion_list = MotionListView.as_view()
 
 
 class GetVersionMixin(object):
+    """Mixin to set a specific version to a motion."""
+
     def get_object(self):
+        """Return a Motion object. The id is taken from the url and the version
+        is set to the version with the 'version_number' from the URL."""
         object = super(GetVersionMixin, self).get_object()
         version_number = self.kwargs.get('version_number', None)
         if version_number is not None:
@@ -61,14 +64,15 @@ class GetVersionMixin(object):
 
 
 class MotionDetailView(GetVersionMixin, DetailView):
-    """
-    Show the details of one motion.
-    """
+    """Show one motion."""
     permission_required = 'motion.can_see_motion'
     model = Motion
-    template_name = 'motion/motion_detail.html'
 
     def get_context_data(self, **kwargs):
+        """Return the template context.
+
+        Append the allowed actions for the motion to the context.
+        """
         context = super(MotionDetailView, self).get_context_data(**kwargs)
         context['allowed_actions'] = self.object.get_allowed_actions(self.request.user)
         return context
@@ -77,10 +81,12 @@ motion_detail = MotionDetailView.as_view()
 
 
 class MotionMixin(object):
-    """
-    Mixin to add save the version-data to the motion-object
-    """
+    """Mixin for MotionViewsClasses, to save the version data."""
+
     def manipulate_object(self, form):
+        """Save the version data into the motion object before it is saved in
+        the Database."""
+
         super(MotionMixin, self).manipulate_object(form)
         for attr in ['title', 'text', 'reason']:
             setattr(self.object, attr, form.cleaned_data[attr])
@@ -92,6 +98,7 @@ class MotionMixin(object):
             pass
 
     def post_save(self, form):
+        """Save the submitter an the supporter so the motion."""
         super(MotionMixin, self).post_save(form)
         # TODO: only delete and save neccessary submitters and supporter
         if 'submitter' in form.cleaned_data:
@@ -106,6 +113,13 @@ class MotionMixin(object):
                  for person in form.cleaned_data['supporter']])
 
     def get_form_class(self):
+        """Return the FormClass to Create or Update the Motion.
+
+        forms.BaseMotionForm is the base for the Class, and some FormMixins
+        will be mixed in dependence of some config values. See motion.forms
+        for more information on the mixins.
+        """
+
         form_classes = [BaseMotionForm]
         if self.request.user.has_perm('motion.can_manage_motion'):
             form_classes.append(MotionSubmitterMixin)
@@ -117,13 +131,12 @@ class MotionMixin(object):
 
 
 class MotionCreateView(MotionMixin, CreateView):
-    """
-    Create a motion.
-    """
+    """View to create a motion."""
     permission_required = 'motion.can_create_motion'
     model = Motion
 
     def form_valid(self, form):
+        """Write a log message, if the form is valid."""
         value = super(MotionCreateView, self).form_valid(form)
         self.object.write_log(ugettext_noop('Motion created'), self.request.user)
         return value
@@ -132,15 +145,15 @@ motion_create = MotionCreateView.as_view()
 
 
 class MotionUpdateView(MotionMixin, UpdateView):
-    """
-    Update a motion.
-    """
+    """View to update a motion."""
     model = Motion
 
     def has_permission(self, request, *args, **kwargs):
+        """Check, if the request.user has the permission to edit the motion."""
         return self.get_object().get_allowed_actions(request.user)['edit']
 
     def form_valid(self, form):
+        """Write a log message, if the form is valid."""
         value = super(MotionUpdateView, self).form_valid(form)
         self.object.write_log(ugettext_noop('Motion updated'), self.request.user)
         return value
@@ -149,34 +162,39 @@ motion_edit = MotionUpdateView.as_view()
 
 
 class MotionDeleteView(DeleteView):
-    """
-    Delete one Motion.
-    """
+    """View to delete a motion."""
     model = Motion
     success_url_name = 'motion_list'
 
     def has_permission(self, request, *args, **kwargs):
+        """Check if the request.user has the permission to delete the motion."""
         return self.get_object().get_allowed_actions(request.user)['delete']
 
 motion_delete = MotionDeleteView.as_view()
 
 
 class VersionPermitView(GetVersionMixin, SingleObjectMixin, QuestionMixin, RedirectView):
+    """View to permit a version of a motion."""
+
     model = Motion
     question_url_name = 'motion_version_detail'
     success_url_name = 'motion_version_detail'
 
     def get(self, *args, **kwargs):
+        """Set self.object to a motion."""
         self.object = self.get_object()
         return super(VersionPermitView, self).get(*args, **kwargs)
 
     def get_url_name_args(self):
+        """Return a list with arguments to create the success- and question_url."""
         return [self.object.pk, self.object.version.version_number]
 
     def get_question(self):
+        """Return a string, shown to the user as question to permit the version."""
         return _('Are you sure you want permit Version %s?') % self.object.version.version_number
 
     def case_yes(self):
+        """Activate the version, if the user chooses 'yes'."""
         self.object.activate_version(self.object.version)
         self.object.save()
 
@@ -184,21 +202,25 @@ version_permit = VersionPermitView.as_view()
 
 
 class VersionRejectView(GetVersionMixin, SingleObjectMixin, QuestionMixin, RedirectView):
+    """View to reject a version."""
     model = Motion
     question_url_name = 'motion_version_detail'
     success_url_name = 'motion_version_detail'
 
     def get(self, *args, **kwargs):
+        """Set self.object to a motion."""
         self.object = self.get_object()
         return super(VersionRejectView, self).get(*args, **kwargs)
 
     def get_url_name_args(self):
+        """Return a list with arguments to create the success- and question_url."""
         return [self.object.pk, self.object.version.version_number]
 
     def get_question(self):
         return _('Are you sure you want reject Version %s?') % self.object.version.version_number
 
     def case_yes(self):
+        """Reject the version, if the user chooses 'yes'."""
         self.object.reject_version(self.object.version)
         self.object.save()
 
@@ -206,23 +228,25 @@ version_reject = VersionRejectView.as_view()
 
 
 class SupportView(SingleObjectMixin, QuestionMixin, RedirectView):
+    """View to support or unsupport a motion.
+
+    If self.support is True, the view will append a request.user to the supporter list.
+
+    If self.support is False, the view will remove a request.user from the supporter list.
     """
-    Classed based view to support or unsupport a motion. Use
-    support=True or support=False in urls.py
-    """
+
     permission_required = 'motion.can_support_motion'
     model = Motion
     support = True
 
     def get(self, request, *args, **kwargs):
+        """Set self.object to a motion."""
         self.object = self.get_object()
         return super(SupportView, self).get(request, *args, **kwargs)
 
     def check_permission(self, request):
-        """
-        Checks whether request.user can support or unsupport the motion.
-        Returns True or False.
-        """
+        """Return True if the user can support or unsupport the motion. Else: False."""
+
         allowed_actions = self.object.get_allowed_actions(request.user)
         if self.support and not allowed_actions['support']:
             messages.error(request, _('You can not support this motion.'))
@@ -233,17 +257,19 @@ class SupportView(SingleObjectMixin, QuestionMixin, RedirectView):
         else:
             return True
 
-    def pre_redirect(self, request, *args, **kwargs):
-        if self.check_permission(request):
-            super(SupportView, self).pre_redirect(request, *args, **kwargs)
-
     def get_question(self):
+        """Return the question string."""
         if self.support:
             return _('Do you really want to support this motion?')
         else:
             return _('Do you really want to unsupport this motion?')
 
     def case_yes(self):
+        """Append or remove the request.user from the motion.
+
+        First the methode checks the permissions, and writes a log message after
+        appending or removing the user.
+        """
         if self.check_permission(self.request):
             user = self.request.user
             if self.support:
@@ -254,12 +280,14 @@ class SupportView(SingleObjectMixin, QuestionMixin, RedirectView):
                 self.object.write_log(ugettext_noop("Supporter: -%s") % user, user)
 
     def get_success_message(self):
+        """Return the success message."""
         if self.support:
             return _("You have supported this motion successfully.")
         else:
             return _("You have unsupported this motion successfully.")
 
     def get_redirect_url(self, **kwargs):
+        """Return the url, the view should redirect to."""
         return self.object.get_absolute_url()
 
 motion_support = SupportView.as_view(support=True)
@@ -267,48 +295,68 @@ motion_unsupport = SupportView.as_view(support=False)
 
 
 class PollCreateView(SingleObjectMixin, RedirectView):
+    """View to create a poll for a motion."""
     permission_required = 'motion.can_manage_motion'
     model = Motion
 
     def get(self, request, *args, **kwargs):
+        """Set self.object to a motion."""
         self.object = self.get_object()
         return super(PollCreateView, self).get(request, *args, **kwargs)
 
     def pre_redirect(self, request, *args, **kwargs):
+        """Create the poll for the motion."""
         self.poll = self.object.create_poll()
         self.object.write_log(ugettext_noop("Poll created"), request.user)
         messages.success(request, _("New vote was successfully created."))
 
     def get_redirect_url(self, **kwargs):
+        """Return the URL to the EditView of the poll."""
         return reverse('motion_poll_edit', args=[self.object.pk, self.poll.poll_number])
 
 poll_create = PollCreateView.as_view()
 
 
 class PollMixin(object):
+    """Mixin for the PollUpdateView and the PollDeleteView."""
     permission_required = 'motion.can_manage_motion'
     success_url_name = 'motion_detail'
 
     def get_object(self):
+        """Return a MotionPoll object.
+
+        Use the motion id and the poll_number from the url kwargs to get the
+        object.
+        """
         return MotionPoll.objects.filter(
             motion=self.kwargs['pk'],
             poll_number=self.kwargs['poll_number']).get()
 
     def get_url_name_args(self):
+        """Return the arguments to create the url to the success_url"""
         return [self.object.motion.pk]
 
 
 class PollUpdateView(PollMixin, PollFormView):
+    """View to update a MotionPoll."""
+
     poll_class = MotionPoll
+    """Poll Class to use for this view."""
+
     template_name = 'motion/poll_form.html'
 
     def get_context_data(self, **kwargs):
+        """Return the template context.
+
+        Append the motion object to the context.
+        """
         context = super(PollUpdateView, self).get_context_data(**kwargs)
         context.update({
             'motion': self.poll.motion})
         return context
 
     def form_valid(self, form):
+        """Write a log message, if the form is valid."""
         value = super(PollUpdateView, self).form_valid(form)
         self.object.write_log(ugettext_noop('Poll updated'), self.request.user)
         return value
@@ -317,9 +365,11 @@ poll_edit = PollUpdateView.as_view()
 
 
 class PollDeleteView(PollMixin, DeleteView):
+    """View to delete a MotionPoll."""
     model = MotionPoll
 
     def case_yes(self):
+        """Write a log message, if the form is valid."""
         super(PollDeleteView, self).case_yes()
         self.object.write_log(ugettext_noop('Poll deleted'), self.request.user)
 
@@ -327,12 +377,19 @@ poll_delete = PollDeleteView.as_view()
 
 
 class MotionSetStateView(SingleObjectMixin, RedirectView):
+    """View to set the state of a motion.
+
+    If self.reset is False, the new state is taken from url.
+
+    If self.reset is True, the default state is taken.
+    """
     permission_required = 'motion.can_manage_motion'
     url_name = 'motion_detail'
     model = Motion
     reset = False
 
     def pre_redirect(self, request, *args, **kwargs):
+        """Save the new state and write a log message."""
         self.object = self.get_object()
         try:
             if self.reset:
@@ -350,6 +407,7 @@ class MotionSetStateView(SingleObjectMixin, RedirectView):
                                         % html_strong(self.object.state)))
 
     def get_url_name_args(self):
+        """Return the arguments to generate the redirect_url."""
         return [self.object.pk]
 
 set_state = MotionSetStateView.as_view()
@@ -357,15 +415,18 @@ reset_state = MotionSetStateView.as_view(reset=True)
 
 
 class CreateAgendaItemView(SingleObjectMixin, RedirectView):
+    """View to create and agenda item for a motion."""
     permission_required = 'agenda.can_manage_agenda'
     url_name = 'item_overview'
     model = Motion
 
     def get(self, request, *args, **kwargs):
+        """Set self.object to a motion."""
         self.object = self.get_object()
         return super(CreateAgendaItemView, self).get(request, *args, **kwargs)
 
     def pre_redirect(self, request, *args, **kwargs):
+        """Create the agenda item."""
         self.item = Item.objects.create(related_sid=self.object.sid)
         self.object.write_log(ugettext_noop('Created Agenda Item'), self.request.user)
 
@@ -373,23 +434,32 @@ create_agenda_item = CreateAgendaItemView.as_view()
 
 
 class MotionPDFView(SingleObjectMixin, PDFView):
+    """Create the PDF for one, or all motions.
+
+    If self.print_all_motions is True, the view returns a PDF with all motions.
+
+    If self.print_all_motions is False, the view returns a PDF with only one
+    motion."""
     permission_required = 'motion.can_manage_motion'
     model = Motion
     top_space = 0
     print_all_motions = False
 
     def get(self, request, *args, **kwargs):
+        """Set self.object to a motion."""
         if not self.print_all_motions:
             self.object = self.get_object()
         return super(MotionPDFView, self).get(request, *args, **kwargs)
 
     def get_filename(self):
+        """Return the filename for the PDF."""
         if self.print_all_motions:
             return _("Motions")
         else:
             return _("Motion: %s") % unicode(self.object)
 
     def append_to_pdf(self, pdf):
+        """Append PDF objects."""
         if self.print_all_motions:
             motions_to_pdf(pdf)
         else:
@@ -400,6 +470,7 @@ motion_detail_pdf = MotionPDFView.as_view(print_all_motions=False)
 
 
 class Config(FormView):
+    """The View for the config tab."""
     permission_required = 'config.can_manage_config'
     form_class = ConfigForm
     template_name = 'motion/config.html'
@@ -431,9 +502,8 @@ class Config(FormView):
 
 
 def register_tab(request):
-    """
-    Register the projector tab.
-    """
+    """Return the motion tab."""
+    # TODO: Find a bether way to set the selected var.
     selected = request.path.startswith('/motion/')
     return Tab(
         title=_('Motions'),
@@ -445,6 +515,10 @@ def register_tab(request):
 
 
 def get_widgets(request):
+    """Return the motion widgets for the dashboard.
+
+    There is only one widget. It shows all motions.
+    """
     return [Widget(
         name='motions',
         display_name=_('Motions'),
diff --git a/openslides/motion/workflow.py b/openslides/motion/workflow.py
index 813e0c537..2efbf803e 100644
--- a/openslides/motion/workflow.py
+++ b/openslides/motion/workflow.py
@@ -1,16 +1,44 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+    openslides.utils.workflow
+    ~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    Defines the States for motions. All States are linked together with there
+    'next_state' attributes. Together there are a workflow.
+
+    :copyright: (c) 2011-2013 by the OpenSlides team, see AUTHORS.
+    :license: GNU GPL, see LICENSE for more details.
+"""
+
 from django.conf import settings
 from django.core import exceptions
 from django.utils.importlib import import_module
+from django.utils.translation import ugettext_noop,
 
 from openslides.config.models import config
-ugettext = lambda s: s
 
 _workflow = None
 
 
 class State(object):
+    """Define a state for a motion."""
     def __init__(self, id, name, next_states=[], create_poll=False, support=False,
                  edit_as_submitter=False, version_permission=True):
+        """Set attributes for the state.
+
+        The Arguments are:
+        - 'id' a unique id for the state.
+        - 'name' a string representing the state.
+        - 'next_states' a list with all states, that can be choosen from this state.
+
+        All the other arguments are boolean values. If True, the specific action for
+        motions in this state.
+        - 'create_poll': polls can be created in this state.
+        - 'support': persons can support the motion in this state.
+        - 'edit_as_submitter':  the submitter can edit the motion in this state.
+        - 'version_permission': new versions are not permitted.
+        """
         self.id = id
         self.name = name
         self.next_states = next_states
@@ -20,19 +48,34 @@ class State(object):
         self.version_permission = version_permission
 
     def __unicode__(self):
+        """Return the name of the state."""
         return self.name
 
 
 class WorkflowError(Exception):
+    """Exception raised when errors in a state accure."""
     pass
 
 
 def motion_workflow_choices():
+    """Return all possible workflows.
+
+    The possible workflows can be set in the settings with the setting
+    'MOTION_WORKFLOW'.
+    """
     for workflow in settings.MOTION_WORKFLOW:
         yield workflow[0], workflow[1]
 
 
 def get_state(state='default'):
+    """Return a state object.
+
+    The argument 'state' has to be a state_id.
+
+    If the argument 'state' is 'default', the default state is returned.
+
+    The default state is the state object choosen in the config tab.
+    """
     global _workflow
     if _workflow is not None:
         try:
@@ -68,24 +111,34 @@ def get_state(state='default'):
 
 
 def populate_workflow(state, workflow):
+    """Append all 'next_states' from state to the workflow.
+
+    The argument state has to be a state object.
+
+    The argument workflow has to be a dictonary.
+
+    Calls this function recrusiv with all next_states from the next_states states.
+    """
     workflow[state.id] = state
     for s in state.next_states:
         if s.id not in workflow:
             populate_workflow(s, workflow)
 
 
-DUMMY_STATE = State('dummy', ugettext('Unknwon state'))
+DUMMY_STATE = State('dummy', ugettext_noop('Unknwon state'))
+"""A dummy state object. Returned, if the state_id is not known."""
 
-default_workflow = State('pub', ugettext('Published'), support=True,
+default_workflow = State('pub', ugettext_noop('Published'), support=True,
                          edit_as_submitter=True, version_permission=False)
+"""Default Workflow for OpenSlides."""
 
 default_workflow.next_states = [
-    State('per', ugettext('Permitted'), create_poll=True, edit_as_submitter=True, next_states=[
-        State('acc', ugettext('Accepted')),
-        State('rej', ugettext('Rejected')),
-        State('wit', ugettext('Withdrawed')),
-        State('adj', ugettext('Adjourned')),
-        State('noc', ugettext('Not Concerned')),
-        State('com', ugettext('Commited a bill')),
-        State('rev', ugettext('Needs Review'))]),
-    State('nop', ugettext('Rejected (not authorized)'))]
+    State('per', ugettext_noop('Permitted'), create_poll=True, edit_as_submitter=True, next_states=[
+        State('acc', ugettext_noop('Accepted')),
+        State('rej', ugettext_noop('Rejected')),
+        State('wit', ugettext_noop('Withdrawed')),
+        State('adj', ugettext_noop('Adjourned')),
+        State('noc', ugettext_noop('Not Concerned')),
+        State('com', ugettext_noop('Commited a bill')),
+        State('rev', ugettext_noop('Needs Review'))]),
+    State('nop', ugettext_noop('Rejected (not authorized)'))]

From 042f1a85710a2de11c59080e10aba3c1ff18c0d8 Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Tue, 5 Feb 2013 18:49:32 +0100
Subject: [PATCH 76/88] Fixed typo

---
 openslides/motion/workflow.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openslides/motion/workflow.py b/openslides/motion/workflow.py
index 2efbf803e..929485fc4 100644
--- a/openslides/motion/workflow.py
+++ b/openslides/motion/workflow.py
@@ -14,7 +14,7 @@
 from django.conf import settings
 from django.core import exceptions
 from django.utils.importlib import import_module
-from django.utils.translation import ugettext_noop,
+from django.utils.translation import ugettext_noop
 
 from openslides.config.models import config
 

From 0c5459f96eafe586f6d7f15dff31b65372844dec Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Tue, 5 Feb 2013 20:40:55 +0100
Subject: [PATCH 77/88] template: Removed old icons. Added some new glyphicons.
 Updated template style. Some fixes.

---
 .../agenda/static/images/icons/summary.png    | Bin 299 -> 0 bytes
 openslides/agenda/static/styles/agenda.css    |  14 ----
 .../static/javascript/assignment.js           |  21 +++---
 .../assignment/static/styles/assignment.css   |  16 +----
 .../assignment/templates/assignment/view.html |  39 +++++++----
 .../templates/projector/Assignment.html       |  14 ++--
 .../motion/templates/motion/base_motion.html  |  66 ------------------
 openslides/motion/templates/motion/view.html  |  26 +++----
 .../motion/templates/projector/Motion.html    |  14 ++--
 .../participant/static/styles/participant.css |  16 -----
 .../templates/participant/group_overview.html |  32 ++++++---
 .../projector/static/images/icons/clock.png   | Bin 1273 -> 0 bytes
 .../static/images/icons/document-save.png     | Bin 563 -> 0 bytes
 .../projector/static/images/icons/go-down.png | Bin 562 -> 0 bytes
 .../projector/static/images/icons/go-up.png   | Bin 532 -> 0 bytes
 .../projector/static/images/icons/pause.png   | Bin 484 -> 0 bytes
 .../projector/static/images/icons/play.png    | Bin 501 -> 0 bytes
 .../static/images/icons/skip-backward.png     | Bin 511 -> 0 bytes
 .../static/images/icons/spin-down.png         | Bin 269 -> 0 bytes
 .../projector/static/images/icons/spin-up.png | Bin 255 -> 0 bytes
 .../static/images/icons/view-reset.png        | Bin 370 -> 0 bytes
 .../projector/static/images/icons/zoom-in.png | Bin 867 -> 0 bytes
 .../static/images/icons/zoom-out.png          | Bin 884 -> 0 bytes
 .../static/img/glyphicons_054_clock.png       | Bin 0 -> 1376 bytes
 .../static/{images => img}/logo-projector.png | Bin
 .../presentation-header-bg.png                | Bin
 .../projector/static/styles/projector.css     |   4 +-
 .../projector/templates/base-projector.html   |   2 +-
 .../static/images/icons/accept-grey.png       | Bin 3142 -> 0 bytes
 openslides/static/images/icons/accept.png     | Bin 924 -> 0 bytes
 openslides/static/images/icons/add-user.png   | Bin 821 -> 0 bytes
 openslides/static/images/icons/add.png        | Bin 564 -> 0 bytes
 openslides/static/images/icons/clear.png      | Bin 644 -> 0 bytes
 openslides/static/images/icons/close-grey.png | Bin 379 -> 0 bytes
 openslides/static/images/icons/close.png      | Bin 654 -> 0 bytes
 openslides/static/images/icons/cross.png      | Bin 2836 -> 0 bytes
 openslides/static/images/icons/delete.png     | Bin 640 -> 0 bytes
 .../static/images/icons/dialog-cancel.png     | Bin 848 -> 0 bytes
 .../static/images/icons/dialog-ok-apply.png   | Bin 597 -> 0 bytes
 openslides/static/images/icons/dialog-ok.png  | Bin 601 -> 0 bytes
 openslides/static/images/icons/done-grey.png  | Bin 413 -> 0 bytes
 openslides/static/images/icons/done.png       | Bin 756 -> 0 bytes
 openslides/static/images/icons/edit.png       | Bin 726 -> 0 bytes
 openslides/static/images/icons/error.png      | Bin 722 -> 0 bytes
 openslides/static/images/icons/export.png     | Bin 614 -> 0 bytes
 openslides/static/images/icons/guest.png      | Bin 636 -> 0 bytes
 openslides/static/images/icons/import.png     | Bin 609 -> 0 bytes
 .../static/images/icons/information.png       | Bin 803 -> 0 bytes
 openslides/static/images/icons/number.png     | Bin 694 -> 0 bytes
 openslides/static/images/icons/off.png        | Bin 489 -> 0 bytes
 openslides/static/images/icons/on.png         | Bin 757 -> 0 bytes
 openslides/static/images/icons/pdf.png        | Bin 688 -> 0 bytes
 openslides/static/images/icons/preview.png    | Bin 808 -> 0 bytes
 openslides/static/images/icons/projector.png  | Bin 720 -> 0 bytes
 .../static/images/icons/reject-grey.png       | Bin 3081 -> 0 bytes
 openslides/static/images/icons/reject.png     | Bin 842 -> 0 bytes
 .../static/images/icons/remove-user.png       | Bin 707 -> 0 bytes
 openslides/static/images/icons/remove.png     | Bin 332 -> 0 bytes
 openslides/static/images/icons/revert.png     | Bin 794 -> 0 bytes
 openslides/static/images/icons/statistics.png | Bin 495 -> 0 bytes
 openslides/static/images/icons/undo.png       | Bin 866 -> 0 bytes
 .../static/images/icons/user-information.png  | Bin 825 -> 0 bytes
 openslides/static/images/icons/warning.png    | Bin 741 -> 0 bytes
 .../static/img/glyphicons_006_user_add.png    | Bin 0 -> 1044 bytes
 .../icons => img}/voting-abstention.png       | Bin
 .../{images/icons => img}/voting-invalid.png  | Bin
 .../{images/icons => img}/voting-no.png       | Bin
 .../{images/icons => img}/voting-total.png    | Bin
 .../{images/icons => img}/voting-yes-grey.png | Bin
 .../{images/icons => img}/voting-yes.png      | Bin
 openslides/static/styles/base.css             |   6 ++
 71 files changed, 93 insertions(+), 177 deletions(-)
 delete mode 100644 openslides/agenda/static/images/icons/summary.png
 delete mode 100644 openslides/motion/templates/motion/base_motion.html
 delete mode 100644 openslides/projector/static/images/icons/clock.png
 delete mode 100644 openslides/projector/static/images/icons/document-save.png
 delete mode 100644 openslides/projector/static/images/icons/go-down.png
 delete mode 100644 openslides/projector/static/images/icons/go-up.png
 delete mode 100644 openslides/projector/static/images/icons/pause.png
 delete mode 100644 openslides/projector/static/images/icons/play.png
 delete mode 100644 openslides/projector/static/images/icons/skip-backward.png
 delete mode 100644 openslides/projector/static/images/icons/spin-down.png
 delete mode 100644 openslides/projector/static/images/icons/spin-up.png
 delete mode 100644 openslides/projector/static/images/icons/view-reset.png
 delete mode 100644 openslides/projector/static/images/icons/zoom-in.png
 delete mode 100644 openslides/projector/static/images/icons/zoom-out.png
 create mode 100644 openslides/projector/static/img/glyphicons_054_clock.png
 rename openslides/projector/static/{images => img}/logo-projector.png (100%)
 rename openslides/projector/static/{images => img}/presentation-header-bg.png (100%)
 delete mode 100644 openslides/static/images/icons/accept-grey.png
 delete mode 100644 openslides/static/images/icons/accept.png
 delete mode 100644 openslides/static/images/icons/add-user.png
 delete mode 100644 openslides/static/images/icons/add.png
 delete mode 100644 openslides/static/images/icons/clear.png
 delete mode 100644 openslides/static/images/icons/close-grey.png
 delete mode 100644 openslides/static/images/icons/close.png
 delete mode 100644 openslides/static/images/icons/cross.png
 delete mode 100644 openslides/static/images/icons/delete.png
 delete mode 100644 openslides/static/images/icons/dialog-cancel.png
 delete mode 100644 openslides/static/images/icons/dialog-ok-apply.png
 delete mode 100644 openslides/static/images/icons/dialog-ok.png
 delete mode 100644 openslides/static/images/icons/done-grey.png
 delete mode 100644 openslides/static/images/icons/done.png
 delete mode 100644 openslides/static/images/icons/edit.png
 delete mode 100644 openslides/static/images/icons/error.png
 delete mode 100644 openslides/static/images/icons/export.png
 delete mode 100644 openslides/static/images/icons/guest.png
 delete mode 100644 openslides/static/images/icons/import.png
 delete mode 100644 openslides/static/images/icons/information.png
 delete mode 100644 openslides/static/images/icons/number.png
 delete mode 100644 openslides/static/images/icons/off.png
 delete mode 100644 openslides/static/images/icons/on.png
 delete mode 100644 openslides/static/images/icons/pdf.png
 delete mode 100644 openslides/static/images/icons/preview.png
 delete mode 100644 openslides/static/images/icons/projector.png
 delete mode 100644 openslides/static/images/icons/reject-grey.png
 delete mode 100644 openslides/static/images/icons/reject.png
 delete mode 100644 openslides/static/images/icons/remove-user.png
 delete mode 100644 openslides/static/images/icons/remove.png
 delete mode 100644 openslides/static/images/icons/revert.png
 delete mode 100644 openslides/static/images/icons/statistics.png
 delete mode 100644 openslides/static/images/icons/undo.png
 delete mode 100644 openslides/static/images/icons/user-information.png
 delete mode 100644 openslides/static/images/icons/warning.png
 create mode 100644 openslides/static/img/glyphicons_006_user_add.png
 rename openslides/static/{images/icons => img}/voting-abstention.png (100%)
 rename openslides/static/{images/icons => img}/voting-invalid.png (100%)
 rename openslides/static/{images/icons => img}/voting-no.png (100%)
 rename openslides/static/{images/icons => img}/voting-total.png (100%)
 rename openslides/static/{images/icons => img}/voting-yes-grey.png (100%)
 rename openslides/static/{images/icons => img}/voting-yes.png (100%)

diff --git a/openslides/agenda/static/images/icons/summary.png b/openslides/agenda/static/images/icons/summary.png
deleted file mode 100644
index 0f8264c78d78dbbea7fa8f458a86f5394e0f61d1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 299
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~&H|6fVxZ#d
zAk65bF}ngN$X?><>&kwUk(E)CS^wIs#Xup~0G|+7APoU*Ntf7?E_0_p5Xn5{+kH8t
z`)JGR3*8&9Z{ECl%a$!$w{G3Jeao)%kI$SrfA;M8Yu9evyZ7Mv^Oyhr{Re`yCss8;
zQ<zJF{DK)IjF0cNoe1PICV9KNh}B$NAqnIJc)B=-RNQJkf10mBfyd=y(EX+)!RP<&
zL(Pr^iOqZJYwUTl@UY<Hzyn8qh81yox~$Wh%D_^Sb>s1}!-eZk--+wFyrAj--46$I
g4&-IjzSzGt?v*H?vj6d;ULe<dy85}Sb4q9e0CCNBC;$Ke

diff --git a/openslides/agenda/static/styles/agenda.css b/openslides/agenda/static/styles/agenda.css
index 3851b9db8..27cb3d47c 100644
--- a/openslides/agenda/static/styles/agenda.css
+++ b/openslides/agenda/static/styles/agenda.css
@@ -5,20 +5,6 @@
  * :license: GNU GPL, see LICENSE for more details.
  */
 
-/* agenda item open/closed */
-.close_link span {
-    background-image: url(../images/icons/close-grey.png);
-    background-repeat: no-repeat;
-    background-position: center;
-    width: 16px;
-    height: 16px;
-    display: inline-block;
-}
-
-.close_link.closed span {
-    background-image: url(../images/icons/close.png);
-}
-
 tr.topline td {
     border-bottom: 1px solid #333333;
     background-color: #CDCDCD;
diff --git a/openslides/assignment/static/javascript/assignment.js b/openslides/assignment/static/javascript/assignment.js
index 9198434a0..1f3efd113 100644
--- a/openslides/assignment/static/javascript/assignment.js
+++ b/openslides/assignment/static/javascript/assignment.js
@@ -24,9 +24,6 @@ $(function() {
                     line.parent().parent().children('td').addClass('elected')
                 }
                 line.attr('href', data.link);
-            },
-            error: function () {
-                alert("Ajax Error");
             }
         });
     });
@@ -48,22 +45,24 @@ $(function() {
             }
         });
     });
+    // change publish status of ballot
     $('.publish_link').click(function(event) {
         event.preventDefault();
-        link = $(this);
+        var link = $(this);
         $.ajax({
             type: 'GET',
-            url: link.attr('href'),
+            url: $(this).attr('href'),
             dataType: 'json',
             success: function(data) {
                 if (data.published) {
-                    link.addClass('published');
-                    //link.attr('title', gettext('Unpublish ballot'))
+                    newclass = 'icon-checked-new_white';
+                    link.addClass('btn-primary');
                 } else {
-                    link.removeClass('published');
-                    //link.attr('title', 'Publish ballot')
+                    newclass = 'icon-unchecked-new';
+                    link.removeClass('btn-primary');
                 }
+                link.children('i').removeClass('icon-checked-new_white icon-unchecked-new').addClass(newclass);
+                link.attr('href', data.link);
             }
         });
-    });
-});
+    });});
diff --git a/openslides/assignment/static/styles/assignment.css b/openslides/assignment/static/styles/assignment.css
index 4079471c7..4a84a9189 100644
--- a/openslides/assignment/static/styles/assignment.css
+++ b/openslides/assignment/static/styles/assignment.css
@@ -10,7 +10,7 @@ td.elected {
 }
 
 td.elected a.election_link {
-    background-image: url(../images/icons/voting-yes.png);
+    background-image: url(../img/voting-yes.png);
     background-repeat: no-repeat;
     background-position: center;
     width: 16px;
@@ -21,7 +21,7 @@ td.elected a.election_link {
 }
 
 td a.election_link {
-    background-image: url(../images/icons/voting-yes-grey.png);
+    background-image: url(../img/voting-yes-grey.png);
     background-repeat: no-repeat;
     background-position: center;
     width: 16px;
@@ -30,15 +30,3 @@ td a.election_link {
     margin-right: 5px;
     float: left;
 }
-
-a.publish_link span {
-    background-image: url(../images/icons/off.png);
-    background-repeat: no-repeat;
-    background-position: center;
-    width: 16px;
-    height: 16px;
-    display: inline-block;
-}
-a.publish_link.published span {
-    background-image: url(../images/icons/on.png);
-}
diff --git a/openslides/assignment/templates/assignment/view.html b/openslides/assignment/templates/assignment/view.html
index cab84e86c..743117126 100644
--- a/openslides/assignment/templates/assignment/view.html
+++ b/openslides/assignment/templates/assignment/view.html
@@ -77,7 +77,9 @@
                 | <b>{% trans "elected" %}</b>
                 {% if perms.assignment.can_manage_assignment %}
                     {% if assignment.status == "sea" or assignment.status == "vot" %}
-                        <a href="{% url 'assignment_user_not_elected' assignment.id person.person_id %}"><img src="{% static 'images/icons/dialog-cancel.png' %}" title="{% trans 'Mark candidate as not elected' %}"></a>
+                        <a class="btn btn-mini" href="{% url 'assignment_user_not_elected' assignment.id person.person_id %}" rel="tooltip" data-original-title="{% trans 'Mark candidate as not elected' %}">
+                            <i class="icon-ban-circle"></i>
+                        </a>
                     {% endif %}
                 {% endif %}
             {% endif %}
@@ -107,9 +109,9 @@
                 <label>{{ field.label }}:</label>
                 <div class="input-append">
                     {{ field }}
-                    <button class="btn btn-primary" type="submit">{% trans 'Apply' %}</button>
+                    <button class="btn btn-primary" type="submit" title="{% trans 'Apply' %}"><i class="icon-ok icon-white"></i></button>
                     {% if perms.participant.can_see_participant and perms.participant.can_manage_participant %}
-                        <a href="{% url 'user_new' %}" target="_blank" class="btn"><img src="{% static 'images/icons/add-user.png' %}" title="{% trans 'Add new participant' %}"></a>
+                        <a href="{% url 'user_new' %}" target="_blank" class="btn"  title="{% trans 'Add new participant' %}"><i class="icon-add-user"></i></a>
                     {% endif %}
                 </div>
             {% endfor %}
@@ -126,7 +128,10 @@
     <ul>
     {% for person in blocked_candidates %}
         <li>
-            {{ person }}<a href="{% url 'assignment_delother' assignment.id person.person_id %}"><img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Remove candidate' %}"></a>
+            {{ person }}
+            <a class="btn btn-mini" href="{% url 'assignment_delother' assignment.id person.person_id %}" title="{% trans 'Remove candidate' %}">
+                <i class="icon-ban-circle"></i>
+            </a>
         </li>
     {% empty %}
         <li>{% trans "No blocked candidates available." %}</li>
@@ -155,10 +160,14 @@
                     {{ poll.get_ballot }}. {% trans 'ballot' %}
                     {% if perms.assignment.can_manage_assignment %}
                         <br>
-                        <a class="publish_link {% if poll.published %}published{% endif %}"
+                        <a class="publish_link btn btn-mini {% if poll.published %}btn-primary{% endif %}"
                         href="{% url 'assignment_poll_publish_status' poll.id %}"
-                        title="{% trans 'Publish/unpublish results' %}">
-                        <span></span>
+                        rel="tooltip" data-original-title="{% trans 'Publish/unpublish results' %}">
+                        {% if poll.published %}
+                            <i class="icon-checked-new_white"></i>
+                            {% else %}
+                            <i class="icon-unchecked-new"></i>
+                            {% endif %}
                         </a>
                         <a href="{% url 'assignment_poll_view' poll.id %}" class="btn btn-mini" title="{% trans 'Edit' %}"><i class="icon-pencil"></i></a>
                         <a href="{% url 'assignment_poll_delete' poll.id %}" class="btn btn-mini" title="{% trans 'Delete' %}"><i class="icon-remove"></i></a>
@@ -178,10 +187,10 @@
             <td>
                 {% if candidate in assignment.elected %}
                     {% if perms.assignment.can_manage_assignment %}
-                        <a class="election_link elected" href="{% url 'assignment_user_not_elected assignment.id' candidate.person_id %}"></a>
+                        <a class="election_link elected" href="{% url 'assignment_user_not_elected' assignment.id candidate.person_id %}"></a>
                     {% else %}
                         <a class="elected">
-                            <img src="{% static 'images/icons/voting-yes.png' %}" title="{% trans 'Candidate is elected' %}">
+                            <img src="{% static 'img/voting-yes.png' %}" title="{% trans 'Candidate is elected' %}">
                         </a>
                     {% endif %}
                 {% else %}
@@ -194,11 +203,11 @@
             {% for vote in poll_list %}
                 <td style="white-space:nowrap;">
                     {% if 'Yes' in vote and 'No' in vote and 'Abstain' in vote %}
-                        <img src="{% static 'images/icons/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ vote.Yes }}<br>
-                        <img src="{% static 'images/icons/voting-no.png' %}" title="{% trans 'No' %}"> {{ vote.No }}<br>
-                        <img src="{% static 'images/icons/voting-abstention.png' %}" title="{% trans 'Abstention' %}"> {{ vote.Abstain }}<br>
+                        <img src="{% static 'img/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ vote.Yes }}<br>
+                        <img src="{% static 'img/voting-no.png' %}" title="{% trans 'No' %}"> {{ vote.No }}<br>
+                        <img src="{% static 'img/voting-abstention.png' %}" title="{% trans 'Abstention' %}"> {{ vote.Abstain }}<br>
                     {% elif 'Votes' in vote %}
-                        <img src="{% static 'images/icons/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ vote.Votes }}
+                        <img src="{% static 'img/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ vote.Votes }}
                     {% elif vote == None %}
                         {% trans 'was not a <br> candidate'%}
                     {% else %}
@@ -217,7 +226,7 @@
                 {% if poll.published or perms.assignment.can_manage_assignment %}
                     <td style="white-space:nowrap;">
                         {% if poll.has_votes %}
-                            <img src="{% static 'images/icons/voting-invalid.png' %}" title="{% trans 'Invalid' %}">
+                            <img src="{% static 'img/voting-invalid.png' %}" title="{% trans 'Invalid' %}">
                             {{ poll.print_votesinvalid }}
                         {% endif %}
                     </td>
@@ -233,7 +242,7 @@
                 {% if poll.published or perms.assignment.can_manage_assignment %}
                     <td style="white-space:nowrap;">
                         {% if poll.has_votes %}
-                            <img src="{% static 'images/icons/voting-total.png' %}" title="{% trans 'Votes cast' %}">
+                            <img src="{% static 'img/voting-total.png' %}" title="{% trans 'Votes cast' %}">
                             <strong>{{ poll.print_votescast }}</strong>
                         {% endif %}
                     </td>
diff --git a/openslides/assignment/templates/projector/Assignment.html b/openslides/assignment/templates/projector/Assignment.html
index 35c10f64b..761e70bf1 100644
--- a/openslides/assignment/templates/projector/Assignment.html
+++ b/openslides/assignment/templates/projector/Assignment.html
@@ -66,7 +66,7 @@
                 <td class="candidate{% if candidate in assignment.elected %} elected{% endif %}">
                     {% if candidate in assignment.elected %}
                         <a class="elected">
-                            <img src="{% static 'images/icons/voting-yes.png' %}" title="{% trans 'Candidate is elected' %}">
+                            <img src="{% static 'img/voting-yes.png' %}" title="{% trans 'Candidate is elected' %}">
                         </a>
                     {% endif %}
                     {{ candidate }}
@@ -75,11 +75,11 @@
                 <td style="white-space:nowrap;"{% if candidate in assignment.elected %} class="elected"{% endif %}>
                     {% if not assignment_publish_winner_results_only or candidate in assignment.elected %}
                         {% if 'Yes' in vote and 'No' in vote and 'Abstain' in vote %}
-                            <img src="{% static 'images/icons/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ vote.Yes }}<br>
-                            <img src="{% static 'images/icons/voting-no.png' %}" title="{% trans 'No' %}"> {{ vote.No }}<br>
-                            <img src="{% static 'images/icons/voting-abstention.png' %}" title="{% trans 'Abstention' %}"> {{ vote.Abstain }}<br>
+                            <img src="{% static 'img/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ vote.Yes }}<br>
+                            <img src="{% static 'img/voting-no.png' %}" title="{% trans 'No' %}"> {{ vote.No }}<br>
+                            <img src="{% static 'img/voting-abstention.png' %}" title="{% trans 'Abstention' %}"> {{ vote.Abstain }}<br>
                         {% elif 'Votes' in vote %}
-                            <img src="{% static 'images/icons/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ vote.Votes }}
+                            <img src="{% static 'img/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ vote.Votes }}
                         {% elif vote == None %}
                             {% trans 'was not a <br> candidate'%}
                         {% else %}
@@ -97,7 +97,7 @@
             {% for poll in polls %}
                 <td style="white-space:nowrap;">
                     {% if  poll.has_votes %}
-                        <img src="{% static 'images/icons/voting-invalid.png' %}" title="{% trans 'Invalid' %}">
+                        <img src="{% static 'img/voting-invalid.png' %}" title="{% trans 'Invalid' %}">
                         {{ poll.print_votesinvalid }}
                     {% endif %}
                 </td>
@@ -112,7 +112,7 @@
 
                 <td style="white-space:nowrap;">
                     {% if poll.has_votes %}
-                        <img src="{% static 'images/icons/voting-total.png' %}" title="{% trans 'Votes cast' %}">
+                        <img src="{% static 'img/voting-total.png' %}" title="{% trans 'Votes cast' %}">
                         <strong>{{ poll.print_votescast }}</strong>
                     {% endif %}
                 </td>
diff --git a/openslides/motion/templates/motion/base_motion.html b/openslides/motion/templates/motion/base_motion.html
deleted file mode 100644
index 0dc5846a6..000000000
--- a/openslides/motion/templates/motion/base_motion.html
+++ /dev/null
@@ -1,66 +0,0 @@
-{% extends "base.html" %}
-
-{% load tags %}
-{% load i18n %}
-{% load staticfiles %}
-
-{% block submenu %}
-    {% url 'motion_overview' as url_motionoverview %}
-    <h4>{% trans "Motions" %}</h4>
-    <ul>
-        <li class="{% if request.path == url_motionoverview %}selected{% endif %}"><a href="{% url 'motion_overview' %}">{% trans "All motions" %}</a></li>
-        {% if perms.motion.can_create_motion or perms.motion.can_manage_motion %}
-            <li class="{% active request '/motion/new' %}"><a href="{% url 'motion_new' %}">{% trans "New motion" %}</a></li>
-        {% endif %}
-        {% if perms.motion.can_manage_motion %}
-            <li class="{% active request '/motion/import' %}"><a href="{% url 'motion_import' %}">{% trans 'Import motions' %}</a></li>
-        {% endif %}
-        <li><a href="{% url 'print_motions' %}"><img src="{% static 'images/icons/pdf.png' %}"> {% trans 'All motions as PDF' %}</a></li>
-    </ul>
-
-    {# second submenu #}
-    {% if motion %}
-        <br>
-        <h3>{% trans "Motion No." %}
-            {% if motion.number != None %}
-                {{ motion.number }}
-            {% else %}
-                <i>[-]</i>
-            {% endif %}
-        </h3>
-        <ul>
-        {# view motion #}
-            {% url 'motion_view' motion.id as url_motionview %}
-            <li class="{% if request.path == url_motionview %}selected{% endif %}"><a href="{% url 'motion_view' motion.id  %}">{% trans 'View motion' %}</a></li>
-        {# edit motion #}
-            {% if "edit" in actions %}
-            {% url 'motion_edit' motion.id as url_motionedit %}
-            <li class="{% if request.path == url_motionedit %}selected{% endif %}"><a href="{% url 'motion_edit' motion.id  %}"><img src="{% static 'images/icons/edit.png' %}"> {% trans 'Edit motion' %}</a></li>
-            {% endif %}
-        {# delete motion #}
-            {% if "delete" in actions %}
-            <li><a href="{% url 'motion_delete' motion.id  %}"><img src="{% static 'images/icons/delete.png' %}"> {% trans 'Delete motion' %}</a></li>
-            {% endif %}
-        {# PDF #}
-            <li><a href="{% url 'print_motion' motion.id  %}"><img src="{% static 'images/icons/pdf.png' %}"> {% trans 'Motion as PDF' %}</a></li>
-        {# activate and polls #}
-            {% if perms.projector.can_manage_projector %}
-                <li>
-                    <a class="activate_link {% if item.active %}active{% endif %}" href="{% url 'projector_activate_slide' motion.sid  %}"><img src="{% static 'images/icons/projector.png' %}"> {% trans 'Show Motion' %}</a>
-                </li>
-            {% endif %}
-            {% if perms.motion.can_manage_motion %}
-                {% for poll in motion.polls %}
-                    {% url 'motion_poll_view' poll.id as url_motionpollview %}
-                    <li class="{% if request.path == url_motionpollview %}selected{% endif %}"><a href="{% url 'motion_poll_view' poll.id %}"><img src="{% static 'images/icons/edit.png' %}"> {{ forloop.counter }}. {% trans "Vote" %}</a></li>
-                {% endfor %}
-            {% endif %}
-        {# Agenda Item #}
-            {% if perms.agenda.can_manage_agenda %}
-            <li>
-                <a href="{% url 'motion_create_agenda' motion.id  %}">{% trans 'New agenda item' %}</a>
-            </li>
-            {% endif %}
-        </ul>
-    {% endif %}
-{% endblock %}
diff --git a/openslides/motion/templates/motion/view.html b/openslides/motion/templates/motion/view.html
index de7d03936..b3e9256ab 100644
--- a/openslides/motion/templates/motion/view.html
+++ b/openslides/motion/templates/motion/view.html
@@ -43,7 +43,7 @@
             <ul class="dropdown-menu pull-right">
                 <!-- edit -->
                 {% if "edit" in actions %}
-                     <li><a href="{% url 'motion_edit' motion.id  %}"><i class="icon-edit"></i> {% trans 'Edit motion' %}</a></li>
+                     <li><a href="{% url 'motion_edit' motion.id  %}"><i class="icon-pencil"></i> {% trans 'Edit motion' %}</a></li>
                 {% endif %}
                 <!-- delete -->
                 {% if "delete" in actions %}
@@ -70,11 +70,11 @@
 <div class="row-fluid">
 <div class="span8">
     {% if motion.public_version != motion.last_version %}
-        &#8901;
+        <span class="label label-warning"><i class="icon-warning-sign icon-white"></i>
         {% if version == motion.public_version %}
-            {% trans "This is not the newest version." %} <a href="{% url 'motion_view_newest' motion.id %}">{% trans "Go to version" %} {{ motion.last_version.aid }}.</a>
+            {% trans "This is not the newest version." %}</span> <a href="{% url 'motion_view_newest' motion.id %}">{% trans "Go to version" %} {{ motion.last_version.aid }}.</a>
         {% else %}
-            {% trans "This is not the authorized version." %} <a href="{% url 'motion_view' motion.id %}">{% trans "Go to version" %} {{ motion.public_version.aid }}.</a>
+            {% trans "This is not the authorized version." %}</span> <a href="{% url 'motion_view' motion.id %}">{% trans "Go to version" %} {{ motion.public_version.aid }}.</a>
         {% endif %}
     {% endif %}
 
@@ -107,17 +107,17 @@
             <td style="white-space:nowrap;">
             {% if motion.status != "pub" %}
             {% if revision == motion.permitted %}
-                 <img title="{% trans 'Version authorized' %}" src="{% static 'images/icons/accept.png' %}">
+                 <span class="badge badge-success" title="{% trans 'This version is authorized' %}"><i class="icon-ok icon-white"></i></span>
             {% else %}
                  {% if perms.motion.can_manage_motion %}
-                     <a href="{% url 'motion_version_permit' revision.id %}"><img title="{% trans 'Permit Version' %}" src="{% static 'images/icons/accept-grey.png' %}"></a>
+                     <a class="btn btn-mini" href="{% url 'motion_version_permit' revision.id %}" title="{% trans 'Permit this version' %}"><i class="icon-ok"></i></a>
                  {% endif %}
                  {% if not revision.rejected and revision.id > motion.permitted.id and perms.motion.can_manage_motion %}
-                     <a href="{% url 'motion_version_reject' revision.id %}"><img title="{% trans 'Reject Version' %}" src="{% static 'images/icons/reject-grey.png' %}"></a>
+                     <a class="btn btn-mini" href="{% url 'motion_version_reject' revision.id %}" title="{% trans 'Reject this version' %}"><i class="icon-ban-circle"></i></a>
                  {% endif %}
             {% endif %}
             {% if revision.rejected %}
-                <img title="{% trans 'Version rejected' %}" src="{% static 'images/icons/reject.png' %}">
+                <span class="badge badge-important" title="{% trans 'This version is rejected' %}"><i class="icon-ban-circle icon-white"></i></span>
             {% endif %}
             {% endif %}
             </td>
@@ -216,12 +216,12 @@
                     <br>
                     {% if poll.has_votes %}
                         {% with poll.get_options.0 as option %}
-                            <img src="{% static 'images/icons/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ option.Yes }}<br>
-                            <img src="{% static 'images/icons/voting-no.png' %}" title="{% trans 'No' %}"> {{ option.No }}<br>
-                            <img src="{% static 'images/icons/voting-abstention.png' %}" title="{% trans 'Abstention' %}"> {{ option.Abstain }}<br>
-                            <img src="{% static 'images/icons/voting-invalid.png' %}" title="{% trans 'Invalid' %}"> {{ poll.print_votesinvalid }}<br>
+                            <img src="{% static 'img/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ option.Yes }}<br>
+                            <img src="{% static 'img/voting-no.png' %}" title="{% trans 'No' %}"> {{ option.No }}<br>
+                            <img src="{% static 'img/voting-abstention.png' %}" title="{% trans 'Abstention' %}"> {{ option.Abstain }}<br>
+                            <img src="{% static 'img/voting-invalid.png' %}" title="{% trans 'Invalid' %}"> {{ poll.print_votesinvalid }}<br>
                             <div style="border-top: 1px solid; padding-top: 5px; margin: 5px 0; width: 10em;">
-                                <img src="{% static 'images/icons/voting-total.png' %}" title="{% trans 'Votes cast' %}"> {{ poll.print_votescast }}
+                                <img src="{% static 'img/voting-total.png' %}" title="{% trans 'Votes cast' %}"> {{ poll.print_votescast }}
                             </div>
                         {% endwith %}
                         {% if perms.motion.can_manage_motion %}
diff --git a/openslides/motion/templates/projector/Motion.html b/openslides/motion/templates/projector/Motion.html
index ab094313f..7ac6ae458 100644
--- a/openslides/motion/templates/projector/Motion.html
+++ b/openslides/motion/templates/projector/Motion.html
@@ -11,10 +11,10 @@
         <p><b>{% trans "Status" %}:</b><br>
         {% if motion.status != "pub" %}
             {% if motion.status == "acc" %}
-            <img src="{% static 'images/icons/voting-yes.png' %}">
+            <img src="{% static 'img/voting-yes.png' %}">
             {% endif %}
             {% if motion.status == "rej" %}
-            <img src="{% static 'images/icons/voting-no.png' %}">
+            <img src="{% static 'img/voting-no.png' %}">
             {% endif %}
             {% trans motion.get_status_display %}
         {% else %}
@@ -34,12 +34,12 @@
                 {% endif %}
                 {% with poll.get_options.0 as option %}
                 <div class="results">
-                    <img src="{% static 'images/icons/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ option.Yes }} <br>
-                    <img src="{% static 'images/icons/voting-no.png' %}" title="{% trans 'No' %}"> {{ option.No }} <br>
-                    <img src="{% static 'images/icons/voting-abstention.png' %}" title="{% trans 'Abstention' %}">  {{ option.Abstain }}<br>
-                    <img src="{% static 'images/icons/voting-invalid.png' %}" title="{% trans 'Invalid' %}"> {{ poll.print_votesinvalid }}<br>
+                    <img src="{% static 'img/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ option.Yes }} <br>
+                    <img src="{% static 'img/voting-no.png' %}" title="{% trans 'No' %}"> {{ option.No }} <br>
+                    <img src="{% static 'img/voting-abstention.png' %}" title="{% trans 'Abstention' %}">  {{ option.Abstain }}<br>
+                    <img src="{% static 'img/voting-invalid.png' %}" title="{% trans 'Invalid' %}"> {{ poll.print_votesinvalid }}<br>
                     <hr>
-                    <img src="{% static 'images/icons/voting-total.png' %}" title="{% trans 'Votes cast' %}"> {{ poll.print_votescast }}
+                    <img src="{% static 'img/voting-total.png' %}" title="{% trans 'Votes cast' %}"> {{ poll.print_votescast }}
                 </div>
                 {% endwith %}
             {% else %}
diff --git a/openslides/participant/static/styles/participant.css b/openslides/participant/static/styles/participant.css
index 0d656c9c8..20def00e1 100644
--- a/openslides/participant/static/styles/participant.css
+++ b/openslides/participant/static/styles/participant.css
@@ -4,19 +4,3 @@
  * :copyright: 2011, 2012 by OpenSlides team, see AUTHORS.
  * :license: GNU GPL, see LICENSE for more details.
  */
-
-a.status_link span {
-    background-repeat: no-repeat;
-    background-position: center;
-    width: 16px;
-    height: 16px;
-    display: inline-block;
-}
-
-a.status_link.deactivate span {
-    background-image: url(../images/icons/on.png);
-}
-
-a.status_link.activate span {
-    background-image: url(../images/icons/off.png);
-}
diff --git a/openslides/participant/templates/participant/group_overview.html b/openslides/participant/templates/participant/group_overview.html
index 3cdbfa171..256135dd6 100644
--- a/openslides/participant/templates/participant/group_overview.html
+++ b/openslides/participant/templates/participant/group_overview.html
@@ -17,20 +17,30 @@
     <table class="table table-striped table-bordered">
         <tr>
             <th>{% trans "Group" %}</th>
-            <th>{% trans "Actions" %}</th>
+            <th style="width: 1px;">{% trans "Actions" %}</th>
         </tr>
     {% for group in groups %}
-        <tr class="{% cycle '' 'odd' %}">
-            <td><a href="{% model_url group 'view' %}">{{ group.name }}</a></td>
-            <td><a href="{% url 'user_group_edit' group.id %}"><img src="{% static 'images/icons/edit.png' %}" title="{% trans 'Edit group' %}"></a>
-            {% if group.name|lower != 'anonymous' and group.name|lower != 'registered' %}
-            <a href="{% url 'user_group_delete' group.id %}"><img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Delete group' %}"></a>
-            {% endif %}
+        <tr class="{% if group.active %}activeline{% endif %}">
+            <td>
+                <a href="{% model_url group 'view' %}">{{ group.name }}</a>
+            </td>
+            <td>
+                <span style="width: 1px; white-space: nowrap;">
+                    {% if perms.projector.can_manage_projector %}
+                       <a href="{% url 'projector_activate_slide' group.sid  %}" class="activate_link btn {% if group.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show' %}">
+                           <i class="icon-facetime-video {% if group.active %}icon-white{% endif %}"></i>
+                       </a>
+                    {% endif %}
+                    <a href="{% url 'user_group_edit' group.id %}" title="{% trans 'Edit' %}" class="btn btn-mini">
+                        <i class="icon-pencil"></i>
+                    </a>
+                    {% if group.name|lower != 'anonymous' and group.name|lower != 'registered' %}
+                    <a href="{% url 'user_group_delete' group.id %}" title="{% trans 'Delete' %}" class="btn btn-mini">
+                        <i class="icon-remove"></i>
+                    </a>
+                    {% endif %}
+                </span>
             </td>
-        </tr>
-    {% empty %}
-        <tr>
-        <td colspan="5"><i>{% trans "No groups available." %}</i></td>
         </tr>
     {% endfor %}
     </table>
diff --git a/openslides/projector/static/images/icons/clock.png b/openslides/projector/static/images/icons/clock.png
deleted file mode 100644
index a7800ef210316d22fa014c1c9665e82ea3d3067e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1273
zcmYL{drXsO6vkV1fOyR?PByb8E)vbuv1y3Isg=<nsEjEIIPl6)bdoS}I;V4}ol{Fe
zDYbwUgswmga%)R1#nRe~El68z5n7-(dcV*cg;Ef9>i*a-=RN29-Z$sFoaechmYTF8
z^5aMZ0<j`_f8t@NYeOqyF=XHQ>ZMSSg@=<85G|7RR=8POu>WWw6ijF#pXzh2!e;oT
z<U{CiRoIf%5%Kv?!W9U_qEl%H)6sCGP$<-DwO+3`jO+Y<e;^RhYBffq(c|&V%ml3#
zv(;kpdOX2ku&%bo>-9RF&Z(&>5udBqYV9`LiR>)R=*Y~>jLYSko}MPxkmNF{+wBfa
zPxlFVeXn@%s5dg1Mx&W<I-tGk5uu9sh{xsfxg0*1D-Z~Tf>%nFN~Kg<%m!%m`FxX;
zlesyk&z{M}U@*mbdBp$@SB%HwaJZ6^lG4%#4<0@&D=RB6FDDQP#PV_?P*G6<iC9rt
z2~h<+h5)Lot1Bz3-&YceR9jnHUtdoqlPMHRLqkI&L}O!9W8+hxwYB-#ds;%Yx3_m-
zZg;e`QmIrLjYg-_J3Hx}3_62OXD}GgsjbhcZA>P!tE-E}Vs&?Sv)M1$Jv|%_hs)*i
z*eo88$A8hq=WzHuo`A;@3i(2zP$UwG#p2%H-q){R_XAR?L?VGClgS1K24G5W0C@<7
ztRHk4l=Tk|4!(Um1Pl)kE168CGBm1@k&)5S(Xp{H_2?*Qr&hysHQKf|U3<GurvoX+
zrPA^7af88NgfJRSCX>0Z&n%al&1Q?mVg;N|o6Tmo+Z}qn!)9^VYz~J5wm@9x#Ctp*
zmskv%f+B7&=<k6A@_BteZ!icN`2qou$q(W8gC9V8a1Pi2d@?&bJ2y8sKR>^)u;3?d
zn+KC^zjQeD2-FZL6lz~aMrLM6GdBCbk-<-?;EUbx9_afY0e_7eT9Bs?BqjFxXmKXE
z9!O5ym%c7~BX@6J)DP>!-L7jrS3IPQvi(N{Wlhh}n|D0FyPAtu)ZIEGLpP-tH2sOn
z&i-|irD5f^dMaKLe{@NB_{PqE?jf_5#TZWDC%5GvpBQ5uQAz(kCB3ovgGH3fZCC{V
z;J3b~1x|N*%ZxrLwm7;7QMYRMkIIUQ%Tvn9d^@+}i-g$BpvC{Pvb&CfkIK>i@zt!Z
zl(JNp$95OQ#NMdiyCFFKYER8E*KO^VW_8JIg!1Mu(N#rf+0wN;bRv}%f9Gyt?8*kL
zSpAXGIHgy7^I29(fn+PI{nGt2Z?JK==9p4EDQIhmCR4mCzQ0P4eo8Dnw|E)xybJT2
zyk>jq!4k=Vl=%3ZT^Os$*Zb3+<;+<Is^=;ViCcJyUGw-a>kw;CD>{L-1z}!p%BAj#
zSo~exv7yrzLjE(%>JKk&-M$2U(|afT*r5x*BcpC%MHAFb!xQVf>qUy)q>C3~)}6g~
z{<<aZ{vaW4pJvRu^K0SFv`>aw=Tou+hNwAX)<$VZQQEmqWplt>>qluvDA(+{dE|G;
z$w4`Djwbv(>_POkcY(xRxhPV)Rh)obzVl?J-K4$oC9&TWe?@T}8(nm&ltw{435#US
ZBf~bx%^A9*KZo3rj808#NjP~c@?SK17_tBW

diff --git a/openslides/projector/static/images/icons/document-save.png b/openslides/projector/static/images/icons/document-save.png
deleted file mode 100644
index 8072aea3268164eb2028a0cebfe44da82b4f4aca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 563
zcmV-30?hr1P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10kBC#K~#9!rISBM!$26tU!vG_tJ=Xj)>XvKK@k7Ytwo{YB(9F?
z;2_0Ku;{F~yQsL?!9iy?1;;|c4%SjZ%{70TwwHKcBH=<E3VpeJm%zQ>J-%EN&+{;d
zhN<MT+3!}%N$l+HLzbdaRiUa16a`Qa+@~i+Xj<&&u2dTJ0hVbcCQ=hvSX_c91AxFN
z3PHs1=i8erR4SE3n80;iXfX}i$Pg|cUZW}eLL*4Am6-wO-1me4E?&CbuAl>(E7P<-
zOhP?!y}wyJm`;b*`kqJvqBiX|nL~L2fd*Ux1d!eYF6Tbg5P<9ZC&&uF5~UDVJ~Kya
z$<v#F88$NWv$7kWWF}VAbpA=;a&SRC+}%c>B9GKW9yGCk1)gXRIvtRXipPk@<6(R{
z10;&Qkze=csdPHpgO1qUX}3Wtm&>>~JBMXkI4Be#D>XTZ+DDB(A$cT#*xhj)kQiey
zO%sM;K-YE1@`TY9(UZv}-m29|6TcYK$LKUNox!$kO4I`&Fl}aA7Py>1;e44jn~%EA
z#v7jv<knU}s@Lm~^<Jw{4m`iSKpj$lAT;pr{0sZi9`+YdPh0>1002ovPDHLkV1jI`
B^11*3

diff --git a/openslides/projector/static/images/icons/go-down.png b/openslides/projector/static/images/icons/go-down.png
deleted file mode 100644
index 6a2bb793c89518ed927086c6efdd7b534bab255b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 562
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJbFq_W2nPqp?T7vkfLzW3kH}&M
z2FBeW%xLxI@gtz1WQl7;NpOBzNqJ&XDnogBxn5>oc5!lIL8@MUQTpt6Hc~)E&jWly
zT>t<7zh%p|#fz7(Sg~f^x(%B*Zv}GCp1lYm7cE)_WS=>6;n1OD+qdstvu5MGd5h5$
zuUxri+qPXm@r4VQE?Key$X&g9!@6}FAx3T4vSZt}-P^bC0&3s66NvWg*>hmuzJmu3
z9zJ;R*pVa0j~+dC`t&)V6+ny5pTB(R($xnK9z1&V=;_m^&!0bk@#4kHmoHzxe*Nan
zo40S@zI*rX{rmSHK79E2@#CjYpFV&7{N>A+uV24@`}Xbo_wPS`{P_9v=PwZW4F-RJ
z;P2nRKtJ{`T`&#kWr>m?zhDMNCJ-<*?da_6>h9^AIu8Use7JgaVgXRiOivfb5D7`v
zgS+)y0!0`uZ2fL2H?b#>qc`l~|NU(pPKqKzj|<y(K2KcB5MJsMd4ECE;@LNkvwJ8g
z3wbCk%4y(ona2{)xQ5Z=fdzw*#x15Rm$Qre-o)O!S|DGzbFc2Re+Iu^{7sBE$(?L?
zY|dtTy{>z=9@=c~-)HkT;6?WT+tW6_o3}sE;M%|4vg`HZ0~Wr0HtYR-h6&>74fTJ#
Wo%8mwcZLET$>8bg=d#Wzp$Pzd9yuQX

diff --git a/openslides/projector/static/images/icons/go-up.png b/openslides/projector/static/images/icons/go-up.png
deleted file mode 100644
index dca17c45267f2b0128eff1b8c015d9e787a38bc8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 532
zcmV+v0_**WP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10g*{WK~#9!os&Cj!cY{)Pi~?miJ)8YLo}60C{o-+I(2dC;E=CS
z`uGlg(4lL(IW*8B1+9ytL+LDZ5xR&7LLsH1CNa0?q@)y@NbP}>d$~9N-+6Hb&N;+c
zqjAeT&%c%=@uOZpIE4g@1=#jIiajfnQO#5;1@pOkRjchE{t3`*J}}qyEmc)a!_a}Q
z`~4U2egATAuX3~!&}uz~k!4vmi^XjaMG=A^faP)tgTX8A`9-;0I*tXj+Z~2`OHmZF
zP|$!e7K-tVoHBsna14SVoFn|?Cm<B#-pb{&rlxHH8Hpo6v{ELM$s1sE&vac28!H;d
zj)3cpBuQqeRKm2`Hz3Yrc>`v%`R-^mmh<_|u7GtLc>at|QHYN2LA6@JbiY99bQ*fS
zClo7y&80FTo=&1)ZrgX<ao*7#KAleaVzJ<zPM631D?x%$6R8|pS6SjMjS%|+QEBS}
zP%K8Z(g@cEpqNFYqec=eK2S11pfB~{e<g4pkeED*zE%bfzR0ZWdf_A#MWy*W5M!VI
W`RmAcW)2<z0000<MNUMnLSTZHv*Vlq

diff --git a/openslides/projector/static/images/icons/pause.png b/openslides/projector/static/images/icons/pause.png
deleted file mode 100644
index a9b3113fb0b3067163f8186bc42d66151b6f7b73..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 484
zcmV<A0UQ2_P)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00002b3#c}2nbc|
zMg#x=010qNS#tmY0lNSI0lNV@?Bn79000?uMObuGZ)S9NVRB^vcXxL#X>MzCV_|S*
zE^l&Yo9;Xs0004FNkl<ZD9=Tay-LGi6oyZ(!_6U=;Os6^4QWJ5wFUpsLiw6vtv|#d
zb<@E~ypI%d@Dik;4pLlPVnqp`!Z*aPJPyWs-r<46;T_H+$ZvY?NgO9p8l`b^68GG{
zy&y>B9I38p(Iz6IO^dEMQjt>}>^t3llMXiwcw)!{H|)}++uwH(K|-~|IrqGh@yQpO
zH=a3ThfpD++=dBx<O9PuW5!r=G%vJi80E@#T<4Z|443o(=upR^8Bk~YSk{vb?$B5+
zXaLY;7RVW~#d;#OG-N=ArNbNmHKqYe#sRfds%eWyG-KuwfP!N*hg4IkB(<W!V+x?4
zC1Z_BB9++Znh`lG%m5V38RAnpmSwkWHhD&4`5%iWq->U5K?1eFDKBVp?BowuED$I}
zkR>PRm)K&!hzw1}kQOC^{*qJ33LIZ~rbLxp_E@EaXM7bn6PpN9cKz5(7SqMlOZ>Pz
a(ftDwiElIZXxcXb0000<MNUMnLSTYnvd2sS

diff --git a/openslides/projector/static/images/icons/play.png b/openslides/projector/static/images/icons/play.png
deleted file mode 100644
index 80ff3a1d50871134d810bc38d2637fcedccc0404..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 501
zcmV<R0Sf+!P)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00002b3#c}2nbc|
zMg#x=010qNS#tmY0lNSI0lNV@?Bn79000?uMObuGZ)S9NVRB^vcXxL#X>MzCV_|S*
zE^l&Yo9;Xs0004WNkl<Z7#Rh@K}%Bs902hDJM|Ij+M#`fE?qoE7j<p37?whss330>
zYnIH1=*_xx>SF|Ngh5}Rs6lxM@#19}#d-$sFy8p}`-Kof9M%r9Ebou{qbxtj4r@XP
z5kmBny|h<$Z0qaW*3m2X(taXDh~1<&*z(MYp&!nCcVfqu-e5NoA-d^?SHAga?8-ld
zU(Oxd&`m|8wav2Y)E}jHu1r-X3KzC*mT4{4vt=LsR+>6?<SVEYhL)}G$4b8Hi$aAx
zs~&jm3KN&stmLsY>KYoWuxj3n8IOEc8GB)A6pN#dQ-vvRyY8A>?)zk_@Y3Qa+WC^9
zu?lzGbVJ8qRK}iY=h4m@-n%rxJ$HQoOq^+G@5jShvwZ4Yq4Guns1&-I<-=NtRyya%
zg~CK-sxnb{YfdW_Ar_L>VAh(UOJjwxGaa*9gM~zd5Ur$<*2`Ioc0Bjkta{l<TZs@M
rgb>YIBdh20qxn%iZ)DAy5JLP1do6CCFD*BW00000NkvXXu0mjf%^}{d

diff --git a/openslides/projector/static/images/icons/skip-backward.png b/openslides/projector/static/images/icons/skip-backward.png
deleted file mode 100644
index 1de5dbacf00bd8584fbc67c67881bb9eda5458f1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 511
zcmV<b0RaAqP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00002b3#c}2nbc|
zMg#x=010qNS#tmY0lNSI0lNV@?Bn79000?uMObuGZ)S9NVRB^vcXxL#X>MzCV_|S*
zE^l&Yo9;Xs0004gNkl<Z7#Rh@K}(YX7y#gRr+z{~rw)Fn&e0_Z@)j{2+f0U~kR>X}
zw~01O<`6psdFfWC=r?SHhx!8{gOUjG;$<1t`i#EA+IV`N5JHH(WVhY!wEC@nyR+Ng
zON0<2glHAE(`H_`uBByNT{GWKTLmFPY!#Z_HJc9fe0A)z0~^*fyITbjqLHrH_sKT{
z=l;licjAQ=jZ{RMtmX|ze#-qbHa7ChOQ+VY=4lek?FH}s@YZv{p=C2NJqwn1VzKkk
zq0DQW`0I_kZn<IT%#y`U%=a6523Fkm#lA&1O-PIkJTc#oxqjV|%pKvQHIpV>aM4)i
zskwgCI`eu4N-pEvo~tgoVr1ZfS|@7lvUkqha}Dspr0a%`mDP4)HmT%~oXCs-{PtX?
zp_0!gA*$(=XHI2?M#e^lGOtXjrXs{lq1r84(sO1YGjOb~sM?(=h!CP$D5s^oXwHVm
z?kg(g<+NH5B7_j4l9bz}&UAmeU+R?Gl|%?3{sTMTW?<W;noR%z002ovPDHLkV1hyP
B=$8Nh

diff --git a/openslides/projector/static/images/icons/spin-down.png b/openslides/projector/static/images/icons/spin-down.png
deleted file mode 100644
index e54993882a90d3e1ad314a48cb7b4c4e579bacf9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 269
zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c!NS16s9VwA1>`Um2e~^jtUD+363Agn@^*J&
z_}|`tW<QX}S>O>_3{<fjgc+^gJbnZeT;l2C7$R}Gv`?RlDNv?mf9;NhE1Mq8-xk3#
z+4CdYyaSIk<8E+E>Xdb-9@Oh_<Pmes-*C$R_=mEKk9?#g_RT!Ot)ze8^^%=Fii|VZ
zcAaXOu6aEuS~kV#DuY@{gIs`Moyg30Z#q0*Tvj>kcxYaaac@_i)|A%^oz&#R{@rd5
z-LWz8Xsei}W^kM6giROH4$d%jcRTaq(Z2PE&d#uUbe6l_*=FOW4~$ovQ+^7FT#x{|
Om%-E3&t;ucLK6TrOJ~;r

diff --git a/openslides/projector/static/images/icons/spin-up.png b/openslides/projector/static/images/icons/spin-up.png
deleted file mode 100644
index 7830c52a7061261624fed981684a7cb5b6bf81fc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 255
zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c!2%?s>bJ`PDaPU;cPEB*=VV?2IZR33?k)`f
z+xyS#2l6-zJR*yMDt3b~qt%<okAQ;gC7!;n>~~nCIJLySC#hNjg_=EG977~7*Pb!t
zV+>?qxcFUsV`od3Z@}*6sFyN%3kq1&1K+8Z@GS@sVC@XreXWjFQPA+L$z;yY9K0)6
z6ixSVX}vVr%3I*hoH<{41+N}_l<JtOzunZ#G~jV@!>NN_>x4>uzT9*CbmizRx0S13
vW<38@%i)&BrJK8Q+Yi|kqy3zpU+D9%Q&QM+gwx;-&^ZjAu6{1-oD!M<r4Cto

diff --git a/openslides/projector/static/images/icons/view-reset.png b/openslides/projector/static/images/icons/view-reset.png
deleted file mode 100644
index 7726c3546aa71ad49c31755dd4fcacaf848eee2e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 370
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~&H|6fVxZ#d
zAk65bF}ngN$X?><>&kwEM@HCM-YMps0#GPFz$e5NNJD_?9LeBK-r<}5(s#vY>`o}z
zpIdq`ukuh)?cvh3w^pvZwQ9rd)f;ZF*?4E|raNo5-rczE?xxeH&zwGe_RQ(Cw{PFQ
zckjWQZ?E5efBo*=hj-uKzWe_E{jawleth`w>;1=H??3(g`03Zj|NsAol~#TO+Q(cH
z<QL2!VSIeA?L;7#G0EHAMP&=y&zV3@uBVG*NX4z(^Vj(r6nGp0S=9NCG**BAzduk>
zCF<+GLZ@3(EJU6PaA|nGxL_xxmoa6PcJSJeV#YJlH~K_Pbn2$PST6D}gP}+)>wyo0
z#DqIn9~5RjJm(}>{lopFl1VcECz0HlRU3Nmp1<&Z>wCWmY9a^u=9gH30>RVO&t;uc
GLK6UKbD~uM

diff --git a/openslides/projector/static/images/icons/zoom-in.png b/openslides/projector/static/images/icons/zoom-in.png
deleted file mode 100644
index e96beb2f7bf9b0e20d4e6b3fe520683b5f87e287..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 867
zcmV-p1DyPcP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2ipS_
z5*QS#mB(%X00QGlL_t(I%bk;3NK<hf$A9NPckJxqRMKgArR>4b=wc?$v_y(77%GWL
z7rGfegqW!*JtbD=t)Pgo9t4f$4M8NN3^5^fOWRcPHeJoRdEd^?&Y5Rtr>De~57p=C
z`||zr<;VAj!3Gu=7o$0jz1OeSD3(_&GB2sv6tdm#BSSk%;uQ%d*aU3dykLItq327H
zOMoxO9o#S279ewKzZp68;INCcn*;oOJhL;>GaEJw0fRxGTiei1O&Uqlk3~km!ti5?
zv|N6{&TGf#=+WMhg^9{%ui3^%WfITxZe9=d(2#IwWV#|UI_5hE0*d7^YRv^?QgX7K
z1JJn;!o?Di)Ne<eO^g|o7>3C=1|Y;cFBw)`W`q+<xP;J4eDHC90yMP4LCXnH`}yNv
z!-7SY(9oczzR`JC(cS!5w+42Kj2)hJO&vKdMQN#-F(DCACWc{{(<f2_6dC!6fRJl$
zdN{cCeTT|KA~CkQ918$_>j5N5A`2~|26e0R9bHPDC%~!<z>;6p9Q3KFqT32UAOP*)
zEaM>(5ux)|tH7;+#cI`TB?M908Cu17;VS<?Tpua&FxzQIDgadW)0{5{;LXzfG0tW@
zX|ppbw;RmpXJ3WO$SAoOh2c){^+Xsh1HdSXVF6%Gf-p8vi1|7h6k<1z__npS_qYWV
z78H_uBm8RuJr)#Zqa)l-ao%l~H9=k3<$V~2u|YyCP)MW0L!I@h^Tz3GzfS-?d{hPr
ziAReJ+IItEUG>?jUTcz%4Nv^+0L6rpKRc>pGU}dI-vp~p6uCRfx#<$`6x@c#<&|*d
z>cvxxgT0T$@?Bd9sf}kT=^8mVpqtiRuPCoklB9J{b8FMN7tde5*>sVaS?TLKE#r*%
zmo6?ThODftof@r%f7__!&tJ$s@W(Iw4S9KaDLFTCI(vG$p}D0cAUHV44F5`LY3Z%W
tsY$;2N!1ekFSWI`RVua0awtBQ_z6K8RN#n?IVu1E002ovPDHLkV1l9Xh-Cl(

diff --git a/openslides/projector/static/images/icons/zoom-out.png b/openslides/projector/static/images/icons/zoom-out.png
deleted file mode 100644
index 75a1837c4fe608df1bbd0199e54b0152a74513ea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 884
zcmV-)1B?8LP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2ipS_
z5)}n>i<!{?00Q($L_t(I%axH^NRx3G#-IQ9{pU7Mn@%mz6%`#ME36qpshLIKg&imf
z!idTuDWWdQpsOIF71dRy6d|NmcA_N}hD8U&d8nMWlAP3XPR+S}Zu|D_J9SYEBMAK6
zz3}qmdEbZN5AGjsn6u3AO^laLg~CTWdmNTfh}Wg38NOwtCbxtI@pQqOwE`go)1d$`
zIQSLjEHi$NkG4E``gVgc#S|<o-pIz$IKlCGFs1$Dr`=lkk9bFh*8=F8E{N$yM%+zJ
zHhamgom&)1lp-Jy6%~@KK$R4b0hfmkIbO{pN+?SZqTXXikN*~Qb#=mENY3eWe0!g}
zy1>n{>J-(`5M{xGAyHXYWnNII5S0yWuX_@UvNdBCOMXf01dAmP{f_R#KZOL>R7CP+
zW+sj$=-|@>0SfRkAoD;x3oLgn%JDyYeRn-5;vgX!`@w{t%XfNpLuHwX`r@Lp)$_A+
zM<q#;L`f1OQBe>jCF*tc&b7U1>weN4_8dB}Kd<KM^>;BrkP8wIr}e#eg+d)2k6m#<
zfB-xJBmxli_ny-}EGB3uBXb<b{MAB)=lYD=<dhFX;XdBLb{mZvFT;Q%Kp21uK(7F%
z;H0um=Er9HCIhi1n1;q%nDhs0mYM>&^9-5=jHo8-S<plRlFBl&i4q}+A@W=e$&5@z
z=0tri=hK$w{696??d@$}{3gS=HvM+aswBIfl2I)o<Fi;2*0RX^K8Di9D`%<(`#UT;
zy?&ti&V2v?3jh}`T2a1ZXZ@NL=Bj~#;Uzp>%BLHtCL@VtsKCk(y%U=r)t)_=l@{+{
zDeb;_qkib01Se0O!1;4lR95b;3Jc0{nlO8oMyKahfs2m>Jgp54&3l|qr@z<n5f2~T
zTUJt1+E=-6FaFE+@~!dH=j!U}GPm2U*4AB<))g0|Rvz4k8Dq6tPkB5))JvByjshU;
zOa-m2t#21DT(r1s^XB}twA4b>*44~NP*G6<0I=C?&)Z(U==lXp+EbCnE1hlt0000<
KMNUMnLSTZK5RxhY

diff --git a/openslides/projector/static/img/glyphicons_054_clock.png b/openslides/projector/static/img/glyphicons_054_clock.png
new file mode 100644
index 0000000000000000000000000000000000000000..46a86c1a954e49a4e8d6cf0642d009168404d890
GIT binary patch
literal 1376
zcmaJ>Yi!$86n4WpRUOmVkBOCsWW4ew@gt2Ln`9-ioi<yOl{A7PAyn7CO|1HbeM6E;
zKv{>hty)zkF$OEr&<6W4iEb(rD&5K$Lt-mvjHehvjMon&)CvR=e-K=!NvXuZvVHG8
zKHoXtd3jH7wrhRsO|2M)txtDLIkax}pO&@geYG6_11)V(?uUK$5G*S$z!I802=KJ2
z6hICrTJ`Y@AckSrE$aDx*q`YURND+GzD}rOItYznvCfL4sKWr_gP@>WabjuiZ35S|
zIPq{KLuDKh6!q>A7xax}^Xka3%4<aDRy<Y_kO31w1+SQf<q4HIQL`(cy)PySyru$&
z<HRzl{!A|}+AhE&p>R;8Xc}kP5Zw`BS^7Slp=gGr(9H(v4k5w{42Rb*0(o<_At5KF
z>b}q^P81<@1d=S5%b{{OWV;2D=6T+?!7xFj5%j7SR4PHs+tRQg0Z(;x2kN$k`xcc!
zy9DC|V!9lH>0~l1hApq2D3mg?qBtZSqDa&9<Em+UFbDpjaZPP6Uv&VP1D;)SRaB3m
zEe$Zr-TymkC~E48o>Ov-TAZ3n0t1-9f*vA8*BBw@!VXtQ1yl^lR!jcZv=k>wC0!HP
zh|Gq0ijA^jil(Jxf|VI58s$VeAtpO0&UfY;SPevykcP0~4xUc%GE1?XOw%&M^C>C8
zrlQfP#6_Z9vVl!o9#kw9_)dMSj<88C!HXj0W2OJZ3Ze@XXuEmaHX5zcTeP9=6>SF>
z`&j(0jH2q6FSy&UWSuK;^(TOqa%~f@l|s<3!GNNpsL?nSBZI=H(J2~E$xJd479+CE
zMu<9ATa~g#<OuLDtjw`ef(lDiM5GB4k<nBE>d*l79!(gqzB6>cPXt4;3Me5#4GbwI
z0}@*cM%5|ms%?2O((ge-M}XRH8B4CRSQD>m+J+{Y1b@3Sg6Oa^#K1z6>!J}Y9w}VJ
zu%?!@l*m`EoPOx?#&h`f&6l3OKiM^~YoeF?snt5$a_fbS&X_g&&Ul%={pjKSbLBIE
zC&~8PK0UvA-<lI`CjtSSSu=HL{FcBk?UUQOhmVPYf%%;W-@UQfS>Tsqi+j(ln|pL7
z&~}MCo7+o1_2$(pKWB>{@Ux%1zi0Qt?w&mU#^l((rBiLsjeb9!J9=^Z*cTJK#@!EN
zCtrCc7Vl!Zj-33pY5Il@2d6Wwciwy8{Fxm+-{z0ce%I`=%`>0hv45O;d206N_p+~D
zo|rryc!0r-!0E@DHcY+sS+wua4-Y;vv)wJdcu!!CF@@r@^S@O;n%6gN>umk=rLVvF
qs`SFTV++rJ`Qyib{cbPxjW%KVrB@eEt(DvTe_mS7O0OpecK!{6anid0

literal 0
HcmV?d00001

diff --git a/openslides/projector/static/images/logo-projector.png b/openslides/projector/static/img/logo-projector.png
similarity index 100%
rename from openslides/projector/static/images/logo-projector.png
rename to openslides/projector/static/img/logo-projector.png
diff --git a/openslides/projector/static/images/presentation-header-bg.png b/openslides/projector/static/img/presentation-header-bg.png
similarity index 100%
rename from openslides/projector/static/images/presentation-header-bg.png
rename to openslides/projector/static/img/presentation-header-bg.png
diff --git a/openslides/projector/static/styles/projector.css b/openslides/projector/static/styles/projector.css
index 423c8039d..2f22b4550 100644
--- a/openslides/projector/static/styles/projector.css
+++ b/openslides/projector/static/styles/projector.css
@@ -18,7 +18,7 @@ body{
 /*** HEADER ***/
 #header {
     position:relative;
-    background:url("../images/presentation-header-bg.png") repeat-x scroll center top #3D3020;
+    background:url("../img/presentation-header-bg.png") repeat-x scroll center top #3D3020;
     height:100px;
 }
 #logo {
@@ -58,7 +58,7 @@ body{
     top:110px;
     right:40px;
     padding-left:30px;
-    background: url(../images/icons/clock.png) no-repeat scroll 0px 4px;
+    background: url(../img/glyphicons_054_clock.png) no-repeat scroll 0px 4px;
 }
 
 #currentTime.ajax_error {
diff --git a/openslides/projector/templates/base-projector.html b/openslides/projector/templates/base-projector.html
index b291d2419..af2845b92 100644
--- a/openslides/projector/templates/base-projector.html
+++ b/openslides/projector/templates/base-projector.html
@@ -21,7 +21,7 @@
         <div id="ajaxswitcher"></div>
 
         <div id="header">
-            <div id="logo"><img src="{% static 'images/logo-projector.png' %}"></div>
+            <div id="logo"><img src="{% static 'img/logo-projector.png' %}"></div>
             <div class="event_name">{% get_config 'event_name' %}</div>
             <div class="event_description">{% get_config 'event_description' %}</div>
         </div>
diff --git a/openslides/static/images/icons/accept-grey.png b/openslides/static/images/icons/accept-grey.png
deleted file mode 100644
index d6c64cfab7cbffcf4fe4b06b400514746f517861..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3142
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

diff --git a/openslides/static/images/icons/accept.png b/openslides/static/images/icons/accept.png
deleted file mode 100644
index 225abbf4d79b7741255290d5ac6e9351b3e1bb20..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 924
zcmV;N17rM&P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2igW5
z4<H1~_ehNZ00SIJL_t(I%WaZhXq9yw#y`LJ&-wEn+s@9>mD`%SXoqIg*wQoz!^Sd^
z2)d|?Y)BG`?u<x^x=08L%7L4Vf;e3)Z=xuOqKj~#nT1D7oV3ccv9+x^cecZJ&U?=L
zzQ5o5>tYrXKJZ+9pXY(^^Zg2LhgW`i5gqNuif_O$L3!g){g$Jd5C1O}0PM-Z*ZZOO
z;`4@W4Ig|sMduo=n;ZlpWU6fF3-g9}|J)Lx7xXaL{xMzsaPlyMRfnO}5Bo+2x3s3R
z*{wDD+N>*t5dX%5hEQuV4GI13kIUlHpT*<kcJ$%&+?4G7@`bkMbgt)tTINf^f4*Cx
zHE1B^m<*4W`F(m}Kf`-IvZ&u>B7@vhtqDDO!xj2=ooJ9+(@+;<dnU=EtMt(cnIpA(
z*re;#-p%V$Pb6$ZxKdK_C4ma@mBN=RtOSyDO_aBu$<R<|Q}F{aK38Jqj-~|z>37#f
zg<dLoB;z)FA8lc7u|nAma6QFRMN;QP=-=0gVcHbRAtz4##p;-$@%(O!z-!SOAxs#0
zX&a!a28#E-x=K7^vTjX+p#vQNEVzp22F?+Sm_%#@%G+SFe#fCyD!sbw1~^fRP3u$K
z*Oa7oRg^2&eLl%{0#Gb@?0V-r3d=6PP0lg;#|;SG1(W7So}69QEz`w{_#%HDX$W>^
zYG_GYJo`{Rp^{9@S83=y#Y~|>q2%FtJ{Uq%EnYNf+}1=a)<rA{u{dYON=Pfh;~SGG
z1ye=IJx9jCw7|M~5)JrEf=V%GlI|EKD8J5~_i7AF;3PP6#fNB=_C|-h-=11A8ya*7
zN`W2G%v=_f+^0=u^B#@ceadrPtlbF0fVjiyap*rU!H$AZ5Gqg-A`V<VEs((*{5&{f
z($NbS2EXU7E%&oH-bQ_^#;Fz9CfG4B1gHQE6M~B7*KY(~^>gyavTW+Z<nKIe&caUv
zpRsmp$n>S1EYGeiE2Y3K!s3MH+F8N)4}wq}A%E;3Z=QfpU%Tb)+YZ3k2UrijoKhBj
yTI<IkY+e}}lR}6QQ|aUK{6K;BLvVQrfPVnur&vwXZ01h@0000<MNUMnLSTXm#J0}>

diff --git a/openslides/static/images/icons/add-user.png b/openslides/static/images/icons/add-user.png
deleted file mode 100644
index b413be26a56f7e7e901cc8bfbedeffa0744aef32..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 821
zcmV-51Iqk~P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L02{9W02{9XUK)`c00007bV*G`2iO7`
z2^Sd)QD{y800Om1L_t(|+J%l=NK<hf$G_*g%^jVtrs<~JG^dDSVp>#8i$Z!Sv=<4Y
zpoda|9s*x_@<HmUhai$rQz}VPE4z?gu=2s6B27b0P4hPMa<;RZZk|iWNhFl`fiFM!
z!~esFz<($^Qk<Qc99N=^iuQH&O}2J*zvZzB{|L^VC^?;Bj;W82H&GT_DtM27`gwPs
zv##agIQ|2P4Ond1+GG=V-D<Z|f#3?<JP%S1SsaPc)z}0Y8;FV0q!i>jV)i%>LT2=!
zXcntM0Y9hi<UnQ1g5rF8f@!-E1Vw{oHDEMaXmolw9H~~dj@(ipN(vumGysYWK!PHM
z0a=7zuN#`47?8IV+-h$7HZtM5Ew2brLVk5#NI^IHM_gAFMZs2r2rqhuYdi~cvgn(~
zs=C3Uq3NrQub(~o-twTLtIYd&^j^Cv+gxz1u6b;1F+4XjJBO*sDYyh_VDiUTxv9VQ
zSi#Qh=qF>%r6uiI#HNCirz#Td8My{NL_?6YFx%4Y`<zD&yx=9Kg+=f_F9e^TSgTlD
z#FS#s#`%iMqQZjw%A}+n$Bi7VagFxksrwx|W?n&D4NGQY0+p7Ti211{_`{x1EXOIi
z=3Si;L2Z58jl+lbR~lnEuq+KC@=D-9Lm@0y6Icy}D3%4sY7v&gm{m(YjSr$Q$tuwo
zFI77V3-T&By%r2ZVLc5h3T&D*e0bjj4Z|QY!3Zur0QnaOVc7?p&IplQc|$s#Mdh4c
zN64}aNs=L}zyGYU{4NGA594!HKNjZQY6XKpFo+A=YR;?@0j9Hbu!QD4KF%Ll22E37
zXgYHLqJRVyxuPuL%j7KdAp<Drsot|L5i0bO$6a-^?tatmyqw|`OF|Y!Q^}$z$A&^-
ztpX@4LkCHcTq?39nLm1kz0nHyvZFQF0Ic&HSurVhgtc!%00000NkvXXu0mjf`GjOF

diff --git a/openslides/static/images/icons/add.png b/openslides/static/images/icons/add.png
deleted file mode 100644
index 1e03be9bc896c5f6d8a943ff9d153b42b67e6b16..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 564
zcmV-40?Yl0P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10kKI$K~#9!rISr-6Hyd~pZhgQ+DS}l-MB~)U6{3k6+{t4=s$4h
zBKiZwjT>8Z)0JRB|3DF3=|YfF7jDEZ>IVpdRI~vVL~%?rHj{Mb-aA4?aN$HkpY6+e
zIJ}%A@;qlRND8>Ne);a1hpoZcM@ORNcT0CDpm2lpt8;$t;5m`HA+Mts_V&s9W~>cf
zetj;y8B(ff-fq3o6i^ss-tluMK}bpJ9RCvtKmqnoV4WvU2M7e2b^n@kK&}DWEA7Qj
z+`01X%TpaFO`sJ<Ns?@c6oMU>G5esISB#+&7>@2gVH>sP%}a+DuI`p-7R~pI$1Y5x
z9J%rcDSiulyep{dI#Oy%ghc%waq@#~ax=Pj`qhjEu-38}b<lyvlohp7h>?Q6+eS$+
zxgkjtHlh#o1_P#oDl<X)R|lT?$M2uqLSxWiv?Nf9*=CE$AYkp|I%T6NX-zfMm>|xq
z)$=3opuA-AQ-@kiO_W*dZ1Abw6Jy<h^PbFQNCBDm6ro26zHRr&g~z(F1=nRGtmmJ*
zUD54lgm#}D^O+X>@#*R^Fg!5P*sA&3jgil^7k&X>BCo8zhBfN|0000<MNUMnLSTXv
Cl=(>j

diff --git a/openslides/static/images/icons/clear.png b/openslides/static/images/icons/clear.png
deleted file mode 100644
index 6c4b83b7ac6e451f461973dac0c9a6c53dedef25..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 644
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJbFq_W2nPqp?T7vkfLzW3kH}&M
z2FBeW%xLxI@gtz1WQl7;NpOBzNqJ&XDnogBxn5>oc5!lIL8@MUQTpt6Hc~*<rU5=7
zuK)l42dcMnvI3GiMmj)JK|ujXii!#WNmf=?TRR&d!`99^IXM}~U}R)8Fw|#aVp366
z0g@6D;w&sIyu7?XaUd7S25MnrV`FD$2Rf05hX*JnARr(jA}k^zA}J{eG+a?hQAtTj
zU0qGzK+n+7(8$=(+}zyC$_i+Oy}i975IEVpxH`MKy1Ki&djWyBhqt%4ub;Oc5cvBB
z1Ox;J2Zw}&goTBMg@;5$hDAn3Mn^}dq$H=LC8cGgWMpJy0YP?pVPRouX=!C;WmQ#G
zOG`^zTU%FG*MtcZ=FgwMX3d&)>(*`Bv~l~6?FSDYJaY8Nv17;1UpRl|%9VTf?mc|?
z@cHxSFJHcV_3G8zw{Jgu`0)Aj=PzHr{QC9l_wV0-{`@KR`o0Pn77`^ve!&d#@_Ksq
z_8}pusXI=cy7Kht(+?kh{P_EqYvr0*Ks9qcT^vIsB<CJv7Gq*$U_CHD_x85j+hx(!
z|CL*89p0NV|LN4@3TF9{bn4Y($NlDSw$%Pe(C#u$3X&K6yhu7fCUn)d`a9w*l_zg9
zelWf0v#F%Q=47;D5{tq|cc+67rl`yh?hoc}SiUVHxAXAV65D4bR(lGku>JkEM|1so
z>*;dxIy;s3ojI<x+U-Dte%qDV>&$kq&AP_I<(sjr<Ku1am?9a8z1sZxK!-ATy85}S
Ib4q9e0FX@VYXATM

diff --git a/openslides/static/images/icons/close-grey.png b/openslides/static/images/icons/close-grey.png
deleted file mode 100644
index b843656fc7556b17b6e1b133c8e6218835d87a57..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 379
zcmV->0fhdEP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00001b5ch_0Itp)
z=>Px#0%A)?L;(MXkIcUS000SaNLh0L00FxI00FxJI_%@(00007bV*G`2iyk?4-N>*
z+V|Z60093<L_t(2&#lnUDnxMr#qrO*_jgT0jfI+IGdl|pAS@JFh?P=S;yrA<fhVvO
zYb=#CCDt~SvOq%?<4?n_nLA@MHOilrvpwI=IUWAg=1}yzxsm3}c{Ol$XyCj3@^N(C
z+S$4bWCPP8v@|sZw4Jyu=4V^y#AG@yv;~P&$D=(T-p%boAaktd!jeSWsVil7Di%6j
z;6YoiVB4&!rr^fB%kGw#d+**n%k68ZyEUmS>jHrhubxDTf`+;oV`6zPq2HQ{OlnYO
z)SQAu=mDvcRa0u}`m8AG6QsS0L_uuPup{eA0y>f&5JXau3FA_!m@gH9&^Y+v>d^2{
Z`UKA|N|pLC-xvS@002ovPDHLkV1jB;qMHB!

diff --git a/openslides/static/images/icons/close.png b/openslides/static/images/icons/close.png
deleted file mode 100644
index 1c311e210b065937aad7540b7b5bd44aeb8a6c98..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 654
zcmV;90&)F`P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10t-n*K~#9!rISra6k!<0e>3yWj$_ucyDWr3By5)?f}leP9;EEj
zMcAM&bxD%FSROp7N2OaDA)T~ar>Mk@=!-xJTNWxPkfl0kQKb9n$9~Ma)4U_Z#$H5!
zFuX84&u`}WzwfKLuFGDDJ&d#q_CUvMhb7(oO-DM9e8JLEIu8Wd1>ee<jjEITP;sgg
zYXe&uUr;Vrg5BL`(KHQ(<2cl6HUAMpppbRR{ZIEu6;f?=$C&q;lK}dTpiJGB%zuB3
zbfw>97zU<kqB6?lG9=#K;E%J0ENT22$leBM5Nvbz;~nO{K4tJtf<h(#@2d|!&oK6W
zl*6q@`0{(1c<W_cPy3%BT}rXAvPdykrntGu)o0gO{INj)tA1XtzUGh?B>gkZaOW^u
zRi_aF@M7yZVG$x*Er0~uY+>x(sJFJVUd~e6t}$|Ygjgu%g}Blzi0fBK)}OFkTt<ot
z2U-M{(7nbg#Wjt=Q@7|j)`PC=NGWMV2Z#ou%=XUE741T9*0D{E=s_E8!{mH>FNre=
zEXz{Cs(_mXrfCpvi!gOzit8u5v{xNU>vcjLW&GSYwrvv#1XQ!CZ63ie1a`poe{ra5
zh~wcH)2V4DFHREi#HL|_f!b14+bj^m@DGtCEOc8Ze)1B1oqYsMOTF{Oik%S*XcmaV
o+*~rqE>N{Ju&>*w(Ag({0awz<t#S;y+5i9m07*qoM6N<$g64QA$p8QV

diff --git a/openslides/static/images/icons/cross.png b/openslides/static/images/icons/cross.png
deleted file mode 100644
index 0cdfc1d428a1e7f581241be1ac79bc87bbcaf842..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2836
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

diff --git a/openslides/static/images/icons/delete.png b/openslides/static/images/icons/delete.png
deleted file mode 100644
index 87cd0b0125d6193c16c59f25b88396493e885f6b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 640
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJbFq_W2nPqp?T7vkfLzW3kH}&M
z2FBeW%xLxI@gtz1WQl7;NpOBzNqJ&XDnogBxn5>oc5!lIL8@MUQTpt6Hc~*<;sHJ(
zuK)l4Z(v|p!N9PVfuWs&p^JfGA_Kz=28KBd467IzAX4jDSb*GiKE6H%hCBv_Tn2_L
z28Klp4AZo=>*d6nRHQFelpgl-Jed$XS6*hniPlkf`z7+iOXNkDC`v6+mRl+(v`kK5
zwTk$9b?ME9YMZs?_j%bL_HsDk<9sU2r$Je<QCV@JoyjI=t1M;tEM<ji8>2`?nP^4n
zy$lTd7#Q|j8XpwoI%I5o$k*ermDN#8qhmrm$Ax%K+S#3Uu|MtSb;ix@0t3SZA)d=&
zVVA>0E~h43Ns7Cc5PLm2@wTwQZ4try!u<C|gzje~K4xHes;~9bK<BBE?o%VZr^SWO
za&w=RmA>rld@myOUR3yfXZwfVuCELX$$gHBz;HAv3GxeOFfuao00U1?PcLu(fWV*&
z*YDnY^6b^8FJFJbz;6)v0|bBn{{8pwYTmshp#IsOE{-7*lD!9A#hMrxSP$@P+)yej
zFHd4mDu4d>{K5|<=XpdH-eIeeoFkI5<onEvOuxRIc6Um;8@En#@y>#Mch*eE5E3q&
zsDJ)QWe~HZu=JPqwHHm!J!tPMoAuVM<=A|yGuL0$MD)r}t=B23K4h_=$wxfq{j{s6
zvbJ;1RM`0b{&%I*Q{~<_^9mg*KC_8ox^*ST366Hw_&MDTLh{a=g|okJNlO7blfl!~
K&t;ucLK6VLNBNWh

diff --git a/openslides/static/images/icons/dialog-cancel.png b/openslides/static/images/icons/dialog-cancel.png
deleted file mode 100644
index 45f8949bfe3dd7cc4242bc26ba7564cc319bc834..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 848
zcmV-W1F!svP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10?kQ8K~#9!rISra6mb~FpZ|P1vopJXt?L)XYH6iGA0URHbqfXS
zkVGE#AQ*vmt&4{aLLIuLCm|?FjXFf72uUi6iD_1Tghk;dx+|``=}zm;?9NQHma+<U
z>AAe8-^261JTEa#6aNtPXBzm680^#gmX>3y!^2O4V`EXNpx`(y%OtY6I4_r$GOo(X
zx)ZIf^GMR31Vi=p_g4G*8Z*w6^JyiekX$YhLZGazAuu_K^{FW}r@Ff1Y**LyWP@GU
z*WcGv=<yI<6tVbv2tSvXAqYI|hYH~+K8mgICcND}X8whX?Fo}zg9$74TwB{acWn(1
zO~dSqmqA{O-<DXmhiBOwiDO@(?6iY-<w4yHVR>LsEop8(Rc5V2!IIb7S<cVmX_~>u
z-o6ka^s&ZR>@Gu5G0`UWq*PTnSV6{yZwWCi1}WdgCz#zUD?VQ~laY?44^yC{+MOmv
zS?!jjEZJdy<2-+^fC)#T1$>wr9EN}46R6bGZDz-SQv7}?#?shY4?y6!&ID|?iQ}&F
zlWxp^gQ)~DGcjf4s<CSb1>sv-M1o1M+X><TzE4lXP!!OFIBfzyE()ewA9)LH<txUf
zXN>eM)x!bL1Ve{znZ%QdVldg+3TwteK}VWR7-bM~3*G<_4PkUOXgDmm!89M~Hro|}
zHX$+u2`0gACt!1O{2Tx+tU+fZG9QS7*jWsyh9PQ(=c)xikR(@Ds&GsH5dmfXW_FKQ
zR8>{CrVFZ&&LO@W0qx|`uNfe5+(b&sNT=O?BQI0@%!M}{NaL_#2x@}aQ>2Ghk-SeI
zHyv?uBr_NTY&60Y0~^C4oi;!PBUo{;m<(v<!AqChJ;_Dd(S6J0OK)#u5wG&O96=@s
zI6@Evu%zjji}LE>nwpM={Z&rZbE}mLR!O|0qftqgODWn)vavCHprRtB*os}d@0tGl
aoqqu?)kdoeH1-ex0000<MNUMnLSTZ<CUznK

diff --git a/openslides/static/images/icons/dialog-ok-apply.png b/openslides/static/images/icons/dialog-ok-apply.png
deleted file mode 100644
index f1d290c6473dabb354d792a7724cc4d786e0d0b6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 597
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJbFq_W2nPqp?T7vkfLzW3kH}&M
z2FBeW%xLxI@gtz1WQl7;NpOBzNqJ&XDnogBxn5>oc5!lIL8@MUQTpt6Hc~*<d;vZo
zuK)l4XYgZS@MK^JWnl1OVDM*P@MQpr07-8c11JvU0!g5_4+B#G6H71)5HSZaGx;%r
zkS`OH2NOdygK&xvV>BaQ29J1}sCcHRXtt1GHXmOGH)lM%P_}?T46j72h<KQwREUsF
zfS^o(h)#>L`z}7OUIX7+O}{2xziz{THCiFfy5WZ;A{IDB&UcKSV;{RoH)Uf$$}Xeg
zEh%MNlgsu*mLCYM+>uzlJFWgeM*RuXrem(nhrButRdw$5?mSlAbuhf^V07P+gudf0
z{U>84?9HBVFn{9F%!&8xCLb%9d?IVw;hY&)-Dh6tpLuD*tP>ftPFK%8nY-*l`L<UJ
zHQ&5n0SrFvk|4ie23|f1X<0=TBV!X&Gq>!VqTUG;r_P$YVDX-7H*P<B{_^$PuV24?
z|M~ORuYbIJ2R;I|HF>%?hDcmaPEcUoz-6%T!%dO3OC%>g6+NVstLmszmzt<>Qt7?C
z&>Lmel#iLN65NIcr+@CUs@5)KU`=t-W%hANv3>KFDb&Kzily|<*}Xn@bJiRV-Knsw
z^Od!vMbwO)D+&*u5x-n~!R%AWbGI8Bc`wA5oa}w0#u>{i7ZUz?lkj_IhPvbY2j=Pd
RmjhkH;OXk;vd$@?2>>yI)$afR

diff --git a/openslides/static/images/icons/dialog-ok.png b/openslides/static/images/icons/dialog-ok.png
deleted file mode 100644
index c173526fa5f970742fedafc67792a6ac49a03c90..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 601
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJbFq_W2nPqp?T7vkfLzW3kH}&M
z2FBeW%xLxI@gtz1WQl7;NpOBzNqJ&XDnogBxn5>oc5!lIL8@MUQTpt6Hc~*<d;vZo
zuK)l42dZZfv1Sl5=T<P~l(FPgHsz4FW0Nswl{06RHs_SG;gGgwm$G7)x8jloB1=wr
zYff1!Zh3n?B_}>bXFer+E;(Cn1#2ETprARAs<)hZB%ivkq+zI(k*}<2n5=1(lxd8Z
zag?Y*xRgnltYy56X|R-`o4A34grS|ZiM_sWnU+hijz^}hTdc89xT#N+Sx}sHNWM#a
zrAtDyZ&sCmR%bwNXJB@FQ2w-#g2|zU?O_E|qROU6m(7kYpAuU&Exu+&LhY=i+8If8
zvyvLtBsDKhuAZFIFekNfc3R{7^yc~LEpszEmSwii%WPkf-@T%sXGO`xl_gX5*3Q~m
zH+xh4>`hZPomhS9-l_MwZNSjbEeY}qW?<yylaQ8G)HAlQadh*}%FZe3n=o<Of)yLK
z?YVN}*7N5tUcLGJ_3QVazyJLC=eLZ%38=Bf)5S4F;&O6=0_z4&!^IzNPGwG+IpOJ4
zC*`|K9d#T{0~JoLk`NIT)L>5Ge8Doi%V2}Xj<)unD+(A`pUBki?K%1+_fKtXh^3=d
z%U2!QIlO20*xFv%sj#f`_3Y@|H*e3%C^&p(`h~4UMVl`?alE0CDe!3d(e5WKZko!u
hb|UUZpNfUwJ2Tui5{OlJmjFsQ44$rjF6*2UngD(H)oTC%

diff --git a/openslides/static/images/icons/done-grey.png b/openslides/static/images/icons/done-grey.png
deleted file mode 100644
index 4e5e16f47925a9515a8e3d9b831621bd8323c8c7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 413
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf67>k44ofy`glX(f`FeQ1ryD<E3
z??1C2$m1;Vh%5$by$-^RP8zc-fP(BLp1!W^cUbs&#0?{R_O1e&py=u17@~2$_2OQy
z<V2CyhtF%|Or?1LnP~A8GhS<ob9%$#Jv)=d(OUGP^@#?B%f5-p#=Tox6LeRsXyxEC
zQ}!{8knr)F@}wqMB{Rvediv|T*#~d^Nf-LD@oH4h{FZ%_d$~C8Z})!6n#q5mWL?#!
zNY9g};%z(TpE+)NTC1^q=B%po`x1FIc}*+NmxgTd5nu6*#YK7F!%e&?_nvgciL&VG
zE;cK8%g|UJdbmvY=Y{ntxA@k*xy<^@H|ZW%Q|X-><|^6lSDw`U&b+FVR`@=^Q!m>(
zg^hQ$^}7@PeZ7)XGPX3bv5BOd`|##UN64zHte<vAKVEiLW7qc=-I~E_e=hD(QT_94
zcX_~xmsdnpni3wU%9QT2G?(HMNbc!W=ogR{Fa5`OLL%wM=G9VjfZ@mB>FVdQ&MBb@
E08?nDQvd(}

diff --git a/openslides/static/images/icons/done.png b/openslides/static/images/icons/done.png
deleted file mode 100644
index 5ea69d2dd82f34721a0ffb7077666068acb583e0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 756
zcmV<Q0t@|#P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2igW6
z6EhbnFTFbe00MMLL_t(I%axK{Xw7jL$3MT{`JbJazw>6pq7Aj(cuAb0NL-MT*SQ!`
z&UP-iz>OPuiKLK1xfy9(C{1~tq?1wRrD-~C-j<k1$ibTPy8rqAe?J!o+tu(~K0V*h
z^Lgq4V9UAb{BLc&P|6tfJ7>@w>t<W)v@@2<#<kWX289rmNwei-!_#=|<WvN}=Ce~;
z#+p@)E2r(C%;gyoU^^C9pC2QYeb>?)dl5GP3i(3g<ccUS`tI{r0|YhR*%WQN34Q^J
z1w|pB#zFn{cC8fwe+7ruB{;lZU;tQo#X#;GN<04$9!+fdfj_;HK~6J}NsXwlv_r^0
zhV2c_0Nm@jG6b-4igY%Gtx6mE(;xA9{0J#fj>d5mA#)77<E;R6KD)vG(@g+K06VYf
zPk$lc3v+b)T{bS;MZtNC+cQWoWHO<0B8Ru#2H;W8b@rZGfua1vPADi0w@G>VXaE+?
z+(d9xnDgy1q%p{zSVw8|^K0xowHnhuivE-uGRS8X4qtiu`3^@~=K(OQb`={IpWtBA
zYe0~E)5h_OYX}B{2qCeu&Je)L7V&vq`28+2RxfAT7XT2g*#yAL4{e-FtR)f-<Mm2}
z&{+B5fP6{E?Q!Apy2%uKxtv@GKws)6mpU5=m>~?e#ASfv2nO@^5J1|#hrN$2DkDXz
z#}}D2K@kdfll&6pS*o7eDi77;ZK^75#+5ttzqi3EOO!qnm@{|D>YRLaK5Kn7m2%Js
zl+yej5K<rnNC{F(yhh}c&zaKD)tTrJGwbG)?0P_5bZJD0uqkktf(ngBBS1)@airEl
mpoN9vd#>xrtsk@IF5)L`k^^D!$l|F00000<MNUMnLSTYh>Q+er

diff --git a/openslides/static/images/icons/edit.png b/openslides/static/images/icons/edit.png
deleted file mode 100644
index 84e345d22430175e80c4ea1f1f17e6790649ee35..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 726
zcmV;{0xA88P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L00!&;00!&<9(6c100007bV*G`2iOY{
z7a2C-AH01400LG?L_t(|+KrK2NK<hbho5t1QsFX{FtXJW!Z4^Xy)iGk(TkA4piiP8
zvP`Rsj9@_$7(s%OV1XY+7t;4d7h$BKVJM-fky%RW6kT(+OwZ1Ay0iT|9N1V}P!GJk
z@40xN-^>3<V6Yb0&VNv_TV8p4V?mwfnj0e_;Y3J~FNA2}9|Zi1czTO?dEZV(dw>O(
zt1}KT&;|T(yOCwtC`po#_0k7ph9JvdOL^V;h3l;{2P{)smPaJXL|`(R!U9vMn@q;+
zw^z~I)5VRZcy?}fbNa00YRQt%#X%S&(MZ=zpTpfZ^$5qeH`waqS#O@<R_SUg>X&Ms
zw`tRn7yOwXN}hd>GX8`M)jn289%?QISxBuwU-kf#VSyA%jF1G>A++hoT)FFEUQwwo
zQP5J$P~{x}4q!3nf{-NOa}u0>i0#f8pNHMtJT-@T(?Mned04GhfF)xm>J5w%nu5@m
zs~QJ+*X_i1bdD|CavAj%l9rZ+#bN;<MqvCd;V0mz<H56jo;FWVQs^N!C!PLZM@UXi
zAu}@*0b$~z1@n__v^BR=+cZg0-Xezz5_vJWpDE`6<~2$5_4TpJoCu)(RiJt$yg@5_
zca2egSmu@eIKv~~sjRHjFGxmJRW6m6zXiHt1V3jS%sM}izRpQTQ8wf8`^edojX7n=
zSoV6o*sj_J8XFo;0zM+h7drQ9Ys9t7$An{~Q~3SMA{Y$n-7h*iI)tJqqU?OxCtxcf
zq6HK7Q4!6u77*PZ2So9i;uc^7QAl8r0%V21W6^+4V2LPx1DV4L^aGFf_5c6?07*qo
IM6N<$f-WFG`~Uy|

diff --git a/openslides/static/images/icons/error.png b/openslides/static/images/icons/error.png
deleted file mode 100644
index 0281708aba8e354160f2a226b25cb253643f0041..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 722
zcmV;@0xkWCP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10#8XqK~#9!rBh8y8&MQJ@6BY!X_{(X6f{yzu@GAP0e0K0T)L>i
zMHhl!dqMmI;#x!$+EsUUA+Dq#w1QxzR9r}Cq1YCRG}8EynMCK~&GhgB#%5LUz<CTa
z_nbNR-Wic332p-u#M?q)vc125Nm`a+*fwM;r6~;Kx-d}+aTscbuB%QD52uSeJFm1s
zCZAt=JUD2!Q}jQmc%FGTms<tUF!;5<FP{tyz^&EL3PH9uX{Xcpy19vGv$K#OzVGhB
zJ3mA1;sVODkR2aK<TwbbRrsXn?nc+x7<}KyC2Q)e{kFXgqG1pUz(1{MLEpp#%uEJ3
znp|-PF~tu@MqqVxpm%Z-!TC8t8c@?5Vn_xwkb%PS))sn(h9FH7Pv_<ugA@YX7JjU)
zK`{aRIyE;8B2rcU@DMmzS<y)z6^q)0(Bjg<0>s`P1kGw?57AA7KyZ*B-Xmi=Xy*)$
zxvDOvFxuJxo$eIg`a06(GR{s;;F<}jY0e-b%_xL)UBo>-$S*JBGK%0*;4yMQ)85rp
z)S2iW6F5>((`rCRn+1J~i-^-{{nk&z!}vHgg^1Ia*(^He=V7y*lt7Dt;6cVp;WxM7
zA06T6=qR2a9H6kVfiKh3sFzB(nweoO2P(8iL;njeOreSyOFCB)oh(R8i3e=K;WL8_
zc(1~*G>l_Zc<tE=ud9B%79~bwjfn`$j<UPyT4jL}2_p(dl{%u*H42vi>Pd|1{Rpuq
z!s{($Q`XDRe(>g<tIXyn{4WwTAzcyX?pR~jE!+lw0U(YKCzs~=eE<Le07*qoM6N<$
Ef|}qv(*OVf

diff --git a/openslides/static/images/icons/export.png b/openslides/static/images/icons/export.png
deleted file mode 100644
index ebcc0fa9a6049100b3aeaf385bf3fe89fb8243dd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 614
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJbFq_W2nPqp?T7vkfLzW3kH}&M
z2FBeW%xLxI@gtz1WQl7;NpOBzNqJ&XDnogBxn5>oc5!lIL8@MUQTpt6Hc~)EKLdP1
zT>t<74`c#CN=gcZ0U>j9bCJ3B_Vz#pSFc{}>7Ouh%9QKZuQzwJw{&&p<>ggWRGdD2
z`rZ5Y-@bpJI(6#InKNh2nl)$6oVj!7u2`{R<;s;CH*VarWy{vBTlekTci_N*qeqXP
zIC0|CsZ(dqp1pMG(v>S$fX3bdg1dJgJbd`z(ZffN9=&+^^2N(nAn^M2>o;%Syaj`I
z?|`<v{{RLbLEsY*d<KIrVDJ?TzJbAa5cu)q$IqWXfBgcYU%!9<{`2S0-@kwV{rd;>
z_4G@NZGk?NDhcunW?*EJl2KIA(KQVS3~F3;;P~+yH*Y@t08|*nydD%jJ3U<-LnI_w
z4{r225+LGwvG&~F$tN3Lu3<S?By#b;K8v-rqt2UBE^blI87(UBk8ZtU!oYCAX7bsM
zZMrkp@3THTgO}mO^4W0-O0wt9?0Wr<U)M8-Z~FPDR}~SvUDL~5SaPEd9G=E9(UF6}
z!^cG@f9sXo-!}gAZ0b3Yy_f&(lv>Xec8`sH`j1;C_Nv5gTfeknqpl~9)qHUSA%>@q
zUzx0#z`^kEQ)Yx&$KCg>6aW0NJtG?Mj@2Rd8t()7;3JOZ?yLNlgCf(@)z4*}Q$iB}
D=(Rq>

diff --git a/openslides/static/images/icons/guest.png b/openslides/static/images/icons/guest.png
deleted file mode 100644
index b50ec42a5e86f71478526a925209af02c6dcaa7e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 636
zcmV-?0)zdDP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10r^QpK~#9!jgn1k6G0fqpLyAr?54ZT+eT6=ZAw5vs@8%B5%L8D
z5ruw&q6a;B5xn%`!Hb{3vtkkb20}pudl01+ghmZ&Xbjk-Y`2-6of*d!DwIu|A3O{^
z1HXCZKZBG~FpBjTkC!MR-3!<5zJ?KG3f??@bY?hY@4_(3m#Q^z9A}rP_|&<pw+C<t
z3>ioX&l9Qg5)@#=1TUz0#I#>Q1{5;Lx$e~Y#YI3)8HD<0{QUD<V=Tdsx2w5IxiCP6
zRiLH~reUT1+D!dBXpX(Y7OQa2b31@AAOso(N=caTCR$?&n$2dS5`G^N1|S(I9_b}Y
z2vYa51sN0<ZmhMxwh|HbLB$bld|YSw`sMAhLrk#?{moAs<(LV`PX_7uV^5GI5}lko
zTWHK*0n7Cvn4Ycc9zIsk8Hj4HxA*XOKinSDisaOX;`F>SN(~~VY%#_ka4v$(pV;jV
zZemQHIWENnlQeyd@u3f<KnM{V23;~u`tm?9WSnfZf9+3IeZ#g)KnTGo^aLQJ+RfQU
zV40MqM||n@?i793&_2+@BTN1*DZHI<@A|<j?DWE_StU|$VM;L&oS9cDU@V3(Vp8Wc
zccSS3&tPR`)eL4z%}Wcjw{o_9S}Ng60k%{U0HFx!vG-ZL`Tj%u3Feb)%gYxzX#N0L
WmG=J@vBtsx0000<MNUMnLSTXz77{D~

diff --git a/openslides/static/images/icons/import.png b/openslides/static/images/icons/import.png
deleted file mode 100644
index 66305f4ad5fb310ffb0d830b88c9dd4db808079b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 609
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJbFq_W2nPqp?T7vkfLzW3kH}&M
z2FBeW%xLxI@gtz1WQl7;NpOBzNqJ&XDnogBxn5>oc5!lIL8@MUQTpt6Hc~)EKLdP1
zT>t<74`kv2DJdyE{SzimnbO?R-qO|i?*03(U%!3({v9Zuk&#hUR8&(_)78~AXU?2?
z^X4sCvSbAitX#Qn-MVetw(Z`%dp{5y0D)u2j-5Pp>h$T;XV0EJfByW13l}b3x^(5r
zm8(~;Ub}Yf)~#E2fZ*=k`wzh2(Zd%nU%h+<0<YhIz}t84fL6c%@ZrNpF!%%lpMl^D
z7<>hTZ(#5p1bzU)PZ0R^3y6OG27*5z@b~ZEfB*ggeSQ4qGY+7)g-e3`f*BZ@WE53&
zOalUgb{s!`^CnQmoZ>Vkp!9A}7sn6@N!Ei0y$(A_v|fCF@29%hqeUINvNFZ=Tt14{
zRJgL-cbupdo6)5gWsqX@QO5Bc1H%D{3HitGO^-aZM4b8S>o+C#&8mqCS5w991qCe&
zs_*SPA6+i&drt7kBe@m9as4OVSQsYFWn%pJU18<k)$-Db2af-%c+8uB_RusJhEMtS
zagiJx4y)&`pX@SsUKT@K+zFxfyPleCDh#L6zgzh*axn0neH`$N<>OwnN%OxuujB|)
eX2_bE_JjS4mZiJDa*ZD-ay?!BT-G@yGywpIGB=R`

diff --git a/openslides/static/images/icons/information.png b/openslides/static/images/icons/information.png
deleted file mode 100644
index cbabb0e54a5f50e447982e63d9b9777c1bab64c0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 803
zcmV+;1Kj+HP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10-#AmK~#9!b(7yq6j2n%zjx-&&i>L(6P11}VMGLGia&@7AA~~c
zv4<ceh^*)rSz&}&87uUVX;2{c;7jySe?Su1OJRbc4@GE_ic3ATo3qWj&g{<2&h6e^
zR#fr>hkH5ae7|Q7Gea0-*Z|?7h!~w(D3>HcT55O20oXh&9xm3f(LlcTbfj@UW;`z4
zQe3^WvbZSVRY*Kx8d}nrtt$6-^t2rw1K|A6Kss=4uuJw8b+;d{SF0*RP!$=XY&kAs
zx`DToi;kuz21X($yM)O)gR&F7x3*Sp@4Iul8CuGQzGB0#$`BZtEQ)*zww0=Q`EeF=
z^U?d?htEd<u$%#DyuO!~R!rS)YxSEJ%S{dXDDIxx4?*PBSENh_ga9GGf`_j^m^7o+
zr{3I~mLQ-?Z*$!~e_XftWD7~df{}J0OGJdY^IX36bIHJw>MGw#8j+k70)hr2tN6>a
z1(wYWt`3evJfX(dS&LUu0EyP;3`ou85(NEWA`vdKP++9z7z(sL7zJTieS@k(0I)Er
zxl%%r^%5`_$&?MMILIM;aH#toKJ^}jAeE(X-7NIw4D@6Yv4ja^ZNMfHW#9TWa`0w+
zVrH>|C>|)@AZQ=}N);p$2?)lbCb$C^Sb)V(M~E|VHvMdgLg2C=aMBfwi!I5+dsM)Y
zunJWHBISd*Kw1av^c*<(E{Sv^6>~u3e6ylL>u*8<?NJ?|`g3`J@I+MX+PUsSB267b
z@P#g5M=cO61K%YtqWpBy`JMIO!2CF1>d)E4z{T|j95i+eL#AgS)k@eC0_@%Ssh$O3
z<_{!i(sdpC1wKDH%Q&kBYatCcT2vn$0+qv7#_@=%67blR;g@Av?ao-=`%VAGjYu_@
h!lKH)3`VgD{{WW=EM6)QLJR-^002ovPDHLkV1f)8Uxokx

diff --git a/openslides/static/images/icons/number.png b/openslides/static/images/icons/number.png
deleted file mode 100644
index 87e23bb31890df34bf4728e7c86519596bc64632..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 694
zcmV;n0!jUeP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2iXb_
z77ZYMU2gXP00K5iL_t(|+O3j3Yg9oLhToa{y(<B;S+@%oA-!T3ti?tw@*6Az8<1@i
z1Gf7Ev<WEN83_Ib6%^E3j46fv%I@Cm-mfz=o_n^i4mxmV?!9x)JI}o5;=hc+U~uD_
ze!nlPUr&{>_s-7Vz20nX-S<2VLk2_yYb}gfKRf5(>UWOmboymD96kf^T?DkVUw3wP
zU8}W;RhFTVG!aGt0^f($8bw|pFA8|R2P!MhSv~ml@xwO&N(6{iSzC=qW8`^;G)kqo
zVv;zFP*gd8FIc#NFbuFrQ$@x>4zH&m@KIzXlveOOAJ!NVcz=G57biyugAhp^!8wbJ
z2^|!)r~V31MTq#MvZ?^(1T|yiy@z`&=s~G<P8>xbL%7w5v6!dgiwImVuW>b-VYytw
zI*3^s3hg@`a1IkWF)!tPV=QK~ITI=@qzf`B1Z<jCS_+6P3<})d*pk!zAP^EF!xSON
z57@{O8vxb>s|-;PL36gR0kVvn#5g=SkfLt4%UuaYtg1--Agb{D;<FI2x@L5Pl1f%4
z+}+;B^lFOJH*aBxpm~2h8p1KYlPfQwwZik4r^*+Cbb*?^)9#?x>q%E!Evz++HS%L6
zNdh9`cIG%fI%dCCc>4I!nqV?pU_PJoDI;#%2@K=;^_`6or%`)jNepZ>5{!l;r0F&G
z_n(MBTo+zm{z6FxKYm`I*-TItC6fg8Dn&(EN+&E6Y2{%unV{8bwH1I}jzf+nZZ>j`
cSNPZQ2N}aSSvHFE@c;k-07*qoM6N<$f@sem*#H0l

diff --git a/openslides/static/images/icons/off.png b/openslides/static/images/icons/off.png
deleted file mode 100644
index fd50901be0b9f24bda2f601ba74875ccc2d961be..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 489
zcmV<F0T%v=P)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00002b3#c}2nbc|
zMg#x=010qNS#tmY0lNSI0lNV@?Bn79000?uMObuGZ)S9NVRB^vcXxL#X>MzCV_|S*
zE^l&Yo9;Xs0004KNkl<Zc-mEwTQ5UV5QR_rZ~E+)xby51Qs*2};Y~cC^&m)Gi?~LJ
z1g!|Rh+ADEga@hAoeGX$P*0!bq=ZanXZBueX3d_l$XO_8M;+sOuICs#8Vdfr`$t~D
zX=?x6A<eri%`P3EPE%e0VLoh|WuAEDO|VSSGjVJq$~VDop5~edj!2N<MdvY(+%SXP
zj3w=GHc5&xN(u3#+&V?$5;`QD4FxSH(ngXEiYa552j#{nr-Uul>A;CtuIXi+DQXzt
zP8BlpVQQIWn|@qlx!wqIb~%^KJuke;@3`Uw!z2w}j<6}k3vQMFA-`69z-EphiA5Ew
zpqmsDk@r!}C~FK#!f$e(8S*Kjhf7j|iz#G*I8im}e>0{_rzn-2az+&ebg{t%jryiP
zs1~M3Fv}2o>=R=_@Eolg)bFTU7}fKNbk|vBiE#vL)PI&0&bHGhV1fZ6D*m&qf9tL{
f^`6YQf7bm4OkiwY^z<ix00000NkvXXu0mjf2t3X3

diff --git a/openslides/static/images/icons/on.png b/openslides/static/images/icons/on.png
deleted file mode 100644
index 1221e13103a3066b11a821e82e26f441fac9dc5d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 757
zcmV<R0t)?!P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10&+=2K~#9!b(2j<R8bVif9Lte=O~V!gv_{7DN;ysGH6k|fuc>(
zu7%a2Roh&aSgW9Is}@m<RzV>Yfvfg@U<>=ej6$bT8Fkc|dGF18_vGV=jf8)=+{HQP
z$GzvAzo;tpvhG-?8{w8(j0g+^C@hF!&WD%gh516A4gqpTti(CFe=^<wc<j>6#=*=W
z>Goa#^4lvc<`;SO>9zko|KmYzMxW|uHHUzx*dCFO_paQ{T_3%MZ3|)nLM#PU2x`jP
znRh(<@O(O$)5{UW25892_>Bu!a~FrsvsKH3p$<?7F%abxO8MLyc|Q(3v7<jXH8MHW
z*GI9oiU49FY7B`L7ZZXpFf`D|)C`mRwNue+$5QP$yShe$?}7q0R5zm|Akf^cB->(u
z2Cyq7Qe8MffiYWzY*VZ9wKPkA@)QV^i?I1qz#>)wx(1Y%ju^1K_l;yqk#))1z_8=M
zYGsLFr%HGG309W{Zx66Q00p*|Ad^)#%j*=}Rh$+;7`6eB_-yP4w##c2Hk%2`32eIo
z1VR&H2Q}Pkg}@IG`PX0@SnynOEd~I>Fd)&p!^XTEc|m4K2}3~RMtW61S+G=@b@znO
z2R&#~TMwkOO0pf29grDS+R~tY91mTnmIO7-irkiHjPscRby7WGwSY8%I3NkY0t{#k
z)B{t7oj<U$D4y$a){1u9_n9c>h3Ynh6)-MnB~CVb2X_U+ay;JRFTwYih-#0la%(5K
zuC&tJ2@OqP*?`1<HXc;Ap!i$ZEizp@SmpoBWG8r(>colW>@>#!uLAC_P%7dDJ`d~7
nbgZ4lVnnUj&SF^5W9<AF7WhP5-;nMK00000NkvXXu0mjf817KC

diff --git a/openslides/static/images/icons/pdf.png b/openslides/static/images/icons/pdf.png
deleted file mode 100644
index 9498f0ffdba67b6960afdf662653a8432f615e4a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 688
zcmV;h0#E&kP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10xd~IK~#9!m6Oj)8&MF)zi+dfP1eK|CCx#x7K+DuP!Yki-Yhf`
z@#LQ&c=0OU`~yThc}Wim2p)3qCRh)#K`YWq0!bP#rM1~+f4@$quBOBmIxxKOGVeQ|
z8NMr|ln_F^05FCBix2enlL~N5S(g3IacmM(&}n@^G?74{>xjkU5C9y<K{OiWVpUb4
zX<8P*g8*#XhWXRPx3e=0Pfz1VqXA(Uu!n{ai^br&F2W#UgrPiKDgu#61c{Lm)OU6e
zPp9EuUUu)edqh$AH|5g;3SBBxG%!An=L-vHZEr&{O&BzSM#w=B!1MjC0M~_~K4P%|
zcS_L+Iu(B1+(aUiL1b<Yx~}t>mSw>(jDCVpAk4(f3{vy+a1Rb(udM+W7f2?Pq0rw6
z#JvCre_&z)>c$5A^K;y7Z2^OWNUg6UJ~q}*fUZE8Bp_=ws8s0F+;O5w6A6f*xw?wa
zv$Ic(@JPXDaB~BUjzSRb-R>@$*(}85Br?axczJTtHv$ug-;X(660okXVICbJwz7g}
z`}+|0Mj}Va{vGsCc(gF{@DSS464J#YG;(FT-NtRb&MqvM%kKev<cCtS*jw7H>~uQv
zd$A}R%gge1Z%>l@B<(<&rYS3x3ZI2Sp$gzNC4Wb~OJuV+trqmfMI>ovG7UHIJdepr
zrBW@I%e?_mkraOrc+{y&VOFcM-E4Aa66BN26Xf&x)85WuhM)5*{_~%~GhcD%p7;ex
WLIk?6j(Oq$0000<MNUMnLSTYQKr80}

diff --git a/openslides/static/images/icons/preview.png b/openslides/static/images/icons/preview.png
deleted file mode 100644
index 3b674c3bd0e08d68a2640af134420e46bb2fd691..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 808
zcmV+@1K0eCP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10;NerK~#9!byHnPQ*j(U_ha69-IuQUfi?!(gAjwj!J0#}mr8S`
zgfEG(e2iYi9y9FA7b$$O7lWRKNzp_07=fu%Bq@{1QMfG=hpwU9?mq6n-(4tv9yr{W
z-#O=Ze)nDufQ4A!+SXR*YxmubZ6+#3o}~p*_;P>X-bgZ;%;O*!ahWj|2Z1A=pPYR6
zabY=z!23TawVIF!aWI}%aHGkHt5;fJHk-k595nDe52L~0A%kfU#OCG;^|Om%ynMS3
z|D9{7K2r{Zq{FY(7~Z^|fvo?4&JJH8sgQW!L55zhw|_FYgX_0iQB_+G)u_i78QAPr
zT)NqU`Be_TqfzjJ0D-7&upgq)WGYK$I9O{ekPJE)WD$7^;3Nro29#7*;M?~fa5x<Q
zqYoP>>2$8tWQA-fLJ5h@0-&QAMdhKI^r*7Q)R`-!6ZUSgS0Nk;FV<EUfiXZ5=s=`4
z5lciKqQK#lkcQLg)Pw~d2LEDgY^bqbMJ}?AR36}I#z10~hNZO#EJzl5llWK@k*Hp5
zX~OKxEYb@ptkzUujaPxKO(?MlWLd^mJdQ*n0lVFPbOR8|Z8rFP?QqqV!MO1g*6kQP
zXY1(obs)B}f#;*6(38>1%F6Br4Ex~O-q~UF#W6)uSSFKU*=&~OaygdI=b5UiED#7V
zzu(Woktmy+n^yt27-P`L?_TyKYG`O^fXn5=<3|rsEEjVV6BB)1U0p&!OY~6sly)fM
z5d+!+!C(+>w;O%^cca!)i_PQl6zO!jsqyjg%Y2~^4W0z51xc^R;FF=RBhQ{XmzI_~
zL!nSI8jUvg^z^&}!JSN{R2tN}ALy?k9{;Nj3_h3!An*3>?(X&u4-bFt?d^4F(Gu|-
maQJ`O`*m}~PbAFZ82kf6#TWb|m_-c$0000<MNUMnLSTX-QFD|4

diff --git a/openslides/static/images/icons/projector.png b/openslides/static/images/icons/projector.png
deleted file mode 100644
index cb2be2258ad636e049e7903049b6f0a662191bd4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 720
zcmV;>0x$iEP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY8?OKW8?OOg8j&0T000McNliru*9ja65FZ>XC`teT0$oW&
zK~#9!#ZpUa6HyfYGI#Q7I!z)-lh~$dv?i^#L0yO-*e-m56(0!VKM<_H!~Oy3TCiQY
zbfYd5L1GXJLSvJW(B{!L>6m2NyeG}|+`*J=T#6rj+?jjs`ObIFz4-62^gkkz2wPo!
zeRXtnbir<SoRuW$B*2Gyy&jH^j+%yH?6=#kbfr@HxU}^Ab3FdFi$0c@U-*+hHsYmH
zk+)hc-syDAwb5wsTCK(p4s>3vmbs>t`0j3jt7_`o%F4?z5F`*LCqqw_Vdb*bY8^1g
z!MR}X*sR53fh@~V6y?(R`1rHFfYt5s+z>$lvMdr!cDr3+-`pF3Ddh3EuZvu1e*RkU
zgx7m<ApR$bgXRFjvETqmz!O_symMN<cmM7KD?uDMJgh<256sHVW)tOd88({@Uatp?
zF{&(43k-I<js9hJ>-Noua;f<1f~J)rNIIsy_4RdZrZy4q2QU$ufYC7!2m~-PG9ubB
z3-o9<`z38w-rnA3^?Kb*rs<<lC_w$GVtRTSx$F+!zxx2c-v_!r%*@R6+cHJ+`2v{F
z=X*rKbD2yAg6VV`dR0fI+Q#E2O9%$Xu(tLJA#y^_MDLWCH-%EE)Q0SII{Dn(9Qs$N
zswxtR1hh&6Z$EuOt**oAQcUZySj=4AZa3(ipxthRg~Q<hZA_7X!U!U$>pF6|E##|o
zsC9^iE3+6@hT(8Hgn&pkG)>#eX0vZB00doRDHx4L&(l+$a=Bcm_KJHxnaO8{TtiI~
z%`k~oNO*@5)nqdHovP;m)GhcsB%+PjBN{}Ge}Uhla5FU+K$&>}0000<MNUMnLSTaO
CT~JN{

diff --git a/openslides/static/images/icons/reject-grey.png b/openslides/static/images/icons/reject-grey.png
deleted file mode 100644
index b3452045314e84e398136bc5a16e97db8655d53b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3081
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
X4XA86tI*uH00000NkvXXu0mjfbyDpc

diff --git a/openslides/static/images/icons/reject.png b/openslides/static/images/icons/reject.png
deleted file mode 100644
index 9006b077d6b19f9529298e384b26c3609151fd04..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 842
zcmV-Q1GW5#P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2igW5
z6)O}Z1*e1n00PQML_t(I%axK#XcJ)+g};Ahl9)-v#5S?fHm#41f~KtnMX3*5w7PTQ
z!kt=CK@{8xq9_#~2x=8XLFz_OaHAW=il8k;L`4M^UkeLuHEBC(YBHHjGym@*rB*lM
z-Q3kVoco;%z}cn<|2yZKX9FPiHq~<N^&l4;L)RzmLI>&}N&$u$>^}6S*l~1u1Oafm
zG1MJREZMn!|0x22ARd4ae+rdC2VA$r(<?{F4u0%D{MPOe0LPXZs-^t^5}37dBZb~x
z0sxv;5le|{7z9_Z#(naHKsZGIozrxFlEMHeNku7}W6`c1G`F@gkV?^a;skyv0dW0(
zHg$HAh{t*6^I<)DOi5O5)hY%8+ZyA2R~Kc+p+1?U_4skJmc{tbpVML|m*ex*s}!wq
z9ItYs0pKV>eq;=(%3N=2qvPR2>g(#*+|`9Y5TGU=r<l#sy=6;<u>@xdO(lT>dnAKB
zI?DLa5SJSpu}4QqHZ)L^NRS&C;6f@zK9eCBjZ(BMN=l!ZKqHs_jxNBI60^P@X`0go
zlueUJGReg7Fz+5bzz4WXW&xAG8JMO?btpvbiWO{s@q(~vlK=V@C!MA$7GvAJd$^W`
zJ{8;XW<az(37IrLpO5yQ9_E-PZaU5LWy|PYyqI!6PpqnnJzu^Mj6_g>8x%c-39P$x
ziMio0lbH-37A|C--_Kkr>6<^Fa-l#?EJoXzGYFtqo>`*@Lf3h_bt~yxxB1wxh?s5=
z*9@Y%fjL>`QDOm~ZrtGMzI{lbB&R<cR@O%QYn|MhgL5?MG(~mDM>L>;Ca_&a)|HGo
zl61jkNDA&s7&K=0yc(WpGXQ94IrnYw!_D29A0f~4ka(a#PDK=AYHOfr8sSLwcVAuV
zB*Q(3rk1t5e%a5;we3+6sR{|rj}Rav3Q!0Ex==`=&@`l1LXMBvulnv!G_TsgFYci!
UhZhFxqW}N^07*qoM6N<$g5Wo91ONa4

diff --git a/openslides/static/images/icons/remove-user.png b/openslides/static/images/icons/remove-user.png
deleted file mode 100644
index 6ac1d68466b36768e352ad52876cd8699604dc45..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 707
zcmV;!0zCbRP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10zgSbK~#9!jgm`f6Hyd~|2s3yq?5^{(Zs$|TdQ3dXe+hSg$P1-
zJ`falib6M~Yr(y^aUr#!E7!G)QVT9zi7N{>6v2?FEz*a1l+x6s$xJ4h%)Qr{bWv#|
z=DVDG;lJ=7&d&koykW)WpFjAr_+so(Yh1*={$}aTv&&|s`oS<vZ>TeZR<FD(!R{Km
zF=?X#0*+u)K1(^g3<QElh8F4$i!JgT{(*!e_%$s&5{&}#NpMa;X%%bPjgh7delE{y
zp-`J4NU|b&WjHT5SJBbkvjvC$j$oM{=J)$Du1uVB07oDgSZm54diAbOE&C~G1#a=0
z0cw`2l0Y6eW#AGTy|a-1wa#f}AKWS<5nm~)=dSEG9imH3QjPE55^CA3A{ais3Wuf*
z5{aazZ(!J0H4SX6C2*oMGGN<`NRq&DoWn(`)o4$lSbhYCdz4w4VChn+ROG>qUQ<<-
z%;u|^PlctA*Ha7chXLr3o8w=NRCcCru)R~5l0@O9qIifTif}bSIE=^bvGVXXPAMT|
zvYSSHH&?!PVKkh|u5Xi6I-?pDvfmyK2wu76V801Do{O#{cK;USLIowu0z`XfJ(e7l
zbdx-33n&6OKq+%Nle)=KT&-5FLP;i|F@{{wM|A*FzMyMvK#XysiZTch(1_U71TMyZ
z;B8+&-!qKj#BQ$3GkAWvp276=e5<cLJbr1Yf6^J_ETdGRjJG;}41|;cUfO!MxU)C+
pI=Y(9k14;i`OY)FpSf*M{{e&yF}P2z#zg=C002ovPDHLkV1j?UHsSyP

diff --git a/openslides/static/images/icons/remove.png b/openslides/static/images/icons/remove.png
deleted file mode 100644
index 5a4d15b7baaf3a4d255430be6d2c0423379f0f9c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 332
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<Z~8yL>4nJ
zFzyCnMyofE9{~j=OI#yLg7ec#$`gxH8OqDc^)mCai<1)zQuXqS(r3T3kpe0@>FMGa
zQgQ3;q>X${1_EvC9b7%{lo;_Hxw!m6<b=B?cUW7m67JT&bhXnwp;$SIBcq4)mA{jU
z)r$v@4ov^!`G5E6yQaFqUKjN<0&Xv8bY!bN-Vl+T#W!#JuGWW2f=#nOOtrf3d*^$L
zovF89&wH=WX*0j@{LjKyyOeExS8|`vei`7J8Cl}?PU^Uc;3JbMMISaDv_1b)$Th{w
zb64VowqsF&0*Y};^H~^=Mz)1osR*vlG`nGFcKAte<kSQ8JK9|C)~vZQ&EdE3|Ahyc
Y+19(7vwv1Q4D=L(r>mdKI;Vst075>6Bme*a

diff --git a/openslides/static/images/icons/revert.png b/openslides/static/images/icons/revert.png
deleted file mode 100644
index b224e05e831017316c6c6be820d8d9773e65a1fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 794
zcmV+#1LgdQP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10+&fdK~#9!g_BE2lwlNxpZ}YG8b`+%okqh8C^cRw47-^`w5n}x
zDuNaT5<wBvD&1ukMXQi#QHvH45rq*BblJE_yBL;TOk60a$(W;K<LJzPImvI6V?n)e
zzQf`B-iH@HjwT`iXqx5+s$qHL{}SMf&Wfrdk;qG11f`TyOVCvXq`PyU>+|i(1ZcMK
zPdT8~5w%PJE|*F_{GCAknZkjrB+<_|l?2)!j!mayjedE>;F~9m4)*dRIz?VVF`F9?
zP_=a*!IFxV1WGOU%O|#dh(*WmboR^+A8V?A6e_c+YbeKGn2Xn+!(uGX%(obW{gX`0
z6m#gzO<cO$N#J(78?_r}Yt2waQ1$dq$iXA^s<b8#u=rbwiJ=)fAAIHbg{Nfu{L6rj
zGnMAilY3p3rQveh0N4vAMl^~M8%NLe;|Z3a*0=zejm&fZ{urmOy>I}!Z42h2fhe$T
zNK6hgH}Z**QJd)~<Yk$JiZuMSyYZ|m#OHOhxzeI1d<y_2wqT@^SZ0d&_s`7D4iJ9r
zMOC%3vpGyMbeiz+M#kTElbniR#uwOBUBuJ7Z2+R1OJ*Z6jmq)j@@3)m_$e)&r>MM^
zvg+-W*X&>+eva_<!vrSB$XdSvu~QTm27obBpNXZu-@DUS;98@jd)%6)KtyNi@fFId
zwv)3q->E?5ex?$=BvXy#7KDfgyFbGFegLhxx!&!|()Yw>qZ0oSlT<1thGB?lnqpa&
z*tRV%yKYN&XNNOiz0@)cWIKDbbT|bxBogzIn4gnmGPw${xDc0t?z{4?=ee}EwG09I
zX`f<64o)czO#_i%Uuu~oViAIc0qJ`7qVIg`#kwV9G;PXUXAiIiGWR7DjtTUOh(U&a
Y0(K8NqN1}yW&i*H07*qoM6N<$g7~*@9RL6T

diff --git a/openslides/static/images/icons/statistics.png b/openslides/static/images/icons/statistics.png
deleted file mode 100644
index 5a05fa48df66de304d39d3804991b47ee97e910f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 495
zcmV<L0TBL)P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy000McNliru*9-y_883(EJWv1t0eneB
zK~#9!#nL}Z!$24Y@aOW!U@e%fCO9j&^g~Ep`~W&SStl1imV=ACF1ocilwuJpqNcVs
z+E$ah_VVUDqNY=oPQJ&%@xuLHp5ySZrIZ50oV9<w|HM+}Q%We9g^n>V5RYPi+ulaS
zte_KiJZoMciX!xudf*8Mk2$Pg^D*{wHuae@Al88V2E;GG-NixBKHu@62=|wVT>vW?
zAT*F@fc^l+FOS~p`X*E&@N{!l$|G<MC=H|>lgVT@Am1Y>JxP&({1ACxNP&=r;EdyT
zbPH=%RvE>B>gg?za5;q&iDuHogLpuZim>W?d%?xlmX{KtUajU?iBAA%z#x#I9O#ex
z7#c%h5m?a6dTunl(%KplDG}7`dDesvpy(A!zCn(rNo{6lm!UMkG!V5~Flx2zF(TK+
zPto`t%m~38Af?>RrlRl#*m_yrQYj$E@fBluaoqreLG}kub~l2nW5)*=`Zvn~(9Qbg
lqjF%Lnm#nJ+}8bnuTK`U*?x&#0oMQk002ovPDHLkV1mwa*^mGL

diff --git a/openslides/static/images/icons/undo.png b/openslides/static/images/icons/undo.png
deleted file mode 100644
index 83e41dcf3afb12cd41f084e0ce5bf1c971b0590c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 866
zcmV-o1D*VdP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10^dnQK~#9!rI1T#6Hyd~&zU=!jLEb~-!C7;N3_M-ZbV#(ZtTW|
z2!f(kaP7v8Zlt23s4E3^D;6p)6jyFUP!TO!6lz;*ZK^dIO=8<5lO{9w&fMcopin_{
z;WwMZ;pdxke;gWs4gfF?oS{#kxN`>AGF|HrM{0LOS~m0q^oYKY8h@9Y|M83@4XWHY
zECcUdwx+H6y0*Dw@~Eb3Ei2<|uWan<HO+7ojM|z?1cY4%UdX}J=y2(C;`1d*bU}%{
zs^G!Z8hdBoL2K;Y6W-bu!`AjS0nLCvB83Lo4-@>=tLI~$=WkaMu7g5T-<IxO1~3BY
zNfjjU3LM;Q<y9USb?p$StFO)tu}))6y0kfw7&)gFCo2LJjsVn1O)BCRz)p-nxiAMd
zH^}D!Fr5)>YL9`nX{*XHh^>zs;}ePFs;~PxDud5m0G&V*hkWWOq-{Z?)8y0!<{$YI
z7r*@s>}^cUXuG+C)`o3N1Ja_=m{~5(AJK>aoLmxwTLg&?1e;r-aTQ>59ZIIjTm9#~
zgRxd;wbh0^^W*DuIh9Cxwq0xrGblT3hvqIi;?wMeJM;dfOn#h{3u#W0A{6fonT)ZU
z>dY=xR+cewR|NH<Sor?hE9OTVLUJ}&fVl2+vFB?ta|!_Z0Me{l1Q00H3<ygQFwduX
ze=+mXar61S?b{ksI}#BrF??269ijd_UoTHwPWwxHbwx+e(8t!T&`*biQxRLkUs$hS
zBV#%&qrpO;U;twvwQB<%vI$dBwZ4dm`>c>YXa-q=Fc3yA!i#|2ks!VJ?SiT6A(Uni
zHXU1_w?nHjV-s`BcBHMbmRZOfk@FBb-29pMYNm4HwrR?~s$e<q2V1c7aJsr2dl*Lm
zWa#?_auG$>HL%3}H?zh4$V6F{d!s7&8>3Hq5QWDof7Tt33K<8dCg)0ru5k&9s^DKt
sKJG!8&0<hUa%a-iH9$~hN$@}X0!S}(D7M`n*#H0l07*qoM6N<$f)xRP(*OVf

diff --git a/openslides/static/images/icons/user-information.png b/openslides/static/images/icons/user-information.png
deleted file mode 100644
index 346f21e7bdab6f68ef31c1ee6e6db224fdeab0c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 825
zcmV-91IGM`P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2iOAw
z4j&`Bv(#Sz00Oy5L_t(|+KrJ(XcJ)=hTnfOnXOq(+G<T|(rVSzYEw6e)}<A<gA^6<
z;7&d0K|w)0C|<;ZhvLP97ZF7TPl|{h+@-iv6x?cEaH)nS%`%<LWG0#4X-;iW>H{x)
z@PF_7eSAMb8AmoPWH^rBCRR9B3!<c?hZ2{Mp1*$^|A0jqqU7jyxV`&bZZB%Xb<i|*
z$4OD#dFaf|^Y{z4vgu)md%~sKP>5t@1vZuiD2SfdV$ncF_ro_o>3ADVZ)m6|t!?dq
z;0CdADCQMhy?Cw~fX~t(%3v@GkJnQ>vD$AL?O^R3I9>oJNQgAfD21b(@&G-r5Bj_=
z049hfTGXww00zYZfREz_<Z`*|@87<CVX7HWT?Wm|Fx3>ke*SXd_?4&eagS&n$!w}|
z4o(eE-ptzwOhd)@FQ0Jt&iy^s+t2^{MnzHX_77xGV^9<f17CloObYZa-Fw>C)D&6k
zayz~KpTEDjdgH+p{qZStOu)QojOot`E4M}FBKi9V)I3G7ekM8FOAh#_w;WW(3crJ8
zV0c4_trD(05v1*<fN7DK)Z9FK_p&9e`(m*Lb*@S$G}8{DP=qVkNYayhU0T|}iin7<
zi-K6z)dL3HrpjRW9kI-8M@PrK&Rts;`+ZJub~^}xC4v#IJ$i!^w|<mriDMA<3wZTS
zhH08m<@86Us;X+uhV|<fI~^kIEDL~wQaaL5(vX}(BAG=(Hn47f5T`pAAfYjcXYxp-
z6c5|p-nP->aiLf&8A_8!GbdDuc=iLR(~V(GM=B9Vib__$0T_i|MjlotWwQ!&qfk=O
zG{-1XUxUr_eE=unL$ZkHeFHE>4+ukYypcXe8fGmL1A%Zyv?aQ{Zc1PV&+`Ea>M|*K
zYbzUTV`N>|GnZffPW7?V!U{y5(~_^Hp}xZd&-9)@^};4LQ{9l000000NkvXXu0mjf
DyzOz>

diff --git a/openslides/static/images/icons/warning.png b/openslides/static/images/icons/warning.png
deleted file mode 100644
index 1abe3f3f93585e88234b6b3270eb5fbbe2067f4c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 741
zcmV<B0vi2^P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2igW5
z3lcSOP_!BV00L!6L_t(I%Z-z}Ym;FV#((F1zobc%FRe+vU=?qriejm@A}V&#!NtkR
zNv94XxQL5Grz$EaPW4X^9lD6LlcFFfR<J5!wf2Iy^b*sACTYLRacEkkM)APQdxnSK
zdk)X@3N=axnjkqNVd7Xfe%Uq7vs<*c1|lPWXq{RBIWdDi=2TEf-XTn279|uJxyk>Q
zmT>(0j0U6qVK6ordUwg|7u;G}Q<L!0o(+?2+f8hv7!wsuA8ug8UINfnTgV@;PZA4;
z8M8b4)=$hfh__gwWo=P|(F+T<g-x=H*?&*)S<Z*CeH*BY$kP{D9zUCcNM5x5V2rQQ
z1E5d-0?-NTdU?HUH=b0&aSGWi#q1B@D>l=n-n^dEceYu&RsmM_8VN3i?*2w&=LGYe
z;#8L6^c2`{h>VN6dn{jqUI2am8$en?$0M0aj*HQ)M^&9Uh~`<y=LkykkN}byBHKH(
z{F5^}Y+B@CH3#|zWH0DzuZLtqOy+Nc6Ngls$)Pmfq6cOgyb|IeW?duxr~EbGlnzu~
z&~c}^IN(gU$Bj{25-~s=J`4$Bp|w+CVcEAhh5nG#fuLPF{nrLy;gR2Kx2&-wN+NNp
zBSU5zG;LezNdR?#Qzo)IO=ZZx0U-Lyw&WfrKBl{UMM{DNqEO5Um)nv6Tzy|8;R1_*
z57>HgeTGy=`H0C42EDP44EQA>0D>h^)KT1eC6!d_6et6g>M4|nA8I21Jh&n=*Bc7y
z(>q*=&MtW(Rc|cdSA(j$0w!F()6Co(Q>i>iJSq;yy2@{76$5Ck@3}hf5ZUaK>g4S&
Xh28ncJWoFC00000NkvXXu0mjfa5O?l

diff --git a/openslides/static/img/glyphicons_006_user_add.png b/openslides/static/img/glyphicons_006_user_add.png
new file mode 100644
index 0000000000000000000000000000000000000000..098d70d3d56417a3456f7579fd4574895fcbcf58
GIT binary patch
literal 1044
zcmV+v1nc{WP)<h;3K|Lk000e1NJLTq000gE000XJ1^@s6Pldc<0008fX+uL$Nkc;*
zP;zf(X>4Tx04R}-l+Q~PVHn51vyB)iL11Qkh@nGBs7w}RMCGo(*tBg~f0Po$?CiU{
zle4qa%<P&X5neiG(LE{;9{K}3c<7Xu!oVy7>26U(f|ru*d1uDm5$(qdGxK?$AK&MB
z-{F0M8d)(-JtP5n!?BWmQR({Vm{j`_Asj&+!l+YJ+l(X<1E9fUv1@F;hrqupt$X|b
zI_lE4ng@jaK<G!B*($K_7ugG0Y6K9uUc-cAI>h%lTb}(f=ak3uu6-!kMZ8FSKs7BM
z|C+c%%_(W1MkH>@24YeH&g(_h@8=*r^~@L^r0;R+=`OQ-d=_TXN_RhT8}a8f>+a#2
z#Pb=gH%8n{&sxUn9rjo_p*gW3k3%Dd9v|?z$w<Yo`kJEYM3dY4c4@F@+kQ*AoFEPp
zC&vr@Jf@LyJEw9(*E|;Vsa#jw=XX{y$?G1Ym^o8-{}=TZdWBKwV9;RD+kk{5`Vd7c
zOjsx&LmrJHG_o=`#v-;czGtM4M1UpouT##tn{yjQ%H~-kh{iF~Qc;lP5As)eRembZ
z$zNu}#pbGK#=5Dg%MZSjF0Z_;>wEp4JbjhwM#!rpOV)g4O?IHuKzA8qHe6NWHQ4?5
zW?+>pP^lFuS83d>RC0Yby(58Yf7(5YU7B8Os@7T+7jCT7FHP^*tHQ2TvC67;&Z}|3
zd?p?hPl_?ILp%pbyd-vt7sYOxofiix8N;NaVZv3ip-`5AN%ERI{+SmG@2t6_p^q8N
z(o~6`|AbY@XgUiV(SNxAbMSk`qp>3J!UhhXuG%(|?j0gDE>~^N72v`*x)0t~ZOwEZ
z4m|-D&ZtGJ<Vy>}8;WLk96sqPn3I;4%{fxLET5GkbR{t<W~gl~lA`O9>#`+_*~}`j
zbQ|o<sdi7Lo_3|?Q@OlB=dbn=u=TK9{`st2-g-_wtN}0e-@v^6MNSwoNdN!<32;bR
za{vGf6951U69E94oEQKA0O?6YK~yM_b<r_OgFz4l;BS5s5XA^K_TIqCvsen2)`AyM
zY`j7WL9d~w$PFw-G=eeY9}DN#HR!_dW@q>9yqzaAWhRUYyTW5EkhsTg)gv<*h;3jC
zPepn!JZl?t5z$4&c0`;;#KhOy#HjMFsX+{~`pkUAMP|O#;R55zvvAmhQAAv0f>lIJ
z@rX;zaL{y|751%+c5P<n9CyRxc*gCoTg^b`YXiC|nJawYuytVQx`PvJ;HYF}$?7X#
zV2b@BfBUwFhq{yvVLje(4&x$T`SES_2cgGu*biR8U`6-O(4zj9SbhR{WQ`9nB!2<`
O0000<MNUMnLSTaZbnuq|

literal 0
HcmV?d00001

diff --git a/openslides/static/images/icons/voting-abstention.png b/openslides/static/img/voting-abstention.png
similarity index 100%
rename from openslides/static/images/icons/voting-abstention.png
rename to openslides/static/img/voting-abstention.png
diff --git a/openslides/static/images/icons/voting-invalid.png b/openslides/static/img/voting-invalid.png
similarity index 100%
rename from openslides/static/images/icons/voting-invalid.png
rename to openslides/static/img/voting-invalid.png
diff --git a/openslides/static/images/icons/voting-no.png b/openslides/static/img/voting-no.png
similarity index 100%
rename from openslides/static/images/icons/voting-no.png
rename to openslides/static/img/voting-no.png
diff --git a/openslides/static/images/icons/voting-total.png b/openslides/static/img/voting-total.png
similarity index 100%
rename from openslides/static/images/icons/voting-total.png
rename to openslides/static/img/voting-total.png
diff --git a/openslides/static/images/icons/voting-yes-grey.png b/openslides/static/img/voting-yes-grey.png
similarity index 100%
rename from openslides/static/images/icons/voting-yes-grey.png
rename to openslides/static/img/voting-yes-grey.png
diff --git a/openslides/static/images/icons/voting-yes.png b/openslides/static/img/voting-yes.png
similarity index 100%
rename from openslides/static/images/icons/voting-yes.png
rename to openslides/static/img/voting-yes.png
diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css
index c40f7dc8b..3d59717ed 100644
--- a/openslides/static/styles/base.css
+++ b/openslides/static/styles/base.css
@@ -304,6 +304,12 @@ legend + .control-group {
     background-image: url("../img/glyphicons_256_delete.png");
     background-position: 0;
 }
+.icon-add-user {
+    background-image: url("../img/glyphicons_006_user_add.png");
+    background-position: 0;
+}
+
+
 
 /** Responsive **/
 @media (max-width: 767px) {

From 82e35bebff2241866cc4ec2dbffecf3be69ccec2 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Tue, 5 Feb 2013 21:31:45 +0100
Subject: [PATCH 78/88] Fixed wrong deletion if user clicks "no" in confirm
 form.

---
 openslides/assignment/views.py | 24 +++++++++++++-----------
 openslides/utils/utils.py      |  4 ++--
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/openslides/assignment/views.py b/openslides/assignment/views.py
index 46024e1d2..992d86938 100644
--- a/openslides/assignment/views.py
+++ b/openslides/assignment/views.py
@@ -145,8 +145,9 @@ def edit(request, assignment_id=None):
 def delete(request, assignment_id):
     assignment = Assignment.objects.get(pk=assignment_id)
     if request.method == 'POST':
-        assignment.delete()
-        messages.success(request, _('Election <b>%s</b> was successfully deleted.') % assignment)
+        if 'submit' in request.POST:
+            assignment.delete()
+            messages.success(request, _('Election <b>%s</b> was successfully deleted.') % assignment)
     else:
         del_confirm_form(request, assignment)
     return redirect(reverse('assignment_overview'))
@@ -204,16 +205,17 @@ def delother(request, assignment_id, user_id):
     is_blocked = assignment.is_blocked(person)
 
     if request.method == 'POST':
-        try:
-            assignment.delrun(person, blocked=False)
-        except Exception, e:
-            messages.error(request, e)
-        else:
-            if not is_blocked:
-                message = _("Candidate <b>%s</b> was withdrawn successfully.") % person
+        if 'submit' in request.POST:
+            try:
+                assignment.delrun(person, blocked=False)
+            except Exception, e:
+                messages.error(request, e)
             else:
-                message = _("<b>%s</b> was unblocked successfully.") % person
-            messages.success(request, message)
+                if not is_blocked:
+                    message = _("Candidate <b>%s</b> was withdrawn successfully.") % person
+                else:
+                    message = _("<b>%s</b> was unblocked successfully.") % person
+                messages.success(request, message)
     else:
         if not is_blocked:
             message = _("Do you really want to withdraw <b>%s</b> from the election?") % person
diff --git a/openslides/utils/utils.py b/openslides/utils/utils.py
index b7744c9a7..d2ab19fca 100644
--- a/openslides/utils/utils.py
+++ b/openslides/utils/utils.py
@@ -38,8 +38,8 @@ def gen_confirm_form(request, message, url):
         %s
         <form action="%s" method="post">
             <input type="hidden" value="%s" name="csrfmiddlewaretoken">
-            <button type="submit" class="btn btn-mini">%s</button>
-            <button class="btn btn-mini">%s</button>
+            <button type="submit" name="submit" class="btn btn-mini">%s</button>
+            <button name="cancel" class="btn btn-mini">%s</button>
         </form>
         """
         % (message, url, csrf(request)['csrf_token'], _("Yes"), _("No")))

From 8388774f127e435652fe7fa20535b4a062cd6c72 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Tue, 5 Feb 2013 21:33:07 +0100
Subject: [PATCH 79/88] template: Minor style changes.

---
 .../templates/assignment/poll_view.html       |  2 +-
 .../assignment/templates/assignment/view.html |  4 +--
 .../motion/templates/motion/poll_view.html    | 12 --------
 openslides/motion/templates/motion/view.html  |  6 ----
 openslides/templates/base.html                | 28 +++++++++----------
 5 files changed, 16 insertions(+), 36 deletions(-)

diff --git a/openslides/assignment/templates/assignment/poll_view.html b/openslides/assignment/templates/assignment/poll_view.html
index 7e99e4b40..3a43b6f32 100644
--- a/openslides/assignment/templates/assignment/poll_view.html
+++ b/openslides/assignment/templates/assignment/poll_view.html
@@ -14,7 +14,7 @@
     <a href="{% url 'assignment_view' assignment.id %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to election" %}</a>
     <!-- activate projector -->
     {% if perms.projector.can_manage_projector %}
-        <a href="{% url 'projector_activate_slide' assignment.sid  %}" class="activate_link btn {% if assignment.active %}btn-primary{% endif %} btn-mini" rel="tooltip" data-original-title="{% trans 'Show motion' %}">
+        <a href="{% url 'projector_activate_slide' assignment.sid  %}" class="activate_link btn {% if assignment.active %}btn-primary{% endif %} btn-mini" rel="tooltip" data-original-title="{% trans 'Show election' %}">
             <i class="icon-facetime-video {% if assignment.active %}icon-white{% endif %}"></i>
         </a>
     {% endif %}
diff --git a/openslides/assignment/templates/assignment/view.html b/openslides/assignment/templates/assignment/view.html
index 743117126..b62eb98e5 100644
--- a/openslides/assignment/templates/assignment/view.html
+++ b/openslides/assignment/templates/assignment/view.html
@@ -20,7 +20,7 @@
     <a href="{% url 'assignment_overview' %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
     <!-- activate projector -->
     {% if perms.projector.can_manage_projector %}
-        <a href="{% url 'projector_activate_slide' assignment.sid  %}" class="activate_link btn {% if assignment.active %}btn-primary{% endif %} btn-mini" rel="tooltip" data-original-title="{% trans 'Show motion' %}">
+        <a href="{% url 'projector_activate_slide' assignment.sid  %}" class="activate_link btn {% if assignment.active %}btn-primary{% endif %} btn-mini" rel="tooltip" data-original-title="{% trans 'Show election' %}">
             <i class="icon-facetime-video {% if assignment.active %}icon-white{% endif %}"></i>
         </a>
     {% endif %}
@@ -31,7 +31,7 @@
         </a>
         <ul class="dropdown-menu pull-right">
             <!-- edit -->
-            <li><a href="{% url 'assignment_edit' assignment.id  %}"><i class="icon-edit"></i> {% trans 'Edit election' %}</a></li>
+            <li><a href="{% url 'assignment_edit' assignment.id  %}"><i class="icon-pencil"></i> {% trans 'Edit election' %}</a></li>
             <!-- delete -->
             <li><a href="{% url 'assignment_delete' assignment.id  %}"><i class="icon-remove"></i> {% trans 'Delete election' %}</a></li>
             <!-- edit poll -->
diff --git a/openslides/motion/templates/motion/poll_view.html b/openslides/motion/templates/motion/poll_view.html
index e4d9c7465..bfadf2e3a 100644
--- a/openslides/motion/templates/motion/poll_view.html
+++ b/openslides/motion/templates/motion/poll_view.html
@@ -23,18 +23,6 @@
                 <i class="icon-facetime-video {% if motion.active %}icon-white{% endif %}"></i>
             </a>
         {% endif %}
-        <div class="btn-group">
-            <a data-toggle="dropdown" href="#" class="btn btn-mini dropdown-toggle">
-                {% trans 'More actions' %}
-                <span class="caret"></span>
-            </a>
-            <ul class="dropdown-menu pull-right">
-                <!-- delete -->
-                {% if "delete" in actions %}
-                    <li><a href="{% url 'motion_poll_delete' poll.id %}"><i class="icon-remove"></i> {% trans 'Delete Vote' %}</a></li>
-                {% endif %}
-            </ul>
-        </div>
     </div>
     </small>
 </h1>
diff --git a/openslides/motion/templates/motion/view.html b/openslides/motion/templates/motion/view.html
index b3e9256ab..4b4114276 100644
--- a/openslides/motion/templates/motion/view.html
+++ b/openslides/motion/templates/motion/view.html
@@ -49,12 +49,6 @@
                 {% if "delete" in actions %}
                     <li><a href="{% url 'motion_delete' motion.id  %}"><i class="icon-remove"></i> {% trans 'Delete motion' %}</a></li>
                 {% endif %}
-                <!-- edit poll -->
-                {% if perms.motion.can_manage_motion %}
-                    {% for poll in motion.polls %}
-                        <li><a href="{% url 'motion_poll_view' poll.id %}"><i class="icon-edit"></i> {{ forloop.counter }}. {% trans "Vote" %}</a></li>
-                    {% endfor %}
-                {% endif %}
                 <!-- create agenda item -->
                 {% if perms.agenda.can_manage_agenda %}
                 <li>
diff --git a/openslides/templates/base.html b/openslides/templates/base.html
index 8a6a3d916..ed67ecf4d 100644
--- a/openslides/templates/base.html
+++ b/openslides/templates/base.html
@@ -79,16 +79,16 @@
   <div class="row-fluid">
     <div class="span12">
       <div id="notifications">
-           <div id="dummy-notification" class="notification" style="display:none">
-               <button type="button" class="close" data-dismiss="alert">×</button>
-           </div>
-           {% for message in messages %}
-           <div class="alert {% if message.tags %}alert-{{ message.tags }}{% endif %}">
-               <button type="button" class="close" data-dismiss="alert">×</button>
-               {{ message|safe }}
-           </div>
-           {% endfor %}
-       </div>
+          <div id="dummy-notification" class="notification" style="display:none">
+              <button type="button" class="close" data-dismiss="alert">×</button>
+          </div>
+          {% for message in messages %}
+          <div class="alert {% if message.tags %}alert-{{ message.tags }}{% endif %}">
+              <button type="button" class="close" data-dismiss="alert">×</button>
+              {{ message|safe }}
+          </div>
+          {% endfor %}
+      </div>
        
       {% block content %}
       {% endblock %}
@@ -97,22 +97,20 @@
   <hr>
   <footer>
       <small>
-      &copy; Copyright 2011-2012 | Powered by <a href="http://openslides.org" target="_blank">OpenSlides</a> | {% trans "Get <a href='http://openslides.org/support' target='_blank'>professional support</a> for OpenSlides." %}
+      &copy; Copyright 2011-2013 | Powered by <a href="http://openslides.org" target="_blank">OpenSlides</a> | {% trans "Get <a href='http://openslides.org/support' target='_blank'>professional support</a> for OpenSlides." %}
       </small>
   </footer>
   </div><!--/content-->
-  
 </div><!--/row-->
 </div><!--/container-fluid-->
 
-
 {% endblock %}<!--/body-->
 
 <!-- JavaScript (Placed at the end of the document so the pages load faster) -->
     <script src="{% static 'javascript/jquery.min.js' %}" type="text/javascript"></script>
-    <script src="{% static 'javascript/utils.js' %}" type="text/javascript"></script>
     <script src="{% static 'javascript/bootstrap.min.js' %}" type="text/javascript"></script>
-    <script type="text/javascript" src="{% url 'django.views.i18n.javascript_catalog' %}"></script>
+    <script src="{% static 'javascript/utils.js' %}" type="text/javascript"></script>
+    <script src="{% url 'django.views.i18n.javascript_catalog' %}" type="text/javascript"></script>
     {% block javascript %}
     {% endblock %}
 </body>

From 64e3c1f3cb5ececc8d5ef4862074a31e853a3ad6 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Tue, 5 Feb 2013 21:41:26 +0100
Subject: [PATCH 80/88] template: Removed unused 'load staticfiles'.

---
 openslides/agenda/templates/agenda/item_row.html                | 1 -
 openslides/agenda/templates/agenda/widget.html                  | 1 -
 openslides/assignment/templates/assignment/overview.html        | 1 -
 openslides/assignment/templates/assignment/widget.html          | 1 -
 openslides/motion/templates/motion/overview.html                | 1 -
 openslides/motion/templates/motion/poll_view.html               | 1 -
 openslides/motion/templates/motion/widget.html                  | 1 -
 .../participant/templates/participant/group_overview.html       | 1 -
 openslides/participant/templates/participant/login.html         | 2 +-
 9 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/openslides/agenda/templates/agenda/item_row.html b/openslides/agenda/templates/agenda/item_row.html
index ee09dfc8b..d987ce56b 100644
--- a/openslides/agenda/templates/agenda/item_row.html
+++ b/openslides/agenda/templates/agenda/item_row.html
@@ -1,5 +1,4 @@
 {% load i18n %}
-{% load staticfiles %}
 {% load tags %}
 
     <td>
diff --git a/openslides/agenda/templates/agenda/widget.html b/openslides/agenda/templates/agenda/widget.html
index 2ccd1933a..ce15b4d57 100644
--- a/openslides/agenda/templates/agenda/widget.html
+++ b/openslides/agenda/templates/agenda/widget.html
@@ -1,4 +1,3 @@
-{% load staticfiles %}
 {% load i18n %}
 {% load tags %}
 
diff --git a/openslides/assignment/templates/assignment/overview.html b/openslides/assignment/templates/assignment/overview.html
index f38cc5489..6519c6bd9 100644
--- a/openslides/assignment/templates/assignment/overview.html
+++ b/openslides/assignment/templates/assignment/overview.html
@@ -1,7 +1,6 @@
 {% extends "base.html" %}
 
 {% load i18n %}
-{% load staticfiles %}
 
 {% block title %}{{ block.super }} – {% trans "Elections" %}{% endblock %}
 
diff --git a/openslides/assignment/templates/assignment/widget.html b/openslides/assignment/templates/assignment/widget.html
index f428d341a..d7a885b1d 100644
--- a/openslides/assignment/templates/assignment/widget.html
+++ b/openslides/assignment/templates/assignment/widget.html
@@ -1,4 +1,3 @@
-{% load staticfiles %}
 {% load i18n %}
 {% load tags %}
 
diff --git a/openslides/motion/templates/motion/overview.html b/openslides/motion/templates/motion/overview.html
index 4c9850559..9f40e1040 100644
--- a/openslides/motion/templates/motion/overview.html
+++ b/openslides/motion/templates/motion/overview.html
@@ -2,7 +2,6 @@
 
 {% load tags %}
 {% load i18n %}
-{% load staticfiles %}
 
 {% block title %}{{ block.super }} – {% trans "Motions" %}{% endblock %}
 
diff --git a/openslides/motion/templates/motion/poll_view.html b/openslides/motion/templates/motion/poll_view.html
index bfadf2e3a..414503db6 100644
--- a/openslides/motion/templates/motion/poll_view.html
+++ b/openslides/motion/templates/motion/poll_view.html
@@ -1,7 +1,6 @@
 {% extends 'base.html' %}
 
 {% load i18n %}
-{% load staticfiles %}
 
 {% block title %}
     {{ block.super }} - {% trans "Motion" %} {{ motion.number }}, {{ ballot }}. {% trans "Vote" %}
diff --git a/openslides/motion/templates/motion/widget.html b/openslides/motion/templates/motion/widget.html
index d7488530c..37302db51 100644
--- a/openslides/motion/templates/motion/widget.html
+++ b/openslides/motion/templates/motion/widget.html
@@ -1,4 +1,3 @@
-{% load staticfiles %}
 {% load i18n %}
 {% load tags %}
 
diff --git a/openslides/participant/templates/participant/group_overview.html b/openslides/participant/templates/participant/group_overview.html
index 256135dd6..f86c9b5ba 100644
--- a/openslides/participant/templates/participant/group_overview.html
+++ b/openslides/participant/templates/participant/group_overview.html
@@ -1,7 +1,6 @@
 {% extends "base.html" %}
 
 {% load i18n %}
-{% load staticfiles %}
 {% load tags %}
 
 {% block title %}{{ block.super }} – {% trans "Groups" %}{% endblock %}
diff --git a/openslides/participant/templates/participant/login.html b/openslides/participant/templates/participant/login.html
index 1e61f90fd..ec7576bae 100644
--- a/openslides/participant/templates/participant/login.html
+++ b/openslides/participant/templates/participant/login.html
@@ -8,7 +8,7 @@
 
 {% block body %}
 <div id="login-page" class="container">
-    <h2><img src="/static/img/logo-login.png"></h2>
+    <h2><img src="{% static '/static/img/logo-login.png' %}"></h2>
 
     {% if form.errors %}
         <div class="alert alert-error">

From 2d009d7c380e6b27e85a0426f63fcc2dfc1ec248 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Tue, 5 Feb 2013 21:47:11 +0100
Subject: [PATCH 81/88] Updated THANKS file: Added Twitter Bootstrap. Removed
 Oxygen Icons.

---
 THANKS | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/THANKS b/THANKS
index b4039e3ef..82e322535 100644
--- a/THANKS
+++ b/THANKS
@@ -12,14 +12,14 @@ OpenSlides uses parts of the following projects:
 * jQuery UI
   <http://jqueryui.com/>
 
+* Twitter Bootstrap
+  <http://twitter.github.com/bootstrap/> 
+
 * ReportLab
   <http://www.reportlab.com/software/opensource/rl-toolkit/>
 
 * Drupal (tabledrag function)
   <http://www.drupal.org/>
 
-* Oxygen-Icons
-  <http://www.oxygen-icons.org/>
-
 * Ubuntu TrueType Font
   <http://font.ubuntu.com/>

From d809ff95bb681af53e366a9624adb6157d3cac3f Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Tue, 5 Feb 2013 21:51:09 +0100
Subject: [PATCH 82/88] template: Removed unused participant.css

---
 openslides/participant/static/styles/participant.css       | 6 ------
 openslides/participant/templates/participant/overview.html | 6 ------
 2 files changed, 12 deletions(-)
 delete mode 100644 openslides/participant/static/styles/participant.css

diff --git a/openslides/participant/static/styles/participant.css b/openslides/participant/static/styles/participant.css
deleted file mode 100644
index 20def00e1..000000000
--- a/openslides/participant/static/styles/participant.css
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * OpenSlides participants style
- *
- * :copyright: 2011, 2012 by OpenSlides team, see AUTHORS.
- * :license: GNU GPL, see LICENSE for more details.
- */
diff --git a/openslides/participant/templates/participant/overview.html b/openslides/participant/templates/participant/overview.html
index 56c7ac5bc..e4706c8c8 100644
--- a/openslides/participant/templates/participant/overview.html
+++ b/openslides/participant/templates/participant/overview.html
@@ -6,12 +6,6 @@
 
 {% block title %}{{ block.super }} – {% trans "Participants" %}{% endblock %}
 
-{% block header %}
-    {% if perms.participant.can_manage_participant %}
-        <link type="text/css" rel="stylesheet" media="all" href="{% static 'styles/participant.css' %}" />
-    {% endif %}
-{% endblock %}
-
 {% block javascript %}
     {% if perms.participant.can_manage_participant %}
         <script type="text/javascript" src="{% static 'javascript/participant.js' %}"></script>

From bfd01e67b6e8003bc253ce4dbdc89fe2c428c637 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Tue, 5 Feb 2013 21:55:41 +0100
Subject: [PATCH 83/88] template: Removed unused 'cycle' template tag.

---
 openslides/assignment/templates/assignment/overview.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/openslides/assignment/templates/assignment/overview.html b/openslides/assignment/templates/assignment/overview.html
index 6519c6bd9..2809352e3 100644
--- a/openslides/assignment/templates/assignment/overview.html
+++ b/openslides/assignment/templates/assignment/overview.html
@@ -38,8 +38,7 @@
             <th style="width: 1px;">{% trans "Actions" %}</th>
         </tr>
     {% for assignment in assignments %}
-        <tr class="{% cycle '' 'odd' %}
-            {% if assignment.active %}activeline{% endif %}">
+        <tr {% if assignment.active %}activeline{% endif %}">
             <td><a href="{% url 'assignment_view' assignment.id %}">{{ assignment }}</a></td>
             <td>
                 {% blocktrans with posts=assignment.posts context "Number of searched candidates for an election"%}posts: {{ posts }}{% endblocktrans %}

From e49efb40d8ecada1f35008c5255330226c5607aa Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Tue, 5 Feb 2013 22:03:43 +0100
Subject: [PATCH 84/88] template: Added new css class for minimum column width.

---
 openslides/agenda/templates/agenda/overview.html           | 4 ++--
 openslides/assignment/templates/assignment/overview.html   | 2 +-
 openslides/motion/templates/motion/overview.html           | 2 +-
 openslides/participant/templates/participant/overview.html | 2 +-
 openslides/static/styles/base.css                          | 3 +++
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/openslides/agenda/templates/agenda/overview.html b/openslides/agenda/templates/agenda/overview.html
index 7346cc862..4b93eded2 100644
--- a/openslides/agenda/templates/agenda/overview.html
+++ b/openslides/agenda/templates/agenda/overview.html
@@ -71,13 +71,13 @@
         </i></small>
         <table id="menu-overview" class="table table-striped table-bordered">
             <tr>
-                <th width="10px"></th>
+                <th class="mini_width"></th>
                 <th>{% trans "Item" %}</th>
                 {% if perms.agenda.can_manage_agenda %}
                     <th width="200" class="optional">{% trans "Comment" %}</th>
                 {% endif %}
                 {% if perms.agenda.can_manage_agenda or perms.projector.can_manage_projector %}
-                    <th width="50">{% trans "Actions" %}</th>
+                    <th class="mini_width">{% trans "Actions" %}</th>
                 {% endif %}
                 {% if perms.agenda.can_manage_agenda %}
                     <th class="tabledrag-hide" style="display: none;">{% trans "Weight" %}</th>
diff --git a/openslides/assignment/templates/assignment/overview.html b/openslides/assignment/templates/assignment/overview.html
index 2809352e3..afd499d48 100644
--- a/openslides/assignment/templates/assignment/overview.html
+++ b/openslides/assignment/templates/assignment/overview.html
@@ -35,7 +35,7 @@
             <th><a href="?sort=name{% if 'name' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Election" %}</a></th>
             <th>{% trans "Candidates" %}</th>
             <th class="optional"><a href="?sort=status{% if 'status' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Status" %}</a></th>
-            <th style="width: 1px;">{% trans "Actions" %}</th>
+            <th class="mini_width">{% trans "Actions" %}</th>
         </tr>
     {% for assignment in assignments %}
         <tr {% if assignment.active %}activeline{% endif %}">
diff --git a/openslides/motion/templates/motion/overview.html b/openslides/motion/templates/motion/overview.html
index 9f40e1040..00d8d2850 100644
--- a/openslides/motion/templates/motion/overview.html
+++ b/openslides/motion/templates/motion/overview.html
@@ -56,7 +56,7 @@
             <th><a href="?sort=status{% if 'status' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Status" %}</a></th>
             <th class="optional"><a href="?sort=submitter{% if 'submitter' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Submitter" %}</a></th>
             <th class="optional"><a href="?sort=time{% if 'time' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Creation Time" %}<a></th>
-            <th style="width: 1px;">{% trans "Actions" %}</th>
+            <th class="mini_width">{% trans "Actions" %}</th>
         </tr>
     {% for app_info in motions %}
     {% with motion=app_info.motion useractions=app_info.actions %}
diff --git a/openslides/participant/templates/participant/overview.html b/openslides/participant/templates/participant/overview.html
index e4706c8c8..6a3c2a067 100644
--- a/openslides/participant/templates/participant/overview.html
+++ b/openslides/participant/templates/participant/overview.html
@@ -105,7 +105,7 @@
             {% if perms.participant.can_manage_participant %}
                 <th class="optional"><a href="?sort=comment&reverse={% if 'comment' in sortfilter.sort and 'reverse' not in sortfilter %}1{% else %}---{%endif%}">{% trans "Comment" %}</a></th>
                 <th class="optional"><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 style="width: 1px;">{% trans "Actions" %}</th>
+                <th class="mini_width">{% trans "Actions" %}</th>
             {% endif %}
         </tr>
         {% for user in users %}
diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css
index 3d59717ed..4ab1f07a4 100644
--- a/openslides/static/styles/base.css
+++ b/openslides/static/styles/base.css
@@ -106,6 +106,9 @@ tr.total td {
 .indentation {
     margin-left: 12px;
 }
+.mini_width {
+    width: 1px;
+}
 /* show optional column */
 .optional {
     display: auto;

From c8ddb2176006e4c951209577aa61c8f63ec916bb Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Tue, 5 Feb 2013 22:36:05 +0100
Subject: [PATCH 85/88] Fixed wrong hiding of open agenda child items if parent
 item is closed

---
 openslides/agenda/templates/agenda/item_row.html | 8 +++++---
 openslides/agenda/templates/agenda/overview.html | 7 +++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/openslides/agenda/templates/agenda/item_row.html b/openslides/agenda/templates/agenda/item_row.html
index d987ce56b..063bc6dc1 100644
--- a/openslides/agenda/templates/agenda/item_row.html
+++ b/openslides/agenda/templates/agenda/item_row.html
@@ -8,7 +8,9 @@
                 <i class="{% if item.closed %}icon-checked-new{% else %}icon-unchecked-new{% endif %}"></i>
             </a>
         {% else %}
-            <i class="icon-"></i>
+            <span class="close_link">
+                <i class="{% if item.closed %}icon-checked-new{% else %}icon-unchecked-new{% endif %}"></i>
+            </span>
         {% endif %}
     </td>
     <td>
@@ -50,7 +52,6 @@
         </span>
     </td>
     {% endif %}
-    {% if perms.agenda.can_manage_agenda %}
     <td class="tabledrag-hide" style="display: none;">
         {% with form=item.weight_form %}
             {{ form.weight }}
@@ -58,4 +59,5 @@
             {{ form.parent }}
         {% endwith %}
     </td>
-    {% endif %}
+ 
+
diff --git a/openslides/agenda/templates/agenda/overview.html b/openslides/agenda/templates/agenda/overview.html
index 4b93eded2..fe4c40719 100644
--- a/openslides/agenda/templates/agenda/overview.html
+++ b/openslides/agenda/templates/agenda/overview.html
@@ -17,7 +17,6 @@
     <script type="text/javascript" src="{% static 'javascript/jquery.cookie.js' %}"></script>
     {% if perms.agenda.can_manage_agenda %}
         <script type="text/javascript" src="{% static 'javascript/jquery.once.js' %}"></script>
-
         <script type="text/javascript" src="{% static 'javascript/jquery.tmpl.js' %}"></script>
         <script type="text/javascript" src="{% static 'javascript/tabledrag.js' %}"></script>
         <script type="text/javascript">
@@ -79,9 +78,9 @@
                 {% if perms.agenda.can_manage_agenda or perms.projector.can_manage_projector %}
                     <th class="mini_width">{% trans "Actions" %}</th>
                 {% endif %}
-                {% if perms.agenda.can_manage_agenda %}
-                    <th class="tabledrag-hide" style="display: none;">{% trans "Weight" %}</th>
-                {% endif %}
+                <th class="tabledrag-hide" style="display: none;">
+                    {% trans "Weight" %}
+                </th>
             </tr>
             <tr class="topline{% if active_sid == 'agenda' %} activeline{% endif %}">
                 <td></td>

From 6b4ee0e4f6a6ab485594771cf8330a964f69a344 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Tue, 5 Feb 2013 23:09:23 +0100
Subject: [PATCH 86/88] Updated translation.

---
 .../agenda/templates/agenda/item_row.html     |    2 +-
 .../agenda/templates/agenda/overview.html     |    2 +-
 openslides/agenda/templates/agenda/view.html  |    2 +-
 .../agenda/templates/agenda/widget.html       |    4 +-
 openslides/locale/de/LC_MESSAGES/django.mo    |  Bin 36354 -> 36097 bytes
 openslides/locale/de/LC_MESSAGES/django.po    | 1008 +++++-----
 openslides/locale/fr/LC_MESSAGES/django.mo    |  Bin 36991 -> 33993 bytes
 openslides/locale/fr/LC_MESSAGES/django.po    | 1770 +++++++++--------
 .../templates/participant/overview.html       |    2 +-
 .../templates/projector/overlay_widget.html   |    2 +-
 10 files changed, 1411 insertions(+), 1381 deletions(-)

diff --git a/openslides/agenda/templates/agenda/item_row.html b/openslides/agenda/templates/agenda/item_row.html
index 063bc6dc1..3e8d71df8 100644
--- a/openslides/agenda/templates/agenda/item_row.html
+++ b/openslides/agenda/templates/agenda/item_row.html
@@ -44,7 +44,7 @@
                 <i class="icon-remove"></i>
             </a>
             {% if not item.is_leaf_node %}
-                <a href="{% url 'projector_activate_slide' item.sid 'summary' %}" class="activate_link btn btn-mini" title="{% trans 'Activate summary for this item' %}">
+                <a href="{% url 'projector_activate_slide' item.sid 'summary' %}" class="activate_link btn btn-mini" title="{% trans 'Show summary for this item' %}">
                     <i class="icon-summary"></i>
                 </a>
             {% endif %}
diff --git a/openslides/agenda/templates/agenda/overview.html b/openslides/agenda/templates/agenda/overview.html
index fe4c40719..539521b04 100644
--- a/openslides/agenda/templates/agenda/overview.html
+++ b/openslides/agenda/templates/agenda/overview.html
@@ -94,7 +94,7 @@
                 <td>
                 {% if perms.projector.can_manage_projector %}
                     <span>
-                    <a href="{% url 'projector_activate_slide' 'agenda' %}" class="activate_link btn {% if active_sid == 'agenda' %}btn-primary{% endif %} btn-mini" title="{% trans 'Activate agenda' %}">
+                    <a href="{% url 'projector_activate_slide' 'agenda' %}" class="activate_link btn {% if active_sid == 'agenda' %}btn-primary{% endif %} btn-mini" title="{% trans 'Show' %}">
                         <i class="icon-facetime-video {% if active_sid == 'agenda' %}icon-white{% endif %}"></i>
                     </a>
                     <span>
diff --git a/openslides/agenda/templates/agenda/view.html b/openslides/agenda/templates/agenda/view.html
index 844461cc9..229298f33 100644
--- a/openslides/agenda/templates/agenda/view.html
+++ b/openslides/agenda/templates/agenda/view.html
@@ -23,7 +23,7 @@
             {% endif %}
         </div>
             {% if perms.projector.can_manage_projector %}
-                <a href="{% url 'projector_activate_slide' item.sid  %}" class="activate_link btn btn-mini {% if item.active %}btn-primary{% endif %}"  rel="tooltip" data-original-title="{% trans 'Show item' %}">
+                <a href="{% url 'projector_activate_slide' item.sid  %}" class="activate_link btn btn-mini {% if item.active %}btn-primary{% endif %}"  rel="tooltip" data-original-title="{% trans 'Show' %}">
                     <i class="icon icon-facetime-video {% if item.active %}icon-white{% endif %}"></i>
                 </a>
             {% endif %}
diff --git a/openslides/agenda/templates/agenda/widget.html b/openslides/agenda/templates/agenda/widget.html
index ce15b4d57..5ed2786fa 100644
--- a/openslides/agenda/templates/agenda/widget.html
+++ b/openslides/agenda/templates/agenda/widget.html
@@ -3,7 +3,7 @@
 
 <ul style="line-height: 180%">
     <li class="{% if agenda.active %}activeline{% endif %}">
-        <a href="{% url 'projector_activate_slide' agenda.key  %}" class="activate_link btn {% if agenda.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show agenda' %}">
+        <a href="{% url 'projector_activate_slide' agenda.key  %}" class="activate_link btn {% if agenda.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show' %}">
             <i class="icon-facetime-video {% if agenda.active %}icon-white{% endif %}"></i>
         </a>&nbsp;
         <a href="{% url 'projctor_preview_slide' agenda.key %}" title="{% trans 'Preview' %}" class="icon preview right">
@@ -26,7 +26,7 @@
             <i class="icon-search"></i>
         </a>
         {% if not item.is_leaf_node %}
-        <a class="activate_link btn btn-mini {% if item.active %}btn-primary{% endif %} right" href="{% url 'projector_activate_slide' item.sid 'summary' %}" title="{% trans 'Activate summary for this item' %}">
+        <a class="activate_link btn btn-mini {% if item.active %}btn-primary{% endif %} right" href="{% url 'projector_activate_slide' item.sid 'summary' %}" title="{% trans 'Show summary for this item' %}">
             <i class="icon-summary {% if item.active %}icon-white{% endif %}"></i>
         </a>
         {% endif %}
diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo
index 446374eff4d0eb3977a70dd0158e07d3a0b07b1e..e60eeac87b6ffa3a8185e70c7175323ab2953d22 100644
GIT binary patch
delta 11183
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
Wqy#zrtLG&9k1snL_~`zW$o~Qw*YRNh

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

diff --git a/openslides/locale/de/LC_MESSAGES/django.po b/openslides/locale/de/LC_MESSAGES/django.po
index 52ccc8a7c..4ffdc675f 100644
--- a/openslides/locale/de/LC_MESSAGES/django.po
+++ b/openslides/locale/de/LC_MESSAGES/django.po
@@ -1,5 +1,5 @@
 # German translations for OpenSlides package.
-# Copyright (C) 2011, 2012 by OpenSlides team, see AUTHORS.
+# Copyright (C) 2011-2013 by OpenSlides team, see AUTHORS.
 # This file is distributed under the same license as the OpenSlides package.
 # Oskar Hahn <mail@oshahn.de>, 2012.
 #
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenSlides 1.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-18 22:49+0100\n"
+"POT-Creation-Date: 2013-02-05 23:06+0100\n"
 "PO-Revision-Date: 2012-07-28 11:07+0200\n"
 "Last-Translator: Emanuel Schuetze <emanuel@intevation.de>\n"
 "Language-Team: support@openslides.de\n"
@@ -34,20 +34,20 @@ msgid "Parent item"
 msgstr "Elternelement"
 
 #: agenda/models.py:34 config/forms.py:59 motion/forms.py:22
-#: motion/models.py:539 motion/templates/motion/view.html:101
+#: motion/models.py:539 motion/templates/motion/view.html:95
 #: projector/models.py:29
 msgid "Title"
 msgstr "Titel"
 
 #: agenda/models.py:35 motion/forms.py:23 motion/models.py:540
-#: motion/templates/motion/view.html:102 projector/models.py:30
+#: motion/templates/motion/view.html:96 projector/models.py:30
 msgid "Text"
 msgstr "Text"
 
-#: agenda/models.py:36 agenda/templates/agenda/overview.html:77
+#: agenda/models.py:36 agenda/templates/agenda/overview.html:76
 #: agenda/templates/agenda/view.html:37 participant/models.py:60
-#: participant/templates/participant/overview.html:108
-#: participant/templates/participant/user_detail.html:45
+#: participant/templates/participant/overview.html:106
+#: participant/templates/participant/user_detail.html:49
 msgid "Comment"
 msgstr "Kommentar"
 
@@ -55,7 +55,7 @@ msgstr "Kommentar"
 msgid "Closed"
 msgstr "Abgeschlossen"
 
-#: agenda/models.py:38 agenda/templates/agenda/overview.html:83
+#: agenda/models.py:38 agenda/templates/agenda/overview.html:82
 #: projector/models.py:31
 msgid "Weight"
 msgstr "Gewichtung"
@@ -72,8 +72,8 @@ msgstr "Darf die Tagesordung verwalten"
 #: agenda/views.py:192 agenda/views.py:212 agenda/views.py:227
 #: agenda/templates/agenda/config.html:8
 #: agenda/templates/agenda/overview.html:8
-#: agenda/templates/agenda/overview.html:56
-#: agenda/templates/agenda/overview.html:89
+#: agenda/templates/agenda/overview.html:55
+#: agenda/templates/agenda/overview.html:88
 #: agenda/templates/projector/AgendaSummary.html:6
 #: agenda/templates/projector/AgendaSummary.html:10
 msgid "Agenda"
@@ -116,33 +116,30 @@ msgid "Agenda settings"
 msgstr "Tagesordnungs-Einstellungen"
 
 #: agenda/templates/agenda/config.html:8
-#: assignment/templates/assignment/config.html:8 config/views.py:110
-#: config/templates/config/general.html:8
-#: motion/templates/motion/config.html:8
-#: participant/templates/participant/config.html:8
+#: assignment/templates/assignment/config.html:9 config/views.py:110
+#: config/templates/config/general.html:9
+#: motion/templates/motion/config.html:9
+#: participant/templates/participant/config.html:9
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: agenda/templates/agenda/config.html:15 agenda/templates/agenda/edit.html:40
-#: assignment/templates/assignment/config.html:15
-#: assignment/templates/assignment/poll_view.html:66
-#: config/templates/config/general.html:58
-#: motion/templates/motion/config.html:15 motion/templates/motion/edit.html:41
-#: motion/templates/motion/poll_view.html:76
+#: agenda/templates/agenda/config.html:15
+#: assignment/templates/assignment/poll_view.html:80
+#: motion/templates/motion/poll_view.html:65
 #: projector/templates/projector/select_widgets.html:28
 #: templates/formbuttons_save.html:4 templates/formbuttons_saveapply.html:4
 msgid "Save"
 msgstr "Speichern"
 
-#: agenda/templates/agenda/config.html:19 agenda/templates/agenda/edit.html:46
-#: assignment/templates/assignment/config.html:19
+#: agenda/templates/agenda/config.html:19 agenda/templates/agenda/edit.html:30
+#: assignment/templates/assignment/config.html:18
 #: assignment/templates/assignment/edit.html:31
-#: assignment/templates/assignment/poll_view.html:73
-#: config/templates/config/general.html:62
-#: motion/templates/motion/config.html:19 motion/templates/motion/edit.html:47
+#: assignment/templates/assignment/poll_view.html:86
+#: config/templates/config/general.html:70
+#: motion/templates/motion/config.html:18 motion/templates/motion/edit.html:42
 #: motion/templates/motion/import.html:44
-#: motion/templates/motion/poll_view.html:82
-#: participant/templates/participant/config.html:16
+#: motion/templates/motion/poll_view.html:71
+#: participant/templates/participant/config.html:18
 #: participant/templates/participant/edit.html:36
 #: participant/templates/participant/group_edit.html:31
 #: participant/templates/participant/import.html:33
@@ -155,36 +152,32 @@ msgid "Edit item"
 msgstr "Eintrag bearbeiten"
 
 #: agenda/templates/agenda/edit.html:10 agenda/templates/agenda/edit.html:19
-#: agenda/templates/agenda/overview.html:59
+#: agenda/templates/agenda/overview.html:58
 msgid "New item"
 msgstr "Neuer Eintrag"
 
 #: agenda/templates/agenda/edit.html:22 agenda/templates/agenda/view.html:12
 #: assignment/templates/assignment/edit.html:22
-#: assignment/templates/assignment/view.html:19
+#: assignment/templates/assignment/view.html:20
 #: motion/templates/motion/edit.html:22 motion/templates/motion/import.html:10
 #: motion/templates/motion/view.html:30
 #: participant/templates/participant/edit.html:22
+#: participant/templates/participant/group_detail.html:12
 #: participant/templates/participant/group_edit.html:22
 #: participant/templates/participant/import.html:11
+#: participant/templates/participant/user_detail.html:12
 #: projector/templates/projector/new.html:11
 #: projector/templates/projector/select_widgets.html:10
 msgid "Back to overview"
 msgstr "Zurück zur Übersicht"
 
-#: agenda/templates/agenda/edit.html:43
-#: assignment/templates/assignment/poll_view.html:69
-#: assignment/templates/assignment/view.html:83
-#: motion/templates/motion/edit.html:44
-#: motion/templates/motion/poll_view.html:79
-#: projector/templates/projector/control_overlay_message.html:8
-#: templates/formbuttons_saveapply.html:7
-msgid "Apply"
-msgstr "Übernehmen"
-
-#: agenda/templates/agenda/edit.html:49
+#: agenda/templates/agenda/edit.html:33
+#: assignment/templates/assignment/config.html:21
 #: assignment/templates/assignment/edit.html:34
-#: motion/templates/motion/edit.html:52 motion/templates/motion/import.html:47
+#: config/templates/config/general.html:73
+#: motion/templates/motion/config.html:21 motion/templates/motion/edit.html:45
+#: motion/templates/motion/import.html:47
+#: participant/templates/participant/config.html:21
 #: participant/templates/participant/edit.html:39
 #: participant/templates/participant/group_edit.html:34
 #: participant/templates/participant/import.html:36
@@ -192,116 +185,127 @@ msgstr "Übernehmen"
 msgid "required"
 msgstr "erforderlich"
 
-#: agenda/templates/agenda/item_row.html:9
-msgid "Reopen item"
-msgstr "Eintrag wieder öffnen"
+#: agenda/templates/agenda/item_row.html:7
+msgid "Change status (open/closed)"
+msgstr "Status ändern (offen/abgeschlossen)"
 
-#: agenda/templates/agenda/item_row.html:36
-msgid "Activate item"
-msgstr "Eintrag projizieren"
+#: agenda/templates/agenda/item_row.html:35
+#: agenda/templates/agenda/overview.html:97
+#: agenda/templates/agenda/view.html:26 agenda/templates/agenda/widget.html:6
+#: agenda/templates/agenda/widget.html:19
+#: assignment/templates/assignment/overview.html:54
+#: assignment/templates/assignment/widget.html:7
+#: motion/templates/motion/overview.html:82
+#: motion/templates/motion/widget.html:7
+#: participant/templates/participant/group_overview.html:29
+#: participant/templates/participant/group_widget.html:8
+#: participant/templates/participant/overview.html:128
+#: participant/templates/participant/user_widget.html:7
+#: projector/templates/projector/custom_slide_widget.html:6
+#: projector/templates/projector/custom_slide_widget.html:19
+msgid "Show"
+msgstr "Anzeigen"
 
-#: agenda/templates/agenda/item_row.html:41
-#: agenda/templates/agenda/widget.html:26
-#: assignment/templates/assignment/view.html:136
-#: assignment/templates/assignment/widget.html:14
-#: motion/templates/motion/widget.html:14
-#: participant/templates/participant/group_widget.html:14
-#: participant/templates/participant/user_widget.html:13
-#: projector/templates/projector/custom_slide_widget.html:29
+#: agenda/templates/agenda/item_row.html:40
+#: agenda/templates/agenda/widget.html:22
+#: assignment/templates/assignment/overview.html:59
+#: assignment/templates/assignment/view.html:172
+#: assignment/templates/assignment/widget.html:10
+#: motion/templates/motion/overview.html:87
+#: motion/templates/motion/widget.html:10
+#: participant/templates/participant/group_overview.html:33
+#: participant/templates/participant/group_widget.html:11
+#: participant/templates/participant/overview.html:132
+#: participant/templates/participant/user_widget.html:10
+#: projector/templates/projector/custom_slide_widget.html:26
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: agenda/templates/agenda/item_row.html:44
-#: agenda/templates/agenda/widget.html:23
-#: assignment/templates/assignment/view.html:137
-#: assignment/templates/assignment/widget.html:11
-#: motion/templates/motion/widget.html:11
-#: participant/templates/participant/group_widget.html:11
-#: participant/templates/participant/user_widget.html:10
-#: projector/templates/projector/custom_slide_widget.html:32
+#: agenda/templates/agenda/item_row.html:43
+#: assignment/templates/assignment/overview.html:62
+#: assignment/templates/assignment/view.html:173
+#: motion/templates/motion/overview.html:91
+#: participant/templates/participant/group_overview.html:37
+#: participant/templates/participant/overview.html:136
+#: projector/templates/projector/custom_slide_widget.html:23
 msgid "Delete"
 msgstr "Löschen"
 
-#: agenda/templates/agenda/item_row.html:48
-#: agenda/templates/agenda/widget.html:35
-msgid "Activate summary for this item"
-msgstr "Zusammenfassung für diesen Eintrag projizieren"
+#: agenda/templates/agenda/item_row.html:47
+#: agenda/templates/agenda/widget.html:29
+msgid "Show summary for this item"
+msgstr "Zusammenfassung für diesen Eintrag anzeigen"
 
-#: agenda/templates/agenda/overview.html:48
+#: agenda/templates/agenda/overview.html:47
 msgid "Do you want to save the changed order of agenda items?"
 msgstr "Möchten Sie die geänderte Reihenfolge der Einträge speichern?"
 
-#: agenda/templates/agenda/overview.html:50 assignment/models.py:291
-#: assignment/views.py:587 assignment/templates/assignment/view.html:170
-#: assignment/templates/assignment/view.html:174
+#: agenda/templates/agenda/overview.html:49 assignment/models.py:291
+#: assignment/views.py:589 assignment/templates/assignment/view.html:206
+#: assignment/templates/assignment/view.html:210
 #: assignment/templates/projector/Assignment.html:78
 #: assignment/templates/projector/Assignment.html:82 motion/models.py:574
 #: motion/views.py:824 motion/views.py:875
-#: motion/templates/motion/view.html:219
+#: motion/templates/motion/view.html:213
 #: motion/templates/projector/Motion.html:37 utils/utils.py:45
 #: utils/views.py:104
 msgid "Yes"
 msgstr "Ja"
 
-#: agenda/templates/agenda/overview.html:51 assignment/models.py:291
-#: assignment/views.py:588 assignment/templates/assignment/view.html:171
+#: agenda/templates/agenda/overview.html:50 assignment/models.py:291
+#: assignment/views.py:590 assignment/templates/assignment/view.html:207
 #: assignment/templates/projector/Assignment.html:79 motion/models.py:574
 #: motion/views.py:824 motion/views.py:876
-#: motion/templates/motion/view.html:220
+#: motion/templates/motion/view.html:214
 #: motion/templates/projector/Motion.html:38 utils/utils.py:45
 #: utils/views.py:104
 msgid "No"
 msgstr "Nein"
 
-#: agenda/templates/agenda/overview.html:59
-#: assignment/templates/assignment/overview.html:13
-#: motion/templates/motion/overview.html:14
-#: participant/templates/participant/group_overview.html:12
-#: participant/templates/participant/overview.html:22
-#: projector/templates/projector/custom_slide_widget.html:19
+#: agenda/templates/agenda/overview.html:58
+#: assignment/templates/assignment/overview.html:12
+#: motion/templates/motion/overview.html:13
+#: participant/templates/participant/group_overview.html:11
+#: participant/templates/participant/overview.html:20
+#: projector/templates/projector/custom_slide_widget.html:39
 msgid "New"
 msgstr "Neu"
 
-#: agenda/templates/agenda/overview.html:61
+#: agenda/templates/agenda/overview.html:60
 msgid "Print agenda as PDF"
 msgstr "Tagesordnung als PDF drucken"
 
-#: agenda/templates/agenda/overview.html:66
+#: agenda/templates/agenda/overview.html:65
 msgid "Hide closed items"
 msgstr "Verstecke abgeschlossene Einträge"
 
-#: agenda/templates/agenda/overview.html:70
+#: agenda/templates/agenda/overview.html:69
 msgid "item"
 msgid_plural "items"
 msgstr[0] "Eintrag"
 msgstr[1] "Einträge"
 
-#: agenda/templates/agenda/overview.html:75
+#: agenda/templates/agenda/overview.html:74
 msgid "Item"
 msgstr "Eintrag"
 
-#: agenda/templates/agenda/overview.html:80
-#: assignment/templates/assignment/overview.html:39
-#: motion/templates/motion/overview.html:60
-#: participant/templates/participant/group_overview.html:20
-#: participant/templates/participant/overview.html:110
+#: agenda/templates/agenda/overview.html:79
+#: assignment/templates/assignment/overview.html:38
+#: motion/templates/motion/overview.html:59
+#: participant/templates/participant/group_overview.html:19
+#: participant/templates/participant/overview.html:108
 msgid "Actions"
 msgstr "Aktionen"
 
-#: agenda/templates/agenda/overview.html:98
-#, fuzzy
-msgid "Activate agenda"
-msgstr "Eintrag projizieren"
-
-#: agenda/templates/agenda/overview.html:114
-#: agenda/templates/agenda/widget.html:46
-#: projector/templates/projector/custom_slide_widget.html:40
+#: agenda/templates/agenda/overview.html:113
+#: agenda/templates/agenda/widget.html:40
+#: projector/templates/projector/custom_slide_widget.html:34
 msgid "No items available."
 msgstr "Keine Einträge vorhanden."
 
 #: agenda/templates/agenda/view.html:15
-#: motion/templates/motion/poll_view.html:21
-#: motion/templates/motion/view.html:34 motion/templates/motion/view.html:318
+#: assignment/templates/assignment/view.html:29
+#: motion/templates/motion/view.html:40 motion/templates/motion/view.html:312
 msgid "More actions"
 msgstr "Mehr Aktionen"
 
@@ -309,27 +313,19 @@ msgstr "Mehr Aktionen"
 msgid "Delete item"
 msgstr "Eintrag löschen"
 
-#: agenda/templates/agenda/view.html:26 agenda/templates/agenda/widget.html:20
-msgid "Show item"
-msgstr "Eintrag projizieren"
-
-#: agenda/templates/agenda/widget.html:7
-msgid "Show agenda"
-msgstr "Tagesordnung anzeigen"
-
-#: agenda/templates/agenda/widget.html:10
-#: agenda/templates/agenda/widget.html:29
-#: assignment/templates/assignment/widget.html:17
-#: motion/templates/motion/widget.html:17
-#: participant/templates/participant/group_widget.html:17
-#: participant/templates/participant/user_widget.html:16
-#: projector/templates/projector/custom_slide_widget.html:10
-#: projector/templates/projector/custom_slide_widget.html:35
+#: agenda/templates/agenda/widget.html:9
+#: agenda/templates/agenda/widget.html:25
+#: assignment/templates/assignment/widget.html:13
+#: motion/templates/motion/widget.html:13
+#: participant/templates/participant/group_widget.html:14
+#: participant/templates/participant/user_widget.html:13
+#: projector/templates/projector/custom_slide_widget.html:9
+#: projector/templates/projector/custom_slide_widget.html:29
 msgid "Preview"
 msgstr "Vorschau"
 
-#: assignment/forms.py:24 assignment/models.py:51 assignment/views.py:381
-#: assignment/templates/assignment/view.html:239
+#: assignment/forms.py:24 assignment/models.py:51 assignment/views.py:383
+#: assignment/templates/assignment/view.html:275
 #: assignment/templates/projector/Assignment.html:21
 msgid "Number of available posts"
 msgstr "Anzahl der zur Wahl stehenden Posten"
@@ -387,18 +383,18 @@ msgstr "Eine Stimme pro Kandidat/in."
 msgid "Always Yes-No-Abstain per candidate."
 msgstr "Ja, Nein, Enthaltung pro Kandidat/in."
 
-#: assignment/models.py:44 assignment/templates/assignment/overview.html:25
-#: assignment/templates/assignment/view.html:248
+#: assignment/models.py:44 assignment/templates/assignment/overview.html:24
+#: assignment/templates/assignment/view.html:284
 msgid "Searching for candidates"
 msgstr "Auf Kandidatensuche"
 
-#: assignment/models.py:45 assignment/templates/assignment/overview.html:26
-#: assignment/templates/assignment/view.html:252
+#: assignment/models.py:45 assignment/templates/assignment/overview.html:25
+#: assignment/templates/assignment/view.html:288
 msgid "Voting"
 msgstr "Im Wahlvorgang"
 
-#: assignment/models.py:46 assignment/templates/assignment/overview.html:27
-#: assignment/templates/assignment/view.html:256
+#: assignment/models.py:46 assignment/templates/assignment/overview.html:26
+#: assignment/templates/assignment/view.html:292
 msgid "Finished"
 msgstr "Abgeschlossen"
 
@@ -406,7 +402,7 @@ msgstr "Abgeschlossen"
 msgid "Name"
 msgstr "Name"
 
-#: assignment/models.py:50 assignment/templates/assignment/view.html:30
+#: assignment/models.py:50 assignment/templates/assignment/view.html:57
 #: participant/models.py:144
 msgid "Description"
 msgstr "Beschreibung"
@@ -430,7 +426,7 @@ msgstr "Der Wahlstatus ist bereits %s."
 msgid "<b>%s</b> is already a candidate."
 msgstr "<b>%s</b> ist bereits ein/e Kandidat/in."
 
-#: assignment/models.py:82 assignment/views.py:195
+#: assignment/models.py:82 assignment/views.py:196
 msgid "The candidate list is already closed."
 msgstr "Die Kandidatenliste ist bereits geschlossen."
 
@@ -464,7 +460,7 @@ msgstr "Darf Wahlen verwalten"
 msgid "Abstain"
 msgstr "Enthaltung"
 
-#: assignment/models.py:293 motion/templates/motion/poll_view.html:49
+#: assignment/models.py:293 motion/templates/motion/poll_view.html:38
 msgid "Votes"
 msgstr "Stimmen"
 
@@ -473,10 +469,10 @@ msgstr "Stimmen"
 msgid "Ballot %d"
 msgstr "Wahlgang %d"
 
-#: assignment/models.py:319 assignment/views.py:336 assignment/views.py:675
-#: assignment/views.py:691 assignment/templates/assignment/config.html:8
-#: assignment/templates/assignment/overview.html:6
-#: assignment/templates/assignment/overview.html:10
+#: assignment/models.py:319 assignment/views.py:338 assignment/views.py:677
+#: assignment/views.py:693 assignment/templates/assignment/config.html:10
+#: assignment/templates/assignment/overview.html:5
+#: assignment/templates/assignment/overview.html:9
 msgid "Elections"
 msgstr "Wahlen"
 
@@ -499,21 +495,21 @@ msgstr "Wahl wurde erfolgreich geändert."
 msgid "Please check the form for errors."
 msgstr "Bitte kontrollieren Sie das Formular nach Fehlern."
 
-#: assignment/views.py:149
+#: assignment/views.py:150
 #, python-format
 msgid "Election <b>%s</b> was successfully deleted."
 msgstr "Wahl <b>%s</b> wurde erfolgreich gelöscht."
 
-#: assignment/views.py:162
+#: assignment/views.py:163
 #, python-format
 msgid "Election status was set to: <b>%s</b>."
 msgstr "Wahlstatus wurde gesetzt auf: <b>%s</b>."
 
-#: assignment/views.py:175
+#: assignment/views.py:176
 msgid "You have set your candidature successfully."
 msgstr "Sie haben Ihre Kandidatur erfolgreich gesetzt."
 
-#: assignment/views.py:192
+#: assignment/views.py:193
 msgid ""
 "You have withdrawn your candidature successfully. You can not be nominated "
 "by other participants anymore."
@@ -521,98 +517,98 @@ msgstr ""
 "Sie haben Ihre Kandidatur erfolgreich zurückgezogen. Sie können nun von "
 "anderen Teilnehmer/innen nicht mehr vorgeschlagen werden."
 
-#: assignment/views.py:213
+#: assignment/views.py:215
 #, python-format
 msgid "Candidate <b>%s</b> was withdrawn successfully."
 msgstr "Die Kandidatur von <b>%s</b> wurde erfolgreich zurückgezogen."
 
-#: assignment/views.py:215
+#: assignment/views.py:217
 #, python-format
 msgid "<b>%s</b> was unblocked successfully."
 msgstr "<b>%s</b> wurde erfolgreich freigegeben."
 
-#: assignment/views.py:219
+#: assignment/views.py:221
 #, 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:221
+#: assignment/views.py:223
 #, python-format
 msgid "Do you really want to unblock <b>%s</b> for the election?"
 msgstr "Soll <b>%s</b> wirklich für die Wahl freigegeben werden?"
 
-#: assignment/views.py:236
+#: assignment/views.py:238
 msgid "New ballot was successfully created."
 msgstr "Neuer Wahlgang erfolgreich angelegt."
 
-#: assignment/views.py:268
+#: assignment/views.py:270
 #, python-format
 msgid "Ballot ID %d does not exist."
 msgstr "Wahlgang-ID %d existiert nicht."
 
-#: assignment/views.py:275
+#: assignment/views.py:277
 msgid "Ballot successfully published."
 msgstr "Wahlgang wurde erfolgreich veröffentlicht."
 
-#: assignment/views.py:277
+#: assignment/views.py:279
 msgid "Ballot successfully unpublished."
 msgstr "Wahlgang wurde erfolgreich unveröffentlicht."
 
-#: assignment/views.py:290
+#: assignment/views.py:292
 msgid "not elected"
 msgstr "nicht gewählt"
 
-#: assignment/views.py:293 assignment/views.py:482
-#: assignment/templates/assignment/view.html:50
+#: assignment/views.py:295 assignment/views.py:484
+#: assignment/templates/assignment/view.html:77
 msgid "elected"
 msgstr "gewählt"
 
-#: assignment/views.py:321
+#: assignment/views.py:323
 msgid "Ballot was successfully deleted."
 msgstr "Abstimmung wurde erfolgreich gelöscht."
 
-#: assignment/views.py:333
+#: assignment/views.py:335
 msgid "Assignment"
 msgstr "Wahl"
 
-#: assignment/views.py:356 assignment/templates/assignment/overview.html:70
-#: assignment/templates/assignment/widget.html:23
+#: assignment/views.py:358 assignment/templates/assignment/overview.html:74
+#: assignment/templates/assignment/widget.html:19
 msgid "No assignments available."
 msgstr "Keine Wahlen vorhanden."
 
-#: assignment/views.py:375
+#: assignment/views.py:377
 #, python-format
 msgid "Election: %s"
 msgstr "Wahlen: %s"
 
-#: assignment/views.py:388 assignment/views.py:424
-#: assignment/templates/assignment/overview.html:37
-#: assignment/templates/assignment/poll_view.html:18
-#: assignment/templates/assignment/view.html:39
-#: assignment/templates/assignment/view.html:125
+#: assignment/views.py:390 assignment/views.py:426
+#: assignment/templates/assignment/overview.html:36
+#: assignment/templates/assignment/poll_view.html:34
+#: assignment/templates/assignment/view.html:66
+#: assignment/templates/assignment/view.html:157
 #: assignment/templates/projector/Assignment.html:38
 #: assignment/templates/projector/Assignment.html:56
 msgid "Candidates"
 msgstr "Kandidaten/innen"
 
-#: assignment/views.py:413 motion/views.py:817
-#: motion/templates/motion/view.html:193
+#: assignment/views.py:415 motion/views.py:817
+#: motion/templates/motion/view.html:187
 msgid "Vote results"
 msgstr "Abstimmungsergebnis"
 
-#: assignment/views.py:417 assignment/templates/assignment/poll_view.html:5
-#: assignment/templates/assignment/poll_view.html:8
-#: assignment/templates/assignment/view.html:120
-#: assignment/templates/assignment/view.html:128
+#: assignment/views.py:419 assignment/templates/assignment/poll_view.html:5
+#: assignment/templates/assignment/poll_view.html:11
+#: assignment/templates/assignment/view.html:152
+#: assignment/templates/assignment/view.html:160
 #: assignment/templates/projector/Assignment.html:59
 msgid "ballot"
 msgstr "Wahlgang"
 
-#: assignment/views.py:420
+#: assignment/views.py:422
 msgid "ballots"
 msgstr "Wahlgänge"
 
-#: assignment/views.py:445
+#: assignment/views.py:447
 #, python-format
 msgid ""
 "Y: %(YES)s\n"
@@ -623,59 +619,59 @@ msgstr ""
 "N: %(NO)s\n"
 "E: %(ABSTAIN)s"
 
-#: assignment/views.py:456 assignment/templates/assignment/poll_view.html:35
-#: assignment/templates/assignment/view.html:188
+#: assignment/views.py:458 assignment/templates/assignment/poll_view.html:51
+#: assignment/templates/assignment/view.html:224
 #: assignment/templates/projector/Assignment.html:96
-#: motion/templates/motion/poll_view.html:58
+#: motion/templates/motion/poll_view.html:47
 msgid "Invalid votes"
 msgstr "Ungültige Stimmen"
 
-#: assignment/views.py:463 assignment/templates/assignment/poll_view.html:45
-#: assignment/templates/assignment/view.html:204
-#: assignment/templates/assignment/view.html:209
+#: assignment/views.py:465 assignment/templates/assignment/poll_view.html:61
+#: assignment/templates/assignment/view.html:240
+#: assignment/templates/assignment/view.html:245
 #: assignment/templates/projector/Assignment.html:109
 #: assignment/templates/projector/Assignment.html:115 motion/views.py:824
-#: motion/templates/motion/poll_view.html:62
-#: motion/templates/motion/view.html:224
+#: motion/templates/motion/poll_view.html:51
+#: motion/templates/motion/view.html:218
 #: motion/templates/projector/Motion.html:42 poll/models.py:76
 msgid "Votes cast"
 msgstr "Abgegebene Stimmen"
 
-#: assignment/views.py:523 assignment/views.py:541
-#: assignment/templates/assignment/overview.html:36
+#: assignment/views.py:525 assignment/views.py:543
+#: assignment/templates/assignment/overview.html:35
 #: assignment/templates/assignment/poll_view.html:5
 #: assignment/templates/assignment/view.html:6
 #: assignment/templates/projector/Assignment.html:27
 msgid "Election"
 msgstr "Wahl"
 
-#: assignment/views.py:548
+#: assignment/views.py:550
 #, python-format
 msgid "%d. ballot"
 msgstr "%d. Wahlgang"
 
-#: assignment/views.py:550
+#: assignment/views.py:552
 #, python-format
 msgid "%d candidate"
 msgid_plural "%d candidates"
 msgstr[0] "%d Kandidat/in"
 msgstr[1] "%d Kandidaten/innen"
 
-#: assignment/views.py:552
+#: assignment/views.py:554
 #, python-format
 msgid "%d available post"
 msgid_plural "%d available posts"
 msgstr[0] "%d verfügbare Posten"
 msgstr[1] "%d verfügbare Posten"
 
-#: assignment/views.py:588 assignment/templates/assignment/view.html:172
+#: assignment/views.py:590 assignment/templates/assignment/view.html:208
 #: assignment/templates/projector/Assignment.html:80 motion/views.py:824
-#: motion/views.py:877 motion/templates/motion/view.html:221
+#: motion/views.py:877 motion/templates/motion/view.html:215
 #: motion/templates/projector/Motion.html:39
 msgid "Abstention"
 msgstr "Enthaltung"
 
-#: assignment/views.py:668
+#: assignment/views.py:670
 msgid "Election settings successfully saved."
 msgstr "Wahl-Einstellungen wurden erfolgreich gespeichert."
 
@@ -685,170 +681,188 @@ msgstr "Wahl-Einstellungen"
 
 #: assignment/templates/assignment/edit.html:8
 #: assignment/templates/assignment/edit.html:17
-#: assignment/templates/assignment/overview.html:61
+#: assignment/templates/assignment/view.html:34
 msgid "Edit election"
 msgstr "Wahl bearbeiten"
 
 #: assignment/templates/assignment/edit.html:10
 #: assignment/templates/assignment/edit.html:19
-#: assignment/templates/assignment/overview.html:13
+#: assignment/templates/assignment/overview.html:12
 msgid "New election"
 msgstr "Neue Wahl"
 
-#: assignment/templates/assignment/overview.html:16
+#: assignment/templates/assignment/overview.html:15
 msgid "Print all elections as PDF"
 msgstr "Alle Wahlen als PDF drucken"
 
-#: assignment/templates/assignment/overview.html:22
-#: participant/templates/participant/overview.html:55
+#: assignment/templates/assignment/overview.html:21
+#: participant/templates/participant/overview.html:53
 msgid "Filter"
 msgstr "Filter"
 
-#: assignment/templates/assignment/overview.html:24
-#: assignment/templates/assignment/overview.html:38
-#: assignment/templates/assignment/view.html:236
+#: assignment/templates/assignment/overview.html:23
+#: assignment/templates/assignment/overview.html:37
+#: assignment/templates/assignment/view.html:272
 #: assignment/templates/projector/Assignment.html:18 motion/views.py:795
-#: motion/templates/motion/overview.html:36
-#: motion/templates/motion/overview.html:57
-#: motion/templates/motion/view.html:183
+#: motion/templates/motion/overview.html:35
+#: motion/templates/motion/overview.html:56
+#: motion/templates/motion/view.html:177
 #: motion/templates/projector/Motion.html:11
-#: participant/templates/participant/overview.html:86
+#: participant/templates/participant/overview.html:84
 msgid "Status"
 msgstr "Status"
 
-#: assignment/templates/assignment/overview.html:32
+#: assignment/templates/assignment/overview.html:31
 msgid "election"
 msgid_plural "elections"
 msgstr[0] "Wahl"
 msgstr[1] "Wahlen"
 
-#: assignment/templates/assignment/overview.html:46
+#: assignment/templates/assignment/overview.html:44
 #, python-format
 msgctxt "Number of searched candidates for an election"
 msgid "posts: %(posts)s"
 msgstr "Posten: %(posts)s"
 
-#: assignment/templates/assignment/overview.html:48
+#: assignment/templates/assignment/overview.html:46
 #, python-format
 msgid "candidates: %(candidates)s"
 msgstr "Kandidaten/innen: %(candidates)s"
 
-#: assignment/templates/assignment/overview.html:50
+#: assignment/templates/assignment/overview.html:48
 #, python-format
 msgid "elected: %(elected)s"
 msgstr "Gewählt: %(elected)s"
 
-#: assignment/templates/assignment/overview.html:56
-msgid "Activate election"
-msgstr "Wahl projizieren"
+#: assignment/templates/assignment/overview.html:66
+msgid "Print election as PDF"
+msgstr "Wahle als PDF drucken"
 
-#: assignment/templates/assignment/overview.html:62
-msgid "Delete election"
-msgstr "Wahl löschen"
+#: assignment/templates/assignment/poll_view.html:14
+msgid "Back to election"
+msgstr "Zurück zur Wahl"
 
-#: assignment/templates/assignment/overview.html:64
-msgid "Election as PDF"
-msgstr "Wahl als PDF drucken"
+#: assignment/templates/assignment/poll_view.html:17
+#: assignment/templates/assignment/view.html:23
+msgid "Show election"
+msgstr "Wahl anzeigen"
 
-#: assignment/templates/assignment/poll_view.html:10
+#: assignment/templates/assignment/poll_view.html:25
 msgid "Short description (for ballot paper)"
 msgstr "Kurzbeschreibung (für Stimmzettel)"
 
-#: assignment/templates/assignment/poll_view.html:12
-#: motion/templates/motion/poll_view.html:41
+#: assignment/templates/assignment/poll_view.html:29
+#: motion/templates/motion/poll_view.html:30
 msgid "Special values"
 msgstr "Spezielle Werte"
 
-#: assignment/templates/assignment/poll_view.html:12
-#: motion/templates/motion/poll_view.html:41 poll/models.py:234
+#: assignment/templates/assignment/poll_view.html:29
+#: motion/templates/motion/poll_view.html:30 poll/models.py:234
 msgid "majority"
 msgstr "Mehrheit"
 
-#: assignment/templates/assignment/poll_view.html:12
-#: motion/templates/motion/poll_view.html:41 poll/models.py:236
+#: assignment/templates/assignment/poll_view.html:29
+#: motion/templates/motion/poll_view.html:30 poll/models.py:236
 #: poll/models.py:238
 msgid "undocumented"
 msgstr "nicht erfasst"
 
-#: assignment/templates/assignment/poll_view.html:59
-#: motion/templates/motion/poll_view.html:70
+#: assignment/templates/assignment/poll_view.html:74
+#: motion/templates/motion/poll_view.html:59
 msgid "Ballot paper as PDF"
 msgstr "Stimmzettel als PDF"
 
-#: assignment/templates/assignment/view.html:21
-msgid "Show election"
-msgstr "Wahl projizieren"
+#: assignment/templates/assignment/poll_view.html:83
+#: assignment/templates/assignment/view.html:112
+#: motion/templates/motion/poll_view.html:68
+#: projector/templates/projector/control_overlay_message.html:7
+#: templates/formbuttons_saveapply.html:7
+msgid "Apply"
+msgstr "Übernehmen"
+
+#: assignment/templates/assignment/view.html:36
+msgid "Delete election"
+msgstr "Wahl löschen"
+
+#: assignment/templates/assignment/view.html:40
+msgid "Ballot"
+msgstr "Wahlgang"
 
 #: assignment/templates/assignment/view.html:46
-#: assignment/templates/assignment/view.html:102
+#: motion/templates/motion/view.html:55
+msgid "New agenda item"
+msgstr "Neuer Tagesordnungseintrag"
+
+#: assignment/templates/assignment/view.html:73
+#: assignment/templates/assignment/view.html:132
 msgid "Remove candidate"
 msgstr "Kandidate/in entfernen"
 
-#: assignment/templates/assignment/view.html:53
+#: assignment/templates/assignment/view.html:80
 msgid "Mark candidate as not elected"
 msgstr "Kandidat/in als nicht gewählt markieren"
 
-#: assignment/templates/assignment/view.html:59
+#: assignment/templates/assignment/view.html:88
 #: assignment/templates/projector/Assignment.html:44
 msgid "No candidates available."
 msgstr "Keine Kandidaten/innen vorhanden."
 
-#: assignment/templates/assignment/view.html:69
+#: assignment/templates/assignment/view.html:98
 msgid "Withdraw self candidature"
 msgstr "Eigene Kandidatur zurückziehen"
 
-#: assignment/templates/assignment/view.html:73
+#: assignment/templates/assignment/view.html:102
 msgid "Self candidature"
 msgstr "Selbst kandidieren"
 
-#: assignment/templates/assignment/view.html:85
+#: assignment/templates/assignment/view.html:114
 msgid "Add new participant"
 msgstr "Neue/n Teilnehmer/in hinzufügen"
 
-#: assignment/templates/assignment/view.html:98
+#: assignment/templates/assignment/view.html:127
 msgid "Blocked Candidates"
 msgstr "Blockierte Kandidaten/innen"
 
-#: assignment/templates/assignment/view.html:105
+#: assignment/templates/assignment/view.html:137
 msgid "No blocked candidates available."
 msgstr "Keine blockierten Kandidaten/innen vorhanden."
 
-#: assignment/templates/assignment/view.html:113
+#: assignment/templates/assignment/view.html:145
 #: assignment/templates/projector/Assignment.html:52
 msgid "Election results"
 msgstr "Wahlergebnisse"
 
-#: assignment/templates/assignment/view.html:133
+#: assignment/templates/assignment/view.html:165
 msgid "Publish/unpublish results"
 msgstr "Ergebnisse veröffentlichen/unveröffentlichen"
 
-#: assignment/templates/assignment/view.html:144
-#: assignment/templates/assignment/view.html:225
+#: assignment/templates/assignment/view.html:180
+#: assignment/templates/assignment/view.html:261
 msgid "New ballot"
 msgstr "Neuer Wahlgang"
 
-#: assignment/templates/assignment/view.html:157
+#: assignment/templates/assignment/view.html:193
 #: assignment/templates/projector/Assignment.html:69
 msgid "Candidate is elected"
 msgstr "Kandidat/in ist gewählt"
 
-#: assignment/templates/assignment/view.html:176
+#: assignment/templates/assignment/view.html:212
 #: assignment/templates/projector/Assignment.html:84
 msgid "was not a <br> candidate"
 msgstr "war kein Kandidat"
 
-#: assignment/templates/assignment/view.html:193
+#: assignment/templates/assignment/view.html:229
 #: assignment/templates/projector/Assignment.html:100 motion/views.py:824
-#: motion/templates/motion/view.html:222
+#: motion/templates/motion/view.html:216
 #: motion/templates/projector/Motion.html:40
 msgid "Invalid"
 msgstr "Ungültig"
 
-#: assignment/templates/assignment/view.html:221
+#: assignment/templates/assignment/view.html:257
 msgid "No ballots available."
 msgstr "Keine Wahlgänge vorhanden."
 
-#: assignment/templates/assignment/view.html:245
+#: assignment/templates/assignment/view.html:281
 msgid "Change status"
 msgstr "Status ändern"
 
@@ -896,14 +910,14 @@ msgstr "Willkommen bei OpenSlides"
 msgid "[Place for your welcome text.]"
 msgstr "[Platz für Ihren Begrüßungstext.]"
 
-#: config/models.py:102 config/templates/config/general.html:8
+#: config/models.py:102 config/templates/config/general.html:10
 msgid "General"
 msgstr "Allgemein"
 
 #: config/models.py:126 config/templates/config/version.html:5
 #: config/templates/config/version.html:8
 #: config/templates/config/version.html:13 motion/views.py:809
-#: motion/templates/motion/view.html:26 motion/templates/motion/view.html:99
+#: motion/templates/motion/view.html:26 motion/templates/motion/view.html:93
 msgid "Version"
 msgstr "Version"
 
@@ -915,20 +929,20 @@ msgstr "Allgemeine Einstellungen erfolgreich gespeichert."
 msgid "General settings"
 msgstr "Allgemeine Einstellungen"
 
-#: config/templates/config/general.html:13
+#: config/templates/config/general.html:15
 msgid "Event"
 msgstr "Veranstaltung"
 
-#: config/templates/config/general.html:28
+#: config/templates/config/general.html:33
 msgid "Welcome Widget"
 msgstr "Willkommens-Widget"
 
-#: config/templates/config/general.html:43
+#: config/templates/config/general.html:51
 msgid "System"
 msgstr "System"
 
 #: motion/forms.py:25 motion/models.py:541 motion/views.py:843
-#: motion/templates/motion/view.html:86 motion/templates/motion/view.html:103
+#: motion/templates/motion/view.html:80 motion/templates/motion/view.html:97
 #: motion/templates/projector/Motion.html:77
 msgid "Reason"
 msgstr "Begründung"
@@ -942,14 +956,14 @@ msgid "Trivial changes don't create a new version."
 msgstr "Triviale Änderungen erzeugen keine neue Version."
 
 #: motion/forms.py:35 motion/models.py:63 motion/views.py:762
-#: motion/templates/motion/overview.html:58
-#: motion/templates/motion/view.html:167
+#: motion/templates/motion/overview.html:57
+#: motion/templates/motion/view.html:161
 #: motion/templates/projector/Motion.html:55
 msgid "Submitter"
 msgstr "Antragsteller/in"
 
 #: motion/forms.py:44 motion/views.py:782
-#: motion/templates/motion/view.html:171
+#: motion/templates/motion/view.html:165
 msgid "Supporters"
 msgstr "Unterstützer/innen"
 
@@ -1002,13 +1016,13 @@ msgstr "Veröffentlicht"
 msgid "Permitted"
 msgstr "Zugelassen"
 
-#: motion/models.py:44 motion/templates/motion/overview.html:41
-#: motion/templates/motion/view.html:304
+#: motion/models.py:44 motion/templates/motion/overview.html:40
+#: motion/templates/motion/view.html:298
 msgid "Accepted"
 msgstr "Angenommen"
 
-#: motion/models.py:45 motion/templates/motion/overview.html:42
-#: motion/templates/motion/view.html:309
+#: motion/models.py:45 motion/templates/motion/overview.html:41
+#: motion/templates/motion/view.html:303
 msgid "Rejected"
 msgstr "Abgelehnt"
 
@@ -1016,17 +1030,17 @@ msgstr "Abgelehnt"
 msgid "Withdrawed"
 msgstr "Zurückgezogen"
 
-#: motion/models.py:47 motion/templates/motion/view.html:323
+#: motion/models.py:47 motion/templates/motion/view.html:317
 msgid "Adjourned"
 msgstr "Vertagt"
 
 # please check!
-#: motion/models.py:48 motion/templates/motion/view.html:326
+#: motion/models.py:48 motion/templates/motion/view.html:320
 msgid "Not Concerned"
 msgstr "Nicht befasst"
 
 # please check!
-#: motion/models.py:49 motion/templates/motion/view.html:329
+#: motion/models.py:49 motion/templates/motion/view.html:323
 msgid "Commited a bill"
 msgstr "Verwiesen (in Ausschuss)"
 
@@ -1034,7 +1048,7 @@ msgstr "Verwiesen (in Ausschuss)"
 msgid "Rejected (not authorized)"
 msgstr "Verworfen (nicht zulässig)"
 
-#: motion/models.py:51 motion/templates/motion/overview.html:44
+#: motion/models.py:51 motion/templates/motion/overview.html:43
 msgid "Needs Review"
 msgstr "Benötigt Review"
 
@@ -1131,14 +1145,14 @@ msgid "by"
 msgstr "von"
 
 #: motion/models.py:453 motion/templates/motion/view.html:12
-#: motion/templates/motion/view.html:24 motion/templates/motion/widget.html:27
+#: motion/templates/motion/view.html:24 motion/templates/motion/widget.html:23
 #: motion/templates/projector/Motion.html:65
 #: participant/templates/participant/personal_info_widget.html:13
 #: participant/templates/participant/personal_info_widget.html:32
 msgid "no number"
 msgstr "ohne Nummer"
 
-#: motion/models.py:454 motion/templates/motion/widget.html:23
+#: motion/models.py:454 motion/templates/motion/widget.html:19
 #: participant/templates/participant/personal_info_widget.html:9
 #: participant/templates/participant/personal_info_widget.html:28
 msgid "motion"
@@ -1169,10 +1183,9 @@ msgid "The assembly may decide,"
 msgstr "Die Versammlung möge beschließen,"
 
 #: motion/models.py:603 motion/views.py:712 motion/views.py:937
-#: motion/views.py:949 motion/templates/motion/base_motion.html:9
-#: motion/templates/motion/config.html:8
-#: motion/templates/motion/overview.html:7
-#: motion/templates/motion/overview.html:11
+#: motion/views.py:949 motion/templates/motion/config.html:10
+#: motion/templates/motion/overview.html:6
+#: motion/templates/motion/overview.html:10
 msgid "Motions"
 msgstr "Anträge"
 
@@ -1404,7 +1417,7 @@ msgstr ""
 "entstehen."
 
 #: motion/views.py:719 motion/views.py:857
-#: motion/templates/motion/poll_view.html:7
+#: motion/templates/motion/poll_view.html:6
 #: motion/templates/motion/poll_view.html:14
 #: motion/templates/motion/view.html:8 motion/templates/motion/view.html:22
 #: motion/templates/projector/Motion.html:7
@@ -1412,13 +1425,12 @@ msgstr ""
 msgid "Motion"
 msgstr "Antrag"
 
-#: motion/views.py:733 motion/templates/motion/overview.html:101
+#: motion/views.py:733 motion/templates/motion/overview.html:105
 msgid "No motions available."
 msgstr "Keine Anträge vorhanden."
 
 #: motion/views.py:738 motion/views.py:740 motion/views.py:755
-#: motion/views.py:757 motion/templates/motion/base_motion.html:24
-#: motion/templates/projector/Motion.html:63
+#: motion/views.py:757 motion/templates/projector/Motion.html:63
 msgid "Motion No."
 msgstr "Antrag Nr."
 
@@ -1426,10 +1438,9 @@ msgstr "Antrag Nr."
 msgid "Signature"
 msgstr "Unterschrift"
 
-#: motion/views.py:823 motion/templates/motion/base_motion.html:55
-#: motion/templates/motion/poll_view.html:7
+#: motion/views.py:823 motion/templates/motion/poll_view.html:6
 #: motion/templates/motion/poll_view.html:14
-#: motion/templates/motion/view.html:55 motion/templates/motion/view.html:211
+#: motion/templates/motion/view.html:205
 #: motion/templates/projector/Motion.html:33
 msgid "Vote"
 msgstr "Abstimmung"
@@ -1452,61 +1463,25 @@ msgstr "%d. Abstimmung"
 msgid "Motion settings successfully saved."
 msgstr "Antrags-Einstellungen wurden erfolgreich gespeichert."
 
-#: motion/templates/motion/base_motion.html:11
-msgid "All motions"
-msgstr "Alle Anträge"
-
-#: motion/templates/motion/base_motion.html:13
-#: motion/templates/motion/edit.html:10 motion/templates/motion/edit.html:19
-#: motion/templates/motion/overview.html:14
-msgid "New motion"
-msgstr "Neuer Antrag"
-
-#: motion/templates/motion/base_motion.html:16
-#: motion/templates/motion/import.html:5 motion/templates/motion/import.html:8
-#: motion/templates/motion/overview.html:17
-msgid "Import motions"
-msgstr "Anträge importieren"
-
-#: motion/templates/motion/base_motion.html:18
-msgid "All motions as PDF"
-msgstr "Alle Anträge als PDF"
-
-#: motion/templates/motion/base_motion.html:34
-msgid "View motion"
-msgstr "Antrag anzeigen"
-
-#: motion/templates/motion/base_motion.html:38
-#: motion/templates/motion/edit.html:8 motion/templates/motion/edit.html:17
-#: motion/templates/motion/overview.html:89
-#: motion/templates/motion/view.html:40
-msgid "Edit motion"
-msgstr "Antrag bearbeiten"
-
-#: motion/templates/motion/base_motion.html:42
-#: motion/templates/motion/overview.html:91
-#: motion/templates/motion/view.html:44
-msgid "Delete motion"
-msgstr "Antrag löschen"
-
-#: motion/templates/motion/base_motion.html:45
-#: motion/templates/motion/overview.html:94
-msgid "Motion as PDF"
-msgstr "Antrag als PDF"
-
-#: motion/templates/motion/base_motion.html:49
-msgid "Show Motion"
-msgstr "Antrag projizieren"
-
-#: motion/templates/motion/base_motion.html:61
-#: motion/templates/motion/view.html:61
-msgid "New agenda item"
-msgstr "Neuer Tagesordnungseintrag"
-
 #: motion/templates/motion/config.html:5
 msgid "Motion settings"
 msgstr "Antrags Einstellungen"
 
+#: motion/templates/motion/edit.html:8 motion/templates/motion/edit.html:17
+#: motion/templates/motion/view.html:46
+msgid "Edit motion"
+msgstr "Antrag bearbeiten"
+
+#: motion/templates/motion/edit.html:10 motion/templates/motion/edit.html:19
+#: motion/templates/motion/overview.html:13
+msgid "New motion"
+msgstr "Neuer Antrag"
+
+#: motion/templates/motion/import.html:5 motion/templates/motion/import.html:8
+#: motion/templates/motion/overview.html:16
+msgid "Import motions"
+msgstr "Anträge importieren"
+
 #: motion/templates/motion/import.html:14
 msgid "Select a CSV file to import motions!"
 msgstr "Wählen Sie eine CSV-Datei zum Importieren von Anträgen aus!"
@@ -1539,79 +1514,74 @@ msgid "A CSV example file is available in OpenSlides Wiki."
 msgstr "Eine CSV-Beispiel-Datei gibt es im OpenSlides Wiki."
 
 #: motion/templates/motion/import.html:41
-#: motion/templates/motion/overview.html:17
+#: motion/templates/motion/overview.html:16
 #: participant/templates/participant/import.html:30
-#: participant/templates/participant/overview.html:24
+#: participant/templates/participant/overview.html:22
 msgid "Import"
 msgstr "Importieren"
 
-#: motion/templates/motion/overview.html:19
+#: motion/templates/motion/overview.html:18
 msgid "Print all motions as PDF"
 msgstr "Alle Anträge als PDF drucken"
 
-#: motion/templates/motion/overview.html:27
+#: motion/templates/motion/overview.html:26
 msgid "Need supporters"
 msgstr "Benötigt Unterstützer/innen"
 
-#: motion/templates/motion/overview.html:32
+#: motion/templates/motion/overview.html:31
 msgid "Without number"
 msgstr "Ohne Nummer"
 
-#: motion/templates/motion/overview.html:39
+#: motion/templates/motion/overview.html:38
 msgid "Not yet authorized"
 msgstr "Noch nicht zugelassen"
 
-#: motion/templates/motion/overview.html:40
+#: motion/templates/motion/overview.html:39
 msgid "Authorized"
 msgstr "Zugelassen"
 
-#: motion/templates/motion/overview.html:43
+#: motion/templates/motion/overview.html:42
 msgid "Withdrawen (by submitter)"
 msgstr "Zurückgezogen (durch Antragsteller/in)"
 
-#: motion/templates/motion/overview.html:48
+#: motion/templates/motion/overview.html:47
 msgctxt "number of motions"
 msgid "motion"
 msgid_plural "motions"
 msgstr[0] "Antrag"
 msgstr[1] "Anträge"
 
-#: motion/templates/motion/overview.html:52
+#: motion/templates/motion/overview.html:51
 msgid "#"
 msgstr "#"
 
-#: motion/templates/motion/overview.html:53
+#: motion/templates/motion/overview.html:52
 msgid "Motion title"
 msgstr "Antragstitel"
 
-#: motion/templates/motion/overview.html:55
+#: motion/templates/motion/overview.html:54
 msgid "Number of supporters"
 msgstr "Anzahl der Unterstützer/innen"
 
-#: motion/templates/motion/overview.html:59
-#: motion/templates/motion/view.html:247
+#: motion/templates/motion/overview.html:58
+#: motion/templates/motion/view.html:241
 msgid "Creation Time"
 msgstr "Erstellungszeit"
 
-#: motion/templates/motion/overview.html:84
-msgid "Activate motion"
-msgstr "Antrag projizieren"
+#: motion/templates/motion/overview.html:96
+msgid "Print motion as PDF"
+msgstr "Antrag als PDF drucken"
 
 #: motion/templates/motion/poll_view.html:18
 msgid "Back to motion"
 msgstr "Zurück zum Antrag"
 
-#: motion/templates/motion/poll_view.html:27
-#: motion/templates/motion/view.html:214
-msgid "Delete Vote"
-msgstr "Abstimmung löschen"
-
-#: motion/templates/motion/poll_view.html:32
-#: motion/templates/motion/view.html:49
+#: motion/templates/motion/poll_view.html:21
+#: motion/templates/motion/view.html:34
 msgid "Show motion"
-msgstr "Antrag projizieren"
+msgstr "Antrag anzeigen"
 
-#: motion/templates/motion/poll_view.html:48
+#: motion/templates/motion/poll_view.html:37
 msgid "Option"
 msgstr "Wahlmöglichkeit"
 
@@ -1619,124 +1589,132 @@ msgstr "Wahlmöglichkeit"
 msgid "Print this motion as PDF"
 msgstr "Diesen Antrag als PDF drucken"
 
-#: motion/templates/motion/view.html:75
+#: motion/templates/motion/view.html:50
+msgid "Delete motion"
+msgstr "Antrag löschen"
+
+#: motion/templates/motion/view.html:69
 msgid "This is not the newest version."
 msgstr "Dies ist nicht die neuste Version."
 
-#: motion/templates/motion/view.html:75 motion/templates/motion/view.html:77
+#: motion/templates/motion/view.html:69 motion/templates/motion/view.html:71
 msgid "Go to version"
 msgstr "Gehe zu Version"
 
-#: motion/templates/motion/view.html:77
+#: motion/templates/motion/view.html:71
 msgid "This is not the authorized version."
 msgstr "Dies ist nicht die zugelassene Version."
 
-#: motion/templates/motion/view.html:82
+#: motion/templates/motion/view.html:76
 msgid "Motion text"
 msgstr "Antragstext"
 
-#: motion/templates/motion/view.html:95
+#: motion/templates/motion/view.html:89
 msgid "Version History"
 msgstr "Versionshistorie"
 
-#: motion/templates/motion/view.html:100
+#: motion/templates/motion/view.html:94
 msgid "Time"
 msgstr "Zeit"
 
+#: motion/templates/motion/view.html:104
+msgid "This version is authorized"
+msgstr "Diese Version wurde zugelassen"
+
+#: motion/templates/motion/view.html:107
+msgid "Permit this version"
+msgstr "Diese Version zulassen"
+
 #: motion/templates/motion/view.html:110
-msgid "Version authorized"
-msgstr "Version %d zugelassen"
+msgid "Reject this version"
+msgstr "Diese Version verwerfen"
 
-#: motion/templates/motion/view.html:113
-msgid "Permit Version"
-msgstr "Version zulassen"
+#: motion/templates/motion/view.html:114
+msgid "This version is rejected"
+msgstr "Diese Version wurde verworfen"
 
-#: motion/templates/motion/view.html:116
-msgid "Reject Version"
-msgstr "Version verwerfen"
-
-#: motion/templates/motion/view.html:120
-msgid "Version rejected"
-msgstr "Version verworfen"
-
-#: motion/templates/motion/view.html:130 motion/templates/motion/view.html:137
-#: motion/templates/motion/view.html:144
+#: motion/templates/motion/view.html:124 motion/templates/motion/view.html:131
+#: motion/templates/motion/view.html:138
 msgid "unchanged"
 msgstr "unverändert"
 
-#: motion/templates/motion/view.html:154
+#: motion/templates/motion/view.html:148
 msgid "Show log"
 msgstr "Log anzeigen"
 
-#: motion/templates/motion/view.html:199 motion/templates/motion/view.html:231
+#: motion/templates/motion/view.html:193 motion/templates/motion/view.html:225
 msgid "New vote"
 msgstr "Neue Abstimmung"
 
-#: motion/templates/motion/view.html:213
+#: motion/templates/motion/view.html:207
 msgid "Edit Vote"
 msgstr "Abstimmung bearbeiten"
 
-#: motion/templates/motion/view.html:238
+#: motion/templates/motion/view.html:208
+msgid "Delete Vote"
+msgstr "Abstimmung löschen"
+
+#: motion/templates/motion/view.html:232
 msgid "No results"
 msgstr "Keine Ergebnisse"
 
-#: motion/templates/motion/view.html:253
+#: motion/templates/motion/view.html:247
 msgid "Withdraw motion"
 msgstr "Antrag zurückziehen"
 
-#: motion/templates/motion/view.html:261
+#: motion/templates/motion/view.html:255
 msgid "Unsupport motion"
 msgstr "Antrag nicht unterstützen"
 
-#: motion/templates/motion/view.html:267
+#: motion/templates/motion/view.html:261
 msgid "Support"
 msgstr "Unterstützen"
 
-#: motion/templates/motion/view.html:274
+#: motion/templates/motion/view.html:268
 msgid "minimum required supporters"
 msgstr "minimal erforderliche Unterstützer/innen"
 
-#: motion/templates/motion/view.html:281
+#: motion/templates/motion/view.html:275
 msgid "Manage motion"
 msgstr "Antrag verwalten"
 
-#: motion/templates/motion/view.html:284
+#: motion/templates/motion/view.html:278
 msgid "Formal validation"
 msgstr "Formale Gültigkeitsprüfung"
 
-#: motion/templates/motion/view.html:286
+#: motion/templates/motion/view.html:280
 msgid "Publish"
 msgstr "Veröffentlichen"
 
-#: motion/templates/motion/view.html:289
+#: motion/templates/motion/view.html:283
 msgid "Permit"
 msgstr "Zulassen"
 
-#: motion/templates/motion/view.html:292
+#: motion/templates/motion/view.html:286
 msgid "Not permit"
 msgstr "Nicht zulassen"
 
-#: motion/templates/motion/view.html:295
+#: motion/templates/motion/view.html:289
 msgid "Set number"
 msgstr "Setze Nummer"
 
-#: motion/templates/motion/view.html:300
+#: motion/templates/motion/view.html:294
 msgid "Result after vote"
 msgstr "Ergebnis nach der Abstimmung"
 
-#: motion/templates/motion/view.html:332
+#: motion/templates/motion/view.html:326
 msgid "Withdrawed by Submitter"
 msgstr "Zurückgezogen durch Antragsteller/in"
 
-#: motion/templates/motion/view.html:339
+#: motion/templates/motion/view.html:333
 msgid "For Administration only:"
 msgstr "Nur zur Administration:"
 
-#: motion/templates/motion/view.html:341
+#: motion/templates/motion/view.html:335
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: motion/templates/motion/widget.html:31
+#: motion/templates/motion/widget.html:27
 msgid "No motion available."
 msgstr "Keine Antrag vorhanden."
 
@@ -1753,9 +1731,10 @@ msgid "Participant"
 msgstr "Teilnehmer"
 
 #: participant/forms.py:28 participant/views.py:605
-#: participant/templates/participant/group_overview.html:7
-#: participant/templates/participant/group_overview.html:10
-#: participant/templates/participant/user_detail.html:14
+#: participant/templates/participant/group_overview.html:6
+#: participant/templates/participant/group_overview.html:9
+#: participant/templates/participant/overview.html:21
+#: participant/templates/participant/user_detail.html:18
 msgid "Groups"
 msgstr "Gruppen"
 
@@ -1764,11 +1743,10 @@ msgid "Permissions"
 msgstr "Rechte"
 
 #: participant/forms.py:56 participant/views.py:543 participant/views.py:591
-#: participant/templates/participant/config.html:8
-#: participant/templates/participant/group_overview.html:13
+#: participant/templates/participant/config.html:10
 #: participant/templates/participant/overview.html:7
-#: participant/templates/participant/overview.html:18
-#: participant/templates/participant/overview.html:97
+#: participant/templates/participant/overview.html:16
+#: participant/templates/participant/overview.html:95
 msgid "Participants"
 msgstr "Teilnehmer/innen"
 
@@ -1797,32 +1775,32 @@ msgstr "Teilnehmer/innen nach Vornamen sortieren"
 msgid "Disable for sorting by last name"
 msgstr "Deaktivieren für Sortierung nach Nachnamen"
 
-#: participant/models.py:33 participant/templates/participant/overview.html:59
+#: participant/models.py:33 participant/templates/participant/overview.html:57
 msgid "Male"
 msgstr "Männlich"
 
-#: participant/models.py:34 participant/templates/participant/overview.html:60
+#: participant/models.py:34 participant/templates/participant/overview.html:58
 msgid "Female"
 msgstr "Weiblich"
 
-#: participant/models.py:37 participant/templates/participant/overview.html:72
+#: participant/models.py:37 participant/templates/participant/overview.html:70
 msgid "Delegate"
 msgstr "Delegierter"
 
-#: participant/models.py:38 participant/templates/participant/overview.html:73
+#: participant/models.py:38 participant/templates/participant/overview.html:71
 msgid "Observer"
 msgstr "Beobachter"
 
-#: participant/models.py:39 participant/templates/participant/overview.html:74
+#: participant/models.py:39 participant/templates/participant/overview.html:72
 msgid "Staff"
 msgstr "Mitarbeiter"
 
-#: participant/models.py:40 participant/templates/participant/overview.html:75
+#: participant/models.py:40 participant/templates/participant/overview.html:73
 msgid "Guest"
 msgstr "Gast"
 
-#: participant/models.py:45 participant/templates/participant/overview.html:64
-#: participant/templates/participant/overview.html:104
+#: participant/models.py:45 participant/templates/participant/overview.html:62
+#: participant/templates/participant/overview.html:102
 msgid "Structure level"
 msgstr "Gliederungsebene"
 
@@ -1830,8 +1808,8 @@ msgstr "Gliederungsebene"
 msgid "Will be shown after the name."
 msgstr "Wird nach dem Namen angezeigt."
 
-#: participant/models.py:49 participant/templates/participant/overview.html:58
-#: participant/templates/participant/user_detail.html:24
+#: participant/models.py:49 participant/templates/participant/overview.html:56
+#: participant/templates/participant/user_detail.html:28
 msgid "Gender"
 msgstr "Geschlecht"
 
@@ -1844,14 +1822,14 @@ msgid "Typ"
 msgstr "Typ"
 
 #: participant/models.py:54 participant/views.py:248
-#: participant/templates/participant/overview.html:79
-#: participant/templates/participant/overview.html:106
-#: participant/templates/participant/user_detail.html:34
+#: participant/templates/participant/overview.html:77
+#: participant/templates/participant/overview.html:104
+#: participant/templates/participant/user_detail.html:38
 msgid "Committee"
 msgstr "Amt"
 
 #: participant/models.py:57
-#: participant/templates/participant/user_detail.html:39
+#: participant/templates/participant/user_detail.html:43
 msgid "About me"
 msgstr "Über mich"
 
@@ -1908,23 +1886,23 @@ msgid "List of Participants"
 msgstr "Teilnehmerliste"
 
 #: participant/views.py:247
-#: participant/templates/participant/overview.html:103
+#: participant/templates/participant/overview.html:101
 msgid "Last Name"
 msgstr "Nachname"
 
 #: participant/views.py:247
-#: participant/templates/participant/overview.html:102
+#: participant/templates/participant/overview.html:100
 msgid "First Name"
 msgstr "Vorname"
 
 #: participant/views.py:247
-#: participant/templates/participant/group_overview.html:19
+#: participant/templates/participant/group_overview.html:18
 msgid "Group"
 msgstr "Gruppe"
 
-#: participant/views.py:247 participant/templates/participant/overview.html:71
-#: participant/templates/participant/overview.html:105
-#: participant/templates/participant/user_detail.html:29
+#: participant/views.py:247 participant/templates/participant/overview.html:69
+#: participant/templates/participant/overview.html:103
+#: participant/templates/participant/user_detail.html:33
 msgid "Type"
 msgstr "Typ"
 
@@ -2009,13 +1987,12 @@ msgstr "Teilnehmer/innen-Einstellungen"
 
 #: participant/templates/participant/edit.html:8
 #: participant/templates/participant/edit.html:17
-#: participant/templates/participant/overview.html:130
 msgid "Edit participant"
 msgstr "Teilnehmer/in bearbeiten"
 
 #: participant/templates/participant/edit.html:10
 #: participant/templates/participant/edit.html:19
-#: participant/templates/participant/overview.html:22
+#: participant/templates/participant/overview.html:20
 msgid "New participant"
 msgstr "Neue/r Teilnehmer/in"
 
@@ -2023,38 +2000,36 @@ msgstr "Neue/r Teilnehmer/in"
 msgid "Reset to First Password"
 msgstr "Auf Erst-Passwort zurücksetzen"
 
-#: participant/templates/participant/group_detail.html:14
+#: participant/templates/participant/group_detail.html:18
 msgid "Members"
 msgstr "Mitglieder"
 
-#: participant/templates/participant/group_detail.html:19
+#: participant/templates/participant/group_detail.html:24
 msgid "No members available."
 msgstr "Keine Mitglieder vorhanden."
 
 #: participant/templates/participant/group_edit.html:8
 #: participant/templates/participant/group_edit.html:17
-#: participant/templates/participant/group_overview.html:25
 msgid "Edit group"
 msgstr "Gruppe bearbeiten"
 
 #: participant/templates/participant/group_edit.html:10
 #: participant/templates/participant/group_edit.html:19
-#: participant/templates/participant/group_overview.html:12
+#: participant/templates/participant/group_overview.html:11
 msgid "New group"
 msgstr "Neue Gruppe"
 
-#: participant/templates/participant/group_overview.html:27
-msgid "Delete group"
-msgstr "Gruppe löschen"
+#: participant/templates/participant/group_overview.html:12
+msgid "Back to participants overview"
+msgstr "Zurück zur Teilnehmer/innen-Übersicht"
 
-#: participant/templates/participant/group_overview.html:33
-#: participant/templates/participant/group_widget.html:24
+#: participant/templates/participant/group_widget.html:21
 msgid "No groups available."
 msgstr "Keine Gruppen vorhanden."
 
 #: participant/templates/participant/import.html:5
 #: participant/templates/participant/import.html:9
-#: participant/templates/participant/overview.html:24
+#: participant/templates/participant/overview.html:22
 msgid "Import participants"
 msgstr "Teilnehmer/innen importieren"
 
@@ -2067,103 +2042,88 @@ msgid ""
 "first_name, last_name, gender, structure level, type, committee, comment"
 msgstr "Vorname, Nachname, Geschlecht, Gliederungsebene, Typ, Amt, Kommentar"
 
-#: participant/templates/participant/login.html:16
+#: participant/templates/participant/login.html:19
 msgid "Your username and password were not accepted. Please try again."
 msgstr ""
 "Benutzername und Passwort wurden nicht akzeptiert. Bitte versuchen Sie es "
 "erneut."
 
-#: participant/templates/participant/login.html:35
+#: participant/templates/participant/login.html:38
 msgid "Username"
 msgstr "Benutzername"
 
-#: participant/templates/participant/login.html:39
+#: participant/templates/participant/login.html:42
 msgid "Password"
 msgstr "Passwort"
 
-#: participant/templates/participant/login.html:44
-#: participant/templates/participant/overview.html:39 templates/base.html:45
+#: participant/templates/participant/login.html:47
+#: participant/templates/participant/overview.html:37 templates/base.html:46
 msgid "Login"
 msgstr "Anmelden"
 
-#: participant/templates/participant/login.html:48
+#: participant/templates/participant/login.html:51
 msgid "Continue as guest"
 msgstr "Weiter als Gast"
 
-#: participant/templates/participant/overview.html:23
-#, fuzzy
-msgid "All user groups"
+#: participant/templates/participant/overview.html:21
+msgid "All groups"
 msgstr "Alle Gruppen"
 
-#: participant/templates/participant/overview.html:23
-#, fuzzy
-msgid "User groups"
-msgstr "Neue Gruppe"
-
-#: participant/templates/participant/overview.html:35
+#: participant/templates/participant/overview.html:33
 msgid "List of participants"
 msgstr "Teilnehmerliste"
 
-#: participant/templates/participant/overview.html:36
+#: participant/templates/participant/overview.html:34
 msgid "First time passwords"
 msgstr "Erst-Passwörter"
 
-#: participant/templates/participant/overview.html:44
+#: participant/templates/participant/overview.html:42
 msgid "Print list of participants as PDF"
 msgstr "Teilnehmerliste als PDF drucken"
 
-#: participant/templates/participant/overview.html:47
+#: participant/templates/participant/overview.html:45
 msgid "Print first time passwords as PDF"
 msgstr "Erst-Passwörter als PDF drucken"
 
-#: participant/templates/participant/overview.html:61
-#: participant/templates/participant/overview.html:76
+#: participant/templates/participant/overview.html:59
+#: participant/templates/participant/overview.html:74
 msgid "Not specified"
 msgstr "Nicht angegeben"
 
-#: participant/templates/participant/overview.html:87 projector/models.py:63
+#: participant/templates/participant/overview.html:85 projector/models.py:63
 msgid "Active"
 msgstr "Aktiv"
 
-#: participant/templates/participant/overview.html:88
+#: participant/templates/participant/overview.html:86
 msgid "Inactive"
 msgstr "Inaktiv"
 
-#: participant/templates/participant/overview.html:95
+#: participant/templates/participant/overview.html:93
 msgid "participant"
 msgid_plural "participants"
 msgstr[0] "Teilnehmer/in"
 msgstr[1] "Teilnehmer/innen"
 
-#: participant/templates/participant/overview.html:97
+#: participant/templates/participant/overview.html:95
 msgid "of"
 msgstr "von"
 
-#: participant/templates/participant/overview.html:109
-#: participant/templates/participant/user_detail.html:49
+#: participant/templates/participant/overview.html:107
+#: participant/templates/participant/user_detail.html:53
 msgid "Last Login"
 msgstr "Letzer Login"
 
-#: participant/templates/participant/overview.html:134
-msgid "Delete participant"
-msgstr "Teilnehmer/in löschen"
+#: participant/templates/participant/overview.html:143
+msgid "Change status (active/inactive)"
+msgstr "Status ändern (aktiv/inaktiv)"
 
-#: participant/templates/participant/overview.html:138
-msgid "Change status to inactive"
-msgstr "Status ändern auf inaktiv"
-
-#: participant/templates/participant/overview.html:141
-msgid "Change status to active"
-msgstr "Status ändern auf aktiv"
-
-#: participant/templates/participant/overview.html:151
-#: participant/templates/participant/user_widget.html:22
+#: participant/templates/participant/overview.html:153
+#: participant/templates/participant/user_widget.html:19
 msgid "No participants available."
 msgstr "Keine Teilnehmer/innen vorhanden."
 
 #: participant/templates/participant/password_change.html:5
 #: participant/templates/participant/password_change.html:8
-#: participant/templates/participant/settings.html:13
 msgid "Password Settings"
 msgstr "Passwort-Einstellungen"
 
@@ -2186,20 +2146,15 @@ msgid "I am candidate for the following elections:"
 msgstr "Ich bin Kandidat/in bei folgenden Wahlen:"
 
 #: participant/templates/participant/settings.html:5
-#: participant/templates/participant/settings.html:12
-#: participant/templates/participant/settings.html:19
-msgid "Personal Settings"
-msgstr "Persönliche Einstellungen"
+#: participant/templates/participant/settings.html:8 templates/base.html:40
+msgid "Edit profile"
+msgstr "Profil bearbeiten"
 
-#: participant/templates/participant/settings.html:10
-msgid "User Settings"
-msgstr "Benutzereinstellungen"
-
-#: participant/templates/participant/user_detail.html:19
+#: participant/templates/participant/user_detail.html:23
 msgid "The participant is not member of any group."
 msgstr "Teilnehmer/in ist kein Mitglied einer Gruppe."
 
-#: participant/templates/participant/user_detail.html:53
+#: participant/templates/participant/user_detail.html:57
 msgid "The participant has not logged in yet."
 msgstr "Teilnehmer/in hat sich noch nicht angemeldet."
 
@@ -2247,32 +2202,32 @@ msgstr "Einblendungen"
 msgid "Custom Slides"
 msgstr "Benutzerdefinierte Folien"
 
-#: projector/templates/projector/control_countdown.html:9
+#: projector/templates/projector/control_countdown.html:7
 msgctxt "seconds"
 msgid "s"
 msgstr "s"
 
-#: projector/templates/projector/control_countdown.html:11
-msgid "Save as default"
-msgstr "Als Voreinstellung speichern"
+#: projector/templates/projector/control_countdown.html:9
+msgid "Save time as default"
+msgstr "Zeit als Voreinstellung speichern"
 
-#: projector/templates/projector/control_countdown.html:15
+#: projector/templates/projector/control_countdown.html:12
 msgid "Reset countdown"
 msgstr "Countdown zurücksetzen"
 
-#: projector/templates/projector/control_countdown.html:18
+#: projector/templates/projector/control_countdown.html:15
 msgid "Start countdown"
 msgstr "Countdown starten"
 
-#: projector/templates/projector/control_countdown.html:21
+#: projector/templates/projector/control_countdown.html:18
 msgid "Stop countdown"
 msgstr "Countdown stoppen"
 
-#: projector/templates/projector/control_overlay_message.html:11
+#: projector/templates/projector/control_overlay_message.html:10
 msgid "Clean message"
 msgstr "Message leeren"
 
-#: projector/templates/projector/custom_slide_widget.html:13
+#: projector/templates/projector/custom_slide_widget.html:12
 msgid "Welcome Page"
 msgstr "Willkommensseite"
 
@@ -2284,23 +2239,23 @@ msgstr "Widgets verwalten"
 msgid "Widgets"
 msgstr "Widgets"
 
-#: projector/templates/projector/live_view_widget.html:9
+#: projector/templates/projector/live_view_widget.html:8
 msgid "Zoom in"
 msgstr "Vergrößern"
 
-#: projector/templates/projector/live_view_widget.html:12
+#: projector/templates/projector/live_view_widget.html:11
 msgid "Zoom out"
 msgstr "Verkleinern"
 
-#: projector/templates/projector/live_view_widget.html:17
+#: projector/templates/projector/live_view_widget.html:16
 msgid "Scroll text up"
 msgstr "Text nach oben scrollen"
 
-#: projector/templates/projector/live_view_widget.html:20
+#: projector/templates/projector/live_view_widget.html:19
 msgid "Scroll text down"
 msgstr "Text nach unten scrollen"
 
-#: projector/templates/projector/live_view_widget.html:25
+#: projector/templates/projector/live_view_widget.html:24
 msgid "Reset projector view"
 msgstr "Projektor-Ansicht zurücksetzen"
 
@@ -2309,6 +2264,14 @@ msgstr "Projektor-Ansicht zurücksetzen"
 msgid "Custom slide"
 msgstr "Benutzerdefinierte Folie"
 
+#: projector/templates/projector/overlay_widget.html:22
+msgid "Countdown for speaking time"
+msgstr "Countdown zur Redezeitbegrenzung"
+
+#: projector/templates/projector/overlay_widget.html:26
+msgid "Message"
+msgstr "Mitteilung"
+
 #: projector/templates/projector/select_widgets.html:5
 #: projector/templates/projector/select_widgets.html:8
 msgid "Select widgets"
@@ -2330,19 +2293,15 @@ msgstr "Serverfehler"
 msgid "Home"
 msgstr "Startseite"
 
-#: templates/base.html:39
-msgid "Profile"
-msgstr "Profil"
-
-#: templates/base.html:40
+#: templates/base.html:41
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: templates/base.html:42
+#: templates/base.html:43
 msgid "Logout"
 msgstr "Abmelden"
 
-#: templates/base.html:98
+#: templates/base.html:100
 msgid ""
 "Get <a href='http://openslides.org/support' target='_blank'>professional "
 "support</a> for OpenSlides."
@@ -2400,66 +2359,5 @@ msgstr "undefinierter-dateiname"
 msgid "Enter valid JSON"
 msgstr "Gebe valides JSON ein"
 
-#~ msgid "Mark item as done"
-#~ msgstr "Eintrag als erledigt markieren"
-
-#~ msgid "Item closed"
-#~ msgstr "Eintrag erledigt"
-
-#, fuzzy
-#~ msgid "Show Application"
-#~ msgstr "Wahl projizieren"
-
-#~ msgid "Log"
-#~ msgstr "Log"
-
-#~ msgid "All items"
-#~ msgstr "Alle Einträge"
-
-#~ msgid "View item"
-#~ msgstr "Eintrag anzeigen"
-
-#~ msgid "Done"
-#~ msgstr "Erledigt"
-
-#~ msgid "All elections"
-#~ msgstr "Alle Wahlen"
-
-#~ msgid "View election"
-#~ msgstr "Wahl anzeigen"
-
-#~ msgid "Number"
-#~ msgstr "Nummer"
-
-#~ msgid "Enter result"
-#~ msgstr "Ergebnis eingeben"
-
-#~ msgid "Unsupport"
-#~ msgstr "Nicht unterstützen"
-
-#~ msgid "Result after debate"
-#~ msgstr "Ergebnis nach der Debatte"
-
-#~ msgid "All participants"
-#~ msgstr "Alle Teilnehmer/innen"
-
-#~ msgid "View participant"
-#~ msgstr "Teilnehmer/in anzeigen"
-
-#~ msgid "View group"
-#~ msgstr "Gruppen anzeigen"
-
-#~ msgid "Close this notification"
-#~ msgstr "Meldung ausblenden"
-
-#~ msgid "Overview"
-#~ msgstr "Übersicht"
-
-#~ msgid "Projector view"
-#~ msgstr "Projektor-Ansicht"
-
-#~ msgid "New slide"
-#~ msgstr "Neue Folie"
-
-#~ msgid "Welcome"
-#~ msgstr "Willkommen"
+#~ msgid "Countdown"
+#~ msgstr "Countdown"
diff --git a/openslides/locale/fr/LC_MESSAGES/django.mo b/openslides/locale/fr/LC_MESSAGES/django.mo
index 22787ea371e8d94aa369bf597b26f7d592ad6182..11e7cf50f5ab023af4f476d406bf56692cfee3bf 100644
GIT binary patch
delta 9674
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
Mk_b=c(%g#w53*mC!2kdN

delta 12381
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
I+3=+Q1A01@#sB~S

diff --git a/openslides/locale/fr/LC_MESSAGES/django.po b/openslides/locale/fr/LC_MESSAGES/django.po
index f3a54f26e..eb469e2e7 100644
--- a/openslides/locale/fr/LC_MESSAGES/django.po
+++ b/openslides/locale/fr/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenSlides\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-09 14:17+0100\n"
+"POT-Creation-Date: 2013-02-05 23:06+0100\n"
 "PO-Revision-Date: 2012-12-09 12:20+0000\n"
 "Last-Translator: moosline <moosline@savvy.ch>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/openslides/"
@@ -37,20 +37,20 @@ msgid "Parent item"
 msgstr "Elément parent"
 
 #: agenda/models.py:34 config/forms.py:59 motion/forms.py:22
-#: motion/models.py:539 motion/templates/motion/view.html:246
+#: motion/models.py:539 motion/templates/motion/view.html:95
 #: projector/models.py:29
 msgid "Title"
 msgstr "Titre"
 
 #: agenda/models.py:35 motion/forms.py:23 motion/models.py:540
-#: motion/templates/motion/view.html:247 projector/models.py:30
+#: motion/templates/motion/view.html:96 projector/models.py:30
 msgid "Text"
 msgstr "Texte"
 
-#: agenda/models.py:36 agenda/templates/agenda/overview.html:65
-#: agenda/templates/agenda/view.html:13 participant/models.py:60
-#: participant/templates/participant/overview.html:72
-#: participant/templates/participant/user_detail.html:45
+#: agenda/models.py:36 agenda/templates/agenda/overview.html:76
+#: agenda/templates/agenda/view.html:37 participant/models.py:60
+#: participant/templates/participant/overview.html:106
+#: participant/templates/participant/user_detail.html:49
 msgid "Comment"
 msgstr "Commentaire"
 
@@ -58,7 +58,7 @@ msgstr "Commentaire"
 msgid "Closed"
 msgstr "Fermé"
 
-#: agenda/models.py:38 agenda/templates/agenda/overview.html:71
+#: agenda/models.py:38 agenda/templates/agenda/overview.html:82
 #: projector/models.py:31
 msgid "Weight"
 msgstr "Pondération"
@@ -72,11 +72,11 @@ msgid "Can manage agenda"
 msgstr "Peut gérer l'ordre du jour"
 
 #: agenda/models.py:180 agenda/slides.py:20 agenda/views.py:191
-#: agenda/views.py:192 agenda/views.py:212 agenda/views.py:226
-#: agenda/templates/agenda/base_agenda.html:10
+#: agenda/views.py:192 agenda/views.py:212 agenda/views.py:227
+#: agenda/templates/agenda/config.html:8
 #: agenda/templates/agenda/overview.html:8
-#: agenda/templates/agenda/overview.html:52
-#: agenda/templates/agenda/overview.html:77
+#: agenda/templates/agenda/overview.html:55
+#: agenda/templates/agenda/overview.html:88
 #: agenda/templates/projector/AgendaSummary.html:6
 #: agenda/templates/projector/AgendaSummary.html:10
 msgid "Agenda"
@@ -114,215 +114,226 @@ msgstr "Elément %s et ses sous-éléments ont été créés avec succès."
 msgid "Item %s was successfully deleted."
 msgstr "Elément %s a été supprimé avec succès."
 
-#: agenda/templates/agenda/base_agenda.html:12
-msgid "All items"
-msgstr "Tous les éléments"
-
-#: agenda/templates/agenda/base_agenda.html:14
-#: agenda/templates/agenda/edit.html:10 agenda/templates/agenda/edit.html:18
-msgid "New item"
-msgstr "Nouvel élément"
-
-#: agenda/templates/agenda/base_agenda.html:16
-msgid "Agenda as PDF"
-msgstr "Ordre du jour en PDF"
-
-#: agenda/templates/agenda/base_agenda.html:26
-msgid "View item"
-msgstr "Afficher l'élément"
-
-#: agenda/templates/agenda/base_agenda.html:31
-#: agenda/templates/agenda/edit.html:8 agenda/templates/agenda/edit.html:16
-#: agenda/templates/agenda/item_row.html:40
-msgid "Edit item"
-msgstr "Modifier l'élément"
-
-#: agenda/templates/agenda/base_agenda.html:33
-#: agenda/templates/agenda/item_row.html:41
-msgid "Delete item"
-msgstr "Supprimer l'élément"
-
-#: agenda/templates/agenda/base_agenda.html:38
-msgid "Show item"
-msgstr "Afficher l'élément"
-
-#: agenda/templates/agenda/config.html:5 agenda/templates/agenda/config.html:8
+#: agenda/templates/agenda/config.html:5
 msgid "Agenda settings"
 msgstr "Paramètres de l'ordre du jour"
 
-#: agenda/templates/agenda/config.html:13 agenda/templates/agenda/edit.html:24
-#: assignment/templates/assignment/config.html:13
-#: assignment/templates/assignment/edit.html:26
-#: assignment/templates/assignment/poll_view.html:66
-#: config/templates/config/general.html:56
-#: motion/templates/motion/config.html:13 motion/templates/motion/edit.html:26
-#: motion/templates/motion/poll_view.html:52
-#: participant/templates/participant/config.html:13
-#: participant/templates/participant/edit.html:31
-#: participant/templates/participant/group_edit.html:25
-#: participant/templates/participant/password_change.html:22
-#: participant/templates/participant/settings.html:22
-#: projector/templates/projector/new.html:13
-#: projector/templates/projector/select_widgets.html:22
+#: agenda/templates/agenda/config.html:8
+#: assignment/templates/assignment/config.html:9 config/views.py:110
+#: config/templates/config/general.html:9
+#: motion/templates/motion/config.html:9
+#: participant/templates/participant/config.html:9
+msgid "Configuration"
+msgstr "Configuration"
+
+#: agenda/templates/agenda/config.html:15
+#: assignment/templates/assignment/poll_view.html:80
+#: motion/templates/motion/poll_view.html:65
+#: projector/templates/projector/select_widgets.html:28
+#: templates/formbuttons_save.html:4 templates/formbuttons_saveapply.html:4
 msgid "Save"
 msgstr "Enregistrer"
 
-#: agenda/templates/agenda/config.html:17 agenda/templates/agenda/edit.html:31
-#: assignment/templates/assignment/config.html:17
-#: assignment/templates/assignment/edit.html:33
-#: assignment/templates/assignment/poll_view.html:73
-#: config/templates/config/general.html:60
-#: motion/templates/motion/config.html:17 motion/templates/motion/edit.html:33
-#: motion/templates/motion/import.html:30
-#: motion/templates/motion/poll_view.html:59
-#: participant/templates/participant/config.html:17
-#: participant/templates/participant/edit.html:38
-#: participant/templates/participant/group_edit.html:32
-#: participant/templates/participant/import.html:28
-#: participant/templates/participant/password_change.html:26
-#: participant/templates/participant/settings.html:26
-#: projector/templates/projector/new.html:20
+#: agenda/templates/agenda/config.html:19 agenda/templates/agenda/edit.html:30
+#: assignment/templates/assignment/config.html:18
+#: assignment/templates/assignment/edit.html:31
+#: assignment/templates/assignment/poll_view.html:86
+#: config/templates/config/general.html:70
+#: motion/templates/motion/config.html:18 motion/templates/motion/edit.html:42
+#: motion/templates/motion/import.html:44
+#: motion/templates/motion/poll_view.html:71
+#: participant/templates/participant/config.html:18
+#: participant/templates/participant/edit.html:36
+#: participant/templates/participant/group_edit.html:31
+#: participant/templates/participant/import.html:33
 msgid "Cancel"
 msgstr "Annuler"
 
-#: agenda/templates/agenda/edit.html:27
-#: assignment/templates/assignment/edit.html:29
-#: assignment/templates/assignment/poll_view.html:69
-#: assignment/templates/assignment/view.html:92
-#: motion/templates/motion/edit.html:29
-#: motion/templates/motion/poll_view.html:55
-#: participant/templates/participant/edit.html:34
-#: participant/templates/participant/group_edit.html:28
-#: projector/templates/projector/control_overlay_message.html:8
-#: projector/templates/projector/new.html:16
-msgid "Apply"
-msgstr "Appliquer"
+#: agenda/templates/agenda/edit.html:8 agenda/templates/agenda/edit.html:17
+#: agenda/templates/agenda/view.html:20
+msgid "Edit item"
+msgstr "Modifier l'élément"
 
-#: agenda/templates/agenda/edit.html:35
-#: assignment/templates/assignment/edit.html:37
-#: motion/templates/motion/edit.html:37 motion/templates/motion/import.html:34
-#: participant/templates/participant/edit.html:42
-#: participant/templates/participant/group_edit.html:36
-#: participant/templates/participant/import.html:32
+#: agenda/templates/agenda/edit.html:10 agenda/templates/agenda/edit.html:19
+#: agenda/templates/agenda/overview.html:58
+msgid "New item"
+msgstr "Nouvel élément"
+
+#: agenda/templates/agenda/edit.html:22 agenda/templates/agenda/view.html:12
+#: assignment/templates/assignment/edit.html:22
+#: assignment/templates/assignment/view.html:20
+#: motion/templates/motion/edit.html:22 motion/templates/motion/import.html:10
+#: motion/templates/motion/view.html:30
+#: participant/templates/participant/edit.html:22
+#: participant/templates/participant/group_detail.html:12
+#: participant/templates/participant/group_edit.html:22
+#: participant/templates/participant/import.html:11
+#: participant/templates/participant/user_detail.html:12
+#: projector/templates/projector/new.html:11
+#: projector/templates/projector/select_widgets.html:10
+msgid "Back to overview"
+msgstr ""
+
+#: agenda/templates/agenda/edit.html:33
+#: assignment/templates/assignment/config.html:21
+#: assignment/templates/assignment/edit.html:34
+#: config/templates/config/general.html:73
+#: motion/templates/motion/config.html:21 motion/templates/motion/edit.html:45
+#: motion/templates/motion/import.html:47
+#: participant/templates/participant/config.html:21
+#: participant/templates/participant/edit.html:39
+#: participant/templates/participant/group_edit.html:34
+#: participant/templates/participant/import.html:36
+#: projector/templates/projector/new.html:19
 msgid "required"
 msgstr "requis"
 
-#: agenda/templates/agenda/item_row.html:8
-msgid "Mark item as done"
-msgstr "Marquez l'élément comme terminé"
-
-#: agenda/templates/agenda/item_row.html:12
-msgid "Item closed"
-msgstr "Elément fermé"
+#: agenda/templates/agenda/item_row.html:7
+#, fuzzy
+msgid "Change status (open/closed)"
+msgstr "Changer le statut sur inactif"
 
 #: agenda/templates/agenda/item_row.html:35
-#: agenda/templates/agenda/overview.html:86
-msgid "Activate item"
-msgstr "Activez l'élément"
+#: agenda/templates/agenda/overview.html:97
+#: agenda/templates/agenda/view.html:26 agenda/templates/agenda/widget.html:6
+#: agenda/templates/agenda/widget.html:19
+#: assignment/templates/assignment/overview.html:54
+#: assignment/templates/assignment/widget.html:7
+#: motion/templates/motion/overview.html:82
+#: motion/templates/motion/widget.html:7
+#: participant/templates/participant/group_overview.html:29
+#: participant/templates/participant/group_widget.html:8
+#: participant/templates/participant/overview.html:128
+#: participant/templates/participant/user_widget.html:7
+#: projector/templates/projector/custom_slide_widget.html:6
+#: projector/templates/projector/custom_slide_widget.html:19
+#, fuzzy
+msgid "Show"
+msgstr "Afficher l'élément"
 
-#: agenda/templates/agenda/item_row.html:44
-#: agenda/templates/agenda/widget.html:35
-msgid "Activate summary for this item"
+#: agenda/templates/agenda/item_row.html:40
+#: agenda/templates/agenda/widget.html:22
+#: assignment/templates/assignment/overview.html:59
+#: assignment/templates/assignment/view.html:172
+#: assignment/templates/assignment/widget.html:10
+#: motion/templates/motion/overview.html:87
+#: motion/templates/motion/widget.html:10
+#: participant/templates/participant/group_overview.html:33
+#: participant/templates/participant/group_widget.html:11
+#: participant/templates/participant/overview.html:132
+#: participant/templates/participant/user_widget.html:10
+#: projector/templates/projector/custom_slide_widget.html:26
+msgid "Edit"
+msgstr "Modifier"
+
+#: agenda/templates/agenda/item_row.html:43
+#: assignment/templates/assignment/overview.html:62
+#: assignment/templates/assignment/view.html:173
+#: motion/templates/motion/overview.html:91
+#: participant/templates/participant/group_overview.html:37
+#: participant/templates/participant/overview.html:136
+#: projector/templates/projector/custom_slide_widget.html:23
+msgid "Delete"
+msgstr "Supprimer"
+
+#: agenda/templates/agenda/item_row.html:47
+#: agenda/templates/agenda/widget.html:29
+#, fuzzy
+msgid "Show summary for this item"
 msgstr "Activez le résumé pour cet élément"
 
-#: agenda/templates/agenda/overview.html:45
+#: agenda/templates/agenda/overview.html:47
 msgid "Do you want to save the changed order of agenda items?"
 msgstr "Voulez-vous enregistrer les modifications de l'ordre du jour?"
 
-#: agenda/templates/agenda/overview.html:46 assignment/models.py:291
-#: assignment/views.py:587 assignment/templates/assignment/view.html:168
-#: assignment/templates/assignment/view.html:172
+#: agenda/templates/agenda/overview.html:49 assignment/models.py:291
+#: assignment/views.py:589 assignment/templates/assignment/view.html:206
+#: assignment/templates/assignment/view.html:210
 #: assignment/templates/projector/Assignment.html:78
 #: assignment/templates/projector/Assignment.html:82 motion/models.py:574
-#: motion/views.py:830 motion/views.py:881
-#: motion/templates/motion/view.html:79
-#: motion/templates/projector/Motion.html:37 utils/utils.py:49
-#: utils/views.py:108
+#: motion/views.py:824 motion/views.py:875
+#: motion/templates/motion/view.html:213
+#: motion/templates/projector/Motion.html:37 utils/utils.py:45
+#: utils/views.py:104
 msgid "Yes"
 msgstr "Oui"
 
-#: agenda/templates/agenda/overview.html:47 assignment/models.py:291
-#: assignment/views.py:588 assignment/templates/assignment/view.html:169
+#: agenda/templates/agenda/overview.html:50 assignment/models.py:291
+#: assignment/views.py:590 assignment/templates/assignment/view.html:207
 #: assignment/templates/projector/Assignment.html:79 motion/models.py:574
-#: motion/views.py:830 motion/views.py:882
-#: motion/templates/motion/view.html:80
-#: motion/templates/projector/Motion.html:38 utils/utils.py:49
-#: utils/views.py:108
+#: motion/views.py:824 motion/views.py:876
+#: motion/templates/motion/view.html:214
+#: motion/templates/projector/Motion.html:38 utils/utils.py:45
+#: utils/views.py:104
 msgid "No"
 msgstr "Non"
 
-#: agenda/templates/agenda/overview.html:55
+#: agenda/templates/agenda/overview.html:58
 #: assignment/templates/assignment/overview.html:12
-#: motion/templates/motion/overview.html:12
-#: participant/templates/participant/overview.html:22
-msgid "Filter"
-msgstr "Filtre"
+#: motion/templates/motion/overview.html:13
+#: participant/templates/participant/group_overview.html:11
+#: participant/templates/participant/overview.html:20
+#: projector/templates/projector/custom_slide_widget.html:39
+msgid "New"
+msgstr ""
 
-#: agenda/templates/agenda/overview.html:56
+#: agenda/templates/agenda/overview.html:60
+#, fuzzy
+msgid "Print agenda as PDF"
+msgstr "Ordre du jour en PDF"
+
+#: agenda/templates/agenda/overview.html:65
 msgid "Hide closed items"
 msgstr "Cachez les élément terminés"
 
-#: agenda/templates/agenda/overview.html:59
+#: agenda/templates/agenda/overview.html:69
 msgid "item"
 msgid_plural "items"
 msgstr[0] "élément"
 msgstr[1] "éléments"
 
-#: agenda/templates/agenda/overview.html:62
-msgid "Done"
-msgstr "Terminé"
-
-#: agenda/templates/agenda/overview.html:63
+#: agenda/templates/agenda/overview.html:74
 msgid "Item"
 msgstr "Elément"
 
-#: agenda/templates/agenda/overview.html:68
-#: assignment/templates/assignment/overview.html:28
-#: motion/templates/motion/overview.html:43
-#: participant/templates/participant/group_overview.html:14
-#: participant/templates/participant/overview.html:74
+#: agenda/templates/agenda/overview.html:79
+#: assignment/templates/assignment/overview.html:38
+#: motion/templates/motion/overview.html:59
+#: participant/templates/participant/group_overview.html:19
+#: participant/templates/participant/overview.html:108
 msgid "Actions"
 msgstr "Actions"
 
-#: agenda/templates/agenda/overview.html:102
-#: agenda/templates/agenda/widget.html:46
-#: projector/templates/projector/custom_slide_widget.html:36
+#: agenda/templates/agenda/overview.html:113
+#: agenda/templates/agenda/widget.html:40
+#: projector/templates/projector/custom_slide_widget.html:34
 msgid "No items available."
 msgstr "Pas d'éléments disponibles."
 
-#: agenda/templates/agenda/widget.html:10
-#: agenda/templates/agenda/widget.html:29
-#: assignment/templates/assignment/widget.html:17
-#: motion/templates/motion/widget.html:17
-#: participant/templates/participant/group_widget.html:17
-#: participant/templates/participant/user_widget.html:16
-#: projector/templates/projector/custom_slide_widget.html:11
-#: projector/templates/projector/custom_slide_widget.html:30
+#: agenda/templates/agenda/view.html:15
+#: assignment/templates/assignment/view.html:29
+#: motion/templates/motion/view.html:40 motion/templates/motion/view.html:312
+#, fuzzy
+msgid "More actions"
+msgstr "Motions"
+
+#: agenda/templates/agenda/view.html:21
+msgid "Delete item"
+msgstr "Supprimer l'élément"
+
+#: agenda/templates/agenda/widget.html:9
+#: agenda/templates/agenda/widget.html:25
+#: assignment/templates/assignment/widget.html:13
+#: motion/templates/motion/widget.html:13
+#: participant/templates/participant/group_widget.html:14
+#: participant/templates/participant/user_widget.html:13
+#: projector/templates/projector/custom_slide_widget.html:9
+#: projector/templates/projector/custom_slide_widget.html:29
 msgid "Preview"
 msgstr "Aperçu"
 
-#: agenda/templates/agenda/widget.html:23
-#: assignment/templates/assignment/view.html:132
-#: assignment/templates/assignment/widget.html:11
-#: motion/templates/motion/widget.html:11
-#: participant/templates/participant/group_widget.html:11
-#: participant/templates/participant/user_widget.html:10
-#: projector/templates/projector/custom_slide_widget.html:24
-msgid "Delete"
-msgstr "Supprimer"
-
-#: agenda/templates/agenda/widget.html:26
-#: assignment/templates/assignment/view.html:131
-#: assignment/templates/assignment/widget.html:14
-#: motion/templates/motion/widget.html:14
-#: participant/templates/participant/group_widget.html:14
-#: participant/templates/participant/user_widget.html:13
-#: projector/templates/projector/custom_slide_widget.html:27
-msgid "Edit"
-msgstr "Modifier"
-
-#: assignment/forms.py:24 assignment/models.py:51 assignment/views.py:381
-#: assignment/templates/assignment/view.html:13
+#: assignment/forms.py:24 assignment/models.py:51 assignment/views.py:383
+#: assignment/templates/assignment/view.html:275
 #: assignment/templates/projector/Assignment.html:21
 msgid "Number of available posts"
 msgstr "Nombre des postes disponibles"
@@ -381,18 +392,18 @@ msgstr "Toujours une option par candidat"
 msgid "Always Yes-No-Abstain per candidate."
 msgstr "Toujours Oui-Non-Abstention par candidat."
 
-#: assignment/models.py:44 assignment/templates/assignment/overview.html:15
-#: assignment/templates/assignment/view.html:23
+#: assignment/models.py:44 assignment/templates/assignment/overview.html:24
+#: assignment/templates/assignment/view.html:284
 msgid "Searching for candidates"
 msgstr "Recherche de candidats"
 
-#: assignment/models.py:45 assignment/templates/assignment/overview.html:16
-#: assignment/templates/assignment/view.html:25
+#: assignment/models.py:45 assignment/templates/assignment/overview.html:25
+#: assignment/templates/assignment/view.html:288
 msgid "Voting"
 msgstr "Vote"
 
-#: assignment/models.py:46 assignment/templates/assignment/overview.html:17
-#: assignment/templates/assignment/view.html:27
+#: assignment/models.py:46 assignment/templates/assignment/overview.html:26
+#: assignment/templates/assignment/view.html:292
 msgid "Finished"
 msgstr "Terminé"
 
@@ -400,7 +411,8 @@ msgstr "Terminé"
 msgid "Name"
 msgstr "Nom"
 
-#: assignment/models.py:50 participant/models.py:144
+#: assignment/models.py:50 assignment/templates/assignment/view.html:57
+#: participant/models.py:144
 msgid "Description"
 msgstr "Description"
 
@@ -423,7 +435,7 @@ msgstr "Le statut d'assignation est déjà sur %s"
 msgid "<b>%s</b> is already a candidate."
 msgstr "<b>%s</b> est déja un candidat."
 
-#: assignment/models.py:82 assignment/views.py:195
+#: assignment/models.py:82 assignment/views.py:196
 msgid "The candidate list is already closed."
 msgstr "La liste des candidats est déjà fermée"
 
@@ -457,7 +469,7 @@ msgstr "Peut gérer l'assignation"
 msgid "Abstain"
 msgstr "Abstention"
 
-#: assignment/models.py:293 motion/templates/motion/poll_view.html:22
+#: assignment/models.py:293 motion/templates/motion/poll_view.html:38
 msgid "Votes"
 msgstr "Votes"
 
@@ -466,10 +478,9 @@ msgstr "Votes"
 msgid "Ballot %d"
 msgstr "Vote %d"
 
-#: assignment/models.py:319 assignment/views.py:336 assignment/views.py:675
-#: assignment/views.py:690
-#: assignment/templates/assignment/base_assignment.html:14
-#: assignment/templates/assignment/overview.html:6
+#: assignment/models.py:319 assignment/views.py:338 assignment/views.py:677
+#: assignment/views.py:693 assignment/templates/assignment/config.html:10
+#: assignment/templates/assignment/overview.html:5
 #: assignment/templates/assignment/overview.html:9
 msgid "Elections"
 msgstr "Elections"
@@ -487,27 +498,27 @@ msgstr "La nouvelle élection a été créée avec succès."
 msgid "Election was successfully modified."
 msgstr "L'élection a été modifiée avec succès."
 
-#: assignment/views.py:130 motion/views.py:245 motion/views.py:689
-#: participant/views.py:508 participant/views.py:531 utils/views.py:222
-#: utils/views.py:240 utils/views.py:264
+#: assignment/views.py:130 motion/views.py:239 motion/views.py:683
+#: participant/views.py:504 participant/views.py:528 utils/views.py:218
+#: utils/views.py:236 utils/views.py:260
 msgid "Please check the form for errors."
 msgstr "S'il vous plaît, vérifier si il a des erreurs dans le formulaire."
 
-#: assignment/views.py:149
+#: assignment/views.py:150
 #, python-format
 msgid "Election <b>%s</b> was successfully deleted."
 msgstr "L'election <b>%s</b> a été supprimée avec succès."
 
-#: assignment/views.py:162
+#: assignment/views.py:163
 #, python-format
 msgid "Election status was set to: <b>%s</b>."
 msgstr "Le statut de l'élection a été changé sur <b>%s</b>."
 
-#: assignment/views.py:175
+#: assignment/views.py:176
 msgid "You have set your candidature successfully."
 msgstr "Vous avez inséré votre candidature avec succès."
 
-#: assignment/views.py:192
+#: assignment/views.py:193
 msgid ""
 "You have withdrawn your candidature successfully. You can not be nominated "
 "by other participants anymore."
@@ -515,101 +526,100 @@ msgstr ""
 "Vous avez retiré votre candidature avec  succès. On ne peut plus vous "
 "nominer comme candidat"
 
-#: assignment/views.py:213
+#: assignment/views.py:215
 #, python-format
 msgid "Candidate <b>%s</b> was withdrawn successfully."
 msgstr "Le candidat <b>%s</b> a été rejeté avec succès."
 
-#: assignment/views.py:215
+#: assignment/views.py:217
 #, python-format
 msgid "<b>%s</b> was unblocked successfully."
 msgstr "Le candidat <b>%s</b> a été nominé avec succès."
 
-#: assignment/views.py:219
+#: assignment/views.py:221
 #, python-format
 msgid "Do you really want to withdraw <b>%s</b> from the election?"
 msgstr "Voulez-vous vraiment exclure <b>%s</b> de cette élection?"
 
-#: assignment/views.py:221
+#: assignment/views.py:223
 #, python-format
 msgid "Do you really want to unblock <b>%s</b> for the election?"
 msgstr ""
 "Voulez-vous vraiment permettre <b>%s</b> de participer à nouveau à cette "
 "élection?"
 
-#: assignment/views.py:236
+#: assignment/views.py:238
 msgid "New ballot was successfully created."
 msgstr "Le nouveau vote a été créé avec succès"
 
-#: assignment/views.py:268
+#: assignment/views.py:270
 #, python-format
 msgid "Ballot ID %d does not exist."
 msgstr "L'identifiant %d de vote n'existe pas."
 
-#: assignment/views.py:275
+#: assignment/views.py:277
 msgid "Ballot successfully published."
 msgstr "Le vote a été publié avec succès."
 
-#: assignment/views.py:277
+#: assignment/views.py:279
 msgid "Ballot successfully unpublished."
 msgstr "Le vote a été retiré avec succès."
 
-#: assignment/views.py:290
+#: assignment/views.py:292
 msgid "not elected"
 msgstr "non élu"
 
-#: assignment/views.py:293 assignment/views.py:482
-#: assignment/templates/assignment/view.html:48
+#: assignment/views.py:295 assignment/views.py:484
+#: assignment/templates/assignment/view.html:77
 msgid "elected"
 msgstr "élu"
 
-#: assignment/views.py:321
+#: assignment/views.py:323
 msgid "Ballot was successfully deleted."
 msgstr "Le vote a été supprimé avec succès."
 
-#: assignment/views.py:333
+#: assignment/views.py:335
 msgid "Assignment"
 msgstr "Assignation"
 
-#: assignment/views.py:356 assignment/templates/assignment/overview.html:59
-#: assignment/templates/assignment/widget.html:23
+#: assignment/views.py:358 assignment/templates/assignment/overview.html:74
+#: assignment/templates/assignment/widget.html:19
 msgid "No assignments available."
 msgstr "Aucune assignation disponible."
 
-#: assignment/views.py:375
+#: assignment/views.py:377
 #, python-format
 msgid "Election: %s"
 msgstr "Election: %s"
 
-#: assignment/views.py:388 assignment/views.py:424
-#: assignment/templates/assignment/overview.html:26
-#: assignment/templates/assignment/poll_view.html:18
-#: assignment/templates/assignment/view.html:37
-#: assignment/templates/assignment/view.html:120
+#: assignment/views.py:390 assignment/views.py:426
+#: assignment/templates/assignment/overview.html:36
+#: assignment/templates/assignment/poll_view.html:34
+#: assignment/templates/assignment/view.html:66
+#: assignment/templates/assignment/view.html:157
 #: assignment/templates/projector/Assignment.html:38
 #: assignment/templates/projector/Assignment.html:56
 msgid "Candidates"
 msgstr "Candidats"
 
-#: assignment/views.py:413 motion/views.py:823
-#: motion/templates/motion/view.html:44
+#: assignment/views.py:415 motion/views.py:817
+#: motion/templates/motion/view.html:187
 msgid "Vote results"
 msgstr "Résultat du vote"
 
-#: assignment/views.py:417
-#: assignment/templates/assignment/base_assignment.html:71
-#: assignment/templates/assignment/poll_view.html:5
-#: assignment/templates/assignment/poll_view.html:8
-#: assignment/templates/assignment/view.html:123
+#: assignment/views.py:419 assignment/templates/assignment/poll_view.html:5
+#: assignment/templates/assignment/poll_view.html:11
+#: assignment/templates/assignment/view.html:152
+#: assignment/templates/assignment/view.html:160
 #: assignment/templates/projector/Assignment.html:59
 msgid "ballot"
 msgstr "vote"
 
-#: assignment/views.py:420
+#: assignment/views.py:422
 msgid "ballots"
 msgstr "votes"
 
-#: assignment/views.py:445
+#: assignment/views.py:447
 #, python-format
 msgid ""
 "Y: %(YES)s\n"
@@ -620,247 +630,258 @@ msgstr ""
 "N: %(NO)s\n"
 "A: %(ABSTAIN)s"
 
-#: assignment/views.py:456 assignment/templates/assignment/poll_view.html:35
-#: assignment/templates/assignment/view.html:186
+#: assignment/views.py:458 assignment/templates/assignment/poll_view.html:51
+#: assignment/templates/assignment/view.html:224
 #: assignment/templates/projector/Assignment.html:96
-#: motion/templates/motion/poll_view.html:31
+#: motion/templates/motion/poll_view.html:47
 msgid "Invalid votes"
 msgstr "Votes invalides"
 
-#: assignment/views.py:463 assignment/templates/assignment/poll_view.html:45
-#: assignment/templates/assignment/view.html:202
-#: assignment/templates/assignment/view.html:207
+#: assignment/views.py:465 assignment/templates/assignment/poll_view.html:61
+#: assignment/templates/assignment/view.html:240
+#: assignment/templates/assignment/view.html:245
 #: assignment/templates/projector/Assignment.html:109
-#: assignment/templates/projector/Assignment.html:115 motion/views.py:830
-#: motion/templates/motion/poll_view.html:35
-#: motion/templates/motion/view.html:84
+#: assignment/templates/projector/Assignment.html:115 motion/views.py:824
+#: motion/templates/motion/poll_view.html:51
+#: motion/templates/motion/view.html:218
 #: motion/templates/projector/Motion.html:42 poll/models.py:76
 msgid "Votes cast"
 msgstr "Nombre de votants"
 
-#: assignment/views.py:523 assignment/views.py:541
-#: assignment/templates/assignment/overview.html:25
+#: assignment/views.py:525 assignment/views.py:543
+#: assignment/templates/assignment/overview.html:35
 #: assignment/templates/assignment/poll_view.html:5
 #: assignment/templates/assignment/view.html:6
 #: assignment/templates/projector/Assignment.html:27
 msgid "Election"
 msgstr "Election"
 
-#: assignment/views.py:548
+#: assignment/views.py:550
 #, python-format
 msgid "%d. ballot"
 msgstr "%d. vote"
 
-#: assignment/views.py:550
+#: assignment/views.py:552
 #, python-format
 msgid "%d candidate"
 msgid_plural "%d candidates"
 msgstr[0] "%d candidat"
 msgstr[1] "%d candidats"
 
-#: assignment/views.py:552
+#: assignment/views.py:554
 #, python-format
 msgid "%d available post"
 msgid_plural "%d available posts"
 msgstr[0] "%d poste disponible"
 msgstr[1] "%d postes disponibles"
 
-#: assignment/views.py:588 assignment/templates/assignment/view.html:170
-#: assignment/templates/projector/Assignment.html:80 motion/views.py:830
-#: motion/views.py:883 motion/templates/motion/view.html:81
+#: assignment/views.py:590 assignment/templates/assignment/view.html:208
+#: assignment/templates/projector/Assignment.html:80 motion/views.py:824
+#: motion/views.py:877 motion/templates/motion/view.html:215
 #: motion/templates/projector/Motion.html:39
 msgid "Abstention"
 msgstr "Abstention"
 
-#: assignment/views.py:668
+#: assignment/views.py:670
 msgid "Election settings successfully saved."
 msgstr "Les paramètres de l'élection ont été enregistrés avec succès."
 
-#: assignment/templates/assignment/base_assignment.html:16
-msgid "All elections"
-msgstr "Toutes les élections"
-
-#: assignment/templates/assignment/base_assignment.html:18
-#: assignment/templates/assignment/edit.html:10
-#: assignment/templates/assignment/edit.html:19
-msgid "New election"
-msgstr "Nouvelle élection"
-
-#: assignment/templates/assignment/base_assignment.html:20
-msgid "All elections as PDF"
-msgstr "Toutes les élections en PDF"
-
-#: assignment/templates/assignment/base_assignment.html:31
-msgid "View election"
-msgstr "Afficher l'élection"
-
-#: assignment/templates/assignment/base_assignment.html:39
-#: assignment/templates/assignment/edit.html:8
-#: assignment/templates/assignment/edit.html:17
-#: assignment/templates/assignment/overview.html:50
-msgid "Edit election"
-msgstr "Modifier l'élection"
-
-#: assignment/templates/assignment/base_assignment.html:44
-#: assignment/templates/assignment/overview.html:51
-msgid "Delete election"
-msgstr "Supprimer l'élection"
-
-#: assignment/templates/assignment/base_assignment.html:50
-#: assignment/templates/assignment/overview.html:53
-msgid "Election as PDF"
-msgstr "L'élection en PDF"
-
-#: assignment/templates/assignment/base_assignment.html:56
-msgid "Show election"
-msgstr "Projeter l'élection"
-
-#: assignment/templates/assignment/base_assignment.html:63
-#: motion/templates/motion/base_motion.html:61
-msgid "New agenda item"
-msgstr "Nouveau point dans l'ordre du jour"
-
 #: assignment/templates/assignment/config.html:5
-#: assignment/templates/assignment/config.html:8
 msgid "Election settings"
 msgstr "Paramètres de l'élection"
 
-#: assignment/templates/assignment/overview.html:14
-#: assignment/templates/assignment/overview.html:27
-#: assignment/templates/assignment/view.html:11
-#: assignment/templates/projector/Assignment.html:18 motion/views.py:801
-#: motion/templates/motion/overview.html:20
-#: motion/templates/motion/overview.html:40
-#: motion/templates/motion/view.html:34
+#: assignment/templates/assignment/edit.html:8
+#: assignment/templates/assignment/edit.html:17
+#: assignment/templates/assignment/view.html:34
+msgid "Edit election"
+msgstr "Modifier l'élection"
+
+#: assignment/templates/assignment/edit.html:10
+#: assignment/templates/assignment/edit.html:19
+#: assignment/templates/assignment/overview.html:12
+msgid "New election"
+msgstr "Nouvelle élection"
+
+#: assignment/templates/assignment/overview.html:15
+#, fuzzy
+msgid "Print all elections as PDF"
+msgstr "Toutes les élections en PDF"
+
+#: assignment/templates/assignment/overview.html:21
+#: participant/templates/participant/overview.html:53
+msgid "Filter"
+msgstr "Filtre"
+
+#: assignment/templates/assignment/overview.html:23
+#: assignment/templates/assignment/overview.html:37
+#: assignment/templates/assignment/view.html:272
+#: assignment/templates/projector/Assignment.html:18 motion/views.py:795
+#: motion/templates/motion/overview.html:35
+#: motion/templates/motion/overview.html:56
+#: motion/templates/motion/view.html:177
 #: motion/templates/projector/Motion.html:11
-#: participant/templates/participant/overview.html:52
+#: participant/templates/participant/overview.html:84
 msgid "Status"
 msgstr "Statut"
 
-#: assignment/templates/assignment/overview.html:22
+#: assignment/templates/assignment/overview.html:31
 msgid "election"
 msgid_plural "elections"
 msgstr[0] "élection"
 msgstr[1] "élections"
 
-#: assignment/templates/assignment/overview.html:35
+#: assignment/templates/assignment/overview.html:44
 #, python-format
 msgctxt "Number of searched candidates for an election"
 msgid "posts: %(posts)s"
 msgstr "postes: %(posts)s"
 
-#: assignment/templates/assignment/overview.html:37
+#: assignment/templates/assignment/overview.html:46
 #, python-format
 msgid "candidates: %(candidates)s"
 msgstr "candidats: %(candidates)s"
 
-#: assignment/templates/assignment/overview.html:39
+#: assignment/templates/assignment/overview.html:48
 #, python-format
 msgid "elected: %(elected)s"
 msgstr "élus: %(elected)s"
 
-#: assignment/templates/assignment/overview.html:45
-msgid "Activate election"
-msgstr "Activer l'élection"
+#: assignment/templates/assignment/overview.html:66
+#, fuzzy
+msgid "Print election as PDF"
+msgstr "Toutes les élections en PDF"
 
-#: assignment/templates/assignment/poll_view.html:10
+#: assignment/templates/assignment/poll_view.html:14
+#, fuzzy
+msgid "Back to election"
+msgstr "Modifier l'élection"
+
+#: assignment/templates/assignment/poll_view.html:17
+#: assignment/templates/assignment/view.html:23
+msgid "Show election"
+msgstr "Projeter l'élection"
+
+#: assignment/templates/assignment/poll_view.html:25
 msgid "Short description (for ballot paper)"
 msgstr "Une courte déscription (pour le bulletin de vote)"
 
-#: assignment/templates/assignment/poll_view.html:12
-#: motion/templates/motion/poll_view.html:14
+#: assignment/templates/assignment/poll_view.html:29
+#: motion/templates/motion/poll_view.html:30
 msgid "Special values"
 msgstr "Valeurs spéciales"
 
-#: assignment/templates/assignment/poll_view.html:12
-#: motion/templates/motion/poll_view.html:14 poll/models.py:234
+#: assignment/templates/assignment/poll_view.html:29
+#: motion/templates/motion/poll_view.html:30 poll/models.py:234
 msgid "majority"
 msgstr "majorité"
 
-#: assignment/templates/assignment/poll_view.html:12
-#: motion/templates/motion/poll_view.html:14 poll/models.py:236
+#: assignment/templates/assignment/poll_view.html:29
+#: motion/templates/motion/poll_view.html:30 poll/models.py:236
 #: poll/models.py:238
 msgid "undocumented"
 msgstr "non documenté"
 
-#: assignment/templates/assignment/poll_view.html:59
-#: motion/templates/motion/poll_view.html:45
+#: assignment/templates/assignment/poll_view.html:74
+#: motion/templates/motion/poll_view.html:59
 msgid "Ballot paper as PDF"
 msgstr "bulletin de vote en PDF"
 
-#: assignment/templates/assignment/view.html:21
-msgid "Change status"
-msgstr "Modifier le statut"
+#: assignment/templates/assignment/poll_view.html:83
+#: assignment/templates/assignment/view.html:112
+#: motion/templates/motion/poll_view.html:68
+#: projector/templates/projector/control_overlay_message.html:7
+#: templates/formbuttons_saveapply.html:7
+msgid "Apply"
+msgstr "Appliquer"
 
-#: assignment/templates/assignment/view.html:44
-#: assignment/templates/assignment/view.html:106
+#: assignment/templates/assignment/view.html:36
+msgid "Delete election"
+msgstr "Supprimer l'élection"
+
+#: assignment/templates/assignment/view.html:40
+#, fuzzy
+msgid "Ballot"
+msgstr "vote"
+
+#: assignment/templates/assignment/view.html:46
+#: motion/templates/motion/view.html:55
+msgid "New agenda item"
+msgstr "Nouveau point dans l'ordre du jour"
+
+#: assignment/templates/assignment/view.html:73
+#: assignment/templates/assignment/view.html:132
 msgid "Remove candidate"
 msgstr "Enlever le candidat"
 
-#: assignment/templates/assignment/view.html:51
+#: assignment/templates/assignment/view.html:80
 msgid "Mark candidate as not elected"
 msgstr "Marquer le candidat comme pas elu."
 
-#: assignment/templates/assignment/view.html:57
+#: assignment/templates/assignment/view.html:88
 #: assignment/templates/projector/Assignment.html:44
 msgid "No candidates available."
 msgstr "Aucun candidat n'est disponible"
 
-#: assignment/templates/assignment/view.html:69
+#: assignment/templates/assignment/view.html:98
 msgid "Withdraw self candidature"
 msgstr "Retirer sa propre candidature"
 
-#: assignment/templates/assignment/view.html:75
+#: assignment/templates/assignment/view.html:102
 msgid "Self candidature"
 msgstr "Se proposer comme candidat"
 
-#: assignment/templates/assignment/view.html:86
+#: assignment/templates/assignment/view.html:114
 msgid "Add new participant"
 msgstr "Ajouter un nouveau participant"
 
-#: assignment/templates/assignment/view.html:102
+#: assignment/templates/assignment/view.html:127
 msgid "Blocked Candidates"
 msgstr "Candidats bloqués"
 
-#: assignment/templates/assignment/view.html:109
+#: assignment/templates/assignment/view.html:137
 msgid "No blocked candidates available."
 msgstr "Aucun candidat n'est disponible"
 
-#: assignment/templates/assignment/view.html:115
+#: assignment/templates/assignment/view.html:145
 #: assignment/templates/projector/Assignment.html:52
 msgid "Election results"
 msgstr "Résultat des élections"
 
-#: assignment/templates/assignment/view.html:128
+#: assignment/templates/assignment/view.html:165
 msgid "Publish/unpublish results"
 msgstr "Publier/dépublier les résultats"
 
-#: assignment/templates/assignment/view.html:140
-#: assignment/templates/assignment/view.html:223
+#: assignment/templates/assignment/view.html:180
+#: assignment/templates/assignment/view.html:261
 msgid "New ballot"
 msgstr "Nouveau vote"
 
-#: assignment/templates/assignment/view.html:155
+#: assignment/templates/assignment/view.html:193
 #: assignment/templates/projector/Assignment.html:69
 msgid "Candidate is elected"
 msgstr "Le candidat est élu"
 
-#: assignment/templates/assignment/view.html:174
+#: assignment/templates/assignment/view.html:212
 #: assignment/templates/projector/Assignment.html:84
 msgid "was not a <br> candidate"
 msgstr "n'était pas un <br> candidat"
 
-#: assignment/templates/assignment/view.html:191
-#: assignment/templates/projector/Assignment.html:100 motion/views.py:830
-#: motion/templates/motion/view.html:82
+#: assignment/templates/assignment/view.html:229
+#: assignment/templates/projector/Assignment.html:100 motion/views.py:824
+#: motion/templates/motion/view.html:216
 #: motion/templates/projector/Motion.html:40
 msgid "Invalid"
 msgstr "Invalide"
 
-#: assignment/templates/assignment/view.html:219
-msgid "No results available."
+#: assignment/templates/assignment/view.html:257
+#, fuzzy
+msgid "No ballots available."
 msgstr "Aucun resultat n'est disponible"
 
+#: assignment/templates/assignment/view.html:281
+msgid "Change status"
+msgstr "Modifier le statut"
+
 #: config/forms.py:22
 msgid "Event name"
 msgstr "Nom de l'événement"
@@ -885,7 +906,7 @@ msgstr "Organisateur de l'événement"
 msgid "Allow access for anonymous guest users"
 msgstr "Permettre l'accès anomyme"
 
-#: config/forms.py:65 participant/forms.py:123
+#: config/forms.py:65 participant/forms.py:126
 msgid "Welcome text"
 msgstr "Texte de bienvenue"
 
@@ -905,14 +926,14 @@ msgstr "Bienvenue sur OpenSlides!"
 msgid "[Place for your welcome text.]"
 msgstr "[Insérer votre texte ici.]"
 
-#: config/models.py:102
+#: config/models.py:102 config/templates/config/general.html:10
 msgid "General"
 msgstr "Général"
 
 #: config/models.py:126 config/templates/config/version.html:5
 #: config/templates/config/version.html:8
-#: config/templates/config/version.html:11 motion/views.py:815
-#: motion/templates/motion/view.html:214 motion/templates/motion/view.html:244
+#: config/templates/config/version.html:13 motion/views.py:809
+#: motion/templates/motion/view.html:26 motion/templates/motion/view.html:93
 msgid "Version"
 msgstr "Version"
 
@@ -920,29 +941,24 @@ msgstr "Version"
 msgid "General settings successfully saved."
 msgstr "Les paramètres généraux ont été enregistrés avec succès."
 
-#: config/views.py:110 config/templates/config/base_config.html:7
-msgid "Configuration"
-msgstr "Configuration"
-
 #: config/templates/config/general.html:5
-#: config/templates/config/general.html:8
 msgid "General settings"
 msgstr "Paramètres généraux"
 
-#: config/templates/config/general.html:11
+#: config/templates/config/general.html:15
 msgid "Event"
 msgstr "Evénement"
 
-#: config/templates/config/general.html:26
+#: config/templates/config/general.html:33
 msgid "Welcome Widget"
 msgstr "Widget de bienvenue"
 
-#: config/templates/config/general.html:41
+#: config/templates/config/general.html:51
 msgid "System"
 msgstr "Système"
 
-#: motion/forms.py:25 motion/models.py:541 motion/views.py:849
-#: motion/templates/motion/view.html:229 motion/templates/motion/view.html:249
+#: motion/forms.py:25 motion/models.py:541 motion/views.py:843
+#: motion/templates/motion/view.html:80 motion/templates/motion/view.html:97
 #: motion/templates/projector/Motion.html:77
 msgid "Reason"
 msgstr "Motivation"
@@ -955,18 +971,19 @@ msgstr "Changement trivial"
 msgid "Trivial changes don't create a new version."
 msgstr "Des changement triviaux ne créent pas une nouvelle version."
 
-#: motion/forms.py:35 motion/models.py:63 motion/views.py:768
-#: motion/templates/motion/overview.html:41
-#: motion/templates/motion/view.html:18
+#: motion/forms.py:35 motion/models.py:63 motion/views.py:762
+#: motion/templates/motion/overview.html:57
+#: motion/templates/motion/view.html:161
 #: motion/templates/projector/Motion.html:55
 msgid "Submitter"
 msgstr "Requérant"
 
-#: motion/forms.py:44 motion/views.py:788 motion/templates/motion/view.html:22
+#: motion/forms.py:44 motion/views.py:782
+#: motion/templates/motion/view.html:165
 msgid "Supporters"
 msgstr "Partisants"
 
-#: motion/forms.py:50 participant/forms.py:111
+#: motion/forms.py:50 participant/forms.py:114
 msgid "CSV File"
 msgstr "Fichier CSV"
 
@@ -1016,13 +1033,13 @@ msgstr "Publié"
 msgid "Permitted"
 msgstr "Permis"
 
-#: motion/models.py:44 motion/templates/motion/overview.html:24
-#: motion/templates/motion/view.html:167
+#: motion/models.py:44 motion/templates/motion/overview.html:40
+#: motion/templates/motion/view.html:298
 msgid "Accepted"
 msgstr "Accepté"
 
-#: motion/models.py:45 motion/templates/motion/overview.html:25
-#: motion/templates/motion/view.html:172
+#: motion/models.py:45 motion/templates/motion/overview.html:41
+#: motion/templates/motion/view.html:303
 msgid "Rejected"
 msgstr "Rejeté"
 
@@ -1030,15 +1047,15 @@ msgstr "Rejeté"
 msgid "Withdrawed"
 msgstr "Retiré"
 
-#: motion/models.py:47 motion/templates/motion/view.html:180
+#: motion/models.py:47 motion/templates/motion/view.html:317
 msgid "Adjourned"
 msgstr "Ajourné"
 
-#: motion/models.py:48 motion/templates/motion/view.html:183
+#: motion/models.py:48 motion/templates/motion/view.html:320
 msgid "Not Concerned"
 msgstr "Non concerné"
 
-#: motion/models.py:49 motion/templates/motion/view.html:186
+#: motion/models.py:49 motion/templates/motion/view.html:323
 msgid "Commited a bill"
 msgstr "Transféré à (une commission)"
 
@@ -1046,7 +1063,7 @@ msgstr "Transféré à (une commission)"
 msgid "Rejected (not authorized)"
 msgstr "Rejeté (non autorisé)"
 
-#: motion/models.py:51 motion/templates/motion/overview.html:27
+#: motion/models.py:51 motion/templates/motion/overview.html:43
 msgid "Needs Review"
 msgstr "Doit être revu"
 
@@ -1142,15 +1159,15 @@ msgstr "Statut modifié"
 msgid "by"
 msgstr "par"
 
-#: motion/models.py:453 motion/templates/motion/view.html:210
-#: motion/templates/motion/widget.html:27
+#: motion/models.py:453 motion/templates/motion/view.html:12
+#: motion/templates/motion/view.html:24 motion/templates/motion/widget.html:23
 #: motion/templates/projector/Motion.html:65
 #: participant/templates/participant/personal_info_widget.html:13
 #: participant/templates/participant/personal_info_widget.html:32
 msgid "no number"
 msgstr "pas de nombre"
 
-#: motion/models.py:454 motion/templates/motion/widget.html:23
+#: motion/models.py:454 motion/templates/motion/widget.html:19
 #: participant/templates/participant/personal_info_widget.html:9
 #: participant/templates/participant/personal_info_widget.html:28
 msgid "motion"
@@ -1180,30 +1197,30 @@ msgstr "Peut gérer les motions"
 msgid "The assembly may decide,"
 msgstr "Je demande a l'Assemblée de décider sur "
 
-#: motion/models.py:603 motion/views.py:718 motion/views.py:943
-#: motion/views.py:954 motion/templates/motion/base_motion.html:9
-#: motion/templates/motion/overview.html:7
+#: motion/models.py:603 motion/views.py:712 motion/views.py:937
+#: motion/views.py:949 motion/templates/motion/config.html:10
+#: motion/templates/motion/overview.html:6
 #: motion/templates/motion/overview.html:10
 msgid "Motions"
 msgstr "Motions"
 
-#: motion/views.py:173
+#: motion/views.py:167
 msgid "You have not the necessary rights to create or edit motions."
 msgstr "Vous n'avez pas l'autorisation de créer ou modifier des motions."
 
-#: motion/views.py:178
+#: motion/views.py:172
 msgid "You can not edit this motion."
 msgstr "Vous ne pouvez pas modifier cette motion."
 
-#: motion/views.py:236
+#: motion/views.py:230
 msgid "New motion was successfully created."
 msgstr "La nouvelle motion a été créée avec succès."
 
-#: motion/views.py:238
+#: motion/views.py:232
 msgid "Motion was successfully modified."
 msgstr "La motion a été modifiée avec succès."
 
-#: motion/views.py:252
+#: motion/views.py:246
 msgid ""
 "Attention: Do you really want to edit this motion? The supporters will "
 "<b>not</b> be removed automatically because you can manage motions. Please "
@@ -1214,7 +1231,7 @@ msgstr ""
 "gérer les motions. S'il vous plait vérifiez si les partisans sont valables "
 "après votre modification!"
 
-#: motion/views.py:254
+#: motion/views.py:248
 #, python-format
 msgid ""
 "Attention: Do you really want to edit this motion? All <b>%s</b> supporters "
@@ -1223,182 +1240,182 @@ msgstr ""
 "Attention: Voulez-vous vraiment modifier cette motion? Tout les <b>%s</b> "
 "partisans seront supprimés! Essayez de convaincre les partisans à nouveau."
 
-#: motion/views.py:286
+#: motion/views.py:280
 msgid "Motion number was successfully set."
 msgstr "Le numéro de la motion a été mis avec succès."
 
-#: motion/views.py:302
+#: motion/views.py:296
 msgid "Motion was successfully authorized."
 msgstr "La motion a été autorisée avec succès."
 
-#: motion/views.py:317
+#: motion/views.py:311
 msgid "Motion was successfully rejected."
 msgstr "La motion a été rejetée avec succès. "
 
-#: motion/views.py:333
+#: motion/views.py:327
 #, python-format
 msgid "Motion status was set to: <b>%s</b>."
 msgstr "Le statut de la motion a été changé sur: <b>%s</b>"
 
-#: motion/views.py:349
+#: motion/views.py:343
 msgid "Motion status was reset."
 msgstr "Le statut de la motion a été remis à zéro."
 
-#: motion/views.py:376
+#: motion/views.py:370
 msgid "You can not support this motion."
 msgstr "Vous ne pouvez pas soutenir cette motion. "
 
-#: motion/views.py:379
+#: motion/views.py:373
 msgid "You can not unsupport this motion."
 msgstr "Vous ne pouvez pas retirer votre soutien pour cette motion. "
 
-#: motion/views.py:390
+#: motion/views.py:384
 msgid "Do you really want to support this motion?"
 msgstr "Voulez-vous vraiment soutenir cette motion?"
 
-#: motion/views.py:392
+#: motion/views.py:386
 msgid "Do you really want to unsupport this motion?"
 msgstr "Voulez-vous vraiment retirer votre soutien pour cette motion?"
 
-#: motion/views.py:403
+#: motion/views.py:397
 msgid "You have supported this motion successfully."
 msgstr ""
 "Vous soutenez maintenant cette motion, vous avez été ajouté avec succès."
 
-#: motion/views.py:405
+#: motion/views.py:399
 msgid "You have unsupported this motion successfully."
 msgstr "Vous avez retiré votre soutien pour cette motion avec succès. "
 
-#: motion/views.py:419
+#: motion/views.py:413
 msgid "New vote was successfully created."
 msgstr "Le nouveau vote a été créé avec succès."
 
-#: motion/views.py:435
+#: motion/views.py:429
 msgid "Poll deleted"
 msgstr "Sondage supprimé"
 
-#: motion/views.py:436
+#: motion/views.py:430
 msgid "Poll was successfully deleted."
 msgstr "Le sondage a été supprimé avec succès."
 
-#: motion/views.py:438
+#: motion/views.py:432
 #, python-format
 msgid "the %s. poll"
 msgstr "le %s. sondage"
 
-#: motion/views.py:479 motion/views.py:488
+#: motion/views.py:473 motion/views.py:482
 #, python-format
 msgid "You can not delete motion <b>%s</b>."
 msgstr "Vous ne pouvez pas supprimer la motion <b>%s</b>."
 
-#: motion/views.py:484 motion/views.py:492
+#: motion/views.py:478 motion/views.py:486
 #, python-format
 msgid "Motion <b>%s</b> was successfully deleted."
 msgstr "La motion <b>%s</b> a été supprimée avec succès."
 
-#: motion/views.py:494
+#: motion/views.py:488
 msgid "Invalid request"
 msgstr "Demande invalide"
 
-#: motion/views.py:518
+#: motion/views.py:512
 msgid "Poll was updated"
 msgstr "Le sondage a été actualisé"
 
-#: motion/views.py:535
+#: motion/views.py:529
 #, python-format
 msgid "Version <b>%s</b> accepted."
 msgstr "Version <b>%s</b> acceptée."
 
-#: motion/views.py:537
+#: motion/views.py:531
 #, python-format
 msgid "Do you really want to authorize version <b>%s</b>?"
 msgstr "Voulez-vous vraiment autoriser cette version <b>%s</b>"
 
-#: motion/views.py:547
+#: motion/views.py:541
 #, python-format
 msgid "Version <b>%s</b> rejected."
 msgstr "Version <b>%s</b> rejetée."
 
-#: motion/views.py:549
+#: motion/views.py:543
 msgid "ERROR by rejecting the version."
 msgstr "ERREUR en rejetant la version."
 
-#: motion/views.py:551
+#: motion/views.py:545
 #, python-format
 msgid "Do you really want to reject version <b>%s</b>?"
 msgstr "Voulez vous vraiment rejeter la version <b>%s</b>?"
 
-#: motion/views.py:587 motion/views.py:591 motion/views.py:597
-#: motion/views.py:600 participant/api.py:81
+#: motion/views.py:581 motion/views.py:585 motion/views.py:591
+#: motion/views.py:594 participant/api.py:78
 #, python-format
 msgid "Ignoring malformed line %d in import file."
 msgstr "La ligne %d mal formée dans le fichier d'entrée a été ignorée"
 
-#: motion/views.py:608
+#: motion/views.py:602
 #, python-format
 msgid "Ignoring line %d because the assigned group may not act as a person."
 msgstr ""
 "La ligne %d a été ignorée car le group assigné ne peut agir en tant que "
 "personne."
 
-#: motion/views.py:617
+#: motion/views.py:611
 msgid "Created by motion import."
 msgstr "Motion a été créé par l'import"
 
-#: motion/views.py:631
+#: motion/views.py:625
 #, python-format
 msgid ""
 "Ignoring line %d because it contains an incomplete first / last name pair."
 msgstr "La ligne %d a été ignorée car le nom ou prénom sont incomplets"
 
-#: motion/views.py:669
+#: motion/views.py:663
 #, python-format
 msgid "%d motion was successfully imported."
 msgid_plural "%d motions were successfully imported."
 msgstr[0] "%d la motion a été importée avec succès."
 msgstr[1] "%d les motions ont été importées avec succès."
 
-#: motion/views.py:672
+#: motion/views.py:666
 #, python-format
 msgid "%d motion was successfully modified."
 msgid_plural "%d motions were successfully modified."
 msgstr[0] "%d la motion a été modifiée avec succès."
 msgstr[1] "%d les motions ont été modifiées avec succès."
 
-#: motion/views.py:675
+#: motion/views.py:669
 #, python-format
 msgid "%d new user was added."
 msgid_plural "%d new users were added."
 msgstr[0] "%d nouvel utilisateur a été créé."
 msgstr[1] "%d nouveaux utilisateurs ont été créés."
 
-#: motion/views.py:678
+#: motion/views.py:672
 #, python-format
 msgid "%d new group was added."
 msgid_plural "%d new groups were added."
 msgstr[0] "%d le nouveau groupe a été ajouter"
 msgstr[1] "%d nouveaux groupes ont été ajouter"
 
-#: motion/views.py:681
+#: motion/views.py:675
 #, python-format
 msgid "%d group assigned to motions."
 msgid_plural "%d groups assigned to motions."
 msgstr[0] "%d groupe a été assigné aux motions."
 msgstr[1] "%d groupes ont été assignés aux motions."
 
-#: motion/views.py:685 participant/api.py:97
+#: motion/views.py:679 participant/api.py:94
 msgid "Import aborted because of severe errors in the input file."
 msgstr ""
 "l'importation a été interrompue en raison d'erreurs graves dans le fichier "
 "d'entrée"
 
-#: motion/views.py:687 participant/api.py:99
+#: motion/views.py:681 participant/api.py:96
 msgid "Import file has wrong character encoding, only UTF-8 is supported!"
 msgstr ""
 "Le fichier d'entrée a un mauvais encodage des caractères, seul UTF-8 est "
 "pris en charge!"
 
-#: motion/views.py:691
+#: motion/views.py:685
 msgid ""
 "Attention: Existing motions will be modified if you import new motions with "
 "the same number."
@@ -1406,7 +1423,7 @@ msgstr ""
 "Attention: Les motions existantes seront modifiées si vous importez de "
 "nouvelles motions avec le même numéro."
 
-#: motion/views.py:692
+#: motion/views.py:686
 msgid ""
 "Attention: Importing an motions without a number multiple times will create "
 "duplicates."
@@ -1414,116 +1431,86 @@ msgstr ""
 "Attention: L'importation d'une motion sans numéro à plusieurs reprises "
 "créera des doublons."
 
-#: motion/views.py:725 motion/views.py:863
-#: motion/templates/motion/poll_view.html:7
-#: motion/templates/motion/poll_view.html:12
-#: motion/templates/motion/view.html:7 motion/templates/motion/view.html:206
-#: motion/templates/motion/view.html:225
+#: motion/views.py:719 motion/views.py:857
+#: motion/templates/motion/poll_view.html:6
+#: motion/templates/motion/poll_view.html:14
+#: motion/templates/motion/view.html:8 motion/templates/motion/view.html:22
 #: motion/templates/projector/Motion.html:7
 #: motion/templates/projector/Motion.html:65
 msgid "Motion"
 msgstr "Motion"
 
-#: motion/views.py:739 motion/templates/motion/overview.html:84
+#: motion/views.py:733 motion/templates/motion/overview.html:105
 msgid "No motions available."
 msgstr "Aucune motion disponible."
 
-#: motion/views.py:744 motion/views.py:746 motion/views.py:761
-#: motion/views.py:763 motion/templates/motion/base_motion.html:24
-#: motion/templates/projector/Motion.html:63
+#: motion/views.py:738 motion/views.py:740 motion/views.py:755
+#: motion/views.py:757 motion/templates/projector/Motion.html:63
 msgid "Motion No."
 msgstr "Motion No."
 
-#: motion/views.py:778
+#: motion/views.py:772
 msgid "Signature"
 msgstr "Signature"
 
-#: motion/views.py:829 motion/templates/motion/base_motion.html:55
-#: motion/templates/motion/poll_view.html:8
-#: motion/templates/motion/poll_view.html:13
-#: motion/templates/motion/view.html:66 motion/templates/motion/view.html:74
+#: motion/views.py:823 motion/templates/motion/poll_view.html:6
+#: motion/templates/motion/poll_view.html:14
+#: motion/templates/motion/view.html:205
 #: motion/templates/projector/Motion.html:33
 msgid "Vote"
 msgstr "Vote"
 
-#: motion/views.py:863
+#: motion/views.py:857
 msgid "Poll"
 msgstr "Sondage"
 
-#: motion/views.py:877
+#: motion/views.py:871
 #, python-format
 msgid "Motion No. %s"
 msgstr "Motion No %s"
 
-#: motion/views.py:879
+#: motion/views.py:873
 #, python-format
 msgid "%d. Vote"
 msgstr "%d. Vote"
 
-#: motion/views.py:936
+#: motion/views.py:930
 msgid "Motion settings successfully saved."
 msgstr "Les paramètres des motions ont été enregistrés avec succès"
 
-#: motion/templates/motion/base_motion.html:11
-msgid "All motions"
-msgstr "Toutes les motions"
-
-#: motion/templates/motion/base_motion.html:13
-#: motion/templates/motion/edit.html:10 motion/templates/motion/edit.html:18
-msgid "New motion"
-msgstr "Nouvelle motion"
-
-#: motion/templates/motion/base_motion.html:16
-#: motion/templates/motion/import.html:5 motion/templates/motion/import.html:8
-msgid "Import motions"
-msgstr "Importer des motions"
-
-#: motion/templates/motion/base_motion.html:18
-msgid "All motions as PDF"
-msgstr "Toutes les motions dans un PDF"
-
-#: motion/templates/motion/base_motion.html:34
-msgid "View motion"
-msgstr "Afficher la motion"
-
-#: motion/templates/motion/base_motion.html:38
-#: motion/templates/motion/edit.html:8 motion/templates/motion/edit.html:16
-#: motion/templates/motion/overview.html:72
-msgid "Edit motion"
-msgstr "Modifier la motion"
-
-#: motion/templates/motion/base_motion.html:42
-#: motion/templates/motion/overview.html:74
-msgid "Delete motion"
-msgstr "Supprimer la motion"
-
-#: motion/templates/motion/base_motion.html:45
-#: motion/templates/motion/overview.html:77
-msgid "Motion as PDF"
-msgstr "Motion dans un PDF"
-
-#: motion/templates/motion/base_motion.html:49
-msgid "Show Motion"
-msgstr "Lancer l'animation"
-
-#: motion/templates/motion/config.html:5 motion/templates/motion/config.html:8
+#: motion/templates/motion/config.html:5
 msgid "Motion settings"
 msgstr "Paramètres de l'animation"
 
-#: motion/templates/motion/import.html:9
+#: motion/templates/motion/edit.html:8 motion/templates/motion/edit.html:17
+#: motion/templates/motion/view.html:46
+msgid "Edit motion"
+msgstr "Modifier la motion"
+
+#: motion/templates/motion/edit.html:10 motion/templates/motion/edit.html:19
+#: motion/templates/motion/overview.html:13
+msgid "New motion"
+msgstr "Nouvelle motion"
+
+#: motion/templates/motion/import.html:5 motion/templates/motion/import.html:8
+#: motion/templates/motion/overview.html:16
+msgid "Import motions"
+msgstr "Importer des motions"
+
+#: motion/templates/motion/import.html:14
 msgid "Select a CSV file to import motions!"
 msgstr "Sélectionnez un fichier CSV pour importer les motions!"
 
-#: motion/templates/motion/import.html:11
-#: participant/templates/participant/import.html:11
+#: motion/templates/motion/import.html:15
+#: participant/templates/participant/import.html:17
 msgid "Required comma separated values"
 msgstr "Valeurs séparées par des virgules (CSV) nécessaires"
 
-#: motion/templates/motion/import.html:12
+#: motion/templates/motion/import.html:16
 msgid "number, title, text, reason, first_name, last_name, is_group"
 msgstr "numéro, titre, texte, motivation, prénom, nom, groupe"
 
-#: motion/templates/motion/import.html:14
+#: motion/templates/motion/import.html:18
 msgid ""
 "<code>number</code>, <code>reason</code> and <code>is_group</code> are "
 "optional and may be empty"
@@ -1531,195 +1518,234 @@ msgstr ""
 "<code>numero</code>, <code>motivation</code> et <code>est_groupe</code> sont "
 "optional et peuvent être laisser vide"
 
-#: motion/templates/motion/import.html:16
-#: participant/templates/participant/import.html:14
+#: motion/templates/motion/import.html:20
+#: participant/templates/participant/import.html:20
 msgid "Required CSV file encoding: UTF-8 (Unicode)."
 msgstr "Le fichier CSV requiert un encodage de caractères UTF-8 (Unicode)"
 
-#: motion/templates/motion/import.html:19
-#: participant/templates/participant/import.html:17
+#: motion/templates/motion/import.html:23
+#: participant/templates/participant/import.html:23
 msgid "A CSV example file is available in OpenSlides Wiki."
 msgstr "Un exemple de fichier CSV est disponible sur le Wiki de Openslides. "
 
-#: motion/templates/motion/import.html:26
-#: participant/templates/participant/import.html:24
+#: motion/templates/motion/import.html:41
+#: motion/templates/motion/overview.html:16
+#: participant/templates/participant/import.html:30
+#: participant/templates/participant/overview.html:22
 msgid "Import"
 msgstr "Importation"
 
-#: motion/templates/motion/overview.html:15
+#: motion/templates/motion/overview.html:18
+#, fuzzy
+msgid "Print all motions as PDF"
+msgstr "Toutes les motions dans un PDF"
+
+#: motion/templates/motion/overview.html:26
 msgid "Need supporters"
 msgstr "A besoin de partisans"
 
-#: motion/templates/motion/overview.html:18
+#: motion/templates/motion/overview.html:31
 msgid "Without number"
 msgstr "Sans numéro"
 
-#: motion/templates/motion/overview.html:22
+#: motion/templates/motion/overview.html:38
 msgid "Not yet authorized"
 msgstr "N'est pas encore autorisé"
 
-#: motion/templates/motion/overview.html:23
+#: motion/templates/motion/overview.html:39
 msgid "Authorized"
 msgstr "Autorisé"
 
-#: motion/templates/motion/overview.html:26
+#: motion/templates/motion/overview.html:42
 msgid "Withdrawen (by submitter)"
 msgstr "retiré (par le requérant)"
 
-#: motion/templates/motion/overview.html:32
+#: motion/templates/motion/overview.html:47
 msgctxt "number of motions"
 msgid "motion"
 msgid_plural "motions"
 msgstr[0] "motion"
 msgstr[1] "motions"
 
-#: motion/templates/motion/overview.html:35
-msgid "Number"
-msgstr "Numéro"
+#: motion/templates/motion/overview.html:51
+msgid "#"
+msgstr ""
 
-#: motion/templates/motion/overview.html:36
+#: motion/templates/motion/overview.html:52
 msgid "Motion title"
 msgstr "Titre de la motion"
 
-#: motion/templates/motion/overview.html:38
+#: motion/templates/motion/overview.html:54
 msgid "Number of supporters"
 msgstr "Nombre de partisans"
 
-#: motion/templates/motion/overview.html:42
-#: motion/templates/motion/view.html:109
+#: motion/templates/motion/overview.html:58
+#: motion/templates/motion/view.html:241
 msgid "Creation Time"
 msgstr "Temps de création"
 
-#: motion/templates/motion/overview.html:67
-msgid "Activate motion"
-msgstr "Activer la motion"
+#: motion/templates/motion/overview.html:96
+#, fuzzy
+msgid "Print motion as PDF"
+msgstr "Toutes les motions dans un PDF"
+
+#: motion/templates/motion/poll_view.html:18
+#, fuzzy
+msgid "Back to motion"
+msgstr "Modifier la motion"
 
 #: motion/templates/motion/poll_view.html:21
+#: motion/templates/motion/view.html:34
+#, fuzzy
+msgid "Show motion"
+msgstr "Lancer l'animation"
+
+#: motion/templates/motion/poll_view.html:37
 msgid "Option"
 msgstr "Option"
 
-#: motion/templates/motion/view.html:51 motion/templates/motion/view.html:91
-msgid "New vote"
-msgstr "Nouveau vote"
+#: motion/templates/motion/view.html:31
+#, fuzzy
+msgid "Print this motion as PDF"
+msgstr "Toutes les motions dans un PDF"
 
-#: motion/templates/motion/view.html:67
-msgid "Edit Vote"
-msgstr "Modifier le vote"
+#: motion/templates/motion/view.html:50
+msgid "Delete motion"
+msgstr "Supprimer la motion"
 
-#: motion/templates/motion/view.html:70
-msgid "Delete Vote"
-msgstr "Supprimer le vote"
-
-#: motion/templates/motion/view.html:99
-msgid "Enter result"
-msgstr "Insérer le résultat"
-
-#: motion/templates/motion/view.html:116
-msgid "Withdraw"
-msgstr "Retirer"
-
-#: motion/templates/motion/view.html:124
-msgid "Unsupport"
-msgstr "Ne plus soutenir"
-
-#: motion/templates/motion/view.html:130
-msgid "Support"
-msgstr "Soutenir"
-
-#: motion/templates/motion/view.html:136
-msgid "minimum required supporters"
-msgstr "Nombres minimum de partisans requis"
-
-#: motion/templates/motion/view.html:143
-msgid "Manage motion"
-msgstr "Gérer la motion"
-
-#: motion/templates/motion/view.html:146
-msgid "Formal validation"
-msgstr "Validation formelle"
-
-#: motion/templates/motion/view.html:148
-msgid "Publish"
-msgstr "Publier"
-
-#: motion/templates/motion/view.html:151
-msgid "Permit"
-msgstr "Permettre"
-
-#: motion/templates/motion/view.html:154
-msgid "Not permit (reject)"
-msgstr "Non autorisé (rejeter)"
-
-#: motion/templates/motion/view.html:157
-msgid "Set number"
-msgstr "Insérer un numéro"
-
-#: motion/templates/motion/view.html:164
-msgid "Result after vote"
-msgstr "Résultat après le vote"
-
-#: motion/templates/motion/view.html:178
-msgid "Result after debate"
-msgstr "Résultat après la discussion"
-
-#: motion/templates/motion/view.html:189
-msgid "Withdrawed by submitter"
-msgstr "Retiré par le requérant"
-
-#: motion/templates/motion/view.html:194
-msgid "For Administration only:"
-msgstr "Seulement pour les administrateurs"
-
-#: motion/templates/motion/view.html:196
-msgid "Reset"
-msgstr "Réinitialiser"
-
-#: motion/templates/motion/view.html:219
+#: motion/templates/motion/view.html:69
 msgid "This is not the newest version."
 msgstr "Ce n'est pas la version la plus récente"
 
-#: motion/templates/motion/view.html:219 motion/templates/motion/view.html:221
+#: motion/templates/motion/view.html:69 motion/templates/motion/view.html:71
 msgid "Go to version"
 msgstr "Aller à la version"
 
-#: motion/templates/motion/view.html:221
+#: motion/templates/motion/view.html:71
 msgid "This is not the authorized version."
 msgstr "Ce n'est pas la version autorisée"
 
-#: motion/templates/motion/view.html:239
+#: motion/templates/motion/view.html:76
+#, fuzzy
+msgid "Motion text"
+msgstr "Titre de la motion"
+
+#: motion/templates/motion/view.html:89
 msgid "Version History"
 msgstr "Historique des versions"
 
-#: motion/templates/motion/view.html:245
+#: motion/templates/motion/view.html:94
 msgid "Time"
 msgstr "Temps"
 
-#: motion/templates/motion/view.html:256
-msgid "Version authorized"
-msgstr "Version autorisée"
+#: motion/templates/motion/view.html:104
+#, fuzzy
+msgid "This version is authorized"
+msgstr "Version %s autorisée"
 
-#: motion/templates/motion/view.html:259
-msgid "Permit Version"
+#: motion/templates/motion/view.html:107
+#, fuzzy
+msgid "Permit this version"
 msgstr "Permettre la version"
 
-#: motion/templates/motion/view.html:262
-msgid "Reject Version"
+#: motion/templates/motion/view.html:110
+#, fuzzy
+msgid "Reject this version"
 msgstr "Rejeter la version "
 
-#: motion/templates/motion/view.html:266
-msgid "Version rejected"
+#: motion/templates/motion/view.html:114
+#, fuzzy
+msgid "This version is rejected"
 msgstr "Version rejetée"
 
-#: motion/templates/motion/view.html:276 motion/templates/motion/view.html:283
-#: motion/templates/motion/view.html:290
+#: motion/templates/motion/view.html:124 motion/templates/motion/view.html:131
+#: motion/templates/motion/view.html:138
 msgid "unchanged"
 msgstr "non modifié"
 
-#: motion/templates/motion/view.html:299
-msgid "Log"
-msgstr "Log"
+#: motion/templates/motion/view.html:148
+#, fuzzy
+msgid "Show log"
+msgstr "Projeter l'élection"
 
-#: motion/templates/motion/widget.html:31
+#: motion/templates/motion/view.html:193 motion/templates/motion/view.html:225
+msgid "New vote"
+msgstr "Nouveau vote"
+
+#: motion/templates/motion/view.html:207
+msgid "Edit Vote"
+msgstr "Modifier le vote"
+
+#: motion/templates/motion/view.html:208
+msgid "Delete Vote"
+msgstr "Supprimer le vote"
+
+#: motion/templates/motion/view.html:232
+#, fuzzy
+msgid "No results"
+msgstr "Résultat du vote"
+
+#: motion/templates/motion/view.html:247
+#, fuzzy
+msgid "Withdraw motion"
+msgstr "Retirer"
+
+#: motion/templates/motion/view.html:255
+#, fuzzy
+msgid "Unsupport motion"
+msgstr "Peut soutenir les motions"
+
+#: motion/templates/motion/view.html:261
+msgid "Support"
+msgstr "Soutenir"
+
+#: motion/templates/motion/view.html:268
+msgid "minimum required supporters"
+msgstr "Nombres minimum de partisans requis"
+
+#: motion/templates/motion/view.html:275
+msgid "Manage motion"
+msgstr "Gérer la motion"
+
+#: motion/templates/motion/view.html:278
+msgid "Formal validation"
+msgstr "Validation formelle"
+
+#: motion/templates/motion/view.html:280
+msgid "Publish"
+msgstr "Publier"
+
+#: motion/templates/motion/view.html:283
+msgid "Permit"
+msgstr "Permettre"
+
+#: motion/templates/motion/view.html:286
+#, fuzzy
+msgid "Not permit"
+msgstr "Non autorisé (rejeter)"
+
+#: motion/templates/motion/view.html:289
+msgid "Set number"
+msgstr "Insérer un numéro"
+
+#: motion/templates/motion/view.html:294
+msgid "Result after vote"
+msgstr "Résultat après le vote"
+
+#: motion/templates/motion/view.html:326
+#, fuzzy
+msgid "Withdrawed by Submitter"
+msgstr "Retiré par le requérant"
+
+#: motion/templates/motion/view.html:333
+msgid "For Administration only:"
+msgstr "Seulement pour les administrateurs"
+
+#: motion/templates/motion/view.html:335
+msgid "Reset"
+msgstr "Réinitialiser"
+
+#: motion/templates/motion/widget.html:27
 msgid "No motion available."
 msgstr "Aucune motion disponible"
 
@@ -1735,77 +1761,78 @@ msgstr "Aucun résultat de sondage disponible"
 msgid "Participant"
 msgstr "Participant"
 
-#: participant/forms.py:27 participant/views.py:607
-#: participant/templates/participant/group_overview.html:7
-#: participant/templates/participant/group_overview.html:10
-#: participant/templates/participant/user_detail.html:14
+#: participant/forms.py:28 participant/views.py:605
+#: participant/templates/participant/group_overview.html:6
+#: participant/templates/participant/group_overview.html:9
+#: participant/templates/participant/overview.html:21
+#: participant/templates/participant/user_detail.html:18
 msgid "Groups"
 msgstr "Groupe"
 
-#: participant/forms.py:52
+#: participant/forms.py:53
 msgid "Permissions"
 msgstr "Permissions"
 
-#: participant/forms.py:55 participant/views.py:546 participant/views.py:593
-#: participant/templates/participant/base_participant.html:12
+#: participant/forms.py:56 participant/views.py:543 participant/views.py:591
+#: participant/templates/participant/config.html:10
 #: participant/templates/participant/overview.html:7
-#: participant/templates/participant/overview.html:18
-#: participant/templates/participant/overview.html:62
+#: participant/templates/participant/overview.html:16
+#: participant/templates/participant/overview.html:95
 msgid "Participants"
 msgstr "Participants"
 
-#: participant/forms.py:92
+#: participant/forms.py:93
 msgid "You can not edit the name for this group."
 msgstr "Vous ne pouvez pas modifier le nom de ce groupe."
 
-#: participant/forms.py:96
+#: participant/forms.py:97
 #, python-format
 msgid "Group name \"%s\" is reserved for internal use."
 msgstr "Ce nom de groupe \"%s\" est réservé pour une utilisation interne."
 
-#: participant/forms.py:118
+#: participant/forms.py:121
 msgid "System URL"
 msgstr "URL du système"
 
-#: participant/forms.py:119 participant/forms.py:124
+#: participant/forms.py:122 participant/forms.py:127
 msgid "Printed in PDF of first time passwords only."
 msgstr ""
 "Imprimé dans le PDF avec la liste des premiers mots de passe seulement."
 
-#: participant/forms.py:127
+#: participant/forms.py:130
 msgid "Sort participants by first name"
 msgstr "Classer les participants par prénom"
 
-#: participant/forms.py:128
+#: participant/forms.py:131
 msgid "Disable for sorting by last name"
 msgstr "Désactiver le classement par nom"
 
-#: participant/models.py:33 participant/templates/participant/overview.html:25
+#: participant/models.py:33 participant/templates/participant/overview.html:57
 msgid "Male"
 msgstr "Masculin"
 
-#: participant/models.py:34 participant/templates/participant/overview.html:26
+#: participant/models.py:34 participant/templates/participant/overview.html:58
 msgid "Female"
 msgstr "Féminin"
 
-#: participant/models.py:37 participant/templates/participant/overview.html:38
+#: participant/models.py:37 participant/templates/participant/overview.html:70
 msgid "Delegate"
 msgstr "Délégué"
 
-#: participant/models.py:38 participant/templates/participant/overview.html:39
+#: participant/models.py:38 participant/templates/participant/overview.html:71
 msgid "Observer"
 msgstr "Observateur"
 
-#: participant/models.py:39 participant/templates/participant/overview.html:40
+#: participant/models.py:39 participant/templates/participant/overview.html:72
 msgid "Staff"
 msgstr "Personnel"
 
-#: participant/models.py:40 participant/templates/participant/overview.html:41
+#: participant/models.py:40 participant/templates/participant/overview.html:73
 msgid "Guest"
 msgstr "Invité"
 
-#: participant/models.py:45 participant/templates/participant/overview.html:30
-#: participant/templates/participant/overview.html:68
+#: participant/models.py:45 participant/templates/participant/overview.html:62
+#: participant/templates/participant/overview.html:102
 msgid "Structure level"
 msgstr "Niveau de structure"
 
@@ -1813,8 +1840,8 @@ msgstr "Niveau de structure"
 msgid "Will be shown after the name."
 msgstr "Apparait après le nom."
 
-#: participant/models.py:49 participant/templates/participant/overview.html:24
-#: participant/templates/participant/user_detail.html:24
+#: participant/models.py:49 participant/templates/participant/overview.html:56
+#: participant/templates/participant/user_detail.html:28
 msgid "Gender"
 msgstr "Sexe"
 
@@ -1826,15 +1853,15 @@ msgstr "Seulement pour filtrer la liste des utilisateurs."
 msgid "Typ"
 msgstr "Type"
 
-#: participant/models.py:54 participant/views.py:255
-#: participant/templates/participant/overview.html:45
-#: participant/templates/participant/overview.html:70
-#: participant/templates/participant/user_detail.html:34
+#: participant/models.py:54 participant/views.py:248
+#: participant/templates/participant/overview.html:77
+#: participant/templates/participant/overview.html:104
+#: participant/templates/participant/user_detail.html:38
 msgid "Committee"
 msgstr "Comité"
 
 #: participant/models.py:57
-#: participant/templates/participant/user_detail.html:39
+#: participant/templates/participant/user_detail.html:43
 msgid "About me"
 msgstr "A propos de moi"
 
@@ -1870,98 +1897,100 @@ msgstr "Par exemple, comme initiant d'une motion."
 msgid "Welcome to OpenSlides!"
 msgstr "Bienvenue sur OpenSlides!"
 
-#: participant/views.py:207
+#: participant/views.py:200
 msgid "You can not delete yourself."
 msgstr "Vous ne pouvez pas vous suprimer vous même."
 
-#: participant/views.py:228
+#: participant/views.py:221
 msgid "You can not deactivate yourself."
 msgstr "Vous ne pouvez pas vous désactiver vous-même"
 
-#: participant/views.py:231
+#: participant/views.py:224
 msgid "You can not deactivate the administrator."
 msgstr "Vous ne pouvez pas désactiver l'administrateur."
 
-#: participant/views.py:250
+#: participant/views.py:243
 msgid "Participant-list"
 msgstr "Liste des participants"
 
-#: participant/views.py:251
+#: participant/views.py:244
 msgid "List of Participants"
 msgstr "La liste des participants"
 
-#: participant/views.py:254 participant/templates/participant/overview.html:67
+#: participant/views.py:247
+#: participant/templates/participant/overview.html:101
 msgid "Last Name"
 msgstr "Nom"
 
-#: participant/views.py:254 participant/templates/participant/overview.html:66
+#: participant/views.py:247
+#: participant/templates/participant/overview.html:100
 msgid "First Name"
 msgstr "Prénom"
 
-#: participant/views.py:254
-#: participant/templates/participant/group_overview.html:13
+#: participant/views.py:247
+#: participant/templates/participant/group_overview.html:18
 msgid "Group"
 msgstr "Groupe"
 
-#: participant/views.py:254 participant/templates/participant/overview.html:37
-#: participant/templates/participant/overview.html:69
-#: participant/templates/participant/user_detail.html:29
+#: participant/views.py:247 participant/templates/participant/overview.html:69
+#: participant/templates/participant/overview.html:103
+#: participant/templates/participant/user_detail.html:33
 msgid "Type"
 msgstr "Type"
 
-#: participant/views.py:286
+#: participant/views.py:279
 msgid "Participant-passwords"
 msgstr "Mot de passe du participant"
 
-#: participant/views.py:308
+#: participant/views.py:301
 msgid "Account for OpenSlides"
 msgstr "Compte pour OpenSlides"
 
-#: participant/views.py:310
+#: participant/views.py:303
 #, python-format
 msgid "for %s"
 msgstr "pour %s"
 
-#: participant/views.py:313
+#: participant/views.py:306
 #, python-format
 msgid "User: %s"
 msgstr "Utilisateur: %s"
 
-#: participant/views.py:317
+#: participant/views.py:310
 #, python-format
 msgid "Password: %s"
 msgstr "Mot de passe: %s"
 
-#: participant/views.py:322
+#: participant/views.py:315
 #, python-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: participant/views.py:364
+#: participant/views.py:357
 #, python-format
 msgid "%d new participants were successfully imported."
 msgstr "%d nouveaux participants ont été importés avec succès. "
 
-#: participant/views.py:375
+#: participant/views.py:368
 msgid "Do you really want to reset the password?"
 msgstr "Voulez-vous vraiment reinitialser le mot de passe?"
 
-#: participant/views.py:388
+#: participant/views.py:381
 #, python-format
 msgid "The Password for %s was successfully reset."
 msgstr "Le mot de passe de %s a été initialisé avec succès"
 
-#: participant/views.py:445
+#: participant/views.py:438
 msgid "You can not delete this Group."
 msgstr "Vous ne pouvez pas suprimer se groupe."
 
-#: participant/views.py:473
+#: participant/views.py:466
 msgid "Participants settings successfully saved."
 msgstr ""
 "Les modifications des paramètres des participants ont été appliquées avec "
 "succès"
 
-#: participant/views.py:483
+#: participant/views.py:476
 #, python-format
 msgid ""
 "Installation was successfully! Use %(user)s (password: %(password)s) for "
@@ -1975,197 +2004,172 @@ msgstr ""
 "ce message apparaîtra toujours pour tout le monde et pourrait représenter un "
 "risque de sécurité."
 
-#: participant/views.py:506
+#: participant/views.py:502
 msgid "User settings successfully saved."
 msgstr "Les paramètres d'utilisateurs ont été enregistrés avec succès."
 
-#: participant/views.py:528
+#: participant/views.py:525
 msgid "Password successfully changed."
 msgstr "Le mot de passe a été changé avec succès."
 
-#: participant/views.py:579
+#: participant/views.py:577
 msgid "My motions and elections"
 msgstr "Mes motions et élections"
 
-#: participant/templates/participant/base_participant.html:15
-msgid "All participants"
-msgstr "Tout les participants"
-
-#: participant/templates/participant/base_participant.html:18
-#: participant/templates/participant/edit.html:10
-#: participant/templates/participant/edit.html:19
-msgid "New participant"
-msgstr "Nouveau participant"
-
-#: participant/templates/participant/base_participant.html:19
-msgid "All groups"
-msgstr "Tout les groupes"
-
-#: participant/templates/participant/base_participant.html:20
-#: participant/templates/participant/group_edit.html:10
-#: participant/templates/participant/group_edit.html:18
-msgid "New group"
-msgstr "Nouveau groupe"
-
-#: participant/templates/participant/base_participant.html:21
-#: participant/templates/participant/import.html:5
-#: participant/templates/participant/import.html:8
-msgid "Import participants"
-msgstr "Importer des participants"
-
-#: participant/templates/participant/base_participant.html:24
-msgid "List of participants as PDF"
-msgstr "La liste des participants en PDF"
-
-#: participant/templates/participant/base_participant.html:27
-msgid "First time passwords as PDF"
-msgstr "La liste des premiers mots de passe en PDF"
-
-#: participant/templates/participant/base_participant.html:38
-msgid "View participant"
-msgstr "Afficher participant"
-
-#: participant/templates/participant/base_participant.html:45
-#: participant/templates/participant/edit.html:8
-#: participant/templates/participant/edit.html:17
-#: participant/templates/participant/overview.html:94
-msgid "Edit participant"
-msgstr "Modifier le participant"
-
-#: participant/templates/participant/base_participant.html:50
-#: participant/templates/participant/overview.html:98
-msgid "Delete participant"
-msgstr "Supprimer le participant"
-
-#: participant/templates/participant/base_participant.html:60
-msgid "View group"
-msgstr "Afficher le groupe"
-
-#: participant/templates/participant/base_participant.html:65
-#: participant/templates/participant/group_edit.html:8
-#: participant/templates/participant/group_edit.html:16
-#: participant/templates/participant/group_overview.html:19
-msgid "Edit group"
-msgstr "Modifier le groupe"
-
-#: participant/templates/participant/base_participant.html:71
-#: participant/templates/participant/group_overview.html:21
-msgid "Delete group"
-msgstr "Supprimer le groupe"
-
 #: participant/templates/participant/config.html:5
-#: participant/templates/participant/config.html:8
 msgid "Participant settings"
 msgstr "Paramètres du participant"
 
-#: participant/templates/participant/edit.html:26
+#: participant/templates/participant/edit.html:8
+#: participant/templates/participant/edit.html:17
+msgid "Edit participant"
+msgstr "Modifier le participant"
+
+#: participant/templates/participant/edit.html:10
+#: participant/templates/participant/edit.html:19
+#: participant/templates/participant/overview.html:20
+msgid "New participant"
+msgstr "Nouveau participant"
+
+#: participant/templates/participant/edit.html:30
 msgid "Reset to First Password"
 msgstr "Initialiser au premier mot de passe"
 
-#: participant/templates/participant/group_detail.html:14
+#: participant/templates/participant/group_detail.html:18
 msgid "Members"
 msgstr "Membres"
 
-#: participant/templates/participant/group_detail.html:19
+#: participant/templates/participant/group_detail.html:24
 msgid "No members available."
 msgstr "Aucun membre n'est disponible"
 
-#: participant/templates/participant/group_overview.html:27
-#: participant/templates/participant/group_widget.html:24
+#: participant/templates/participant/group_edit.html:8
+#: participant/templates/participant/group_edit.html:17
+msgid "Edit group"
+msgstr "Modifier le groupe"
+
+#: participant/templates/participant/group_edit.html:10
+#: participant/templates/participant/group_edit.html:19
+#: participant/templates/participant/group_overview.html:11
+msgid "New group"
+msgstr "Nouveau groupe"
+
+#: participant/templates/participant/group_overview.html:12
+#, fuzzy
+msgid "Back to participants overview"
+msgstr "Aucun participant disponible"
+
+#: participant/templates/participant/group_widget.html:21
 msgid "No groups available."
 msgstr "Aucun groupe n'est disponible"
 
+#: participant/templates/participant/import.html:5
 #: participant/templates/participant/import.html:9
+#: participant/templates/participant/overview.html:22
+msgid "Import participants"
+msgstr "Importer des participants"
+
+#: participant/templates/participant/import.html:15
 msgid "Select a CSV file to import participants!"
 msgstr "Selectionnez un fichier CSV pour importer des participants"
 
-#: participant/templates/participant/import.html:12
+#: participant/templates/participant/import.html:18
 msgid ""
 "first_name, last_name, gender, structure level, type, committee, comment"
 msgstr "prénom, nom, sexe, position, type, comité, commentaire"
 
-#: participant/templates/participant/login.html:8
-#: participant/templates/participant/login.html:16
-#: participant/templates/participant/login.html:58 templates/base.html:32
-msgid "Login"
-msgstr "Connexion"
-
-#: participant/templates/participant/login.html:21
-#: participant/templates/participant/login.html:34 templates/base.html:57
-#: templates/base.html.py:64
-msgid "Close this notification"
-msgstr "Fermez cette notification"
-
-#: participant/templates/participant/login.html:27
+#: participant/templates/participant/login.html:19
 msgid "Your username and password were not accepted. Please try again."
 msgstr ""
 "Votre nom d'utilisateur et votre mot de passe n'ont pas été acceptés. "
 "Veuillez essayer à nouveau."
 
-#: participant/templates/participant/login.html:62
+#: participant/templates/participant/login.html:38
+msgid "Username"
+msgstr ""
+
+#: participant/templates/participant/login.html:42
+#, fuzzy
+msgid "Password"
+msgstr "Mot de passe: %s"
+
+#: participant/templates/participant/login.html:47
+#: participant/templates/participant/overview.html:37 templates/base.html:46
+msgid "Login"
+msgstr "Connexion"
+
+#: participant/templates/participant/login.html:51
 msgid "Continue as guest"
 msgstr "Continuer en tant qu'invité"
 
-#: participant/templates/participant/overview.html:27
+#: participant/templates/participant/overview.html:21
+#, fuzzy
+msgid "All groups"
+msgstr "Tout les groupes"
+
+#: participant/templates/participant/overview.html:33
+#, fuzzy
+msgid "List of participants"
+msgstr "La liste des participants"
+
+#: participant/templates/participant/overview.html:34
+#, fuzzy
+msgid "First time passwords"
+msgstr "La liste des premiers mots de passe en PDF"
+
 #: participant/templates/participant/overview.html:42
+#, fuzzy
+msgid "Print list of participants as PDF"
+msgstr "La liste des participants en PDF"
+
+#: participant/templates/participant/overview.html:45
+#, fuzzy
+msgid "Print first time passwords as PDF"
+msgstr "La liste des premiers mots de passe en PDF"
+
+#: participant/templates/participant/overview.html:59
+#: participant/templates/participant/overview.html:74
 msgid "Not specified"
 msgstr "Non spécifié"
 
-#: participant/templates/participant/overview.html:53 projector/models.py:63
+#: participant/templates/participant/overview.html:85 projector/models.py:63
 msgid "Active"
 msgstr "Actif"
 
-#: participant/templates/participant/overview.html:54
+#: participant/templates/participant/overview.html:86
 msgid "Inactive"
 msgstr "Inactif"
 
-#: participant/templates/participant/overview.html:60
+#: participant/templates/participant/overview.html:93
 msgid "participant"
 msgid_plural "participants"
 msgstr[0] "participant"
 msgstr[1] "participants"
 
-#: participant/templates/participant/overview.html:62
+#: participant/templates/participant/overview.html:95
 msgid "of"
 msgstr "de"
 
-#: participant/templates/participant/overview.html:73
-#: participant/templates/participant/user_detail.html:49
+#: participant/templates/participant/overview.html:107
+#: participant/templates/participant/user_detail.html:53
 msgid "Last Login"
 msgstr "Dernière connexion"
 
-#: participant/templates/participant/overview.html:102
-msgid "Change status to inactive"
+#: participant/templates/participant/overview.html:143
+#, fuzzy
+msgid "Change status (active/inactive)"
 msgstr "Changer le statut sur inactif"
 
-#: participant/templates/participant/overview.html:105
-msgid "Change status to active"
-msgstr "Changer le statut sur actif"
-
-#: participant/templates/participant/overview.html:115
-#: participant/templates/participant/user_widget.html:22
+#: participant/templates/participant/overview.html:153
+#: participant/templates/participant/user_widget.html:19
 msgid "No participants available."
 msgstr "Aucun participant disponible"
 
 #: participant/templates/participant/password_change.html:5
-#: participant/templates/participant/password_change.html:11
-#: participant/templates/participant/password_change.html:16
-#: participant/templates/participant/settings.html:11
+#: participant/templates/participant/password_change.html:8
 msgid "Password Settings"
 msgstr "Paramètres du mot de passe"
 
-#: participant/templates/participant/password_change.html:8
-#: participant/templates/participant/settings.html:8 templates/base.html:29
-msgid "User Settings"
-msgstr "Paramètres d'utilisateur"
-
-#: participant/templates/participant/password_change.html:10
-#: participant/templates/participant/settings.html:5
-#: participant/templates/participant/settings.html:10
-#: participant/templates/participant/settings.html:16
-msgid "Personal Settings"
-msgstr "Paramètres personnels"
-
 #: participant/templates/participant/personal_info_widget.html:5
 msgid "I submitted the following motions:"
 msgstr "Je propose les motions suivantes:"
@@ -2184,11 +2188,17 @@ msgstr "Je soutien les motions suivantes"
 msgid "I am candidate for the following elections:"
 msgstr "Je suis candidat aux élections suivantes"
 
-#: participant/templates/participant/user_detail.html:19
+#: participant/templates/participant/settings.html:5
+#: participant/templates/participant/settings.html:8 templates/base.html:40
+#, fuzzy
+msgid "Edit profile"
+msgstr "Modifier l'élément"
+
+#: participant/templates/participant/user_detail.html:23
 msgid "The participant is not member of any group."
 msgstr "Le participant n'est membre d'aucun groupe"
 
-#: participant/templates/participant/user_detail.html:53
+#: participant/templates/participant/user_detail.html:57
 msgid "The participant has not logged in yet."
 msgstr "Le participant ne s'est pas encore authentifié."
 
@@ -2220,89 +2230,78 @@ msgstr "Peut voir la vue d'ensemble"
 msgid "Errors in the form"
 msgstr "Erreurs dans le formulaire"
 
-#: projector/views.py:375 projector/templates/projector/base_projector.html:7
-#: projector/templates/projector/base_projector.html:12
-#: projector/templates/projector/dashboard.html:17
+#: projector/views.py:375 projector/templates/projector/dashboard.html:18
 msgid "Dashboard"
 msgstr "Vue d'ensemble"
 
-#: projector/views.py:402
+#: projector/views.py:403
 msgid "Projector live view"
 msgstr "Vue projecteur live"
 
-#: projector/views.py:428
+#: projector/views.py:429
 msgid "Overlays"
 msgstr "Superpositions"
 
-#: projector/views.py:440
+#: projector/views.py:441
 msgid "Custom Slides"
 msgstr "Diapositives personnalisées"
 
-#: projector/templates/projector/base_projector.html:15
-msgid "Overview"
-msgstr "Vue d'ensemble"
-
-#: projector/templates/projector/base_projector.html:18
-#: projector/templates/projector/select_widgets.html:5
-#: projector/templates/projector/select_widgets.html:8
-msgid "Select widgets"
-msgstr "Sélectionner les composants"
-
-#: projector/templates/projector/base_projector.html:22
-msgid "Projector view"
-msgstr "Vue projecteur"
-
-#: projector/templates/projector/control_countdown.html:6
+#: projector/templates/projector/control_countdown.html:7
 msgctxt "seconds"
 msgid "s"
 msgstr "s"
 
-#: projector/templates/projector/control_countdown.html:7
-msgid "Save as default"
+#: projector/templates/projector/control_countdown.html:9
+#, fuzzy
+msgid "Save time as default"
 msgstr "Enregistrer par défault "
 
-#: projector/templates/projector/control_countdown.html:10
-#: projector/templates/projector/control_countdown.html:11
+#: projector/templates/projector/control_countdown.html:12
 msgid "Reset countdown"
 msgstr "Remettre le compte à rebours à zéro"
 
-#: projector/templates/projector/control_countdown.html:13
+#: projector/templates/projector/control_countdown.html:15
 msgid "Start countdown"
 msgstr "Démarrer le compte à rebours"
 
-#: projector/templates/projector/control_countdown.html:16
+#: projector/templates/projector/control_countdown.html:18
 msgid "Stop countdown"
 msgstr "Arrêter le compte à rebours "
 
-#: projector/templates/projector/control_overlay_message.html:11
+#: projector/templates/projector/control_overlay_message.html:10
 msgid "Clean message"
 msgstr "Supprimer le message"
 
-#: projector/templates/projector/custom_slide_widget.html:14
+#: projector/templates/projector/custom_slide_widget.html:12
 msgid "Welcome Page"
 msgstr "Page d'accueil"
 
-#: projector/templates/projector/custom_slide_widget.html:41
-msgid "New slide"
-msgstr "nouvelle diapositive"
+#: projector/templates/projector/dashboard.html:20
+#, fuzzy
+msgid "Manage widgets"
+msgstr "Sélectionner les composants"
 
-#: projector/templates/projector/live_view_widget.html:10
+#: projector/templates/projector/dashboard.html:20
+msgid "Widgets"
+msgstr ""
+
+#: projector/templates/projector/live_view_widget.html:8
 msgid "Zoom in"
 msgstr "Zoom avant"
 
-#: projector/templates/projector/live_view_widget.html:13
+#: projector/templates/projector/live_view_widget.html:11
 msgid "Zoom out"
 msgstr "Zoom arrière"
 
-#: projector/templates/projector/live_view_widget.html:18
+#: projector/templates/projector/live_view_widget.html:16
 msgid "Scroll text up"
 msgstr "Faire défiler le texte vers le haut"
 
-#: projector/templates/projector/live_view_widget.html:21
+#: projector/templates/projector/live_view_widget.html:19
 msgid "Scroll text down"
 msgstr "Faire défiler le texte vers le bas"
 
-#: projector/templates/projector/live_view_widget.html:26
+#: projector/templates/projector/live_view_widget.html:24
 msgid "Reset projector view"
 msgstr "Remettre la vue projecteur à zéro"
 
@@ -2311,7 +2310,21 @@ msgstr "Remettre la vue projecteur à zéro"
 msgid "Custom slide"
 msgstr "Diapositive personnalisée"
 
-#: projector/templates/projector/select_widgets.html:17
+#: projector/templates/projector/overlay_widget.html:22
+msgid "Countdown for speaking time"
+msgstr ""
+
+#: projector/templates/projector/overlay_widget.html:26
+#, fuzzy
+msgid "Message"
+msgstr "Supprimer le message"
+
+#: projector/templates/projector/select_widgets.html:5
+#: projector/templates/projector/select_widgets.html:8
+msgid "Select widgets"
+msgstr "Sélectionner les composants"
+
+#: projector/templates/projector/select_widgets.html:23
 msgid "No widgets available"
 msgstr "Pas d'éléments disponibles."
 
@@ -2323,19 +2336,20 @@ msgstr "N'a pas pu trouver la page."
 msgid "Server Error"
 msgstr "Erreur du serveur"
 
-#: templates/base.html:21
+#: templates/base.html:29
 msgid "Home"
 msgstr "Accueil"
 
-#: templates/base.html:27
+#: templates/base.html:41
+#, fuzzy
+msgid "Change password"
+msgstr "Premier mot de passe"
+
+#: templates/base.html:43
 msgid "Logout"
 msgstr "Déconnecter"
 
-#: templates/base.html:30
-msgid "Welcome"
-msgstr "Bienvenue"
-
-#: templates/base.html:79
+#: templates/base.html:100
 msgid ""
 "Get <a href='http://openslides.org/support' target='_blank'>professional "
 "support</a> for OpenSlides."
@@ -2343,52 +2357,170 @@ msgstr ""
 "Obtenir un <a href='http://openslides.org/support' target='_blank'> support "
 "professionel</a> pour OpenSlides."
 
-#: utils/pdf.py:227
+#: utils/pdf.py:226
 #, python-format
 msgid "As of: %s"
 msgstr "A partir de: %s"
 
-#: utils/pdf.py:238 utils/pdf.py:247
+#: utils/pdf.py:237 utils/pdf.py:246
 #, python-format
 msgid "Page %s"
 msgstr "Page %s"
 
-#: utils/utils.py:63 utils/views.py:287
+#: utils/utils.py:59 utils/views.py:283
 #, python-format
 msgid "Do you really want to delete %s?"
 msgstr "Voulez-vous vraiment supprimer %s?"
 
-#: utils/utils.py:110
+#: utils/utils.py:106
 msgid "Sorry, you have no rights to see this page."
 msgstr "Désolé, vous n'avez pas le droit de voir cette page"
 
-#: utils/views.py:106
+#: utils/views.py:102
 msgid "Are you sure?"
 msgstr "Etes-vous sûr?"
 
-#: utils/views.py:107
+#: utils/views.py:103
 msgid "Thank you for your answer"
 msgstr "Merci pour votre réponse"
 
-#: utils/views.py:244
+#: utils/views.py:240
 #, python-format
 msgid "%s was successfully modified."
 msgstr "%s a été modifié avec succès."
 
-#: utils/views.py:275
+#: utils/views.py:271
 #, python-format
 msgid "%s was successfully created."
 msgstr "%s a été créé avec succès."
 
-#: utils/views.py:293
+#: utils/views.py:289
 #, python-format
 msgid "%s was successfully deleted."
 msgstr "%s a été supprimé avec succès"
 
-#: utils/views.py:308
+#: utils/views.py:304
 msgid "undefined-filename"
 msgstr "nom de fichier indéterminé"
 
 #: utils/jsonfield/fields.py:22
 msgid "Enter valid JSON"
 msgstr "Entrez un JSON valide"
+
+#, fuzzy
+#~ msgid "Countdown"
+#~ msgstr "Arrêter le compte à rebours "
+
+#~ msgid "Activate summary for this item"
+#~ msgstr "Activez le résumé pour cet élément"
+
+#, fuzzy
+#~ msgid "Show agenda"
+#~ msgstr "Nouveau point dans l'ordre du jour"
+
+#, fuzzy
+#~ msgid "Activate agenda"
+#~ msgstr "Activez l'élément"
+
+#~ msgid "Show item"
+#~ msgstr "Afficher l'élément"
+
+#, fuzzy
+#~ msgid "User groups"
+#~ msgstr "Nouveau groupe"
+
+#~ msgid "All items"
+#~ msgstr "Tous les éléments"
+
+#~ msgid "View item"
+#~ msgstr "Afficher l'élément"
+
+#~ msgid "Mark item as done"
+#~ msgstr "Marquez l'élément comme terminé"
+
+#~ msgid "Item closed"
+#~ msgstr "Elément fermé"
+
+#~ msgid "Done"
+#~ msgstr "Terminé"
+
+#~ msgid "All elections"
+#~ msgstr "Toutes les élections"
+
+#~ msgid "View election"
+#~ msgstr "Afficher l'élection"
+
+#~ msgid "Election as PDF"
+#~ msgstr "L'élection en PDF"
+
+#~ msgid "Activate election"
+#~ msgstr "Activer l'élection"
+
+#~ msgid "All motions"
+#~ msgstr "Toutes les motions"
+
+#~ msgid "View motion"
+#~ msgstr "Afficher la motion"
+
+#~ msgid "Motion as PDF"
+#~ msgstr "Motion dans un PDF"
+
+#~ msgid "Number"
+#~ msgstr "Numéro"
+
+#~ msgid "Activate motion"
+#~ msgstr "Activer la motion"
+
+#~ msgid "Enter result"
+#~ msgstr "Insérer le résultat"
+
+#~ msgid "Unsupport"
+#~ msgstr "Ne plus soutenir"
+
+#~ msgid "Result after debate"
+#~ msgstr "Résultat après la discussion"
+
+#~ msgid "Version authorized"
+#~ msgstr "Version autorisée"
+
+#~ msgid "Log"
+#~ msgstr "Log"
+
+#~ msgid "All participants"
+#~ msgstr "Tout les participants"
+
+#~ msgid "View participant"
+#~ msgstr "Afficher participant"
+
+#~ msgid "Delete participant"
+#~ msgstr "Supprimer le participant"
+
+#~ msgid "View group"
+#~ msgstr "Afficher le groupe"
+
+#~ msgid "Delete group"
+#~ msgstr "Supprimer le groupe"
+
+#~ msgid "Close this notification"
+#~ msgstr "Fermez cette notification"
+
+#~ msgid "Change status to active"
+#~ msgstr "Changer le statut sur actif"
+
+#~ msgid "User Settings"
+#~ msgstr "Paramètres d'utilisateur"
+
+#~ msgid "Personal Settings"
+#~ msgstr "Paramètres personnels"
+
+#~ msgid "Overview"
+#~ msgstr "Vue d'ensemble"
+
+#~ msgid "Projector view"
+#~ msgstr "Vue projecteur"
+
+#~ msgid "New slide"
+#~ msgstr "nouvelle diapositive"
+
+#~ msgid "Welcome"
+#~ msgstr "Bienvenue"
diff --git a/openslides/participant/templates/participant/overview.html b/openslides/participant/templates/participant/overview.html
index 6a3c2a067..fb28d61a9 100644
--- a/openslides/participant/templates/participant/overview.html
+++ b/openslides/participant/templates/participant/overview.html
@@ -18,7 +18,7 @@
         <div class="btn-toolbar">
             {% if perms.participant.can_manage_participant %}
                 <a href="{% url 'user_new' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'New participant' %}"><i class="icon-plus"></i> {% trans "New" %}</a>
-                <a href="{% url 'user_group_overview' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'All user groups' %}"><i class="icon-group"></i> {% trans "User groups" %}</a>
+                <a href="{% url 'user_group_overview' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'All groups' %}"><i class="icon-group"></i> {% trans "Groups" %}</a>
                 <a href="{% url 'user_import' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Import participants' %}"><i class="icon-import"></i> {% trans 'Import' %}</a>
             {% endif %}
             {% if perms.participant.can_see_participant and perms.participant.can_manage_participant %}
diff --git a/openslides/projector/templates/projector/overlay_widget.html b/openslides/projector/templates/projector/overlay_widget.html
index d904021f7..b0cb79205 100644
--- a/openslides/projector/templates/projector/overlay_widget.html
+++ b/openslides/projector/templates/projector/overlay_widget.html
@@ -19,7 +19,7 @@
 
             {# TODO: Call the html via overlay.html #}
             {% if overlay.def_name == "Countdown" %}
-                {% trans "Countdown" %}:<br>
+                {% trans "Countdown for speaking time" %}:<br>
                 {% include 'projector/control_countdown.html' %}
             {% endif %}
             {% if overlay.def_name == "Message" %}

From ce51f0ef7e1d17239b650fd9048c20720b16dbcd Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Tue, 5 Feb 2013 23:42:30 +0100
Subject: [PATCH 87/88] template: minor style changes

---
 openslides/motion/templates/motion/view.html           | 2 +-
 openslides/participant/templates/participant/edit.html | 4 ++--
 openslides/templates/form.html                         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/openslides/motion/templates/motion/view.html b/openslides/motion/templates/motion/view.html
index 4b4114276..3afd2a03c 100644
--- a/openslides/motion/templates/motion/view.html
+++ b/openslides/motion/templates/motion/view.html
@@ -332,7 +332,7 @@
     <hr>
     <h5>{% trans "For Administration only:" %}</h5>
     <a href="{% url 'motion_reset' motion.id %}" class="btn btn-danger">
-        <i  class="icon-exclamation-sign icon-white"></i> {% trans 'Reset' %}
+        <i class="icon-exclamation-sign icon-white"></i> {% trans 'Reset' %}
     </a>
     </div> <!--/well-->
     {% endif %} {# end perms.motion.can_support_motion #}
diff --git a/openslides/participant/templates/participant/edit.html b/openslides/participant/templates/participant/edit.html
index 7ea413779..d0dfc143a 100644
--- a/openslides/participant/templates/participant/edit.html
+++ b/openslides/participant/templates/participant/edit.html
@@ -26,8 +26,8 @@
     <form action="" method="post">{% csrf_token %}
         {% include "form.html" %}
         {% if edit_user %}
-            <p>
-                <a href="{% url 'user_reset_password' edit_user.id %}">{% trans 'Reset to First Password' %}</a>
+            <p style="margin: -15px 0 25px 0;">
+                <a class="btn btn-mini" href="{% url 'user_reset_password' edit_user.id %}"><i class="icon-exclamation-sign"></i> {% trans 'Reset to First Password' %}</a>
             </p>
         {% endif %}
         <p>
diff --git a/openslides/templates/form.html b/openslides/templates/form.html
index 63b08a983..cdebfb2ce 100644
--- a/openslides/templates/form.html
+++ b/openslides/templates/form.html
@@ -1,5 +1,5 @@
 {% for field in form %}
-    <div class="control-group{% if field.errors %} error{% endif%}">
+    <div class="control-group {% if field.errors %}error{% endif%}">
         <label for="id_{{ field.name }}">{{ field.label }}{% if field.field.required %}<span class="required">*</span>{% endif %}:</label>
         {{ field }}
         {% if field.errors %}

From 5573077b88e52ec21aaba5ebc9708c220dbf4a36 Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Wed, 6 Feb 2013 09:34:44 +0100
Subject: [PATCH 88/88] fixed pep8

---
 openslides/motion/models.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/openslides/motion/models.py b/openslides/motion/models.py
index cf39e3410..adcfcabec 100644
--- a/openslides/motion/models.py
+++ b/openslides/motion/models.py
@@ -527,7 +527,6 @@ class MotionSupporter(models.Model):
     person = PersonField()
     """The person, who is the supporter."""
 
-
     def __unicode__(self):
         """Return the name of the supporter as string."""
         return unicode(self.person)