CC-5765 : Fixing up history page to match UI/UX
upgraded timepicker,removing bootstrap datepicker js.
This commit is contained in:
parent
ee6be2e22c
commit
0b01f598ae
|
@ -83,6 +83,7 @@ class PlayouthistoryController extends Zend_Controller_Action
|
||||||
|
|
||||||
$this->view->date_form = $form;
|
$this->view->date_form = $form;
|
||||||
|
|
||||||
|
$this->view->headScript()->appendFile($baseUrl.'js/timepicker/jquery.ui.timepicker.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
|
||||||
$this->view->headScript()->appendFile($baseUrl.'js/contextmenu/jquery.contextMenu.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
|
$this->view->headScript()->appendFile($baseUrl.'js/contextmenu/jquery.contextMenu.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
|
||||||
$this->view->headScript()->appendFile($baseUrl.'js/datatables/js/jquery.dataTables.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
|
$this->view->headScript()->appendFile($baseUrl.'js/datatables/js/jquery.dataTables.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
|
||||||
$this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.pluginAPI.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
|
$this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.pluginAPI.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
|
||||||
|
@ -98,6 +99,7 @@ class PlayouthistoryController extends Zend_Controller_Action
|
||||||
$this->view->headLink()->appendStylesheet($baseUrl.'css/playouthistory.css?'.$CC_CONFIG['airtime_version']);
|
$this->view->headLink()->appendStylesheet($baseUrl.'css/playouthistory.css?'.$CC_CONFIG['airtime_version']);
|
||||||
$this->view->headLink()->appendStylesheet($baseUrl.'css/history_styles.css?'.$CC_CONFIG['airtime_version']);
|
$this->view->headLink()->appendStylesheet($baseUrl.'css/history_styles.css?'.$CC_CONFIG['airtime_version']);
|
||||||
$this->view->headLink()->appendStylesheet($baseUrl.'css/jquery.contextMenu.css?'.$CC_CONFIG['airtime_version']);
|
$this->view->headLink()->appendStylesheet($baseUrl.'css/jquery.contextMenu.css?'.$CC_CONFIG['airtime_version']);
|
||||||
|
$this->view->headLink()->appendStylesheet($baseUrl.'css/jquery.ui.timepicker.css?'.$CC_CONFIG['airtime_version']);
|
||||||
|
|
||||||
//set datatables columns for display of data.
|
//set datatables columns for display of data.
|
||||||
$historyService = new Application_Service_HistoryService();
|
$historyService = new Application_Service_HistoryService();
|
||||||
|
|
|
@ -0,0 +1,57 @@
|
||||||
|
/*
|
||||||
|
* Timepicker stylesheet
|
||||||
|
* Highly inspired from datepicker
|
||||||
|
* FG - Nov 2010 - Web3R
|
||||||
|
*
|
||||||
|
* version 0.0.3 : Fixed some settings, more dynamic
|
||||||
|
* version 0.0.4 : Removed width:100% on tables
|
||||||
|
* version 0.1.1 : set width 0 on tables to fix an ie6 bug
|
||||||
|
*/
|
||||||
|
|
||||||
|
.ui-timepicker-inline { display: inline; }
|
||||||
|
|
||||||
|
#ui-timepicker-div { padding: 0.2em; }
|
||||||
|
.ui-timepicker-table { display: inline-table; width: 0; }
|
||||||
|
.ui-timepicker-table table { margin:0.15em 0 0 0; border-collapse: collapse; }
|
||||||
|
|
||||||
|
.ui-timepicker-hours, .ui-timepicker-minutes { padding: 0.2em; }
|
||||||
|
|
||||||
|
.ui-timepicker-table .ui-timepicker-title { line-height: 1.8em; text-align: center; }
|
||||||
|
.ui-timepicker-table td { padding: 0.1em; width: 2.2em; }
|
||||||
|
.ui-timepicker-table th.periods { padding: 0.1em; width: 2.2em; }
|
||||||
|
|
||||||
|
/* span for disabled cells */
|
||||||
|
.ui-timepicker-table td span {
|
||||||
|
display:block;
|
||||||
|
padding:0.2em 0.3em 0.2em 0.5em;
|
||||||
|
width: 1.2em;
|
||||||
|
|
||||||
|
text-align:right;
|
||||||
|
text-decoration:none;
|
||||||
|
}
|
||||||
|
/* anchors for clickable cells */
|
||||||
|
.ui-timepicker-table td a {
|
||||||
|
display:block;
|
||||||
|
padding:0.2em 0.3em 0.2em 0.5em;
|
||||||
|
width: 1.2em;
|
||||||
|
cursor: pointer;
|
||||||
|
text-align:right;
|
||||||
|
text-decoration:none;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* buttons and button pane styling */
|
||||||
|
.ui-timepicker .ui-timepicker-buttonpane {
|
||||||
|
background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0;
|
||||||
|
}
|
||||||
|
.ui-timepicker .ui-timepicker-buttonpane button { margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
|
||||||
|
/* The close button */
|
||||||
|
.ui-timepicker .ui-timepicker-close { float: right }
|
||||||
|
|
||||||
|
/* the now button */
|
||||||
|
.ui-timepicker .ui-timepicker-now { float: left; }
|
||||||
|
|
||||||
|
/* the deselect button */
|
||||||
|
.ui-timepicker .ui-timepicker-deselect { float: left; }
|
||||||
|
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue