From a11ed6cfdbbf607270713fb54f0e1ef90e6ab0b4 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Thu, 22 Mar 2012 17:30:02 +0100
Subject: [PATCH] Minor template fixes.

---
 openslides/assignment/templates/assignment/view.html  |  2 +-
 .../projector/templates/projector/base_projector.html | 11 ++++++++---
 openslides/templates/base.html                        |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/openslides/assignment/templates/assignment/view.html b/openslides/assignment/templates/assignment/view.html
index dfdd8c4fa..3029ccc78 100644
--- a/openslides/assignment/templates/assignment/view.html
+++ b/openslides/assignment/templates/assignment/view.html
@@ -44,7 +44,7 @@
     <h4></h4>
     <a href='{% url assignment_activate_item assignment.id %}'>
     <span class="button">
-        <span class="icon projector">{%trans 'Beam assignment' %}</span>
+        <span class="icon projector">{%trans 'Beam election' %}</span>
     </span>
     </a>
 
diff --git a/openslides/projector/templates/projector/base_projector.html b/openslides/projector/templates/projector/base_projector.html
index f38e43aa1..b8169ef54 100644
--- a/openslides/projector/templates/projector/base_projector.html
+++ b/openslides/projector/templates/projector/base_projector.html
@@ -6,12 +6,17 @@
 {% block title %}{{ block.super}} – {% trans 'Projector' %} {% endblock %}
 
 {% block submenu %}
-    {% url item_overview as url_itemoverview %}
-    {% url item_new as url_itemnew %}
+    {% url projector_control as url_projectoroverview %}
+    {% url projector_new as url_projectornew %}
     <h4 class="sectiontitle">{%trans "Projector" %}</h4>
     <ul>
+        {% if perms.projector.can_manage_projector %}
+        <li class="{% if request.path == url_projectoroverview %}selected{% endif %}">
+          <a href="{% url projector_control %}">{% trans 'Overview' %}</a></li>
+        {% endif %}
         {% if perms.projector.can_see_projector %}
-        <li><a href="{% url projector_new %}">{% trans 'New Slide' %}</a></li>
+        <li class="{% if request.path == url_projectornew %}selected{% endif %}">
+          <a href="{% url projector_new %}">{% trans 'New Slide' %}</a></li>
         <li><a href="{% url projector_show %}"><img src="/static/images/icons/video-projector.png"> {% trans 'Projector view' %}</a></li>
         {% endif %}
     </ul>
diff --git a/openslides/templates/base.html b/openslides/templates/base.html
index ed8512d48..587e2d5a2 100644
--- a/openslides/templates/base.html
+++ b/openslides/templates/base.html
@@ -22,7 +22,7 @@
             <ul>
             {% if user.is_authenticated %}
                 <li>|<a href="{% url user_logout %}">{%trans "Logout" %}</a></li>
-                <li>|<a href="{% url user_settings %}">{%trans "Usersettings" %}</a></li>
+                <li>|<a href="{% url user_settings %}">{%trans "User Settings" %}</a></li>
                 <li>{%trans "Welcome" %}, <strong>{{ user.username }}</strong></li>
             {% else %}
                 <li><a href="{% url user_login %}">{%trans "Login" %}</a></li>