From 059c0d85073737942a8680e2a301f22f921b7b77 Mon Sep 17 00:00:00 2001
From: Naomi <naomiaro@gmail.com>
Date: Tue, 1 Apr 2014 12:59:27 -0400
Subject: [PATCH] CC-5762 : Playlist options validation

styling the datetimepicker to look better in less space.
---
 airtime_mvc/application/Bootstrap.php         |  2 +-
 .../public/css/jquery-ui-timepicker-addon.css | 19 +++++++++++++------
 .../public/js/airtime/common/common.js        |  4 ++++
 .../public/js/airtime/playlist/playlist.js    |  2 +-
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php
index 1f017f720..c8c313b29 100644
--- a/airtime_mvc/application/Bootstrap.php
+++ b/airtime_mvc/application/Bootstrap.php
@@ -80,7 +80,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
 
         //jPlayer css.
         $view->headLink()->appendStylesheet($baseUrl.'css/jplayer.airtime.audio.preview.css?'.$CC_CONFIG['airtime_version']);
-        $view->headLink()->appendStylesheet($baseUrl.'css/jquery.ui.timepicker.css?'.$CC_CONFIG['airtime_version']);
+        $view->headLink()->appendStylesheet($baseUrl.'css/jquery-ui-timepicker-addon.css?'.$CC_CONFIG['airtime_version']);
     }
 
     protected function _initHeadScript()
diff --git a/airtime_mvc/public/css/jquery-ui-timepicker-addon.css b/airtime_mvc/public/css/jquery-ui-timepicker-addon.css
index b93a85f62..25628d653 100644
--- a/airtime_mvc/public/css/jquery-ui-timepicker-addon.css
+++ b/airtime_mvc/public/css/jquery-ui-timepicker-addon.css
@@ -1,10 +1,17 @@
 .ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
-.ui-timepicker-div dl { text-align: left; }
-.ui-timepicker-div dl dt { height: 25px; margin-bottom: -25px; }
-.ui-timepicker-div dl dd { margin: 0 10px 10px 65px; }
+
 .ui-timepicker-div td { font-size: 90%; }
 .ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
 
-.ui-timepicker-rtl{ direction: rtl; }
-.ui-timepicker-rtl dl { text-align: right; }
-.ui-timepicker-rtl dl dd { margin: 0 65px 10px 10px; }
\ No newline at end of file
+.ui-timepicker-div dl { 
+	text-align: center; 
+}
+
+.ui-timepicker-div dt {
+	display: none;
+}
+
+.ui-timepicker-div dd, .ui-timepicker-div div {
+    display:inline;
+    margin: 0;
+}
\ No newline at end of file
diff --git a/airtime_mvc/public/js/airtime/common/common.js b/airtime_mvc/public/js/airtime/common/common.js
index 05fb4f05c..47b30bb96 100644
--- a/airtime_mvc/public/js/airtime/common/common.js
+++ b/airtime_mvc/public/js/airtime/common/common.js
@@ -57,6 +57,10 @@ $.datepicker.setDefaults($.datepicker.regional[""]);
 
 $.datetimepicker.regional[""].timeFormat = "HH:mm:ss";
 $.datetimepicker.regional[""].controlType = "select";
+$.datetimepicker.regional[""].hourText = "";
+$.datetimepicker.regional[""].minuteText = "";
+$.datetimepicker.regional[""].secondText = "";
+$.datetimepicker.regional[""].showTime = false;
 $.datetimepicker.setDefaults($.datetimepicker.regional[""]);
 
 function adjustDateToServerDate(date, serverTimezoneOffset){
diff --git a/airtime_mvc/public/js/airtime/playlist/playlist.js b/airtime_mvc/public/js/airtime/playlist/playlist.js
index 0a6f4d6b2..db8a04a1e 100644
--- a/airtime_mvc/public/js/airtime/playlist/playlist.js
+++ b/airtime_mvc/public/js/airtime/playlist/playlist.js
@@ -280,7 +280,7 @@ var AIRTIME = (function(AIRTIME){
     	
     	var datepickerOptions = Object.keys(numericCriteriaOptions);
     	if (type === "d" && datepickerOptions.indexOf(modifierValue) !== -1) {
-    		$el.find(".input_text").datepicker();
+    		$el.find(".input_text").datetimepicker();
     	}
     	
     	return $el;