From 7f0386138fe2a2c1d4cc3428c9931dca52b158c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emanuel=20Sch=C3=BCtze?= <emanuel@intevation.de>
Date: Mon, 9 Apr 2018 14:55:40 +0200
Subject: [PATCH] Template fixes (fixed #3603, fixed #3601, fixed #3555)

- Fixed agenda import preview (Fixed #3603)
- Show import error only if available; for agenda/motions/users (Fixed #3601)
- Added missing tooltips in detail views (Fixed #3555).
---
 openslides/agenda/static/templates/agenda/item-list.html    | 1 -
 .../static/templates/assignments/assignment-detail.html     | 6 ++++--
 .../motions/static/templates/motions/motion-detail.html     | 5 +++--
 .../motions/static/templates/motions/motion-import.html     | 2 +-
 openslides/topics/static/templates/topics/topic-detail.html | 3 ++-
 openslides/topics/static/templates/topics/topic-import.html | 4 ++--
 openslides/users/static/templates/users/user-detail.html    | 3 ++-
 openslides/users/static/templates/users/user-import.html    | 2 +-
 8 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/openslides/agenda/static/templates/agenda/item-list.html b/openslides/agenda/static/templates/agenda/item-list.html
index 7260d3f41..14912b786 100644
--- a/openslides/agenda/static/templates/agenda/item-list.html
+++ b/openslides/agenda/static/templates/agenda/item-list.html
@@ -253,7 +253,6 @@
           uib-tooltip="{{ 'Projector' | translate }} {{ item.isProjected(item.tree)[0] || '' }}"
           tooltip-enable="item.isProjected(item.tree).length">
           <button class="btn btn-default btn-sm"
-              title="{{ 'Project item' | translate }}"
               ng-click="item.project(getProjectionDefault(item), item.tree)"
               ng-class="{ 'btn-primary': item.isProjected(item.tree).length && inArray(item.isProjected(item.tree), getProjectionDefault(item))}">
             <i class="fa fa-video-camera"></i>
diff --git a/openslides/assignments/static/templates/assignments/assignment-detail.html b/openslides/assignments/static/templates/assignments/assignment-detail.html
index 7f3a743f5..672ac4909 100644
--- a/openslides/assignments/static/templates/assignments/assignment-detail.html
+++ b/openslides/assignments/static/templates/assignments/assignment-detail.html
@@ -12,7 +12,8 @@
         <translate>List of speakers</translate>
       </a>
       <!-- project -->
-      <projector-button model="assignment", default-projector-id="defaultProjectorId">
+      <projector-button model="assignment", default-projector-id="defaultProjectorId"
+        title="{{ 'Project' | translate }}">
       </projector-button>
       <!-- edit -->
       <a os-perms="assignments.can_manage" ng-click="openDialog()"
@@ -21,7 +22,8 @@
         <i class="fa fa-pencil"></i>
       </a>
       <!-- pdf -->
-      <a ng-click="pdfExport()" target="_blank" class="btn btn-default btn-sm">
+      <a ng-click="pdfExport()" target="_blank" class="btn btn-default btn-sm"
+          title="{{ 'Export as PDF' | translate}}">
         <i class="fa fa-file-pdf-o fa-lg"></i>
         <translate>PDF</translate>
       </a>
diff --git a/openslides/motions/static/templates/motions/motion-detail.html b/openslides/motions/static/templates/motions/motion-detail.html
index eaffec05a..411cb9837 100644
--- a/openslides/motions/static/templates/motions/motion-detail.html
+++ b/openslides/motions/static/templates/motions/motion-detail.html
@@ -17,7 +17,7 @@
         tooltip-enable="motion.isProjected().length"
         os-perms="core.can_manage_projector">
         <button type="button" class="btn btn-default btn-sm"
-            title="{{ 'Project motion' | translate }}"
+            title="{{ 'Project' | translate }}"
             ng-click="motion.project(defaultProjectorId, projectionMode.mode)"
             ng-class="{ 'btn-primary': motion.isProjected().length && inArray(motion.isProjected(), defaultProjectorId)}">
           <i class="fa fa-video-camera"></i>
@@ -54,7 +54,8 @@
         <i class="fa fa-pencil"></i>
       </a>
       <!-- pdf -->
-      <a ng-click="pdfExport()" class="btn btn-default btn-sm">
+      <a ng-click="pdfExport()" class="btn btn-default btn-sm"
+          title="{{ 'Export as PDF' | translate}}">
         <i class="fa fa-file-pdf-o fa-lg"></i>
         <translate>PDF</translate>
       </a>
diff --git a/openslides/motions/static/templates/motions/motion-import.html b/openslides/motions/static/templates/motions/motion-import.html
index 9f3174a61..8af7b7560 100644
--- a/openslides/motions/static/templates/motions/motion-import.html
+++ b/openslides/motions/static/templates/motions/motion-import.html
@@ -104,7 +104,7 @@
       </table>
     </div>
 
-    <div class="text-danger">
+    <div ng-if="motionsWillNotBeImported" class="text-danger">
       <i class="fa fa-exclamation-triangle"></i>
       {{ motionsWillNotBeImported }}
       <translate>motions will be not imported.</translate>
diff --git a/openslides/topics/static/templates/topics/topic-detail.html b/openslides/topics/static/templates/topics/topic-detail.html
index daf4ce012..024a48b7e 100644
--- a/openslides/topics/static/templates/topics/topic-detail.html
+++ b/openslides/topics/static/templates/topics/topic-detail.html
@@ -11,7 +11,8 @@
         <translate>List of speakers</translate>
       </a>
       <!-- project -->
-      <projector-button model="topic" default-projector-id="defaultProjectorId">
+      <projector-button model="topic" default-projector-id="defaultProjectorId"
+        title="{{ 'Project' | translate }}">
       </projector-button>
       <!-- edit -->
       <a os-perms="agenda.can_manage" ng-click="openDialog(topic)"
diff --git a/openslides/topics/static/templates/topics/topic-import.html b/openslides/topics/static/templates/topics/topic-import.html
index c454bd929..2d801dbcc 100644
--- a/openslides/topics/static/templates/topics/topic-import.html
+++ b/openslides/topics/static/templates/topics/topic-import.html
@@ -92,13 +92,13 @@
               </span>
               {{ item.title }}
             <td>{{ item.text | limitTo:80 }}{{ item.text.length > 80 ? '...' : '' }}
-            <td>{{ item.duration ? 'item.duration | osMinutesToTime' : '' }}
+            <td><span ng-if="item.duration">{{ item.duration | osMinutesToTime }}</span>
             <td>{{ item.comment }}
             <td>{{ item.is_hidden }}
       </table>
     </div>
 
-    <div class="text-danger">
+    <div ng-if="itemsWillNotBeImported" class="text-danger">
       <i class="fa fa-exclamation-triangle"></i>
       {{ itemsWillNotBeImported }}
       <translate>topics will be not imported.</translate>
diff --git a/openslides/users/static/templates/users/user-detail.html b/openslides/users/static/templates/users/user-detail.html
index a60450e84..39a257341 100644
--- a/openslides/users/static/templates/users/user-detail.html
+++ b/openslides/users/static/templates/users/user-detail.html
@@ -6,7 +6,8 @@
         <translate>Back to overview</translate>
       </a>
       <!-- project -->
-      <projector-button model="user" default-projector-id="defaultProjectorId">
+      <projector-button model="user" default-projector-id="defaultProjectorId"
+        title="{{ 'Project' | translate }}">
       </projector-button>
       <!-- edit -->
       <a os-perms="users.can_manage" ng-click="openDialog(user)"
diff --git a/openslides/users/static/templates/users/user-import.html b/openslides/users/static/templates/users/user-import.html
index 364c60d83..1b7c25a94 100644
--- a/openslides/users/static/templates/users/user-import.html
+++ b/openslides/users/static/templates/users/user-import.html
@@ -199,7 +199,7 @@
     </ul>
 
     <div class="spacer-top-lg">
-      <div class="text-danger" ng-if="usersWillNotBeImported > 0">
+      <div class="text-danger" ng-if="usersWillNotBeImported">
         <i class="fa fa-exclamation-triangle"></i>
         {{ usersWillNotBeImported }}
         <translate>participants will be not imported.</translate>