From fdd997cbdbc21e18eb5d22e607df2cdda022969f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96man?= Date: Sat, 18 Jul 2009 10:31:09 +0000 Subject: [PATCH] From the department of bells and whistles: Add more icons --- src/webui/extjs.c | 9 ++++-- src/webui/static/app/acleditor.js | 2 +- src/webui/static/app/chconf.js | 1 + src/webui/static/app/cteditor.js | 2 +- src/webui/static/app/cwceditor.js | 2 +- src/webui/static/app/dvb.js | 1 + src/webui/static/app/dvr.js | 5 ++- src/webui/static/app/epg.js | 3 +- src/webui/static/app/ext.css | 45 ++++++++++++++++++++++++++ src/webui/static/app/tableeditor.js | 3 +- src/webui/static/app/tvheadend.js | 2 ++ src/webui/static/app/xmltv.js | 1 + src/webui/static/icons/clock.png | Bin 0 -> 882 bytes src/webui/static/icons/drive.png | Bin 0 -> 346 bytes src/webui/static/icons/group.png | Bin 0 -> 753 bytes src/webui/static/icons/key.png | Bin 0 -> 612 bytes src/webui/static/icons/newspaper.png | Bin 0 -> 658 bytes src/webui/static/icons/pci.png | Bin 0 -> 850 bytes src/webui/static/icons/tag.png | Bin 0 -> 389 bytes src/webui/static/icons/tag_blue.png | Bin 0 -> 586 bytes src/webui/static/icons/television.png | Bin 0 -> 696 bytes src/webui/static/icons/wand.png | Bin 0 -> 570 bytes src/webui/static/icons/wrench.png | Bin 0 -> 610 bytes 23 files changed, 67 insertions(+), 9 deletions(-) create mode 100644 src/webui/static/icons/clock.png create mode 100644 src/webui/static/icons/drive.png create mode 100644 src/webui/static/icons/group.png create mode 100644 src/webui/static/icons/key.png create mode 100644 src/webui/static/icons/newspaper.png create mode 100644 src/webui/static/icons/pci.png create mode 100644 src/webui/static/icons/tag.png create mode 100644 src/webui/static/icons/tag_blue.png create mode 100644 src/webui/static/icons/television.png create mode 100644 src/webui/static/icons/wand.png create mode 100644 src/webui/static/icons/wrench.png diff --git a/src/webui/extjs.c b/src/webui/extjs.c index a0eb5296..4c77d5ec 100644 --- a/src/webui/extjs.c +++ b/src/webui/extjs.c @@ -176,9 +176,12 @@ page_about(http_connection_t *hc, const char *remain, void *opaque) "" "http://hts.lonelycoder.com/

" "Based on software from " - "FFmpeg and " - "ExtJS.
" - "
" + "FFmpeg and " + "ExtJS. " + "Icons from " + "" + "FamFamFam" + "

" "Build: %s" "", htsversion, diff --git a/src/webui/static/app/acleditor.js b/src/webui/static/app/acleditor.js index 0749f6bf..d9864d83 100644 --- a/src/webui/static/app/acleditor.js +++ b/src/webui/static/app/acleditor.js @@ -73,5 +73,5 @@ tvheadend.acleditor = function() { dvrColumn, webuiColumn, adminColumn], null, - 'config_access.html'); + 'config_access.html', 'group'); } diff --git a/src/webui/static/app/chconf.js b/src/webui/static/app/chconf.js index b51a47b8..a23902f5 100644 --- a/src/webui/static/app/chconf.js +++ b/src/webui/static/app/chconf.js @@ -204,6 +204,7 @@ tvheadend.chconf = function() var grid = new Ext.grid.EditorGridPanel({ stripeRows: true, title: 'Channels', + iconCls: 'television', store: tvheadend.channels, clicksToEdit: 2, cm: cm, diff --git a/src/webui/static/app/cteditor.js b/src/webui/static/app/cteditor.js index 1236a405..57eef7a6 100644 --- a/src/webui/static/app/cteditor.js +++ b/src/webui/static/app/cteditor.js @@ -56,5 +56,5 @@ tvheadend.cteditor = function() { [enabledColumn, internalColumn, titledIconColumn], null, - 'config_tags.html'); + 'config_tags.html', 'tags'); } diff --git a/src/webui/static/app/cwceditor.js b/src/webui/static/app/cwceditor.js index 94503373..87c4bd1f 100644 --- a/src/webui/static/app/cwceditor.js +++ b/src/webui/static/app/cwceditor.js @@ -52,5 +52,5 @@ tvheadend.cwceditor = function() { return new tvheadend.tableEditor('Code Word Client', 'cwc', cm, rec, [enabledColumn], null, - 'config_cwc.html'); + 'config_cwc.html', 'key'); } diff --git a/src/webui/static/app/dvb.js b/src/webui/static/app/dvb.js index 24d7ea18..8fc5a09f 100644 --- a/src/webui/static/app/dvb.js +++ b/src/webui/static/app/dvb.js @@ -1142,6 +1142,7 @@ tvheadend.dvb = function() var panel = new Ext.Panel({ title: 'DVB Adapters', + iconCls: 'hardware', layout:'fit', tbar: [ adapterSelection diff --git a/src/webui/static/app/dvr.js b/src/webui/static/app/dvr.js index c7143302..88466a83 100644 --- a/src/webui/static/app/dvr.js +++ b/src/webui/static/app/dvr.js @@ -147,6 +147,7 @@ tvheadend.dvrlog = function() { stripeRows: true, disableSelection: true, title: 'Recorder log', + iconCls: 'clock', store: tvheadend.dvrStore, cm: dvrCm, viewConfig: {forceFit:true}, @@ -252,7 +253,7 @@ tvheadend.autoreceditor = function() { return new tvheadend.tableEditor('Automatic Recorder', 'autorec', cm, tvheadend.autorecRecord, [enabledColumn], tvheadend.autorecStore, - 'autorec.html'); + 'autorec.html', 'wand'); } /** * @@ -314,6 +315,7 @@ tvheadend.dvr = function() { activeTab:0, autoScroll:true, title: 'Digital Video Recorder', + iconCls: 'drive', items: [new tvheadend.dvrlog, new tvheadend.autoreceditor ] @@ -336,6 +338,7 @@ tvheadend.dvrsettings = function() { var confpanel = new Ext.FormPanel({ title:'Digital Video Recorder', + iconCls: 'drive', border:false, bodyStyle:'padding:15px', anchor: '100% 50%', diff --git a/src/webui/static/app/epg.js b/src/webui/static/app/epg.js index 61b04c69..5a987276 100644 --- a/src/webui/static/app/epg.js +++ b/src/webui/static/app/epg.js @@ -254,6 +254,7 @@ tvheadend.epg = function() { enableDragDrop : false, cm: epgCm, title: 'Electronic Program Guide', + iconCls: 'newspaper', store : epgStore, selModel : new Ext.ux.grid.livegrid.RowSelectionModel(), view : epgView, @@ -273,7 +274,7 @@ tvheadend.epg = function() { '->', { text: 'Create AutoRec', - iconCls: 'rec', + iconCls: 'wand', tooltip: 'Create an automatic recording entry that will ' + 'record all future programmes that matches ' + 'the current query.', diff --git a/src/webui/static/app/ext.css b/src/webui/static/app/ext.css index 11ad0ba4..bf5c4d7c 100644 --- a/src/webui/static/app/ext.css +++ b/src/webui/static/app/ext.css @@ -137,6 +137,51 @@ background-image:url(../icons/undo.png) !important; } +.key { + background-image:url(../icons/key.png) !important; +} + +.tags { + background-image:url(../icons/tag_blue.png) !important; +} + +.xml { + background-image:url(../icons/tag.png) !important; +} + +.drive { + background-image:url(../icons/drive.png) !important; +} + +.group { + background-image:url(../icons/group.png) !important; +} + +.hardware { + background-image:url(../icons/pci.png) !important; +} + +.television { + background-image:url(../icons/television.png) !important; +} + +.newspaper { + background-image:url(../icons/newspaper.png) !important; +} + +.clock { + background-image:url(../icons/clock.png) !important; +} + +.wrench { + background-image:url(../icons/wrench.png) !important; +} + +.wand { + background-image:url(../icons/wand.png) !important; +} + + .x-smallhdr { float:left; width: 100px; diff --git a/src/webui/static/app/tableeditor.js b/src/webui/static/app/tableeditor.js index ad68664e..561154ee 100644 --- a/src/webui/static/app/tableeditor.js +++ b/src/webui/static/app/tableeditor.js @@ -1,5 +1,5 @@ tvheadend.tableEditor = function(title, dtable, cm, rec, plugins, store, - helpContent) { + helpContent, icon) { cm.defaultSortable = true; if(store == null) { @@ -129,6 +129,7 @@ tvheadend.tableEditor = function(title, dtable, cm, rec, plugins, store, var grid = new Ext.grid.EditorGridPanel({ title: title, + iconCls: icon, plugins: plugins, store: store, clicksToEdit: 2, diff --git a/src/webui/static/app/tvheadend.js b/src/webui/static/app/tvheadend.js index 7b98b36e..3a16abcc 100644 --- a/src/webui/static/app/tvheadend.js +++ b/src/webui/static/app/tvheadend.js @@ -46,6 +46,7 @@ function accessUpdate(o) { activeTab:0, autoScroll:true, title: 'Configuration', + iconCls: 'wrench', items: [new tvheadend.chconf, new tvheadend.xmltv, new tvheadend.cteditor, @@ -62,6 +63,7 @@ function accessUpdate(o) { border: false, layout:'fit', title:'About', + iconCls:'info', autoLoad: 'about.html' }); tvheadend.rootTabPanel.add(tvheadend.aboutPanel); diff --git a/src/webui/static/app/xmltv.js b/src/webui/static/app/xmltv.js index e194e764..51bed3d5 100644 --- a/src/webui/static/app/xmltv.js +++ b/src/webui/static/app/xmltv.js @@ -30,6 +30,7 @@ tvheadend.xmltv = function() { var confpanel = new Ext.FormPanel({ title:'XML TV', + iconCls: 'xml', border:false, bodyStyle:'padding:15px', labelAlign: 'right', diff --git a/src/webui/static/icons/clock.png b/src/webui/static/icons/clock.png new file mode 100644 index 0000000000000000000000000000000000000000..e2672c20676177efb2fdea593b8f000fd5f12342 GIT binary patch literal 882 zcmV-&1C9KNP)Zkp%;s8}r$h6cUMpt8KZ&`memftw9r2BH zXZp!+CFaEnJk?xA$eKJbHrNPn>;Axd{TeCT;zL2Z2lqOE#$fse--k~9GCAnb$WrIY zUzF=05;%7ScRp;-^ba=g4+!_yjOVxZHrAy=-Qy;3W{V_ws3i3@rj zN6Uq**d4Ifp5hMksmBf!JrmJQC(GkeNV1GOW##ZtQFwF|H80+P{}RL%{YNk_%ft(I z#;Cz`v~ti@ZP83cwQ@*mu2Dwn=d>z@4RV(M%#h6&LDo!N4vuc zo|;?G=MQ0U0&vMd?WX`v6t{tSSteePbgELlMO}xKy8^QHBD{2ALkbX%5TpZC;3a)d zD?(MwgLzpdUa8!vFvP literal 0 HcmV?d00001 diff --git a/src/webui/static/icons/drive.png b/src/webui/static/icons/drive.png new file mode 100644 index 0000000000000000000000000000000000000000..37b7c9b27d39acaaecf06951b024ac08afbfd4d2 GIT binary patch literal 346 zcmV-g0j2(lP)`6pHR4C7- zkv&QTK@f$%UVGNSAB4p~7X&kJu`rW(3s2w)1kd9QoMeZ&fx$)tn+OJimk zjCT$JD?{UrQ?3~v=-g&C?-zWP;E3TkpyGrhTDFaQSzpwKU?tq9Uh&CO=Y?-R7%>t` z!bl_(!*h(_r3OLS;FuM!k+?!xBDEihL=?r53TBrP2>202N!*Y~*dL6MvS5Ku!P&n9 sT@vv>?encL=G!4ixo5^&>-PTUFAyGx1U4B=kpKVy07*qoM6N<$g0$g{=l}o! literal 0 HcmV?d00001 diff --git a/src/webui/static/icons/group.png b/src/webui/static/icons/group.png new file mode 100644 index 0000000000000000000000000000000000000000..7fb4e1f1e1cd6ee67d33ffd24f09ddd5c3478bec GIT binary patch literal 753 zcmV(G`SI(6vnfMgxg){D+Lwutc1Si0swhN#FwOv#}l83ts6rCW;r!9Q9l zl<41549yYiq6clJ;(J(YgF_14nmKFB@QK(mo6I~sr{BJxJ$rsp0HSt^ntND0Z;o48 z>O2Ckm9}n?$F`*>$L{;{zT>f+bCm7tpaqw^4q@%k z&cHHt3=3xZmt6rQ_dtDM#)Xwp66-Thu=<9?(zFvpy0gAr0U4Z3smE5f@pZNr!NoqT zEjSPuCQzMw(H;?yvf{+e;!7(;4hv)+d%cjKFiBL%egy0aeCof8z<>rLEjMsF|CBRH z86WcxAYvS6H;Yq)jY1Z-rrjWiu~m;clLmJlDAE7UhMJ*jBxp}s&nQkrZvqDXxsiv3 zSJ78>4W2GFIu$$+Ic&5Pq{1?zhIy(24enCZy35e>z6~XgVx$x%k(+>tPw)9SL~R?4 zs${`1bqjTFC3F)dxIIw>)!QP7$vk+;^#2c5r{lsjtwKYnfnn+j{~{GK;|I8rvPFU z5NbS#W7m)ofjNER&&ggR6fXi0xd4%4143#8JZlhXW+2TN#8b=5@L&-EUlY^cTT=>w zb_~+jfcRCYfdj}H0J49#sP#gtxE~%YBJiQ3AjMgoQJKuMITA}Iz|zizG7pw|7R*XF j=$D`QjOCK>V3B}dL4UFUkhgq600000NkvXXu0mjf1x-zB literal 0 HcmV?d00001 diff --git a/src/webui/static/icons/key.png b/src/webui/static/icons/key.png new file mode 100644 index 0000000000000000000000000000000000000000..4ec1a928140311ff30a0a9120e958096c77f446e GIT binary patch literal 612 zcmV-q0-ODbP)nmX^MrbE*gmZ6|p*GkKoxa?X?hD9M+@sRvFH{EqYA??u6x z2pu{uGnrwz*>rh zfvUA@7b#acN?M*mBG3rQV?e^+0R5m3YXWyRZL5Bt@3vAw{9JaEW$}=f4bXO52yBH{ z;G~ZN|GLn>k~{On3Swd-Sy(gFkOdyw-RP%&exwl01RJRp))TI*SsngruhZksQ*NT%!X?K0000oVs((xWgD$)EF}_d~6|E9cYZTvaqk~9`i&BW97*P>v z@lDk@Xl;b%^t%HQ(pa0tz@5kM+;h(T<_N&ip(~wEOB0DiJ{F5{;c!^;_xs1dg=jRo z3WY*KAQ0euKA+@K0;yC=8jr^rydICoSglqd_{QV$a4whY=|O=zI1-7hhr=Og4T=Ck z5O8*O_S@lbByBd^lf44TWKv2W^LH=<&(F_6aj;k{L?;9b7K?>5nM{(sFqO3)3}ZrBV@HFj%2boa`NCnylwer*m5<6vU%rtuL2L)a!Nd zJP*qIOD>n6?i;$@!fv-8Tdme9+l?I|%bm;R7`!3)<-bP$-VIIGvB6*%vHYw+%Da)t sWG@c=a1S2nbh=||dPK1BKbT#A0Qk`HN6lbD;Q#;t07*qoM6N<$f^gU==>Px# literal 0 HcmV?d00001 diff --git a/src/webui/static/icons/pci.png b/src/webui/static/icons/pci.png new file mode 100644 index 0000000000000000000000000000000000000000..865b413e7aee01ea3513b03f23005a5c2856d765 GIT binary patch literal 850 zcmV-Y1FigtP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXS_ z2?8@S;+$9j00PoUL_t(I%Z-yeb6Z6KM$hhD->0r*OO|X&mXwUG1Q!g$YurHt73ry{ zDaa4tFEI>hlF-q?3<*gF7#_x%gv65LSn^A!-J4e`s1qYB|(*?ry zK}l?pA(kW{Nfs%75MZ=MN)1v&T7Xgrn^_+I_>;YR?+!^er@PtZ_U$i(0dfi??$tVi zB%Kp_E&`1v$3dVL7B=5{Q|x3D>$o}JeSeQ54p_oR5@0aQ?1ETC;91UCU@0)n5onZj zA#i=%IL3`M-+cQO{<^WxUK|irs^mr>97&eXiQ^cneS`z;ZiUZ2`BX?K$ZUqzhOPch z*4j0e>m?jt5LP_2vtYI3W14=jz^LtO!F~@3(h77{2!XlZKS>Q!6;PdbA5XQ6J)q$i(f8L zU8~T$+2m|wP*F<%qYWxGpLkV}EgTdeP2f-{$U=wZUIniK{dao2n!YAc8GpWf3UxS{ zC#2SJpi_=g$+evu6o8s#uoOZrQxaC9_~a1zx5j1)a~YtMDT_&pV?vGx2{NzIsa%QFsWoYLD=gz&z2Heu zI$`(8U%cJ_kk4;@DeSE>zHKrZowKsM%KpnCVHDxIOEl^+iM=XBy7>j3bIJQ}Y>9lF z5M8#I90_7JaD}2)iIFzt#%7CNyGpYj;{cI>01#H6K$1Y<0}5;iLZb5&$MpaUh<}Ux c4;IMb9}F2aYEr;63;+NC07*qoM6N<$f}!bq=Kufz literal 0 HcmV?d00001 diff --git a/src/webui/static/icons/tag.png b/src/webui/static/icons/tag.png new file mode 100644 index 0000000000000000000000000000000000000000..e093032a77d0b90d3a5dc05759dd6bcc2ad51715 GIT binary patch literal 389 zcmV;00eb$4P)OW%^N^ox0}MJJ@O#dCdMskq^A9kwxXrIWcrSi_3?zrw0R6UmLLRf9 z9xK}R`oI6&r}tpuA*){AE8G3%KS)ly_Kpx%1N2(%MMSTD`Mq%KtN(tpp59Y0xFL-s zCmpcp**%b4#M0;AfpQTj2Iw~2WeZ>a{A1;gH$Vl?eyiqOGe&o+X8A2+kX-4em;VE2 zKK`hXbcGGY1?t5&BSPmt{hqbz#ea{!2lwRTE=eQFNqbLybPpsKH1pASpj-sjFi=dn zB4pce=UD3Er~h4B?!v>sYto~887rRu2g%7rUlhU{3o;QG_$|wC9`o+J2ag5+DGxu` j)ZRG;k{c;WnG_5FM|sxYY1FNa00000NkvXXu0mjf#+s`M literal 0 HcmV?d00001 diff --git a/src/webui/static/icons/tag_blue.png b/src/webui/static/icons/tag_blue.png new file mode 100644 index 0000000000000000000000000000000000000000..9757fc6ed6597438eb8e5a70a1ab2402cdebd5d1 GIT binary patch literal 586 zcmV-Q0=4~#P)6YY{78#rvt}vj%qrc zN=UU@y$E6COaj9&r1NAlaUpajQlL~SorN%pOwHs*2laYgHBA$?ZOd~4Rw@5yFm2?1ZIg`0V-$-;GT1Fi5dB7wUSNi^%`^Ge62m>OBeX610Nsukl}DhDG-mxT?nhyYH!4he7Ri8 zrq0Ti&UXUvqX&F@JcJAe14@BNBqAY_QZAPjF(Y3r7P9H_kB#@LgFAf>xz>Qp&n=|a z>ro1XLZK^nmO`PRh#C2OK0ktd7l6-A;O5?fz1gNnCX)yR0H`oW|{1}@v@LQ05MEhB<# z<4=>;WR@@@AqLtaC!HVPednGQ<4lg$g~L5?&-dMX?!97W^xd6Eo$oxkoJ>mN{Nh?T zKGK`#ALG)s`^~4%wdc0Bisi*@repfmSR`f!P$zkx{T@z?_SH!)UcKGidA1{0C>G0$ zA7?uRzSSI_Ih89GO69MgXFKNKK98zQ zodDp<&Bv*(&J#KH@!=2Cb72$}=}dR!3fra9w=bFS)4LbZ-g+@J1_uWp0QaggGoz)Y zB>|wSc<)(XUsp53%urPdg~G$}@$up0E-(~ceR!Hy^s(H0Oy=QCCAKYOhW5XAsPII%aO9W8L<_45+Wpm z3J{2(s?-F|Ih+_O=Jc>IDrA4Q#$1Wo2cBk)48vLrVrKOB_giagE2{e6@ZQ&E?>*UUmP{riNq~)w4Hgy_YKz``%%A_P)hUn2-Navsqo?5A8 zh}}V^=%7@_%C;=H{tGpIj5CMu*>5J=i;m^t2QTySd)}9aAppozC}++wDz`eOViU-dbRRoz=JsVlZk>N%^azhi%=xTCt9`LQjtqNFW~e|R=r9= z`@I3J^#z@aD5yBuq2DLQO#|4uFW6R5kzPZ+h&6Af&5}POarL&lA~3t5R1i7uh*ffDw@qEs=HBW ze?CI~MkvG6H-MF7r{Yv4kw_q&PNP^XqFgTHXlH@RpLO}3aV{T{Ez=8lo;PHV$Ads1 zfOtF(s5%5V>3qE|&{lueV1Y1j%GF zXt&#NI-LlGLPN>_18TJzN~Mxf*f6pY5Dteo^|P&3>(H{!KTr&_wGRQWb^rhX07*qo IM6N<$g7V1&P5=M^ literal 0 HcmV?d00001 diff --git a/src/webui/static/icons/wrench.png b/src/webui/static/icons/wrench.png new file mode 100644 index 0000000000000000000000000000000000000000..5c8213fef5ab969f03189d4367e32e597e38bd7f GIT binary patch literal 610 zcmV-o0-gPdP)^jb z4`0v}DG1te)wmeb(>p90leRz?_mO+^JKy=v&2<29Od6?F%9%(c8los#f*@G`-%W&* z$)uBj2i@u-@SgX}gtyWPe6d*|w6h%R? zScK2#Yn%$sum0cy>90DmY*i{1XqpClEtktsRTZ)lCUe z<FogV^*tm>8*AlX za4oiR!&85LrobG57qUHUX#{>Vz(RHpB5|@>9O6N$jqB8>%($0wxE5R3)b>Y~xtCo$ zCgEk&A?_#IxHdN)9tqre^o{ho4{?hmPuf@^@I3-wncaRd%|~O3xbrKY=&TiwPYkJroM{;WUQTuMY8vp