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

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Browse source
This commit is contained in:
Martin Konecny 2012-05-07 16:47:44 -04:00
commit 925a07b9c8
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
airtime_mvc/public/js/airtime/dashboard/playlist.js
View file

@ -85,7 +85,7 @@ function updateProgressBarValue(){
var scheduled_play_div = $("#scheduled_play_div") var scheduled_play_div = $("#scheduled_play_div")
var scheduled_play_line_to_switch = scheduled_play_div.parent().find(".line-to-switch") 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; songPercentDone = (estimatedSchedulePosixTime - currentSong.songStartPosixTime)/currentSong.songLengthMs*100;
if (songPercentDone < 0 || songPercentDone > 100){ if (songPercentDone < 0 || songPercentDone > 100){
songPercentDone = 0; songPercentDone = 0;
@ -149,7 +149,7 @@ function updatePlaybar(){
$('#previous').empty(); $('#previous').empty();
$('#prev-length').empty(); $('#prev-length').empty();
} }
if (currentSong !== null){ if (currentSong !== null && !master_dj_on_air && !live_dj_on_air){
if (currentSong.record == "1") if (currentSong.record == "1")
$('#current').html("<span style='color:red; font-weight:bold'>Recording: </span>"+currentSong.name+","); $('#current').html("<span style='color:red; font-weight:bold'>Recording: </span>"+currentSong.name+",");
else else
@ -185,7 +185,7 @@ function updatePlaybar(){
$('#time-elapsed').empty(); $('#time-elapsed').empty();
$('#time-remaining').empty(); $('#time-remaining').empty();
$('#song-length').empty(); $('#song-length').empty();
if (currentSong !== null){ if (currentSong !== null && !master_dj_on_air && !live_dj_on_air){
$('#start').text(currentSong.starts.split(' ')[1]); $('#start').text(currentSong.starts.split(' ')[1]);
$('#end').text(currentSong.ends.split(' ')[1]); $('#end').text(currentSong.ends.split(' ')[1]);

4
airtime_mvc/public/js/airtime/library/library.js
View file

@ -217,8 +217,8 @@ var AIRTIME = (function(AIRTIME) {
/* Title */ {"sTitle": "Title", "mDataProp": "track_title", "sClass": "library_title", "sWidth": "170px"}, /* Title */ {"sTitle": "Title", "mDataProp": "track_title", "sClass": "library_title", "sWidth": "170px"},
/* Creator */ {"sTitle": "Creator", "mDataProp": "artist_name", "sClass": "library_creator", "sWidth": "160px"}, /* Creator */ {"sTitle": "Creator", "mDataProp": "artist_name", "sClass": "library_creator", "sWidth": "160px"},
/* Album */ {"sTitle": "Album", "mDataProp": "album_title", "sClass": "library_album", "sWidth": "150px"}, /* Album */ {"sTitle": "Album", "mDataProp": "album_title", "sClass": "library_album", "sWidth": "150px"},
/* Genre */ {"sTitle": "Genre", "mDataProp": "genre", "sClass": "library_genre", "sWidth": "100px"}, /* Genre */ {"sTitle": "Genre", "mDataProp": "genre", "bVisible": false, "sClass": "library_genre", "sWidth": "100px"},
/* Year */ {"sTitle": "Year", "mDataProp": "year", "sClass": "library_year", "sWidth": "60px"}, /* Year */ {"sTitle": "Year", "mDataProp": "year", "bVisible": false, "sClass": "library_year", "sWidth": "60px"},
/* Length */ {"sTitle": "Length", "mDataProp": "length", "sClass": "library_length", "sWidth": "80px"}, /* Length */ {"sTitle": "Length", "mDataProp": "length", "sClass": "library_length", "sWidth": "80px"},
/* Upload Time */ {"sTitle": "Uploaded", "mDataProp": "utime", "sClass": "library_upload_time", "sWidth": "125px"}, /* 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"}, /* Last Modified */ {"sTitle": "Last Modified", "mDataProp": "mtime", "bVisible": false, "sClass": "library_modified_time", "sWidth": "125px"},