Merge pull request #1321 from emanuelschuetze/template-fixes

Last template fixes for 1.6

openslides/agenda/templates/agenda/overview.html

@@ -46,15 +46,21 @@
         </h1>
 
         <div class="row-fluid">
-            <div class="span6">
+            <div class="pull-left">
+                {% if perms.agenda.can_manage_agenda %}
+                    <p><a href="{% url 'agenda_numbering' %}"
+                       class="btn btn-mini">{% trans 'Number agenda items' %}</a>
+                    </p>
+                {% endif %}
+                <p>
                 <label class="checkbox">
                     <input type="checkbox" id="hide_closed_items"> {% trans "Hide closed items" %}
                 </label>
                 <small><i>{{ items|length }}
                 {% blocktrans count counter=items|length %}item{% plural %}items{% endblocktrans %}<span id="hiddencount"></span>
                 </i></small>
+                </p>
             </div>
-            <div class="span6">
             {% if perms.agenda.can_see_orga_items %}
                 {% if start and end %}
                     <table id="agendatime" class="table table-bordered pull-right">
@@ -67,15 +73,10 @@
                             <td>{{ end|date:"DATETIME_FORMAT" }}</td>
                         </tr>
                     </table>
-                    {% else %}
+                {% elif perms.config.can_manage %}
                     <a href="{% url 'config_agenda' %}" class="btn btn-mini pull-right">{% trans 'Set start time of event' %}</a>
                 {% endif %}
-                    {% if perms.agenda.can_manage_agenda %}
-                        <a href="{% url 'agenda_numbering' %}"
-                           class="btn btn-mini pull-left">{% trans 'Number agenda items' %}</a>
             {% endif %}
-                {% endif %}
-            </div>
         </div>
 
         <table id="menu-overview" class="table table-striped table-bordered">

openslides/assignment/templates/assignment/assignment_list.html

@@ -33,7 +33,9 @@
             <th>{% trans "Election" %}</th>
             <th class="optional">{% trans "Candidates" %}</th>
             <th>{% trans "Status" %}</th>
+            {% if perms.assignment.can_manage_assignment or perms.core.can_manage_projector %}
                 <th class="mini_width">{% trans "Actions" %}</th>
+            {% endif %}
         </tr>
     </thead>
     {% for object in object_list %}
@@ -51,6 +53,7 @@
                 | {% trans "Elected" %}: <span class="badge badge-success">{{ object.elected|length }}</span>
             </td>
             <td><span class="label label-info">{{ object.get_status_display }}</status></td>
+            {% if perms.assignment.can_manage_assignment or perms.core.can_manage_projector %}
             <td>
                 <span style="width: 1px; white-space: nowrap;">
                 {% if perms.core.can_manage_projector %}
@@ -70,12 +73,9 @@
                         class="btn btn-mini"><i class="icon-remove"></i>
                     </a>
                 {% endif %}
-                <a href="{% url 'assignment_pdf' object.id  %}"
-                    data-original-title="{% trans 'Print election as PDF' %}" target="_blank"
-                    class="btn btn-mini tooltip-left"><i class="icon-print"></i> PDF
-                </a>
                 </span>
             </td>
+            {% endif %}
         </tr>
     {% endfor %}
     </table>

openslides/motion/templates/motion/motion_list.html

@@ -56,7 +56,9 @@
                 <th class="optional">{% trans "Supporters" %}</th>
             {% endif %}
             <th class="optional">{% trans "Last changes" %}</th>
+            {% if perms.motion.can_manage_motion or perms.core.can_manage_projector %}
                 <th class="mini_width">{% trans "Actions" %}</th>
+            {% endif %}
         </tr>
     </thead>
     {% for motion in motion_list %}
@@ -88,6 +90,7 @@
                         <i class="icon-warning-sign icon-white"></i>
                     </a>
                 {% endif %}</td>
+            {% if perms.motion.can_manage_motion or perms.core.can_manage_projector %}
             <td>
                 <span style="width: 1px; white-space: nowrap;">
                 {% if perms.core.can_manage_projector %}
@@ -106,6 +109,7 @@
                 {% endif %}
                 </span>
             </td>
+            {% endif %}
         </tr>
     {% endfor %}
     </table>