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

Merge remote-tracking branch 'origin/pr/358'

Browse source
This commit is contained in:
Adam Sutton 2014-04-04 15:55:37 +01:00
commit 42dbcbe74e
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/webui/static/app/chconf.js
View file

@ -205,6 +205,7 @@ tvheadend.channel_tab = function(panel)
tbar : [ mapButton, lowNoButton, noUpButton, noDownButton, noSwapButton ],
lcol : [
{
width : 50,
header : 'Play',
renderer : function (v, o, r) {
return "<a href='stream/channel/" + r.id + "'>Play</a>";

13
src/webui/static/app/idnode.js
View file

@ -129,13 +129,20 @@ tvheadend.IdNodeField = function (conf)
this.column = function ()
{
var w = 300;
var ftype = 'string';
if (this.type == 'int' || this.type == 'u32' ||
this.type == 'u16' || this.type == 'dbl')
this.type == 'u16' || this.type == 'dbl') {
ftype = 'numeric';
else if (this.type == 'bool')
ftype = 'boolean'
w = 80;
} else if (this.type == 'bool') {
ftype = 'boolean';
w = 60;
}
if (this.enum || this.list)
w = 300;
return {
width : w,
dataIndex: this.id,
header : this.text,
sortable : true,

2
src/webui/static/app/mpegts.js
View file

@ -81,6 +81,7 @@ tvheadend.muxes = function(panel)
del : true,
lcol : [
{
width : 50,
header : 'Play',
renderer : function(v, o, r) {
return "<a href='stream/mux/" + r.id + "'>Play</a>";
@ -123,6 +124,7 @@ tvheadend.services = function(panel)
tbar : [ mapButton ],
lcol : [
{
width : 50,
header : 'Play',
renderer : function(v, o, r) {
return "<a href='stream/service/" + r.id + "'>Play</a>";