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

-timezone now correct on now playing bar

Browse source
This commit is contained in:
mkonecny 2011-01-31 11:47:52 -05:00
parent 24da57ae4f
commit 42490d53aa
3 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
application/models/Schedule.php
View file

@ -474,7 +474,8 @@ class Schedule {
$timeNow = Schedule::GetSchedulerTime(); $timeNow = Schedule::GetSchedulerTime();
return array("schedulerTime"=>$timeNow,"previous"=>Schedule::GetPreviousItems($timeNow), return array("schedulerTime"=>$timeNow,"previous"=>Schedule::GetPreviousItems($timeNow),
"current"=>Schedule::GetCurrentlyPlaying($timeNow), "current"=>Schedule::GetCurrentlyPlaying($timeNow),
"next"=>Schedule::GetNextItems($timeNow)); "next"=>Schedule::GetNextItems($timeNow),
"timezone"=> date("T"));
} }
public static function GetPreviousItems($timeNow, $prevCount = 1){ public static function GetPreviousItems($timeNow, $prevCount = 1){

2
application/views/scripts/partialviews/header.phtml
View file

@ -23,7 +23,7 @@
<ul> <ul>
<li>Station time</li> <li>Station time</li>
<li class="time" id="time"></li> <li class="time" id="time"></li>
<li class="time-zone">CET</li> <li class="time-zone"><span id="time-zone"></span></li>
</ul> </ul>
</div> </div>
<div class="personal-block"> <div class="personal-block">

2
public/js/playlist/playlist.js
View file

@ -188,6 +188,8 @@ function calcAdditionalData(currentItem, bUpdateGlobalValues){
function parseItems(obj){ function parseItems(obj){
var schedulePosixTime = convertDateToPosixTime(obj.schedulerTime); var schedulePosixTime = convertDateToPosixTime(obj.schedulerTime);
$('#time-zone').text(obj.timezone);
previousSongs = obj.previous; previousSongs = obj.previous;
currentSong = obj.current; currentSong = obj.current;