From 9b78b5992b2b648ab4ddbf412701a7b420cd0094 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Wed, 30 Dec 2015 23:19:53 +0100
Subject: [PATCH 1/2] Fix typo

---
 .../users/static/templates/users/user-detail-profile.html       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openslides/users/static/templates/users/user-detail-profile.html b/openslides/users/static/templates/users/user-detail-profile.html
index 3cd4c9392..df341506d 100644
--- a/openslides/users/static/templates/users/user-detail-profile.html
+++ b/openslides/users/static/templates/users/user-detail-profile.html
@@ -1,6 +1,6 @@
 <div class="header">
   <div class="title">
-    <h1 translate>Edit profil</h1>
+    <h1 translate>Edit profile</h1>
   </div>
 </div>
 

From de77cfc38c06c08683f3b8a9666bcdf518bddee7 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Fri, 8 Jan 2016 21:31:58 +0100
Subject: [PATCH 2/2] Fixed zooming/scrolling on slides.

---
 .../agenda/static/templates/agenda/slide-item-detail.html       | 2 +-
 openslides/agenda/static/templates/agenda/slide-item-list.html  | 2 +-
 .../static/templates/assignments/slide_assignment.html          | 2 +-
 openslides/core/static/css/projector.css                        | 2 ++
 openslides/core/static/js/core/projector.js                     | 2 +-
 openslides/motions/static/templates/motions/slide_motion.html   | 2 +-
 openslides/users/static/templates/users/slide_user.html         | 2 +-
 7 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/openslides/agenda/static/templates/agenda/slide-item-detail.html b/openslides/agenda/static/templates/agenda/slide-item-detail.html
index 768052c9a..43df47410 100644
--- a/openslides/agenda/static/templates/agenda/slide-item-detail.html
+++ b/openslides/agenda/static/templates/agenda/slide-item-detail.html
@@ -1,4 +1,4 @@
-<div ng-controller="SlideItemDetailCtrl" class="content">
+<div ng-controller="SlideItemDetailCtrl" class="content scrollcontent">
   <h1>
     {{ item.title }}
     <span translate>List of speakers</span>
diff --git a/openslides/agenda/static/templates/agenda/slide-item-list.html b/openslides/agenda/static/templates/agenda/slide-item-list.html
index 62bdbc1b6..d7bda0920 100644
--- a/openslides/agenda/static/templates/agenda/slide-item-list.html
+++ b/openslides/agenda/static/templates/agenda/slide-item-list.html
@@ -1,4 +1,4 @@
-<div ng-controller="SlideItemListCtrl" class="content">
+<div ng-controller="SlideItemListCtrl" class="content scrollcontent">
   <h1 translate>Agenda</h1>
 
   <table class="tablelist">
diff --git a/openslides/assignments/static/templates/assignments/slide_assignment.html b/openslides/assignments/static/templates/assignments/slide_assignment.html
index 4ff0f65f6..eb870254e 100644
--- a/openslides/assignments/static/templates/assignments/slide_assignment.html
+++ b/openslides/assignments/static/templates/assignments/slide_assignment.html
@@ -1,4 +1,4 @@
-<div ng-controller="SlideAssignmentCtrl" class="content">
+<div ng-controller="SlideAssignmentCtrl" class="content scrollcontent">
   <h1>{{ assignment.title }}</h1>
   <div class="white-space-pre-line">{{ assignment.description }}</div>
 </div>
diff --git a/openslides/core/static/css/projector.css b/openslides/core/static/css/projector.css
index 8a7a6e90f..e4e0816ec 100644
--- a/openslides/core/static/css/projector.css
+++ b/openslides/core/static/css/projector.css
@@ -60,6 +60,8 @@ body{
     right: 40px;
     z-index: -1;
     line-height: normal;
+}
+.scrollcontent {
     transition-property: margin, font-size;
     transition-duration: 1s;
 }
diff --git a/openslides/core/static/js/core/projector.js b/openslides/core/static/js/core/projector.js
index e6e3acd8c..7a61df0b8 100644
--- a/openslides/core/static/js/core/projector.js
+++ b/openslides/core/static/js/core/projector.js
@@ -65,7 +65,7 @@ angular.module('OpenSlidesApp.core.projector', ['OpenSlidesApp.core'])
                     console.error("Error for slide " + element.name + ": " + element.error);
                 }
             });
-            $scope.scroll = -10 * Projector.get(1).scroll;
+            $scope.scroll = -5 * Projector.get(1).scroll;
             $scope.scale = 100 + 20 * Projector.get(1).scale;
         });
     });
diff --git a/openslides/motions/static/templates/motions/slide_motion.html b/openslides/motions/static/templates/motions/slide_motion.html
index 99c1497c5..b2d472a45 100644
--- a/openslides/motions/static/templates/motions/slide_motion.html
+++ b/openslides/motions/static/templates/motions/slide_motion.html
@@ -1,4 +1,4 @@
-<div ng-controller="SlideMotionCtrl" class="content">
+<div ng-controller="SlideMotionCtrl" class="content scrollcontent">
   <h1>{{ motion.getTitle() }}</h1>
   <div class="white-space-pre-line">{{ motion.getText() }}</div>
 </div>
diff --git a/openslides/users/static/templates/users/slide_user.html b/openslides/users/static/templates/users/slide_user.html
index c9fcd6896..83d4739fe 100644
--- a/openslides/users/static/templates/users/slide_user.html
+++ b/openslides/users/static/templates/users/slide_user.html
@@ -1,3 +1,3 @@
-<div ng-controller="SlideUserCtrl" class="content">
+<div ng-controller="SlideUserCtrl" class="content scrollcontent">
     <h1>{{ user.get_full_name() }}</h1>
 </div>