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] 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 {