diff --git a/application/models/Schedule.php b/application/models/Schedule.php index f6e890d72..c42344fde 100644 --- a/application/models/Schedule.php +++ b/application/models/Schedule.php @@ -474,7 +474,8 @@ class Schedule { $timeNow = Schedule::GetSchedulerTime(); return array("schedulerTime"=>$timeNow,"previous"=>Schedule::GetPreviousItems($timeNow), "current"=>Schedule::GetCurrentlyPlaying($timeNow), - "next"=>Schedule::GetNextItems($timeNow)); + "next"=>Schedule::GetNextItems($timeNow), + "timezone"=> date("T")); } public static function GetPreviousItems($timeNow, $prevCount = 1){ diff --git a/application/views/scripts/partialviews/header.phtml b/application/views/scripts/partialviews/header.phtml index 498f62cbc..5795d1239 100644 --- a/application/views/scripts/partialviews/header.phtml +++ b/application/views/scripts/partialviews/header.phtml @@ -23,7 +23,7 @@
diff --git a/public/js/playlist/playlist.js b/public/js/playlist/playlist.js index 1786a32f5..77dc4cdf0 100644 --- a/public/js/playlist/playlist.js +++ b/public/js/playlist/playlist.js @@ -188,6 +188,8 @@ function calcAdditionalData(currentItem, bUpdateGlobalValues){ function parseItems(obj){ var schedulePosixTime = convertDateToPosixTime(obj.schedulerTime); + + $('#time-zone').text(obj.timezone); previousSongs = obj.previous; currentSong = obj.current;