webui: more channel icon work

diff --git a/src/webui/static/app/dvr.js b/src/webui/static/app/dvr.js
index 16a6065bed20c3eeeb591d2d691f00a6db734a7e..0cf4bc80464c3ffe9f724f245fcbc9efa5d37368 100644 (file)
--- a/src/webui/static/app/dvr.js
+++ b/src/webui/static/app/dvr.js
@@ -26,39 +26,51 @@ tvheadend.dvrDetails = function(uuid) {
         var content = '';
         var but;
 
-        if (chicon != null && chicon.length > 0)
+        if (chicon != null && chicon.length > 0) {
             content += '<img class="x-epg-chicon" src="' + chicon + '">';
+        } else {
+            chicon = null;
+        }
+
+        if (chicon)
+            content += '<div class="x-epg-left">';
 
         if (duplicate)
             content += '<div class="x-epg-meta"><font color="red"><span class="x-epg-prefix">' + _('Will be skipped') + '<br>' + _('because it is a rerun of:') + '</span>' + tvheadend.niceDate(duplicate * 1000) + '</font></div>';
 
         if (title)
-          content += '<div class="x-epg-title">' + title + '</div>';
+            content += '<div class="x-epg-title">' + title + '</div>';
         if (subtitle)
-          content += '<div class="x-epg-title">' + subtitle + '</div>';
+            content += '<div class="x-epg-title">' + subtitle + '</div>';
         if (episode)
-          content += '<div class="x-epg-title">' + episode + '</div>';
+            content += '<div class="x-epg-title">' + episode + '</div>';
         if (start_real)
-          content += '<div class="x-epg-time"><span class="x-epg-prefix">' + _('Scheduled Start Time') + ':</span><span class="x-epg-body">' + tvheadend.niceDate(start_real * 1000) + '</span></div>';
+            content += '<div class="x-epg-time"><span class="x-epg-prefix">' + _('Scheduled Start Time') + ':</span><span class="x-epg-body">' + tvheadend.niceDate(start_real * 1000) + '</span></div>';
         if (stop_real)
-          content += '<div class="x-epg-time"><span class="x-epg-prefix">' + _('Scheduled Stop Time') + ':</span><span class="x-epg-body">' + tvheadend.niceDate(stop_real * 1000) + '</span></div>';
+            content += '<div class="x-epg-time"><span class="x-epg-prefix">' + _('Scheduled Stop Time') + ':</span><span class="x-epg-body">' + tvheadend.niceDate(stop_real * 1000) + '</span></div>';
         if (duration)
-          content += '<div class="x-epg-time"><span class="x-epg-prefix">' + _('Duration') + ':</span><span class="x-epg-body">' + parseInt(duration / 60) + ' ' + _('min') + '</span></div>';
+            content += '<div class="x-epg-time"><span class="x-epg-prefix">' + _('Duration') + ':</span><span class="x-epg-body">' + parseInt(duration / 60) + ' ' + _('min') + '</span></div>';
+        if (chicon) {
+            content += '</div>'; /* x-epg-left */
+            content += '<div class="x-epg-bottom">';
+        }
         content += '<hr class="x-epg-hr"/>';
         if (desc) {
-          content += '<div class="x-epg-desc">' + desc + '</div>';
-          content += '<hr class="x-epg-hr"/>';
+            content += '<div class="x-epg-desc">' + desc + '</div>';
+            content += '<hr class="x-epg-hr"/>';
         }
         if (status)
-          content += '<div class="x-epg-meta"><span class="x-epg-prefix">' + _('Status') + ':</span><span class="x-epg-body">' + status + '</span></div>';
+            content += '<div class="x-epg-meta"><span class="x-epg-prefix">' + _('Status') + ':</span><span class="x-epg-body">' + status + '</span></div>';
         if (filesize)
-          content += '<div class="x-epg-meta"><span class="x-epg-prefix">' + _('File size') + ':</span><span class="x-epg-body">' + parseInt(filesize / 1000000) + ' MB</span></div>';
+            content += '<div class="x-epg-meta"><span class="x-epg-prefix">' + _('File size') + ':</span><span class="x-epg-body">' + parseInt(filesize / 1000000) + ' MB</span></div>';
         if (comment)
-          content += '<div class="x-epg-meta"><span class="x-epg-prefix">' + _('Comment') + ':</span><span class="x-epg-body">' + comment + '</span></div>';
+            content += '<div class="x-epg-meta"><span class="x-epg-prefix">' + _('Comment') + ':</span><span class="x-epg-body">' + comment + '</span></div>';
         if (autorec_caption)
-          content += '<div class="x-epg-meta"><span class="x-epg-prefix">' + _('Autorec') + ':</span><span class="x-epg-body">' + autorec_caption + '</span></div>';
+            content += '<div class="x-epg-meta"><span class="x-epg-prefix">' + _('Autorec') + ':</span><span class="x-epg-body">' + autorec_caption + '</span></div>';
         if (timerec_caption)
-          content += '<div class="x-epg-meta"><span class="x-epg-prefix">' + _('Time Scheduler') + ':</span><span class="x-epg-body">' + timerec_caption + '</span></div>';
+            content += '<div class="x-epg-meta"><span class="x-epg-prefix">' + _('Time Scheduler') + ':</span><span class="x-epg-body">' + timerec_caption + '</span></div>';
+        if (chicon)
+            content += '</div>'; /* x-epg-bottom */
 
         var buttons = [];
 

diff --git a/src/webui/static/app/epg.js b/src/webui/static/app/epg.js
index e05b46c2eaa236281a387738f70043a5ee7737ef..9b3aa702cc5bd87027df288d03d451da229561a1 100644 (file)
--- a/src/webui/static/app/epg.js
+++ b/src/webui/static/app/epg.js
@@ -90,14 +90,18 @@ tvheadend.epgDetails = function(event) {
 
     var content = '';
     var duration = 0;
+    var chicon = 0;
 
     if (event.start && event.stop && event.stop - event.start > 0)
         duration = (event.stop - event.start) / 1000;
 
-    if (event.channelIcon != null && event.channelIcon.length > 0)
+    if (event.channelIcon != null && event.channelIcon.length > 0) {
         content += '<img class="x-epg-chicon" src="' + event.channelIcon + '">';
+        chicon = 1;
+    }
 
-    content += '<div class="x-epg-left">';
+    if (chicon)
+        content += '<div class="x-epg-left">';
     content += '<div class="x-epg-title">' + event.title;
     if (event.subtitle)
         content += "&nbsp;:&nbsp;" + event.subtitle;
@@ -110,8 +114,10 @@ tvheadend.epgDetails = function(event) {
       content += '<div class="x-epg-time"><span class="x-epg-prefix">' + _('End Time') + ':</span><span class="x-epg-body">' + tvheadend.niceDate(event.stop) + '</span></div>';
     if (duration)
       content += '<div class="x-epg-time"><span class="x-epg-prefix">' + _('Duration') + ':</span><span class="x-epg-body">' + parseInt(duration / 60) + ' ' + _('min') + '</span></div>';
-    content += '</div>'; /* x-epg-left */
-    content += '<div class="x-epg-bottom">';
+    if (chicon) {
+      content += '</div>'; /* x-epg-left */
+      content += '<div class="x-epg-bottom">';
+    }
     content += '<hr class="x-epg-hr"/>';
     if (event.summary)
       content += '<div class="x-epg-summary">' + event.summary + '</div>';
@@ -161,7 +167,8 @@ tvheadend.epgDetails = function(event) {
 
     content += '<div id="related"></div>';
     content += '<div id="altbcast"></div>';
-    content += '</div>'; /* x-epg-bottom */
+    if (chicon)
+      content += '</div>'; /* x-epg-bottom */
     
     var now = new Date();
     var buttons = [];