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