From 5a17294811bb90d803e8e632360d7e46515bf875 Mon Sep 17 00:00:00 2001 From: Naomi Date: Tue, 1 Apr 2014 14:12:01 -0400 Subject: [PATCH] CC-5765 : Fixing up history page to match UI/UX removing bootstrap datetimepicker, with better jQuery datetimepicker that matches UI. --- .../controllers/PlayouthistoryController.php | 3 - airtime_mvc/application/forms/EditHistory.php | 3 - .../application/forms/EditHistoryItem.php | 8 +- .../scripts/form/edit-history-item.phtml | 9 +- .../css/bootstrap-datetimepicker.min.css | 8 - .../public/css/jquery.ui.timepicker.css | 72 - .../js/airtime/playouthistory/historytable.js | 35 +- .../js/timepicker/jquery.ui.timepicker.js | 1345 ----------------- 8 files changed, 20 insertions(+), 1463 deletions(-) delete mode 100644 airtime_mvc/public/css/bootstrap-datetimepicker.min.css delete mode 100644 airtime_mvc/public/css/jquery.ui.timepicker.css delete mode 100644 airtime_mvc/public/js/timepicker/jquery.ui.timepicker.js diff --git a/airtime_mvc/application/controllers/PlayouthistoryController.php b/airtime_mvc/application/controllers/PlayouthistoryController.php index 077cce0b2..9ced0cd49 100644 --- a/airtime_mvc/application/controllers/PlayouthistoryController.php +++ b/airtime_mvc/application/controllers/PlayouthistoryController.php @@ -91,14 +91,11 @@ class PlayouthistoryController extends Zend_Controller_Action $this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/TableTools-2.1.5/js/TableTools.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.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/playouthistory/historytable.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); - $this->view->headLink()->appendStylesheet($baseUrl.'css/bootstrap-datetimepicker.min.css?'.$CC_CONFIG['airtime_version']); $this->view->headLink()->appendStylesheet($baseUrl.'js/datatables/plugin/TableTools-2.1.5/css/TableTools.css?'.$CC_CONFIG['airtime_version']); - $this->view->headLink()->appendStylesheet($baseUrl.'css/jquery.ui.timepicker.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/jquery.contextMenu.css?'.$CC_CONFIG['airtime_version']); diff --git a/airtime_mvc/application/forms/EditHistory.php b/airtime_mvc/application/forms/EditHistory.php index 9d98b1f80..9fdc75643 100644 --- a/airtime_mvc/application/forms/EditHistory.php +++ b/airtime_mvc/application/forms/EditHistory.php @@ -3,9 +3,6 @@ class Application_Form_EditHistory extends Zend_Form { const VALIDATE_DATETIME_FORMAT = 'yyyy-MM-dd HH:mm:ss'; - //this is used by the javascript widget, unfortunately h/H is opposite from Zend. - const TIMEPICKER_DATETIME_FORMAT = 'yyyy-MM-dd hh:mm:ss'; - const VALIDATE_DATE_FORMAT = 'yyyy-MM-dd'; const VALIDATE_TIME_FORMAT = 'HH:mm:ss'; diff --git a/airtime_mvc/application/forms/EditHistoryItem.php b/airtime_mvc/application/forms/EditHistoryItem.php index e80959200..fab23a42a 100644 --- a/airtime_mvc/application/forms/EditHistoryItem.php +++ b/airtime_mvc/application/forms/EditHistoryItem.php @@ -26,8 +26,8 @@ class Application_Form_EditHistoryItem extends Application_Form_EditHistory $starts->setValidators(array( new Zend_Validate_Date(self::VALIDATE_DATETIME_FORMAT) )); - $starts->setAttrib('class', self::TEXT_INPUT_CLASS." datepicker"); - $starts->setAttrib('data-format', self::TIMEPICKER_DATETIME_FORMAT); + $starts->setAttrib('class', self::TEXT_INPUT_CLASS); + //$starts->setAttrib('data-format', self::TIMEPICKER_DATETIME_FORMAT); $starts->addFilter('StringTrim'); $starts->setLabel(_('Start Time')); $starts->setDecorators(array('ViewHelper')); @@ -38,8 +38,8 @@ class Application_Form_EditHistoryItem extends Application_Form_EditHistory $ends->setValidators(array( new Zend_Validate_Date(self::VALIDATE_DATETIME_FORMAT) )); - $ends->setAttrib('class', self::TEXT_INPUT_CLASS." datepicker"); - $ends->setAttrib('data-format', self::TIMEPICKER_DATETIME_FORMAT); + $ends->setAttrib('class', self::TEXT_INPUT_CLASS); + //$ends->setAttrib('data-format', self::TIMEPICKER_DATETIME_FORMAT); $ends->addFilter('StringTrim'); $ends->setLabel(_('End Time')); $ends->setDecorators(array('ViewHelper')); diff --git a/airtime_mvc/application/views/scripts/form/edit-history-item.phtml b/airtime_mvc/application/views/scripts/form/edit-history-item.phtml index 8e902df09..519eac285 100644 --- a/airtime_mvc/application/views/scripts/form/edit-history-item.phtml +++ b/airtime_mvc/application/views/scripts/form/edit-history-item.phtml @@ -22,14 +22,7 @@
-
-
- getElement($name) ?> - - - -
-
+ getElement($name) ?> getElement($name)->hasErrors()) : ?>