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

Merge branch 'master' of dev.sourcefabric.org:campcaster

This commit is contained in:
Naomi 2011-02-09 18:48:05 -05:00
parent e95b877960 313252f93a
commit 8d311a7cc3
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/views/scripts/nowplaying/index.phtml
View File

@ -1,4 +1,4 @@
<div class="button-bar-top"> <div class="button-bar-top">
<a href="javascript:void(0)" class="toggle-button-active end-button" id="now_view">Now View</a><a href="javascript:void(0)" class="toggle-button" id="day_view">Day View</a> <a href="javascript:void(0)" class="toggle-button-active" id="now_view">Now View</a><a href="javascript:void(0)" class="toggle-button end-button" id="day_view">Day View</a>
</div> </div>
<div id='demo'></div> <div id='demo'></div>

BIN
public/css/images/progressbar_show_red.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 150 B

7
public/css/styles.css
View File

@ -174,7 +174,7 @@ select {
border-width:1px 1px 0 1px; border-width:1px 1px 0 1px;
background:#141414 url(images/progressbar_bg.png) repeat-x 0 0; background:#141414 url(images/progressbar_bg.png) repeat-x 0 0;
} }
.progressbar .progress-song, .progressbar .progress-show { .progressbar .progress-song, .progressbar .progress-show, .progress-show-red {
height:4px; height:4px;
width:0%; width:0%;
background:#f97202 url(images/progressbar_song.png) repeat-x 0 0; background:#f97202 url(images/progressbar_song.png) repeat-x 0 0;
@ -182,6 +182,9 @@ select {
.progressbar .progress-show { .progressbar .progress-show {
background:#02cef9 url(images/progressbar_show.png) repeat-x 0 0; background:#02cef9 url(images/progressbar_show.png) repeat-x 0 0;
} }
.progressbar .progress-show-red {
background:#02cef9 url(images/progressbar_show_red.png) repeat-x 0 0;
}
.now-playing-info .lenght { .now-playing-info .lenght {
color:#c4c4c4; color:#c4c4c4;
padding-left:6px; padding-left:6px;
@ -1235,4 +1238,4 @@ ul.errors li {
} }
#schedule-add-show .button-bar { #schedule-add-show .button-bar {
height: 28px; height: 28px;
margin: 0 0 8px 0; margin: 0 0 8px 0;

11
public/js/playlist/playlist.js
View File

@ -92,13 +92,16 @@ function updateProgressBarValue(){
if (currentSong.length > 0){ if (currentSong.length > 0){
songPercentDone = (estimatedSchedulePosixTime - currentSong[0].songStartPosixTime)/currentSong[0].songLengthMs*100; songPercentDone = (estimatedSchedulePosixTime - currentSong[0].songStartPosixTime)/currentSong[0].songLengthMs*100;
if (songPercentDone < 0 || songPercentDone > 100){ if (songPercentDone < 0 || songPercentDone > 100){
songPercentDone = 0; songPercentDone = 0;
currentSong = new Array(); currentSong = new Array();
} else { } else {
$('#on-air-info').attr("class", "on-air-info on"); $('#on-air-info').attr("class", "on-air-info on");
$('#progress-show').attr("class", "progress-show");
} }
} else } else {
$('#on-air-info').attr("class", "on-air-info off"); $('#on-air-info').attr("class", "on-air-info off");
$('#progress-show').attr("class", "progress-show-red");
}
$('#progress-bar').attr("style", "width:"+songPercentDone+"%"); $('#progress-bar').attr("style", "width:"+songPercentDone+"%");
//calculate how much time left to next song if there is any //calculate how much time left to next song if there is any
@ -132,7 +135,7 @@ function updatePlaybar(){
/* Column 0 update */ /* Column 0 update */
$('#previous').empty(); $('#previous').empty();
$('#prev-length').empty(); $('#prev-length').empty();
$('#current').text("Current:"); $('#current').html("Current: <span style='color:red; font-weight:bold'>Nothing Scheduled</span>");
$('#next').empty(); $('#next').empty();
$('#next-length').empty(); $('#next-length').empty();
if (previousSongs.length > 0){ if (previousSongs.length > 0){