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

Show countdown in red if negative (projector and control panel).

Browse Source 
Show 00:00 instead of --:--
This commit is contained in:
Emanuel Schuetze 2016-01-21 21:43:02 +01:00
parent b291473c61
commit 646bf52ea7
3 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openslides/core/static/css/app.css
View File

@ -458,6 +458,10 @@ img {
padding-right: 10px; padding-right: 10px;
} }
.col2 .countdown_timer.negative {
color: #CC0000;
}
.col2 .notNull { .col2 .notNull {
color: red; color: red;
font-weight: bold; font-weight: bold;

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

@ -333,8 +333,8 @@ angular.module('OpenSlidesApp.core', [
function () { function () {
return function (totalseconds) { return function (totalseconds) {
var time; var time;
var total = Math.abs(totalseconds); // floor returns the largest integer of the absolut value of totalseconds
if (parseInt(totalseconds)) { var total = Math.floor(Math.abs(totalseconds));
var hh = Math.floor(total / 3600); var hh = Math.floor(total / 3600);
var mm = Math.floor(total % 3600 / 60); var mm = Math.floor(total % 3600 / 60);
var ss = Math.floor(total % 60); var ss = Math.floor(total % 60);
@ -349,9 +349,6 @@ angular.module('OpenSlidesApp.core', [
time = hh + ":" + mm + ":" + ss; time = hh + ":" + mm + ":" + ss;
if (totalseconds < 0) if (totalseconds < 0)
time = "-"+time; time = "-"+time;
} else {
time = "--:--";
}
return time; return time;
}; };
} }

2
openslides/core/static/templates/core/slide_countdown.html
View File

@ -1,6 +1,6 @@
<div ng-controller="SlideCountdownCtrl"> <div ng-controller="SlideCountdownCtrl">
<div ng-if="visible"> <div ng-if="visible">
<div class="countdown well" style="margin-top: calc({{index}}*100px);"> <div class="countdown well" style="margin-top: calc({{index}}*100px);" ng-class="{ 'negative': seconds < 0 }">
{{ seconds | osSecondsToTime}} {{ seconds | osSecondsToTime}}
<div class="description">{{ description }}</div> <div class="description">{{ description }}</div>
</div> </div>