From eb348d60a8d5b797cc9760e74bce063061253fee Mon Sep 17 00:00:00 2001
From: arknu <asbjoern@stentebjerg.net>
Date: Sun, 5 Oct 2014 00:58:37 +0200
Subject: [PATCH] styling tweaks for new datepicker

---
 .../src/less/property-editors.less                    |  5 +++++
 .../datepicker/datepicker.controller.js               | 11 +++++++++--
 .../views/propertyeditors/datepicker/datepicker.html  |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
index 036dafec08..468a66a84c 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -492,3 +492,8 @@ ul.color-picker li a  {
 .umb-tags .tag i{padding: 2px;}
 .umb-tags input{border: none; background: white}
 
+//
+// Date/time picker
+// --------------------------------------------------
+.bootstrap-datetimepicker-widget .btn{padding: 0;}
+.bootstrap-datetimepicker-widget .picker-switch .btn{ background: none; border: none;}
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js
index db9912918a..3b030e8cb0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js
@@ -4,8 +4,15 @@ function dateTimePickerController($scope, notificationsService, assetsService, a
     var config = {
         pickDate: true,
         pickTime: true,
-        pick12HourFormat: false,
-        format: "yyyy-MM-dd hh:mm:ss"
+		useSeconds: true,
+        format: "YYYY-MM-DD HH:mm:ss",
+		icons: {
+                    time: "icon-time",
+                    date: "icon-calendar",
+                    up: "icon-chevron-up",
+                    down: "icon-chevron-down"
+                }
+
     };
 
     //map the user config
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html
index 1794464002..95452e0f19 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html
@@ -5,7 +5,7 @@
                 ng-required="model.validation.mandatory"   
                 val-server="value" />
         <span class="add-on">
-            <i data-time-icon="icon-time" data-date-icon="icon-calendar"></i>
+            <i class="icon-calendar"></i>
         </span>        
     </div>