stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
Adam Sutton 2012-05-31 13:57:43 +01:00
parent 5ba6bc5a44
commit c4e4c81f46
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/webui/extjs.c
View file

@ -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);

16
src/webui/static/app/epg.js
View file

@ -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',