Merge pull request #3473 from FinnStutzenstein/zoomcontent
Do not zoom slideheaders
This commit is contained in:
Emanuel Schütze
GitHub
commit
432ab9068d
@ -7,27 +7,29 @@
|
||||
</h2>
|
||||
</div>
|
||||
|
||||
<!-- Last speakers -->
|
||||
<p ng-repeat="speaker in lastSpeakers = (agendaItem.speakers
|
||||
| filter: {end_time: '!!', begin_time: '!!'})
|
||||
| limitTo: config('agenda_show_last_speakers') : (lastSpeakers.length - config('agenda_show_last_speakers'))"
|
||||
class="lastSpeakers">
|
||||
{{ speaker.user.get_full_name() }}
|
||||
</p>
|
||||
|
||||
<!-- Current speaker -->
|
||||
<p ng-repeat="speaker in currentspeakers = (agendaItem.speakers
|
||||
| filter: {end_time: null, begin_time: '!!'})"
|
||||
class="currentSpeaker nobr">
|
||||
<i class="fa fa-microphone fa-lg"></i> {{ speaker.user.get_full_name() }}
|
||||
</p>
|
||||
|
||||
<!-- Next speakers -->
|
||||
<ol class="nextSpeakers">
|
||||
<li ng-repeat="speaker in agendaItem.speakers
|
||||
| filter: {begin_time: null}
|
||||
| orderBy:'weight'">
|
||||
<div class="zoomcontent">
|
||||
<!-- Last speakers -->
|
||||
<p ng-repeat="speaker in lastSpeakers = (agendaItem.speakers
|
||||
| filter: {end_time: '!!', begin_time: '!!'})
|
||||
| limitTo: config('agenda_show_last_speakers') : (lastSpeakers.length - config('agenda_show_last_speakers'))"
|
||||
class="lastSpeakers">
|
||||
{{ speaker.user.get_full_name() }}
|
||||
</li>
|
||||
</ol>
|
||||
</p>
|
||||
|
||||
<!-- Current speaker -->
|
||||
<p ng-repeat="speaker in currentspeakers = (agendaItem.speakers
|
||||
| filter: {end_time: null, begin_time: '!!'})"
|
||||
class="currentSpeaker nobr">
|
||||
<i class="fa fa-microphone fa-lg"></i> {{ speaker.user.get_full_name() }}
|
||||
</p>
|
||||
|
||||
<!-- Next speakers -->
|
||||
<ol class="nextSpeakers">
|
||||
<li ng-repeat="speaker in agendaItem.speakers
|
||||
| filter: {begin_time: null}
|
||||
| orderBy:'weight'">
|
||||
{{ speaker.user.get_full_name() }}
|
||||
</li>
|
||||
</ol>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
<h1 ng-if="!element.id" translate>Agenda</h1>
|
||||
<h1 ng-if="element.id">{{ rootItem.getTitle() }}</h1>
|
||||
|
||||
<div class="agendalist" ng-class="{'spacer-left-lg': element.id}">
|
||||
<div class="agendalist zoomcontent" ng-class="{'spacer-left-lg': element.id}">
|
||||
<table class="agendalist-table">
|
||||
<tr ng-repeat="node in tree" ng-include="'projector_agenda_renderer.html'"></tr>
|
||||
</table>
|
||||
|
||||
@ -11,19 +11,21 @@
|
||||
</h2>
|
||||
</div>
|
||||
|
||||
<!-- Last speakers -->
|
||||
<p ng-repeat="speaker in lastSpeakers = (item.speakers | filter: {end_time: '!!', begin_time: '!!'}) |
|
||||
limitTo: config('agenda_show_last_speakers') : (lastSpeakers.length - config('agenda_show_last_speakers'))" class="lastSpeakers">
|
||||
{{ speaker.user.get_full_name() }}
|
||||
<div class="zoomcontent">
|
||||
<!-- Last speakers -->
|
||||
<p ng-repeat="speaker in lastSpeakers = (item.speakers | filter: {end_time: '!!', begin_time: '!!'}) |
|
||||
limitTo: config('agenda_show_last_speakers') : (lastSpeakers.length - config('agenda_show_last_speakers'))" class="lastSpeakers">
|
||||
{{ speaker.user.get_full_name() }}
|
||||
|
||||
<!-- Current speaker -->
|
||||
<p ng-repeat="speaker in item.speakers | filter: {end_time: null, begin_time: '!!'}"
|
||||
class="currentSpeaker">
|
||||
<i class="fa fa-microphone fa-lg"></i> {{ speaker.user.get_full_name() }}
|
||||
<!-- Current speaker -->
|
||||
<p ng-repeat="speaker in item.speakers | filter: {end_time: null, begin_time: '!!'}"
|
||||
class="currentSpeaker">
|
||||
<i class="fa fa-microphone fa-lg"></i> {{ speaker.user.get_full_name() }}
|
||||
|
||||
<!-- Next speakers -->
|
||||
<ol class="nextSpeakers">
|
||||
<li ng-repeat="speaker in item.speakers | filter: {begin_time: null} | orderBy:'weight'">
|
||||
{{ speaker.user.get_full_name() }}
|
||||
</ol>
|
||||
<!-- Next speakers -->
|
||||
<ol class="nextSpeakers">
|
||||
<li ng-repeat="speaker in item.speakers | filter: {begin_time: null} | orderBy:'weight'">
|
||||
{{ speaker.user.get_full_name() }}
|
||||
</ol>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -9,12 +9,12 @@
|
||||
</div>
|
||||
|
||||
<!-- Description -->
|
||||
<div ng-if="!showResult && assignment.description !== ''" class="white-space-pre-line">
|
||||
<div ng-if="!showResult && assignment.description !== ''" class="white-space-pre-line zoomcontent">
|
||||
{{ assignment.description }}
|
||||
</div>
|
||||
|
||||
<!-- Candidates -->
|
||||
<div ng-if="!showResult">
|
||||
<div class="zoomcontent" ng-if="!showResult">
|
||||
<h3 translate>Candidates</h3>
|
||||
<ul>
|
||||
<li ng-repeat="related_user in assignment.assignment_related_users | orderBy:'weight'">
|
||||
@ -24,7 +24,7 @@
|
||||
</div>
|
||||
|
||||
<!-- vote results -->
|
||||
<div ng-show="showResult">
|
||||
<div class="zoomcontent" ng-show="showResult">
|
||||
<div ng-if="(assignment.polls | filter: {id: element.poll}).length == 0" translate>
|
||||
Waiting for results ...
|
||||
</div>
|
||||
|
||||
@ -24,6 +24,9 @@
|
||||
body {
|
||||
font-family: "Roboto", sans-serif;
|
||||
}
|
||||
h1, h2, h3, h4, h5, h6 {
|
||||
font-size: inherit;
|
||||
}
|
||||
h1, h2, h3, h4, h5, h6, .countdown, .message {
|
||||
font-family: "Roboto Condensed", sans-serif;
|
||||
font-weight: normal;
|
||||
@ -166,14 +169,18 @@ body {
|
||||
left: 50px;
|
||||
right: 50px;
|
||||
z-index: -1;
|
||||
line-height: 1.3em;
|
||||
line-height: 1.5em;
|
||||
}
|
||||
.content img {
|
||||
max-width: 65%;
|
||||
height: auto;
|
||||
}
|
||||
.scrollcontent {
|
||||
transition-property: margin, font-size;
|
||||
transition-property: margin;
|
||||
transition-duration: 1s;
|
||||
}
|
||||
.zoomcontent {
|
||||
transition-property: font-size;
|
||||
transition-duration: 1s;
|
||||
}
|
||||
.fullscreen {
|
||||
|
||||
@ -51,6 +51,8 @@
|
||||
<style type="text/css">
|
||||
.scrollcontent {
|
||||
margin-top: {{ scroll }}px !important;
|
||||
}
|
||||
.zoomcontent {
|
||||
font-size: {{ 100 + 20 * projector.scale }}%;
|
||||
}
|
||||
.mediascrollcontent {
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
<div ng-controller="SlideMotionCtrl" class="content scrollcontent">
|
||||
|
||||
<div id="sidebox">
|
||||
<!-- State -->
|
||||
<h3 translate>State</h3>
|
||||
@ -66,63 +65,65 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="motioncontent">
|
||||
<!-- Title -->
|
||||
<div id="title">
|
||||
<h1>{{ motion.agenda_item.getTitle() || motion.getTitle() }}</h1>
|
||||
<h2>
|
||||
<translate>Motion</translate> {{ motion.identifier }}
|
||||
<span ng-if="motion.versions.length > 1" >| Version {{ motion.getVersion().version_number }}</span>
|
||||
</h2>
|
||||
</div>
|
||||
<div id="motioncontent">
|
||||
<!-- Title -->
|
||||
<div id="title">
|
||||
<h1>{{ motion.agenda_item.getTitle() || motion.getTitle() }}</h1>
|
||||
<h2>
|
||||
<translate>Motion</translate> {{ motion.identifier }}
|
||||
<span ng-if="motion.versions.length > 1" >| Version {{ motion.getVersion().version_number }}</span>
|
||||
</h2>
|
||||
</div>
|
||||
|
||||
<!-- Preamble -->
|
||||
<div><p>{{ config('motions_preamble') | translate }}</p></div><br>
|
||||
<div class="zoomcontent">
|
||||
<!-- Preamble -->
|
||||
<div><p>{{ config('motions_preamble') | translate }}</p></div><br>
|
||||
|
||||
<!-- Text -->
|
||||
<!-- Original view -->
|
||||
<div ng-if="mode == 'original'">
|
||||
<div id="view-original-inline-editor" ng-bind-html="motion.getTextWithLineBreaks(null, line) | trusted"
|
||||
class="motion-text motion-text-original line-numbers-{{ config('motions_default_line_numbering') }}"
|
||||
contenteditable="false"></div>
|
||||
</div>
|
||||
|
||||
<!-- Diff View -->
|
||||
<div ng-if="mode == 'diff'">
|
||||
<!-- The actual diff view -->
|
||||
<div class="motion-text-with-diffs line-numbers-{{ config('motions_default_line_numbering') }}">
|
||||
<div ng-repeat="change in (changes = (change_recommendations | orderBy: 'line_from')) ">
|
||||
|
||||
<div class="motion-text original-text line-numbers-{{ config('motions_default_line_numbering') }}"
|
||||
ng-bind-html="motion.getTextBetweenChangeRecommendations(null, changes[$index - 1], change, line) | trusted">
|
||||
</div>
|
||||
<div class="diff-box diff-box-{{ change.id }} clearfix motion-text motion-text-diff line-numbers-{{ config('motions_default_line_numbering') }}">
|
||||
<div ng-bind-html="change.getDiff(motion, null, line) | trusted"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="motion-text original-text line-numbers-{{ config('motions_default_line_numbering') }}"
|
||||
ng-bind-html="motion.getTextRemainderAfterLastChangeRecommendation(null, changes, line) | trusted">
|
||||
<!-- Text -->
|
||||
<!-- Original view -->
|
||||
<div ng-if="mode == 'original'">
|
||||
<div id="view-original-inline-editor" ng-bind-html="motion.getTextWithLineBreaks(null, line) | trusted"
|
||||
class="motion-text motion-text-original line-numbers-{{ config('motions_default_line_numbering') }}"
|
||||
contenteditable="false"></div>
|
||||
</div>
|
||||
|
||||
<!-- Diff View -->
|
||||
<div ng-if="mode == 'diff'">
|
||||
<!-- The actual diff view -->
|
||||
<div class="motion-text-with-diffs line-numbers-{{ config('motions_default_line_numbering') }}">
|
||||
<div ng-repeat="change in (changes = (change_recommendations | orderBy: 'line_from')) ">
|
||||
|
||||
<div class="motion-text original-text line-numbers-{{ config('motions_default_line_numbering') }}"
|
||||
ng-bind-html="motion.getTextBetweenChangeRecommendations(null, changes[$index - 1], change, line) | trusted">
|
||||
</div>
|
||||
<div class="diff-box diff-box-{{ change.id }} clearfix motion-text motion-text-diff line-numbers-{{ config('motions_default_line_numbering') }}">
|
||||
<div ng-bind-html="change.getDiff(motion, null, line) | trusted"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="motion-text original-text line-numbers-{{ config('motions_default_line_numbering') }}"
|
||||
ng-bind-html="motion.getTextRemainderAfterLastChangeRecommendation(null, changes, line) | trusted">
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Changed View -->
|
||||
<div ng-if="mode == 'changed'">
|
||||
<div ng-bind-html="motion.getTextByMode('changed', null, line) | trusted"
|
||||
class="motion-text motion-text-changed line-numbers-{{ config('motions_default_line_numbering') }}"></div>
|
||||
</div>
|
||||
|
||||
<!-- Agreed View -->
|
||||
<div ng-if="mode == 'agreed'">
|
||||
<div ng-bind-html="motion.getTextByMode('agreed', null, line) | trusted"
|
||||
class="motion-text motion-text-changed line-numbers-{{ config('motions_default_line_numbering') }}"></div>
|
||||
</div>
|
||||
|
||||
<!-- Reason -->
|
||||
<div ng-if="motion.getReason() && !config('motions_disable_reason_on_projector')">
|
||||
<h3 translate>Reason</h3>
|
||||
<div ng-bind-html="motion.getReason() | trusted"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Changed View -->
|
||||
<div ng-if="mode == 'changed'">
|
||||
<div ng-bind-html="motion.getTextByMode('changed', null, line) | trusted"
|
||||
class="motion-text motion-text-changed line-numbers-{{ config('motions_default_line_numbering') }}"></div>
|
||||
</div>
|
||||
|
||||
<!-- Agreed View -->
|
||||
<div ng-if="mode == 'agreed'">
|
||||
<div ng-bind-html="motion.getTextByMode('agreed', null, line) | trusted"
|
||||
class="motion-text motion-text-changed line-numbers-{{ config('motions_default_line_numbering') }}"></div>
|
||||
</div>
|
||||
|
||||
<!-- Reason -->
|
||||
<div ng-if="motion.getReason() && !config('motions_disable_reason_on_projector')">
|
||||
<h3 translate>Reason</h3>
|
||||
<div ng-bind-html="motion.getReason() | trusted"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
</div>
|
||||
|
||||
<!-- motion list -->
|
||||
<div class="motion-block">
|
||||
<div class="motion-block zoomcontent">
|
||||
<div ng-repeat="motion in motionBlock.motions">
|
||||
{{ motion.identifier }}
|
||||
<br>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<div ng-controller="SlideTopicCtrl" class="content scrollcontent">
|
||||
<h1>{{ topic.agenda_item.getTitle() }}</h1>
|
||||
<div ng-bind-html="topic.text | trusted"></div>
|
||||
<div ng-bind-html="topic.text | trusted" class="zoomcontent"></div>
|
||||
</div>
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
<div ng-controller="SlideUserCtrl" class="content scrollcontent">
|
||||
<div ng-controller="SlideUserCtrl" class="content scrollcontent zoomcontent">
|
||||
<h1>{{ user.get_full_name() }}</h1>
|
||||
</div>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user