Use checkbox instead of combobox for EIT

Update doc

diff --git a/docs/html/config_dvb.html b/docs/html/config_dvb.html
index 2950c6d1a8bd8088d907ffdd1dd4b22f1bf76f68..b7963a7d9c735915cf55e198a350a41c147807a7 100644 (file)
--- a/docs/html/config_dvb.html
+++ b/docs/html/config_dvb.html
@@ -119,6 +119,16 @@
   <dt>Channel name
   <dd>Double-click on this column to map the service to a channel.
 
+  <dt>DVB default charset
+  <dd>
+  According to "ETSI EN 300 468", the default character set for EIT data is
+  ISO6937. Unfortunately, some broadcasters actually use ISO-8859-x encodings
+  but fail to correctly announce it. To fix this you can set the default 
+  charset to use when none is specified by the broadcaster.
+
+  <dt>EIT
+  <dd>Uncheck this if EIT data should not be retreived for this service.
+
   <dt>Type
   <dd>Type of service. Can not be changed
 

diff --git a/src/webui/static/app/dvb.js b/src/webui/static/app/dvb.js
index e9cbf8da983fc661f4aa7773e9d0298075f7b176..7fae890afcd1092f7fbd9fa7391485724a8ee721 100644 (file)
--- a/src/webui/static/app/dvb.js
+++ b/src/webui/static/app/dvb.js
@@ -338,6 +338,12 @@ tvheadend.dvb_services = function(adapterId) {
        width: 45
     });
 
+       var eitColumn = new Ext.grid.CheckColumn({
+               header: "EIT",
+               dataIndex: 'dvb_eit_enable',
+               width: 45
+       });
+
     var actions = new Ext.ux.grid.RowActions({
        header:'',
        dataIndex: 'actions',
@@ -433,32 +439,7 @@ tvheadend.dvb_services = function(adapterId) {
                        valueField:'key'
                })
        },
-       {
-               header: "EIT",
-               dataIndex: 'dvb_eit_enable',
-               width: 100,
-               renderer: function(value, metadata, record, row, col, store) {
-                       if (value == '0')
-                               return 'Disabled';
-                       if (value == '1')
-                               return 'Enabled';
-               },
-               editor: new fm.ComboBox({
-                       mode: 'local',
-                       store: new Ext.data.SimpleStore({
-                               fields: ['key','value'],
-                               data: [
-                                       ['0','Disabled'],
-                                       ['1','Enabled']
-                               ]
-                       }),
-                       typeAhead: true,
-                       lazyRender: true,
-                       triggerAction: 'all',
-                       displayField:'value',
-                       valueField:'key'
-               })
-       },
+       eitColumn,
        {
            header: "Type",
            dataIndex: 'type',
@@ -591,7 +572,7 @@ tvheadend.dvb_services = function(adapterId) {
     var grid = new Ext.grid.EditorGridPanel({
        stripeRows: true,
        title: 'Services',
-       plugins: [enabledColumn, actions],
+       plugins: [enabledColumn, eitColumn, actions],
        store: store,
        clicksToEdit: 2,
        cm: cm,