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

Merge pull request #2461 from FinnStutzenstein/minorFixes

Browse Source 
some minor fixes
This commit is contained in:
Emanuel Schütze 2016-09-30 17:37:27 +02:00 committed by GitHub
commit 447d475321
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openslides/assignments/static/templates/assignments/assignment-detail.html
View File

@ -78,8 +78,10 @@
</div> </div>
<div class="details"> <div class="details">
<div ng-if="assignment.description">
<h3 translate>Description</h3> <h3 translate>Description</h3>
<div class="white-space-pre-line">{{ assignment.description }}</div> <div class="white-space-pre-line">{{ assignment.description }}</div>
</div>
<div ng-if="assignment.phase != 2"> <div ng-if="assignment.phase != 2">
<h3 translate>Candidates</h3> <h3 translate>Candidates</h3>

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

@ -215,7 +215,7 @@ angular.module('OpenSlidesApp.core', [
'$rootScope', '$rootScope',
function ($http, $rootScope) { function ($http, $rootScope) {
// Loads server time and calculates server offset // Loads server time and calculates server offset
$rootScope.serverOffset = Math.floor(Date.now() / 1000); $rootScope.serverOffset = 0;
$http.get('/core/servertime/') $http.get('/core/servertime/')
.then(function(data) { .then(function(data) {
$rootScope.serverOffset = Math.floor(Date.now() / 1000 - data.data); $rootScope.serverOffset = Math.floor(Date.now() / 1000 - data.data);

2
openslides/mediafiles/static/templates/mediafiles/mediafile-list.html
View File

@ -56,7 +56,7 @@
</button> </button>
<button class="btn" ng-click="mediafileFit()" title="{{ 'Reset zoom' | translate }}" <button class="btn" ng-click="mediafileFit()" title="{{ 'Reset zoom' | translate }}"
ng-class="presentedMediafile.scale=='page-fit' ? 'btn-primary' : 'btn-default'"> ng-class="presentedMediafile.scale=='page-fit' ? 'btn-primary' : 'btn-default'">
100% <i class="fa fa-arrows-alt"></i>
</button> </button>
<button class="btn btn-default" ng-click="mediafileZoomIn()" title="{{ 'Zoom in' | translate }}"> <button class="btn btn-default" ng-click="mediafileZoomIn()" title="{{ 'Zoom in' | translate }}">
<i class="fa fa-search-plus"></i> <i class="fa fa-search-plus"></i>