diff --git a/airtime_mvc/application/views/scripts/partialviews/header.phtml b/airtime_mvc/application/views/scripts/partialviews/header.phtml index 0432dcee9..29931f8f8 100644 --- a/airtime_mvc/application/views/scripts/partialviews/header.phtml +++ b/airtime_mvc/application/views/scripts/partialviews/header.phtml @@ -2,8 +2,8 @@
-
-
+
+
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index 2d9ac34b7..a209b1e59 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -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; diff --git a/airtime_mvc/public/js/airtime/dashboard/dashboard.js b/airtime_mvc/public/js/airtime/dashboard/dashboard.js index 80a9521d5..e4ffc1faf 100644 --- a/airtime_mvc/public/js/airtime/dashboard/dashboard.js +++ b/airtime_mvc/public/js/airtime/dashboard/dashboard.js @@ -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:")); diff --git a/airtime_mvc/public/js/airtime/dashboard/helperfunctions.js b/airtime_mvc/public/js/airtime/dashboard/helperfunctions.js index 87a50796f..bccef632b 100644 --- a/airtime_mvc/public/js/airtime/dashboard/helperfunctions.js +++ b/airtime_mvc/public/js/airtime/dashboard/helperfunctions.js @@ -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){