Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed CC-5045 and Now Playing time remaining style improvements

This commit is contained in:
Albert Santoni 2013-09-25 16:40:20 -04:00
parent 86c570744a
commit 99669c78a0
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
airtime_mvc/application/views/scripts/partialviews/header.phtml
View File

@ -2,8 +2,8 @@
<div class="now-playing-block"> <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="text-row"><strong><? echo _("Previous:"); ?></strong> <span id='previous'></span> <span id='prev-length'></span></div>
<div class="now-playing-info song"> <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> <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><span class="length" id="song-length"></span></div> <span id='current'></span></div>
<div class="progressbar"> <div class="progressbar">
<div class="progress-song" id="progress-bar" style="width:0%;"></div> <div class="progress-song" id="progress-bar" style="width:0%;"></div>
</div> </div>

7
airtime_mvc/public/css/styles.css
View File

@ -246,7 +246,7 @@ select {
margin-bottom:3px; margin-bottom:3px;
} }
.time-elapsed { .time-elapsed {
color:#9b9b9b; color:#c4c4c4;
padding-right:6px; padding-right:6px;
} }
.time-remaining { .time-remaining {
@ -274,6 +274,11 @@ select {
padding-left:6px; padding-left:6px;
} }
.now-playing-info .song-length {
color:#9b9b9b;
padding-right:6px;
}
.on-air-block { .on-air-block {
padding:0 12px 0 0; padding:0 12px 0 0;
background:url(images/masterpanel_spacer.png) no-repeat right 0; background:url(images/masterpanel_spacer.png) no-repeat right 0;

2
airtime_mvc/public/js/airtime/dashboard/dashboard.js
View File

@ -172,7 +172,7 @@ function updatePlaybar(){
$('#time-elapsed').text(convertToHHMMSS(approximateServerTime - songStartRoughly)); $('#time-elapsed').text(convertToHHMMSS(approximateServerTime - songStartRoughly));
$('#time-remaining').text(convertToHHMMSS(songEndRoughly - approximateServerTime)); $('#time-remaining').text(convertToHHMMSS(songEndRoughly - approximateServerTime));
$('#song-length').text(convertToHHMMSSmm(currentSong.songLengthMs)); $('#song-length').text(convertToHHMMSS(currentSong.songLengthMs));
} }
/* Column 1 update */ /* Column 1 update */
$('#playlist').text($.i18n._("Current Show:")); $('#playlist').text($.i18n._("Current Show:"));

5
airtime_mvc/public/js/airtime/dashboard/helperfunctions.js
View File

@ -73,10 +73,7 @@ function convertToHHMMSS(timeInMS){
minutes = "0" + minutes; minutes = "0" + minutes;
if (seconds.length == 1) if (seconds.length == 1)
seconds = "0" + seconds; seconds = "0" + seconds;
if (hours == "00") return hours + ":" + minutes + ":" + seconds;
return minutes + ":" + seconds;
else
return hours + ":" + minutes + ":" + seconds;
} }
function convertToHHMMSSmm(timeInMS){ function convertToHHMMSSmm(timeInMS){