Fixed CC-5045 and Now Playing time remaining style improvements
This commit is contained in:
parent
86c570744a
commit
99669c78a0
|
@ -2,8 +2,8 @@
|
|||
<div class="now-playing-block">
|
||||
<div class="text-row"><strong><? echo _("Previous:"); ?></strong> <span id='previous'></span> <span id='prev-length'></span></div>
|
||||
<div class="now-playing-info song">
|
||||
<div class="time-flow"><span class="time-elapsed" id="time-elapsed"></span><span class="time-remaining" id="time-remaining"></span></div>
|
||||
<span id='current'></span><span class="length" id="song-length"></span></div>
|
||||
<div class="time-flow"><span class="song-length" id="song-length"></span><span class="time-elapsed" id="time-elapsed"></span><span class="time-remaining" id="time-remaining"></span></div>
|
||||
<span id='current'></span></div>
|
||||
<div class="progressbar">
|
||||
<div class="progress-song" id="progress-bar" style="width:0%;"></div>
|
||||
</div>
|
||||
|
|
|
@ -246,7 +246,7 @@ select {
|
|||
margin-bottom:3px;
|
||||
}
|
||||
.time-elapsed {
|
||||
color:#9b9b9b;
|
||||
color:#c4c4c4;
|
||||
padding-right:6px;
|
||||
}
|
||||
.time-remaining {
|
||||
|
@ -274,6 +274,11 @@ select {
|
|||
padding-left:6px;
|
||||
}
|
||||
|
||||
.now-playing-info .song-length {
|
||||
color:#9b9b9b;
|
||||
padding-right:6px;
|
||||
}
|
||||
|
||||
.on-air-block {
|
||||
padding:0 12px 0 0;
|
||||
background:url(images/masterpanel_spacer.png) no-repeat right 0;
|
||||
|
|
|
@ -172,7 +172,7 @@ function updatePlaybar(){
|
|||
|
||||
$('#time-elapsed').text(convertToHHMMSS(approximateServerTime - songStartRoughly));
|
||||
$('#time-remaining').text(convertToHHMMSS(songEndRoughly - approximateServerTime));
|
||||
$('#song-length').text(convertToHHMMSSmm(currentSong.songLengthMs));
|
||||
$('#song-length').text(convertToHHMMSS(currentSong.songLengthMs));
|
||||
}
|
||||
/* Column 1 update */
|
||||
$('#playlist').text($.i18n._("Current Show:"));
|
||||
|
|
|
@ -73,10 +73,7 @@ function convertToHHMMSS(timeInMS){
|
|||
minutes = "0" + minutes;
|
||||
if (seconds.length == 1)
|
||||
seconds = "0" + seconds;
|
||||
if (hours == "00")
|
||||
return minutes + ":" + seconds;
|
||||
else
|
||||
return hours + ":" + minutes + ":" + seconds;
|
||||
return hours + ":" + minutes + ":" + seconds;
|
||||
}
|
||||
|
||||
function convertToHHMMSSmm(timeInMS){
|
||||
|
|
Loading…
Reference in New Issue