Merge pull request #3492 from emanuelschuetze/templateImprovements

Template improvements for motions and projector
This commit is contained in:
Emanuel Schütze 2017-11-15 12:08:24 +01:00 committed by GitHub
commit de47da646b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 24 additions and 38 deletions

View File

@ -515,12 +515,6 @@ angular.module('OpenSlidesApp.agenda.site', [
case 'removeAll': case 'removeAll':
return (operator.hasPerms('agenda.can_manage_list_of_speakers') && return (operator.hasPerms('agenda.can_manage_list_of_speakers') &&
$scope.speakers.length > 0); $scope.speakers.length > 0);
case 'beginNextSpeech':
return (operator.hasPerms('agenda.can_manage_list_of_speakers') &&
$scope.nextSpeakers.length > 0);
case 'endCurrentSpeech':
return (operator.hasPerms('agenda.can_manage_list_of_speakers') &&
$scope.currentSpeaker.length > 0);
case 'showLastSpeakers': case 'showLastSpeakers':
return $scope.lastSpeakers.length > 0; return $scope.lastSpeakers.length > 0;
} }
@ -682,7 +676,7 @@ angular.module('OpenSlidesApp.agenda.site', [
var isProjected = $scope.currentListOfSpeakers.isProjectedWithOverlayStatus(); var isProjected = $scope.currentListOfSpeakers.isProjectedWithOverlayStatus();
$scope.currentListOfSpeakersAsOverlay = isProjected[0].overlay; $scope.currentListOfSpeakersAsOverlay = isProjected[0].overlay;
} else { } else {
$scope.currentListOfSpeakersAsOverlay = true; $scope.currentListOfSpeakersAsOverlay = false;
} }
$scope.setOverlay = function (overlay) { $scope.setOverlay = function (overlay) {
$scope.currentListOfSpeakersAsOverlay = overlay; $scope.currentListOfSpeakersAsOverlay = overlay;

View File

@ -22,18 +22,6 @@
</button> </button>
</span> </span>
</div> </div>
<!-- Start/Stop controls -->
<button ng-if="isAllowed('endCurrentSpeech')" ng-click="endSpeech()"
class="btn btn-sm btn-default">
<i class="fa fa-stop"></i>
<translate>End current speech</translate>
</button>
<button ng-if="isAllowed('beginNextSpeech')" ng-click="beginSpeech()"
class="btn btn-sm btn-default">
<i class="fa fa-play"></i>
<translate>Begin next speech</translate>
</button>
</div> </div>
<!-- text for empty list --> <!-- text for empty list -->
@ -44,7 +32,7 @@
<template-hook hook-name="itemDetailListOfSpeakersButtons"></template-hook> <template-hook hook-name="itemDetailListOfSpeakersButtons"></template-hook>
<!-- Last speakers --> <!-- Last speakers -->
<div class="spacer-top-lg"> <div class="spacer-top-lg spacer-bottom">
<button ng-if="isAllowed('showLastSpeakers')" ng-click="$parent.showOldSpeakers = !$parent.showOldSpeakers" <button ng-if="isAllowed('showLastSpeakers')" ng-click="$parent.showOldSpeakers = !$parent.showOldSpeakers"
class="btn btn-xs btn-default"> class="btn btn-xs btn-default">
<translate ng-if="!$parent.showOldSpeakers">Last speakers</translate> <translate ng-if="!$parent.showOldSpeakers">Last speakers</translate>

View File

@ -1,9 +1,13 @@
<div class="content scrollcontent"> <div class="content scrollcontent">
<div class="title">
<h1 translate>Current list of speakers</h1> <!-- Title -->
<h2> {{ agendaItem.getTitle() }} <div id="title">
<span class="slimlabel label label-danger ng-scope" <h1>{{ agendaItem.getTitle() }}</h1>
ng-if="agendaItem.speaker_list_closed" translate>Closed</span> <h2>
<span translate>List of speakers</span>
<span ng-if="(agendaItem.speakers | filter: {begin_time: null}).length > 0">
&ndash; {{ (agendaItem.speakers | filter: {begin_time: null}).length }} <translate>speakers</translate>
<span ng-if="agendaItem.speaker_list_closed" class="slimlabel label label-danger" translate>Closed</span>
</h2> </h2>
</div> </div>

View File

@ -94,7 +94,7 @@ def add_projection_defaults(apps, schema_editor):
projector=default_projector)) projector=default_projector))
projectiondefaults.append(ProjectionDefault( projectiondefaults.append(ProjectionDefault(
name='motionBlocks', name='motionBlocks',
display_name='Motion Blocks', display_name='Motion blocks',
projector=default_projector)) projector=default_projector))
projectiondefaults.append(ProjectionDefault( projectiondefaults.append(ProjectionDefault(
name='assignments', name='assignments',

View File

@ -224,17 +224,16 @@ h3 {
margin-bottom: 5px; margin-bottom: 5px;
} }
#motioncontent { #motioncontent {
width: calc(100% - 260px); width: calc(100% - 230px);
} }
#sidebox { #sidebox {
width: 260px; width: 260px;
float: right;
margin: 75px -50px 20px 10px;
right: 0; right: 0;
margin-top: 75px;
background: #d3d3d3; background: #d3d3d3;
border-radius: 7px 0 0 7px; border-radius: 7px 0 0 7px;
padding: 3px 7px 10px 19px; padding: 3px 7px 10px 19px;
position: absolute; position: fixed;
z-index: 5; z-index: 5;
} }
#sidebox h3 { #sidebox h3 {
@ -595,12 +594,15 @@ p.os-split-after {
} }
.motion-block > div { .motion-block > div {
width: 50%; width: 50%;
font-size: 1.1em;
margin-bottom: 15px; margin-bottom: 15px;
padding-right: 15px; padding-right: 15px;
line-height: 1em; line-height: 1em;
} }
.motion-block .label { .motion-block .label {
text-align: left; text-align: left;
padding: 5px 10px;
margin-top: 3px;
} }
/*** Video and Image projection ***/ /*** Video and Image projection ***/

View File

@ -139,7 +139,7 @@
<div ng-if="motion.isAllowed('can_see_amendments')"> <div ng-if="motion.isAllowed('can_see_amendments')">
<h3 translate>Amendments</h3> <h3 translate>Amendments</h3>
<div ng-repeat="amendment in amendments"> <div ng-repeat="amendment in amendments | orderBy: 'identifier'">
<a ui-sref="motions.motion.detail({id: amendment.id})"> <a ui-sref="motions.motion.detail({id: amendment.id})">
<translate>Motion</translate> {{ amendment.identifier || amendment.getTitle() }} <translate>Motion</translate> {{ amendment.identifier || amendment.getTitle() }}
</a> </a>

View File

@ -1,4 +1,4 @@
<div ng-controller="SlideMotionCtrl" class="content scrollcontent"> <div ng-controller="SlideMotionCtrl" class="content">
<div id="sidebox"> <div id="sidebox">
<!-- State --> <!-- State -->
<h3 translate>State</h3> <h3 translate>State</h3>
@ -65,7 +65,7 @@
</div> </div>
</div> </div>
<div id="motioncontent"> <div id="motioncontent" class="scrollcontent">
<!-- Title --> <!-- Title -->
<div id="title"> <div id="title">
<h1>{{ motion.getTitle() }}</h1> <h1>{{ motion.getTitle() }}</h1>

View File

@ -10,11 +10,9 @@
<div ng-repeat="motion in motionBlock.motions"> <div ng-repeat="motion in motionBlock.motions">
{{ motion.identifier }} {{ motion.identifier }}
<br> <br>
<small>
<span class="label" ng-class="'label-'+motion.recommendation.css_class"> <span class="label" ng-class="'label-'+motion.recommendation.css_class">
{{ motion.getRecommendationName() }} {{ motion.getRecommendationName() }}
</span> </span>
</small>
</div> </div>
</div> </div>
</div> </div>