-basic now playing bar
This commit is contained in:
parent
616b85ddef
commit
8d5aea0d14
4 changed files with 54 additions and 49 deletions
|
@ -276,28 +276,3 @@ class ScheduleController extends Zend_Controller_Action
|
|||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -479,10 +479,10 @@ class Schedule {
|
|||
|
||||
private static function GetPreviousItems($timeNow, $prevCount = 1){
|
||||
global $CC_CONFIG, $CC_DBC;
|
||||
$sql = "SELECT * FROM $CC_CONFIG[scheduleTable], $CC_CONFIG[filesTable]"
|
||||
." WHERE ($CC_CONFIG[scheduleTable].ends < TIMESTAMP '$timeNow')"
|
||||
." AND ($CC_CONFIG[scheduleTable].file_id = $CC_CONFIG[filesTable].id)"
|
||||
." ORDER BY $CC_CONFIG[scheduleTable].starts DESC"
|
||||
$sql = "SELECT * FROM $CC_CONFIG[scheduleTable] st, $CC_CONFIG[filesTable] ft"
|
||||
." WHERE (st.ends < TIMESTAMP '$timeNow')"
|
||||
." AND (st.file_id = ft.id)"
|
||||
." ORDER BY st.starts DESC"
|
||||
." LIMIT $prevCount";
|
||||
$rows = $CC_DBC->GetAll($sql);
|
||||
return $rows;
|
||||
|
@ -491,20 +491,21 @@ class Schedule {
|
|||
private static function GetCurrentlyPlaying($timeNow){
|
||||
global $CC_CONFIG, $CC_DBC;
|
||||
|
||||
$sql = "SELECT * FROM $CC_CONFIG[scheduleTable], $CC_CONFIG[filesTable]"
|
||||
." WHERE ($CC_CONFIG[scheduleTable].starts < TIMESTAMP '$timeNow')"
|
||||
." AND ($CC_CONFIG[scheduleTable].ends > TIMESTAMP '$timeNow')"
|
||||
." AND ($CC_CONFIG[scheduleTable].file_id = $CC_CONFIG[filesTable].id)";
|
||||
$sql = "SELECT *, pt.name as playlistName FROM $CC_CONFIG[scheduleTable] st, $CC_CONFIG[filesTable] ft, $CC_CONFIG[playListTable] pt"
|
||||
." WHERE (st.starts < TIMESTAMP '$timeNow')"
|
||||
." AND (st.ends > TIMESTAMP '$timeNow')"
|
||||
." AND (st.playlist_id = pt.id)"
|
||||
." AND (st.file_id = ft.id)";
|
||||
$rows = $CC_DBC->GetAll($sql);
|
||||
return $rows;
|
||||
}
|
||||
|
||||
private static function GetNextItems($timeNow, $nextCount = 1) {
|
||||
global $CC_CONFIG, $CC_DBC;
|
||||
$sql = "SELECT * FROM $CC_CONFIG[scheduleTable], $CC_CONFIG[filesTable]"
|
||||
." WHERE ($CC_CONFIG[scheduleTable].starts > TIMESTAMP '$timeNow')"
|
||||
." AND ($CC_CONFIG[scheduleTable].file_id = $CC_CONFIG[filesTable].id)"
|
||||
." ORDER BY $CC_CONFIG[scheduleTable].starts"
|
||||
$sql = "SELECT * FROM $CC_CONFIG[scheduleTable] st, $CC_CONFIG[filesTable] ft"
|
||||
." WHERE (st.starts > TIMESTAMP '$timeNow')"
|
||||
." AND (st.file_id = ft.id)"
|
||||
." ORDER BY st.starts"
|
||||
." LIMIT $nextCount";
|
||||
$rows = $CC_DBC->GetAll($sql);
|
||||
return $rows;
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
<div>Volume</div>
|
||||
</div>
|
||||
|
||||
<div id='col1' style='float:left; width: 30%; height: 100%;'>
|
||||
<div id='col1' style='float:left; width: 25%; height: 100%;'>
|
||||
<div>Show: <span id='show'></span></div>
|
||||
<div>Playlist: <span id='playlist'></span></div>
|
||||
<div>Host: <span id='host'></span></div>
|
||||
|
@ -15,7 +15,8 @@
|
|||
<div>Upcoming: <span id='next'></span></div>
|
||||
</div>
|
||||
|
||||
<div id='list0' style='float:left; width: 30%; height: 100%;'></div>
|
||||
<div>Start: <span id='start'></span> End: <span id='end'></span></div>
|
||||
<div id='progressbar'></div>
|
||||
<div id='list0' style='float:left; width: 35%; height: 100%;'></div>
|
||||
<div>Start: <span id='start'></span></div>
|
||||
<div>End: <span id='end'></span></div>
|
||||
<div><span id='progressbar'></span> <span id='songposition'></span> | <span id='songlength'></span></div>
|
||||
</div>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue