From 04843294acb1428d26c06c8229b45cf5e9b042b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emanuel=20Sch=C3=BCtze?= <emanuel@intevation.de>
Date: Tue, 10 Apr 2018 15:09:38 +0200
Subject: [PATCH] Use simple pdf export button for delegates.

Don't use drop down list with one entry only.
Show agenda docx entry for managers only.
---
 .../static/templates/agenda/item-list.html    | 16 ++++++++--
 .../assignments/assignment-list.html          | 32 ++++++-------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/openslides/agenda/static/templates/agenda/item-list.html b/openslides/agenda/static/templates/agenda/item-list.html
index 14912b786..67a1e41d8 100644
--- a/openslides/agenda/static/templates/agenda/item-list.html
+++ b/openslides/agenda/static/templates/agenda/item-list.html
@@ -83,8 +83,8 @@
         <i class="fa fa-sort-numeric-asc"></i>
         <translate>Numbering</translate>
       </button>
-      <!-- pdf -->
-      <div class="pull-right" uib-dropdown>
+      <!-- Export drop down list (for manager) -->
+      <div os-perms="motions.can_manage" class="pull-right" uib-dropdown>
         <button type="button" class="btn btn-default btn-sm" id="dropdownExport" uib-dropdown-toggle>
           <i class="fa fa-upload"></i>
           <span ng-if="itemsFiltered.length == items.length" translate>
@@ -111,6 +111,7 @@
               CSV
             </a>
           </li>
+          <!-- DOCX export -->
           <li>
             <a href="" ng-click="docxExport()">
               <i class="fa fa-file-word-o"></i>
@@ -119,6 +120,17 @@
           </li>
         </ul>
       </div>
+      <!-- Export button (for normal users) -->
+      <button type="button" class="btn btn-default btn-sm pull-right"
+        os-perms="!motions.can_manage" ng-click="pdfExport()">
+        <i class="fa fa-file-pdf-o"></i>
+        <span ng-if="itemsFiltered.length == items.length" translate>
+          Export all
+        </span>
+        <span ng-if="itemsFiltered.length != items.length" translate>
+          Export filtered
+        </span>
+      </button>
     </div>
   </div>
   <div uib-collapse="!isSelectMode" class="row spacer">
diff --git a/openslides/assignments/static/templates/assignments/assignment-list.html b/openslides/assignments/static/templates/assignments/assignment-list.html
index 595ae7a98..4a762553e 100644
--- a/openslides/assignments/static/templates/assignments/assignment-list.html
+++ b/openslides/assignments/static/templates/assignments/assignment-list.html
@@ -24,28 +24,16 @@
         <i class="fa fa-check-square-o"></i>
         <translate>Select ...</translate>
       </button>
-      <!-- export dropdown -->
-      <div class="dropdown pull-right" uib-dropdown>
-        <button type="button" class="btn btn-default btn-sm" id="dropdownExport" uib-dropdown-toggle>
-          <i class="fa fa-upload"></i>
-          <span ng-if="assignmentsFiltered.length == assignments.length" translate>
-            Export all
-          </span>
-          <span ng-if="assignmentsFiltered.length != assignments.length" translate>
-            Export filtered
-          </span>
-          <span class="caret"></span>
-        </button>
-        <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownExport">
-          <!-- PDF export -->
-          <li>
-            <a href="" ng-click="pdfExport()">
-              <i class="fa fa-file-pdf-o"></i>
-              <translate>PDF</translate>
-            </a>
-          </li>
-        </ul>
-      </div>
+      <!-- export button -->
+      <button type="button" class="btn btn-default btn-sm pull-right" ng-click="pdfExport()">
+        <i class="fa fa-file-pdf-o"></i>
+        <span ng-if="assignmentsFiltered.length == assignments.length" translate>
+          Export all
+        </span>
+        <span ng-if="assignmentsFiltered.length != assignments.length" translate>
+          Export filtered
+        </span>
+      </button>
     </div>
   </div>
   <div uib-collapse="!isFilterOpen" class="row">