webui: Fix #5292

diff --git a/src/webui/static/app/ext.css b/src/webui/static/app/ext.css
index d1f4f4bde42c6fac0fe143f741799aac91f268ed..6b0966d47b24246ddce631b8e1458e09c841d5bd 100644 (file)
--- a/src/webui/static/app/ext.css
+++ b/src/webui/static/app/ext.css
@@ -656,6 +656,10 @@
     width: 100px;
 }
 
+.x-nice-customformat {
+    display: inline-block;
+    width: 18em;
+}
 
 .x-nice-dayofweek {
     display: inline-block;

diff --git a/src/webui/static/app/tvheadend.js b/src/webui/static/app/tvheadend.js
index 7bc17a1f8d2729bf92f827c9ae98b73814097ecc..2346b5484eeababc8ecedb0f87da1f167e9ee92e 100644 (file)
--- a/src/webui/static/app/tvheadend.js
+++ b/src/webui/static/app/tvheadend.js
@@ -746,9 +746,13 @@ Ext.Ajax.request({
  */
 tvheadend.niceDate = function(dt) {
     var d = new Date(dt);
-    return '<div class="x-nice-dayofweek">' + d.toLocaleString(tvheadend.toLocaleFormat(), {weekday: 'long'}) + '</div>' +
-           '<div class="x-nice-date">' + d.toLocaleDateString(tvheadend.toLocaleFormat()) + '</div>' +
-           '<div class="x-nice-time">' + d.toLocaleTimeString() + '</div>';
+    if (/([%][MmsSyYdhq]+)/.test(tvheadend.date_mask)){
+           return '<div class=".x-nice-customformat">' + tvheadend.toCustomDate(d, tvheadend.date_mask) + '</div>';
+    }else{
+           return '<div class="x-nice-dayofweek">' + d.toLocaleString(tvheadend.toLocaleFormat(), {weekday: 'long'}) + '</div>' +
+                  '<div class="x-nice-date">' + d.toLocaleDateString(tvheadend.toLocaleFormat(), {day: '2-digit', month: '2-digit', year: 'numeric'}) + '</div>' +
+                  '<div class="x-nice-time">' + d.toLocaleTimeString(tvheadend.toLocaleFormat(), {hour: '2-digit', minute: '2-digit', second: '2-digit', hour12: false}) + '</div>';
+    }
 }
 
 /* Date format when time is not needed, e.g., first_aired time is
@@ -790,7 +794,7 @@ tvheadend.niceDateYearMonth = function(dt, refdate) {
       }
     }
     return '<div class="x-nice-dayofweek">' + d.toLocaleString(tvheadend.toLocaleFormat(), {weekday: 'long'}) + '</div>' +
-           '<div class="x-nice-date">' + d.toLocaleDateString(tvheadend.toLocaleFormat()) + '</div>';
+           '<div class="x-nice-date">' + d.toLocaleDateString(tvheadend.toLocaleFormat(), {day: '2-digit', month: '2-digit', year: 'numeric'}) + '</div>';
 }
 
 /*