From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 15 Dec 2014 17:03:29 +0000 (+0100)
Subject: webui: fix the css clash for date picker, fixes #2553
X-Git-Tag: v4.1~586
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7be037d0c86c2e70a74783c3d22d22a8fa5f1fa;p=thirdparty%2Ftvheadend.git

webui: fix the css clash for date picker, fixes #2553
---

diff --git a/src/webui/static/app/ext.css b/src/webui/static/app/ext.css
index feb079846..596b0809d 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 afa5fb63d..531067490 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 '<div class="x-date-date">' + d.toLocaleDateString() + '</div>' +
-           '<div class="x-date-time">' + d.toLocaleTimeString() + '</div>';
+    return '<div class="x-nice-date">' + d.toLocaleDateString() + '</div>' +
+           '<div class="x-nice-time">' + d.toLocaleTimeString() + '</div>';
 }
 
 /**