From the department of bells and whistles:

Add more icons

diff --git a/src/webui/extjs.c b/src/webui/extjs.c
index a0eb529623e5848c1461ef870b862da1b079ecec..4c77d5eca1c32af8fc465841d1da58970a5bd070 100644 (file)
--- 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)
                 "<a href=\"http://hts.lonelycoder.com/\">"
                 "http://hts.lonelycoder.com/</a><br><br>"
                 "Based on software from "
-                "<a href=\"http://www.ffmpeg.org/\">FFmpeg</a> and "
-                "<a href=\"http://www.extjs.com/\">ExtJS</a>.<br>"
-                "<br>"
+                "<a target=\"_blank\" href=\"http://www.ffmpeg.org/\">FFmpeg</a> and "
+                "<a target=\"_blank\" href=\"http://www.extjs.com/\">ExtJS</a>. "
+                "Icons from "
+                "<a target=\"_blank\" href=\"http://www.famfamfam.com/lab/icons/silk/\">"
+                "FamFamFam</a>"
+                "<br><br>"
                 "Build: %s"
                 "</center>",
                 htsversion,

diff --git a/src/webui/static/app/acleditor.js b/src/webui/static/app/acleditor.js
index 0749f6bf233026b3aaa05fb55d37fb4af72582ea..d9864d837120d2ecc632d38ccfef77ebd1771dcf 100644 (file)
--- 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 b51a47b8d2015f86f4a55754b6656d8a8c084a7d..a23902f57c1e5eceb73c4743a048f2ef2adca9c4 100644 (file)
--- 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 1236a405ef0d365c81e764878e937ed27354ac17..57eef7a65d5514ab9fe32370fb33c591650f041c 100644 (file)
--- 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 945033735a7c59b232a7f2c7cf7ec10ac3f9a00a..87c4bd1f2b99521c56a9179a723aa9b99d814c68 100644 (file)
--- 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 24d7ea181d2c6e045384aa5228c525ac69c05a1f..8fc5a09f088506f2408bee9d768e0156fefa2b43 100644 (file)
--- 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 c71433020ca8d777efb4471b176a94660e448c64..88466a838c1feedf83ef51e8d8cc955d59f1afe4 100644 (file)
--- 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 61b04c69b73eab09b809bd46d388181029d9b82e..5a9872762610bc3ae0b574d372cba7801342f050 100644 (file)
--- 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 11ad0ba424f7578a2cd53ce6c715c64b9033135c..bf5c4d7c102569101b6ee34d0cacde17a68dbea8 100644 (file)
--- 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 ad68664ef1bc31c3f4ea18cb964631d5813d1f7f..561154eef9c2a5f5308ae43b2fb6ee72497c814d 100644 (file)
--- 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 7b98b36e9f6c37cad7f899ca9f33049aaa328a4b..3a16abccb43d29ccdbd536c07fa44dd5bad0531c 100644 (file)
--- 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 e194e7648022e4dad37b3bda09792465c99684cd..51bed3d597332cfff50cd9c18f65a59c89134b2d 100644 (file)
--- 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 (file)
index 0000000..e2672c2
Binary files /dev/null and b/src/webui/static/icons/clock.png differ

diff --git a/src/webui/static/icons/drive.png b/src/webui/static/icons/drive.png
new file mode 100644 (file)
index 0000000..37b7c9b
Binary files /dev/null and b/src/webui/static/icons/drive.png differ

diff --git a/src/webui/static/icons/group.png b/src/webui/static/icons/group.png
new file mode 100644 (file)
index 0000000..7fb4e1f
Binary files /dev/null and b/src/webui/static/icons/group.png differ

diff --git a/src/webui/static/icons/key.png b/src/webui/static/icons/key.png
new file mode 100644 (file)
index 0000000..4ec1a92
Binary files /dev/null and b/src/webui/static/icons/key.png differ

diff --git a/src/webui/static/icons/newspaper.png b/src/webui/static/icons/newspaper.png
new file mode 100644 (file)
index 0000000..6a2ecce
Binary files /dev/null and b/src/webui/static/icons/newspaper.png differ

diff --git a/src/webui/static/icons/pci.png b/src/webui/static/icons/pci.png
new file mode 100644 (file)
index 0000000..865b413
Binary files /dev/null and b/src/webui/static/icons/pci.png differ

diff --git a/src/webui/static/icons/tag.png b/src/webui/static/icons/tag.png
new file mode 100644 (file)
index 0000000..e093032
Binary files /dev/null and b/src/webui/static/icons/tag.png differ

diff --git a/src/webui/static/icons/tag_blue.png b/src/webui/static/icons/tag_blue.png
new file mode 100644 (file)
index 0000000..9757fc6
Binary files /dev/null and b/src/webui/static/icons/tag_blue.png differ

diff --git a/src/webui/static/icons/television.png b/src/webui/static/icons/television.png
new file mode 100644 (file)
index 0000000..1738a4f
Binary files /dev/null and b/src/webui/static/icons/television.png differ

diff --git a/src/webui/static/icons/wand.png b/src/webui/static/icons/wand.png
new file mode 100644 (file)
index 0000000..44ccbf8
Binary files /dev/null and b/src/webui/static/icons/wand.png differ

diff --git a/src/webui/static/icons/wrench.png b/src/webui/static/icons/wrench.png
new file mode 100644 (file)
index 0000000..5c8213f
Binary files /dev/null and b/src/webui/static/icons/wrench.png differ