Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch '2.5.x' into cc-5232-show-timezone

Browse source
This commit is contained in:
denise 2013-09-25 17:24:44 -04:00
commit a8a02704f3
4 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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;

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

@ -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:"));

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

@ -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){