From b6fcb4523d809dbd4afd2d3e29d2632d5f6cc38e Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Sun, 16 Nov 2014 16:29:30 +0100 Subject: [PATCH] WEBUI JS: Add start/stop times to epg dialog, more cosmetic changes for EPG/DVR dialogs --- src/webui/static/app/dvr.js | 10 +++++----- src/webui/static/app/epg.js | 10 +++++++--- src/webui/static/app/ext.css | 17 +++++++++++------ 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/src/webui/static/app/dvr.js b/src/webui/static/app/dvr.js index 4d0b2c4c..0e3f39c8 100644 --- a/src/webui/static/app/dvr.js +++ b/src/webui/static/app/dvr.js @@ -26,13 +26,13 @@ tvheadend.dvrDetails = function(uuid) { content += '
' + title + '
'; content += '
' + episode + '
'; - content += '
Scheduled Start Time: ' + new Date(start_real * 1000).toLocaleString() + '
'; - content += '
Scheduled Stop Time: ' + new Date(stop_real * 1000).toLocaleString() + '
'; - content += '
Duration: ' + parseInt(duration / 60) + ' min
'; + content += '
Scheduled Start Time:
' + new Date(start_real * 1000).toLocaleString() + '
'; + content += '
Scheduled Stop Time:
' + new Date(stop_real * 1000).toLocaleString() + '
'; + content += '
Duration:
' + parseInt(duration / 60) + ' min
'; content += '
' + desc + '
'; content += '
'; - content += '
Status: ' + status + '
'; - content += '
File size: ' + parseInt(filesize / 1000000) + ' MB
'; + content += '
Status:
' + status + '
'; + content += '
File size:
' + parseInt(filesize / 1000000) + ' MB
'; var win = new Ext.Window({ title: title, diff --git a/src/webui/static/app/epg.js b/src/webui/static/app/epg.js index 87310d2f..8db27641 100644 --- a/src/webui/static/app/epg.js +++ b/src/webui/static/app/epg.js @@ -99,14 +99,18 @@ tvheadend.epgDetails = function(event) { content += ''; if (event.episodeOnscreen) content += '
' + event.episodeOnscreen + '
'; + if (event.start) + content += '
Start time:
' + new Date(event.start).toLocaleString() + '
'; + if (event.stop) + content += '
Stop time:
' + new Date(event.stop).toLocaleString() + '
'; if (event.summary) content += '
' + event.summary + '
'; if (event.description) content += '
' + event.description + '
'; if (event.starRating) - content += '
Star Rating: ' + event.starRating + '
'; + content += '
Star Rating:
' + event.starRating + '
'; if (event.ageRating) - content += '
Age Rating: ' + event.ageRating + '
'; + content += '
Age Rating:
' + event.ageRating + '
'; if (event.genre) { var genre = []; Ext.each(event.genre, function(g) { @@ -117,7 +121,7 @@ tvheadend.epgDetails = function(event) { if (g1 || g2) genre.push((g1 ? '[' + g1 + '] ' : '') + g2); }); - content += '
Content Type: ' + genre.join(', ') + '
'; + content += '
Content Type:
' + genre.join(', ') + '
'; } content += ''; diff --git a/src/webui/static/app/ext.css b/src/webui/static/app/ext.css index e8a6949a..e37df835 100644 --- a/src/webui/static/app/ext.css +++ b/src/webui/static/app/ext.css @@ -522,8 +522,18 @@ font-weight: bold; } -.x-epg-summary { +.x-epg-time { margin: 5px; +} + +.x-epg-prefix { + display: inline-block; + width: 12em; + font-weight: bold; +} + +.x-epg-summary { + margin: 10px 5px 5px 5px; font-weight: bold; } @@ -543,11 +553,6 @@ margin: 5px; } -.x-epg-action { - font-weight: bold; - margin: 5px; -} - .hts-t-info { float: left; width: 100px;