Merge pull request #3473 from FinnStutzenstein/zoomcontent

Do not zoom slideheaders

openslides/agenda/static/templates/agenda/partial-slide-current-list-of-speakers.html

@@ -7,27 +7,29 @@
     </h2>
   </div>
 
-  <!-- Last speakers -->
+  <div class="zoomcontent">
-  <p ng-repeat="speaker in lastSpeakers = (agendaItem.speakers
+    <!-- Last speakers -->
-    | filter: {end_time: '!!', begin_time: '!!'})
+    <p ng-repeat="speaker in lastSpeakers = (agendaItem.speakers
-    | limitTo: config('agenda_show_last_speakers') : (lastSpeakers.length - config('agenda_show_last_speakers'))"
+      | filter: {end_time: '!!', begin_time: '!!'})
-    class="lastSpeakers">
+      | limitTo: config('agenda_show_last_speakers') : (lastSpeakers.length - config('agenda_show_last_speakers'))"
-    {{ speaker.user.get_full_name() }}
+      class="lastSpeakers">
-  </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>
+    </p>
-  </ol>
+
+    <!-- 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>

openslides/agenda/static/templates/agenda/slide-item-list.html

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

openslides/agenda/static/templates/agenda/slide-list-of-speakers.html

@@ -11,19 +11,21 @@
     </h2>
   </div>
 
-  <!-- Last speakers -->
+  <div class="zoomcontent">
-  <p ng-repeat="speaker in lastSpeakers = (item.speakers | filter: {end_time: '!!', begin_time: '!!'}) |
+    <!-- Last speakers -->
-      limitTo: config('agenda_show_last_speakers') : (lastSpeakers.length - config('agenda_show_last_speakers'))" class="lastSpeakers">
+    <p ng-repeat="speaker in lastSpeakers = (item.speakers | filter: {end_time: '!!', begin_time: '!!'}) |
-      {{ speaker.user.get_full_name() }}
+        limitTo: config('agenda_show_last_speakers') : (lastSpeakers.length - config('agenda_show_last_speakers'))" class="lastSpeakers">
+        {{ speaker.user.get_full_name() }}
 
-  <!-- Current speaker -->
+    <!-- Current speaker -->
-  <p ng-repeat="speaker in item.speakers | filter: {end_time: null, begin_time: '!!'}"
+    <p ng-repeat="speaker in item.speakers | filter: {end_time: null, begin_time: '!!'}"
-      class="currentSpeaker">
+        class="currentSpeaker">
-      <i class="fa fa-microphone fa-lg"></i> {{ speaker.user.get_full_name() }}
+        <i class="fa fa-microphone fa-lg"></i> {{ speaker.user.get_full_name() }}
 
-  <!-- Next speakers -->
+    <!-- Next speakers -->
-  <ol class="nextSpeakers">
+    <ol class="nextSpeakers">
-    <li ng-repeat="speaker in item.speakers | filter: {begin_time: null} | orderBy:'weight'">
+      <li ng-repeat="speaker in item.speakers | filter: {begin_time: null} | orderBy:'weight'">
-      {{ speaker.user.get_full_name() }}
+        {{ speaker.user.get_full_name() }}
-  </ol>
+    </ol>
+  </div>
 </div>

openslides/assignments/static/templates/assignments/slide_assignment.html

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

openslides/core/static/css/projector.css

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

openslides/core/static/templates/projector.html

@@ -51,6 +51,8 @@
   <style type="text/css">
     .scrollcontent {
       margin-top: {{ scroll }}px !important;
+    }
+    .zoomcontent {
       font-size: {{ 100 + 20 * projector.scale }}%;
     }
     .mediascrollcontent {

openslides/motions/static/templates/motions/slide_motion.html

@@ -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">
+  <div id="motioncontent">
-  <!-- Title -->
+    <!-- Title -->
-  <div id="title">
+    <div id="title">
-    <h1>{{  motion.agenda_item.getTitle() || motion.getTitle() }}</h1>
+      <h1>{{  motion.agenda_item.getTitle() || motion.getTitle() }}</h1>
-    <h2>
+      <h2>
-      <translate>Motion</translate> {{ motion.identifier }}
+        <translate>Motion</translate> {{ motion.identifier }}
-      <span ng-if="motion.versions.length > 1" >| Version {{ motion.getVersion().version_number }}</span>
+        <span ng-if="motion.versions.length > 1" >| Version {{ motion.getVersion().version_number }}</span>
-    </h2>
+      </h2>
-  </div>
+    </div>
 
-  <!-- Preamble -->
+    <div class="zoomcontent">
-  <div><p>{{ config('motions_preamble') | translate }}</p></div><br>
+      <!-- Preamble -->
+      <div><p>{{ config('motions_preamble') | translate }}</p></div><br>
 
-  <!-- Text -->
+      <!-- Text -->
-  <!-- Original view -->
+      <!-- Original view -->
-  <div ng-if="mode == 'original'">
+      <div ng-if="mode == 'original'">
-    <div id="view-original-inline-editor" ng-bind-html="motion.getTextWithLineBreaks(null, line) | trusted"
+        <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') }}"
+          class="motion-text motion-text-original line-numbers-{{ config('motions_default_line_numbering') }}"
-      contenteditable="false"></div>
+          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>
 
+      <!-- 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>

openslides/motions/static/templates/motions/slide_motion_block.html

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

openslides/topics/static/templates/topics/slide_topic.html

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

openslides/users/static/templates/users/slide_user.html

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