From b4d8c72869882ad4acf5d2b275d242c2116c3b37 Mon Sep 17 00:00:00 2001 From: denise Date: Mon, 7 May 2012 16:08:26 -0400 Subject: [PATCH 1/2] CC-3765: When master resource and schedule source are all ON, the current playing area only shows scheduled resource's name -fixed --- airtime_mvc/public/js/airtime/dashboard/playlist.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/public/js/airtime/dashboard/playlist.js b/airtime_mvc/public/js/airtime/dashboard/playlist.js index c61254857..cbf97c640 100644 --- a/airtime_mvc/public/js/airtime/dashboard/playlist.js +++ b/airtime_mvc/public/js/airtime/dashboard/playlist.js @@ -85,7 +85,7 @@ function updateProgressBarValue(){ var scheduled_play_div = $("#scheduled_play_div") var scheduled_play_line_to_switch = scheduled_play_div.parent().find(".line-to-switch") - if (currentSong !== null){ + if (currentSong !== null && !master_dj_on_air && !live_dj_on_air){ songPercentDone = (estimatedSchedulePosixTime - currentSong.songStartPosixTime)/currentSong.songLengthMs*100; if (songPercentDone < 0 || songPercentDone > 100){ songPercentDone = 0; @@ -149,7 +149,7 @@ function updatePlaybar(){ $('#previous').empty(); $('#prev-length').empty(); } - if (currentSong !== null){ + if (currentSong !== null && !master_dj_on_air && !live_dj_on_air){ if (currentSong.record == "1") $('#current').html("Recording: "+currentSong.name+","); else @@ -185,7 +185,7 @@ function updatePlaybar(){ $('#time-elapsed').empty(); $('#time-remaining').empty(); $('#song-length').empty(); - if (currentSong !== null){ + if (currentSong !== null && !master_dj_on_air && !live_dj_on_air){ $('#start').text(currentSong.starts.split(' ')[1]); $('#end').text(currentSong.ends.split(' ')[1]); From 9203e8c5d6e3cabba3f06f34b1b7f03c4c6e66d3 Mon Sep 17 00:00:00 2001 From: denise Date: Mon, 7 May 2012 16:24:59 -0400 Subject: [PATCH 2/2] CC-3768: Reduce number of columns selected by default on the Playlist Builder screen -fixed --- airtime_mvc/public/js/airtime/library/library.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index e98674ed9..69e0de66d 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -217,8 +217,8 @@ var AIRTIME = (function(AIRTIME) { /* Title */ {"sTitle": "Title", "mDataProp": "track_title", "sClass": "library_title", "sWidth": "170px"}, /* Creator */ {"sTitle": "Creator", "mDataProp": "artist_name", "sClass": "library_creator", "sWidth": "160px"}, /* Album */ {"sTitle": "Album", "mDataProp": "album_title", "sClass": "library_album", "sWidth": "150px"}, - /* Genre */ {"sTitle": "Genre", "mDataProp": "genre", "sClass": "library_genre", "sWidth": "100px"}, - /* Year */ {"sTitle": "Year", "mDataProp": "year", "sClass": "library_year", "sWidth": "60px"}, + /* Genre */ {"sTitle": "Genre", "mDataProp": "genre", "bVisible": false, "sClass": "library_genre", "sWidth": "100px"}, + /* Year */ {"sTitle": "Year", "mDataProp": "year", "bVisible": false, "sClass": "library_year", "sWidth": "60px"}, /* Length */ {"sTitle": "Length", "mDataProp": "length", "sClass": "library_length", "sWidth": "80px"}, /* Upload Time */ {"sTitle": "Uploaded", "mDataProp": "utime", "sClass": "library_upload_time", "sWidth": "125px"}, /* Last Modified */ {"sTitle": "Last Modified", "mDataProp": "mtime", "bVisible": false, "sClass": "library_modified_time", "sWidth": "125px"},