diff --git a/src/webui/extjs.c b/src/webui/extjs.c index c4e4c54d..7e6c5145 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 68eaff4f..2c8e5e8c 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 += ''; - content += '
' + event.title + '
'; + content += '
' + event.title; + if (event.subtitle) content += " : " + event.subtitle; + content += '
'; content += '
' + event.episode + '
'; content += '
' + event.description + '
'; @@ -120,7 +122,7 @@ tvheadend.epgDetails = function(event) { html += '
'; if (ee.episode) html += ee.episode + '   '; html += ee.title; - if (ee.subtitle) html += ':' + ee.subtitle + if (ee.subtitle) html += ' : ' + ee.subtitle html += '
'; } } @@ -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',