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).
This commit is contained in:
Emanuel Schütze 2018-04-09 14:55:40 +02:00
parent ba579637bd
commit 7f0386138f
8 changed files with 15 additions and 11 deletions

View File

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

View File

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

View File

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

View File

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

View File

@ -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)"

View File

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

View File

@ -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)"

View File

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