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

showing time first for endtime box.

This commit is contained in:
Naomi Aro 2013-08-22 21:39:46 -04:00
parent 48e6ddbb04
commit af822bb5b9
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
airtime_mvc/application/controllers/PlayouthistoryController.php
View File

@ -61,7 +61,8 @@ class PlayouthistoryController extends Zend_Controller_Action
$offset = date("Z") * -1; $offset = date("Z") * -1;
$this->view->headScript()->appendScript("var serverTimezoneOffset = {$offset}; //in seconds"); $this->view->headScript()->appendScript("var serverTimezoneOffset = {$offset}; //in seconds");
$this->view->headScript()->appendFile($baseUrl.'js/timepicker/jquery.ui.timepicker.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'js/timepicker/jquery.ui.timepicker.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/bootstrap-datetime/bootstrap-datetimepicker.min.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'js/bootstrap-datetime/bootstrap-datetimepicker.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
//$this->view->headScript()->appendFile($baseUrl.'js/bootstrap-datetime/bootstrap-datetimepicker.min.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/airtime/buttons/buttons.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'js/airtime/buttons/buttons.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/airtime/utilities/utilities.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'js/airtime/utilities/utilities.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/airtime/playouthistory/historytable.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'js/airtime/playouthistory/historytable.js?'.$CC_CONFIG['airtime_version'],'text/javascript');

10
airtime_mvc/public/js/airtime/playouthistory/historytable.js
View File

@ -292,14 +292,20 @@ var AIRTIME = (function(AIRTIME) {
modal: false, modal: false,
open: function( event, ui ) { open: function( event, ui ) {
$hisDialogEl.find('.date').datetimepicker(); //$hisDialogEl.find('.date').datetimepicker();
//icon-time
var $startPicker = $hisDialogEl.find('#his_item_starts_datetimepicker'); var $startPicker = $hisDialogEl.find('#his_item_starts_datetimepicker');
$startPicker.datetimepicker();
var $endPicker = $hisDialogEl.find('#his_item_ends_datetimepicker'); var $endPicker = $hisDialogEl.find('#his_item_ends_datetimepicker');
$endPicker.datetimepicker({
showTimeFirst: true
});
$startPicker.on('changeDate', function(e) { $startPicker.on('changeDate', function(e) {
$endPicker.data('datetimepicker').setLocalDate(e.localDate); $endPicker.data('datetimepicker').setLocalDate(e.localDate);
}); });
}, },
close: function() { close: function() {