From 314ff802d6ce4b3946a49df61aee5b33de11a9d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96man?= Date: Tue, 26 Aug 2008 14:35:21 +0000 Subject: [PATCH] Add add,delete,save and 'option' icons --- webui/static/app/acleditor.js | 3 +++ webui/static/app/chconf.js | 8 +++--- webui/static/app/cwceditor.js | 3 +++ webui/static/app/dvb.js | 47 ++++++++++++---------------------- webui/static/app/ext.css | 20 ++++++++++----- webui/static/icons/add.gif | Bin 0 -> 994 bytes webui/static/icons/delete.gif | Bin 0 -> 989 bytes webui/static/icons/plugin.gif | Bin 0 -> 988 bytes webui/static/icons/save.gif | Bin 0 -> 1014 bytes 9 files changed, 42 insertions(+), 39 deletions(-) create mode 100644 webui/static/icons/add.gif create mode 100644 webui/static/icons/delete.gif create mode 100644 webui/static/icons/plugin.gif create mode 100644 webui/static/icons/save.gif 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 0000000000000000000000000000000000000000..93195256dc0abb6a451c41be3cba50fabb28781f GIT binary patch literal 994 zcmZ?wbhEHb6krfwXlG!sZ8LT1HFNH_aOtsj?X~gjxA*9E^z3&Ep6U}i%{O4CWB5GR zxH(~o^CD6fgr+PAPg@j`zBoE{b!f)w;OtcqS!<$mRz>A)jmQU~$dc{RCEH^Pc0?BK zj4s|4Q@Ag_Y)yK_x{UHY2^CvX>NjQ8>`JNKlUBPgy>f3}?ar*)o!Rv}a~=LW6dX*h zJeX2-EW74#cHP0uy5spxTl1Q?=Cy4v?ATG>v%9QoXJzNUir#(IllRv*o+)iRS=Dy3 zruA%P*P+V(L$#eJ>buU@PTk+sbGotbOiSOT=1E5zrXFaTe!O-1nbyf?J7%12n{lRn z#+k0!2dB?IIAhA?u4$J$r(WrrcBOmz)$W-WyXW4RwB+2BW#^|YyD)9R&8Z7+PFs3= z_Nps$S6`X4?8JiQCl{{2zjXcmWt(p<-2z0nmTkJdV)NaVTW_z}erwg1yQ{X|U$gD* znjKfy@3^~u_nq~-u5H}@VEw*F+x9-$cI3{Eqjz^6eR1IQv%}|Jp1kt<{PlO2?tHxQ z;M1M||Nk?Lf&mQy#h)z93=BFz2n3)!!N9SfA(BJJW5a@j)}C2s4k#Xfa6mTl)0>OT z>8>2@=8t}?e7y9ugpGrO$eoSL_{G%RRs~oZxx2PBmQDHaP|5Yge0%$Z6B(NwdK{GU zPKbPLe3Zs2D7Q`_Q(*#|thQ~Q*Wbg6$EGtec`lJWl>EwVMicT~*I!ki1b6H6&Jl5GM`0ubQ$Yg)8)xI#xeK8LEV;m0p8XpNTIS^`lAkzL!kj({u zyW3&j*JA?@rTZL7@j0FyayB9GTvEuHw9u2;VP`WUt|f$A%S*YPnR+KX<6d^woxIE| zg{gNditkmHJPY%A7UAlI>^%bAW zlRsA`ziO_1*HZhwt?pe{>9?kgZ!I|=S_?ijSAXa!|JYacqpjdaPuYiw_1`DfeV<(S zb5h-}$@M>`)ZbY)?auP)?|K^FPVRd*ssBq~sLL|Nji5U@(P% z;!hT4kb87M1Sn51aO`4Ww_yhq8#fCULHB56%)3>aIyn;H1jHEskh_2Ok_k>R?-q}a&79%Rz3CLzFJ F4FJtTGqV5y literal 0 HcmV?d00001 diff --git a/webui/static/icons/plugin.gif b/webui/static/icons/plugin.gif new file mode 100644 index 0000000000000000000000000000000000000000..209c121c5a0000353a9ee0effdddf71e23e57075 GIT binary patch literal 988 zcmZ?wbhEHb6krfwXlG!s?X|S;vvQnZ<2b?AX`-#uBs=ag=Hxlu z#doTg*GyNxxgP%WJcH-^1upOoTIdtH#6NO*P}Iuc*wtZiYr`YA`bTdIjNKj-zauzt zeN@t#nB=vwsaxU_c7`VI3`^VWj7E-rtOYO+Z~&+CpvRaZ06qBti5qL`{Hx9 zrsi%<%iWfmwIeBeXL9!5q}=@pd3#dx_on6VPc7V)S-LmZ;lD%vfuzENDTN2piVmh0 z9|EHEqJx>`hcn9$`8ctL+ovvs)ThV^Hvh`$5%Za+y6LrlOD%(#rbbwG}=c%U7Q_Wqco4e06 z_nc|zJ=@xMwr#@sj)~_xCY|q^e7<|i`K~GFyQc!tg`Q~_d#7FKpMI%#`t|-97yD;k znlR_eK6#ra)z!Eia%o2kk0#u5WVrWQ8Im<=(S3KQ6Pl+ryqZcJcop2o+`!6Lxn+$*V& ze5mGO(Ic*=Cizn>0+*c*G4uP);?OvuxL%x-Nz}lSX~665Id) literal 0 HcmV?d00001 diff --git a/webui/static/icons/save.gif b/webui/static/icons/save.gif new file mode 100644 index 0000000000000000000000000000000000000000..817474951105aee223c169146a76a57cdd4b7cf8 GIT binary patch literal 1014 zcmeH`y=xRf7>7r0FWG30+dC69aN;JOL_&~F2(scw=8lWm6vCV~i)r>G#TFK0w}Qpo zEhHyt*3;t3@jys9BEo^qqzPNefK3XE@uLt#m{O~C)-r!Xemp$I`&RD{-p#Fh?#+$` zEU*Xi*ba1@z;UqyA#^d)@i7Xp