From: Adam Sutton <dev@adamsutton.me.uk>
Date: Thu, 31 May 2012 12:57:43 +0000 (+0100)
Subject: Add a few extra bits of info to the epg ui code.
X-Git-Tag: 3.3~219^2~101^2~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=190e2efc9d26bd2b833aba274e57b3b311be1ec6;p=thirdparty%2Ftvheadend.git

Add a few extra bits of info to the epg ui code.
---

diff --git a/src/webui/extjs.c b/src/webui/extjs.c
index c4e4c54df..7e6c51452 100644
--- a/src/webui/extjs.c
+++ b/src/webui/extjs.c
@@ -722,6 +722,8 @@ extjs_epg(http_connection_t *hc, const char *remain, void *opaque)
 
     if(ee->title != NULL)
       htsmsg_add_str(m, "title", ee->title);
+    if(ee->subtitle)
+      htsmsg_add_str(m, "subtitle", ee->subtitle);
 
     if(ee->description != NULL)
       htsmsg_add_str(m, "description", ee->description);
diff --git a/src/webui/static/app/epg.js b/src/webui/static/app/epg.js
index 68eaff4f6..2c8e5e8cd 100644
--- a/src/webui/static/app/epg.js
+++ b/src/webui/static/app/epg.js
@@ -14,7 +14,9 @@ tvheadend.epgDetails = function(event) {
     if(event.chicon != null && event.chicon.length > 0)
 	content += '<img class="x-epg-chicon" src="' + event.chicon + '">';
 
-    content += '<div class="x-epg-title">' + event.title + '</div>';
+    content += '<div class="x-epg-title">' + event.title;
+    if (event.subtitle) content += "&nbsp;:&nbsp;" + event.subtitle;
+    content += '</div>';
     content += '<div class="x-epg-desc">' + event.episode + '</div>';
     content += '<div class="x-epg-desc">' + event.description + '</div>';
 
@@ -120,7 +122,7 @@ tvheadend.epgDetails = function(event) {
           html += '<div class="x-epg-desc">';
           if (ee.episode) html += ee.episode + '&nbsp;&nbsp;&nbsp;';
           html += ee.title;
-          if (ee.subtitle) html += ':' + ee.subtitle
+          if (ee.subtitle) html += ' : ' + ee.subtitle
           html += '</div>';
         }
       }
@@ -180,11 +182,9 @@ tvheadend.epg = function() {
 	    {name: 'channel'},
 	    {name: 'channelid'},
 	    {name: 'title'},
+	    {name: 'subtitle'},
 	    {name: 'episode'},
 	    {name: 'description'},
-	    {name: 'ext_desc'},
-	    {name: 'ext_item'},
-	    {name: 'ext_text'},
 	    {name: 'chicon'},
             {name: 'start', type: 'date', dateFormat: 'U' /* unix time */},
             {name: 'end', type: 'date', dateFormat: 'U' /* unix time */},
@@ -242,6 +242,12 @@ tvheadend.epg = function() {
 	    header: "Title",
 	    dataIndex: 'title',
 	    renderer: renderText
+	},{
+	    width: 250,
+	    id:'subtitle',
+	    header: "SubTitle",
+	    dataIndex: 'subtitle',
+	    renderer: renderText
 	},{
 	    width: 100,
 	    id:'episode',