ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1785 from emanuelschuetze/fix-template-bugs

Browse Source 
Fix template bugs
This commit is contained in:
Norman Jäckel 2016-01-09 01:12:51 +01:00
commit 7843cc2ec0
8 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openslides/agenda/static/templates/agenda/slide-item-detail.html
View File

@ -1,4 +1,4 @@
<div ng-controller="SlideItemDetailCtrl" class="content"> <div ng-controller="SlideItemDetailCtrl" class="content scrollcontent">
<h1> <h1>
{{ item.title }} {{ item.title }}
<span translate>List of speakers</span> <span translate>List of speakers</span>

2
openslides/agenda/static/templates/agenda/slide-item-list.html
View File

@ -1,4 +1,4 @@
<div ng-controller="SlideItemListCtrl" class="content"> <div ng-controller="SlideItemListCtrl" class="content scrollcontent">
<h1 translate>Agenda</h1> <h1 translate>Agenda</h1>
<table class="tablelist"> <table class="tablelist">

2
openslides/assignments/static/templates/assignments/slide_assignment.html
View File

@ -1,4 +1,4 @@
<div ng-controller="SlideAssignmentCtrl" class="content"> <div ng-controller="SlideAssignmentCtrl" class="content scrollcontent">
<h1>{{ assignment.title }}</h1> <h1>{{ assignment.title }}</h1>
<div class="white-space-pre-line">{{ assignment.description }}</div> <div class="white-space-pre-line">{{ assignment.description }}</div>
</div> </div>

2
openslides/core/static/css/projector.css
View File

@ -60,6 +60,8 @@ body{
right: 40px; right: 40px;
z-index: -1; z-index: -1;
line-height: normal; line-height: normal;
}
.scrollcontent {
transition-property: margin, font-size; transition-property: margin, font-size;
transition-duration: 1s; transition-duration: 1s;
} }

2
openslides/core/static/js/core/projector.js
View File

@ -65,7 +65,7 @@ angular.module('OpenSlidesApp.core.projector', ['OpenSlidesApp.core'])
console.error("Error for slide " + element.name + ": " + element.error); 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; $scope.scale = 100 + 20 * Projector.get(1).scale;
}); });
}); });

2
openslides/motions/static/templates/motions/slide_motion.html
View File

@ -1,4 +1,4 @@
<div ng-controller="SlideMotionCtrl" class="content"> <div ng-controller="SlideMotionCtrl" class="content scrollcontent">
<h1>{{ motion.getTitle() }}</h1> <h1>{{ motion.getTitle() }}</h1>
<div class="white-space-pre-line">{{ motion.getText() }}</div> <div class="white-space-pre-line">{{ motion.getText() }}</div>
</div> </div>

2
openslides/users/static/templates/users/slide_user.html
View File

@ -1,3 +1,3 @@
<div ng-controller="SlideUserCtrl" class="content"> <div ng-controller="SlideUserCtrl" class="content scrollcontent">
<h1>{{ user.get_full_name() }}</h1> <h1>{{ user.get_full_name() }}</h1>
</div> </div>

2
openslides/users/static/templates/users/user-detail-profile.html
View File

@ -1,6 +1,6 @@
<div class="header"> <div class="header">
<div class="title"> <div class="title">
<h1 translate>Edit profil</h1> <h1 translate>Edit profile</h1>
</div> </div>
</div> </div>