diff --git a/webui/static/app/acleditor.js b/webui/static/app/acleditor.js index df098903..be811e27 100644 --- a/webui/static/app/acleditor.js +++ b/webui/static/app/acleditor.js @@ -174,12 +174,15 @@ tvheadend.acleditor = function() { cm: cm, selModel: new Ext.grid.RowSelectionModel({singleSelect:false}), tbar: [{ + iconCls:'add', text: 'Add entry', handler: addRecord }, '-', { + iconCls:'remove', text: 'Delete selected', handler: delSelected }, '-', { + iconCls:'save', text: "Save changes", handler: saveChanges } diff --git a/webui/static/app/chconf.js b/webui/static/app/chconf.js index 03d4d279..3b8051dc 100644 --- a/webui/static/app/chconf.js +++ b/webui/static/app/chconf.js @@ -203,11 +203,13 @@ tvheadend.channeldetails = function(chid, chname) { title: chname, border:false, tbar: [{ - text: "Save changes", - handler: saveChanges - },{ + iconCls:'remove', text: "Delete channel", handler: deleteChannel + }, '-', { + iconCls:'save', + text: "Save configuration", + handler: saveChanges }], defaults: { border:false, diff --git a/webui/static/app/cwceditor.js b/webui/static/app/cwceditor.js index b55c370a..030a0db8 100644 --- a/webui/static/app/cwceditor.js +++ b/webui/static/app/cwceditor.js @@ -161,12 +161,15 @@ tvheadend.cwceditor = function() { cm: cm, selModel: new Ext.grid.RowSelectionModel({singleSelect:false}), tbar: [{ + iconCls:'add', text: 'Add entry', handler: addRecord }, '-', { + iconCls:'remove', text: 'Delete selected', handler: delSelected }, '-', { + iconCls:'save', text: "Save changes", handler: saveChanges } diff --git a/webui/static/app/dvb.js b/webui/static/app/dvb.js index 7ec80527..654a472d 100644 --- a/webui/static/app/dvb.js +++ b/webui/static/app/dvb.js @@ -44,18 +44,6 @@ tvheadend.dvb_adapterdetails = function(adapterId, adapterName, treenode) { - var submit = confpanel.addButton({ - text: 'Save changes', - handler: function() { - confpanel.getForm().submit({url:'/dvbadapter', - params:{'adapterId': adapterId, 'op':'save'}, - waitMsg:'Saving Data...', - success:function(form, action) { - } - }) - } - }); - var status = { region:'center', html: 'Status...', @@ -103,23 +91,6 @@ tvheadend.dvb_adapterdetails = function(adapterId, adapterName, treenode) { } }); - /* - var locationpanel = new Ext.FormPanel({ - frame:true, - title:'By location', - margins:'0 0 0 0', - reader: confreader, - defaultType: 'textfield', - items: [locationlist] - }); - var submit = locationpanel.addButton({ - text: 'Submit', - handler: function() { - alert('hej'); - } - }); - */ - win = new Ext.Window({ title: 'Add mux(es) on ' + adapterName, @@ -160,6 +131,17 @@ tvheadend.dvb_adapterdetails = function(adapterId, adapterName, treenode) { }); }; + + /** + * + */ + function saveconfig() { + confpanel.getForm().submit({url:'/dvbadapter', + params:{'adapterId': adapterId, 'op':'save'}, + waitMsg:'Saving Data...' + }); + }; + var panel = new Ext.Panel({ title: adapterName, @@ -170,9 +152,14 @@ tvheadend.dvb_adapterdetails = function(adapterId, adapterName, treenode) { iconCls:'add', text: 'Add mux(es)', handler: addmux - },{ + }, '-', { + iconCls:'option', text: 'Probe services', handler: probeservices + }, '-', { + iconCls:'save', + text: 'Save configuration', + handler: saveconfig }] }); return panel; diff --git a/webui/static/app/ext.css b/webui/static/app/ext.css index 8982e642..1020f41d 100644 --- a/webui/static/app/ext.css +++ b/webui/static/app/ext.css @@ -56,10 +56,18 @@ border-left:1px solid #eee; border-right:1px solid #d0d0d0; } -/* -.task { - background-image:url(../shared/icons/fam/cog.png) !important; + + +.add { + background-image:url(../icons/add.gif) !important; } -.task-folder { - background-image:url(../shared/icons/fam/folder_go.png) !important; -}*/ \ No newline at end of file +.option { + background-image:url(../icons/plugin.gif) !important; +} +.remove { + background-image:url(../icons/delete.gif) !important; +} +.save { + background-image:url(../icons/save.gif) !important; +} + \ No newline at end of file diff --git a/webui/static/icons/add.gif b/webui/static/icons/add.gif new file mode 100644 index 00000000..93195256 Binary files /dev/null and b/webui/static/icons/add.gif differ diff --git a/webui/static/icons/delete.gif b/webui/static/icons/delete.gif new file mode 100644 index 00000000..5e2a3b14 Binary files /dev/null and b/webui/static/icons/delete.gif differ diff --git a/webui/static/icons/plugin.gif b/webui/static/icons/plugin.gif new file mode 100644 index 00000000..209c121c Binary files /dev/null and b/webui/static/icons/plugin.gif differ diff --git a/webui/static/icons/save.gif b/webui/static/icons/save.gif new file mode 100644 index 00000000..81747495 Binary files /dev/null and b/webui/static/icons/save.gif differ