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

Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x

This commit is contained in:
denise 2013-01-24 12:00:47 -05:00
parent 1e336fa2d7 548b73db42
commit f4f6f9043a
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
airtime_mvc/application/controllers/ScheduleController.php
View File

@ -96,7 +96,15 @@ class ScheduleController extends Zend_Controller_Action
$this->view->preloadShowForm = true; $this->view->preloadShowForm = true;
} }
$this->view->headScript()->appendScript("var weekStart = ".Application_Model_Preference::GetWeekStartDay().";"); $this->view->headScript()->appendScript(
"var calendarPref = {};\n".
"calendarPref.weekStart = ".Application_Model_Preference::GetWeekStartDay().";\n".
"calendarPref.timestamp = ".time().";\n".
"calendarPref.timezoneOffset = ".date("Z").";\n".
"calendarPref.timeScale = '".Application_Model_Preference::GetCalendarTimeScale()."';\n".
"calendarPref.timeInterval = ".Application_Model_Preference::GetCalendarTimeInterval().";\n".
"calendarPref.weekStartDay = ".Application_Model_Preference::GetWeekStartDay().";\n"
);
} }
public function eventFeedAction() public function eventFeedAction()

4
airtime_mvc/public/js/airtime/schedule/add-show.js
View File

@ -37,7 +37,7 @@ function createDateInput(el, onSelect) {
dayNamesMin: i18n_days_short, dayNamesMin: i18n_days_short,
closeText: $.i18n._('Close'), closeText: $.i18n._('Close'),
//showButtonPanel: true, //showButtonPanel: true,
firstDay: weekStart firstDay: calendarPref.weekStart
}); });
} }
@ -324,7 +324,7 @@ function setAddShowEvents() {
dayNamesMin: i18n_days_short, dayNamesMin: i18n_days_short,
closeText: 'Close', closeText: 'Close',
showButtonPanel: true, showButtonPanel: true,
firstDay: weekStart firstDay: calendarPref.weekStart
}); });
form.find('input[name^="add_show_rebroadcast_time"]').timepicker({ form.find('input[name^="add_show_rebroadcast_time"]').timepicker({
amPmText: ['', ''], amPmText: ['', ''],

5
airtime_mvc/public/js/airtime/schedule/schedule.js
View File

@ -328,8 +328,9 @@ function alertShowErrorAndReload(){
} }
$(document).ready(function() { $(document).ready(function() {
$.ajax({ url: baseUrl+"Api/calendar-init/format/json", dataType:"json", success:createFullCalendar var data = {};
, error:function(jqXHR, textStatus, errorThrown){}}); data.calendarInit = calendarPref;
createFullCalendar(data);
setInterval(checkCalendarSCUploadStatus, 5000); setInterval(checkCalendarSCUploadStatus, 5000);