From c7be037d0c86c2e70a74783c3d22d22a8fa5f1fa Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 15 Dec 2014 18:03:29 +0100 Subject: [PATCH] webui: fix the css clash for date picker, fixes #2553 --- src/webui/static/app/ext.css | 4 ++-- src/webui/static/app/tvheadend.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/webui/static/app/ext.css b/src/webui/static/app/ext.css index feb07984..596b0809 100644 --- a/src/webui/static/app/ext.css +++ b/src/webui/static/app/ext.css @@ -510,12 +510,12 @@ width: 100px; } -.x-date-date { +.x-nice-date { display: inline-block; width: 6em; } -.x-date-time { +.x-nice-time { display: inline-block; width: 4em; text-align: right; diff --git a/src/webui/static/app/tvheadend.js b/src/webui/static/app/tvheadend.js index afa5fb63..53106749 100644 --- a/src/webui/static/app/tvheadend.js +++ b/src/webui/static/app/tvheadend.js @@ -156,8 +156,8 @@ Ext.Ajax.request({ */ tvheadend.niceDate = function(dt) { var d = new Date(dt); - return '
' + d.toLocaleDateString() + '
' + - '
' + d.toLocaleTimeString() + '
'; + return '
' + d.toLocaleDateString() + '
' + + '
' + d.toLocaleTimeString() + '
'; } /**