WEBUI: help changes, cosmetics and icon

diff --git a/docs/docresources/configdvbnetwork.png b/docs/docresources/configdvbnetwork.png
index 1b88964031034c28ff611c2f909ee0fe34685e0a..40e70841574fc02f8cb6a9f294fe078889ce3455 100644 (file)
Binary files a/docs/docresources/configdvbnetwork.png and b/docs/docresources/configdvbnetwork.png differ

diff --git a/docs/docresources/configdvrtab.png b/docs/docresources/configdvrtab.png
deleted file mode 100644 (file)
index 834a1ff..0000000
Binary files a/docs/docresources/configdvrtab.png and /dev/null differ

diff --git a/docs/docresources/configdvrtab1.png b/docs/docresources/configdvrtab1.png
new file mode 100644 (file)
index 0000000..adfd5d1
Binary files /dev/null and b/docs/docresources/configdvrtab1.png differ

diff --git a/docs/docresources/configdvrtab2.png b/docs/docresources/configdvrtab2.png
new file mode 100644 (file)
index 0000000..b3b5a55
Binary files /dev/null and b/docs/docresources/configdvrtab2.png differ

diff --git a/docs/docresources/configdvrtab3.png b/docs/docresources/configdvrtab3.png
new file mode 100644 (file)
index 0000000..622f56b
Binary files /dev/null and b/docs/docresources/configdvrtab3.png differ

diff --git a/docs/docresources/configtvadapters.png b/docs/docresources/configtvadapters.png
new file mode 100644 (file)
index 0000000..194b25c
Binary files /dev/null and b/docs/docresources/configtvadapters.png differ

diff --git a/docs/html/config_dvr.html b/docs/html/config_dvr.html
index 1b5a652b5fb3911709fd76d957d5f9d7b7c36de9..87432c1cc027757b21e361f950be531046d6ec85 100644 (file)
--- a/docs/html/config_dvr.html
+++ b/docs/html/config_dvr.html
@@ -1,6 +1,10 @@
 <div class="hts-doc-text">
 
- <img src="docresources/configdvrtab.png">
+ <img src="docresources/configdvrtab1.png">
+ <br>
+ <img src="docresources/configdvrtab2.png">
+ <br>
+ <img src="docresources/configdvrtab3.png">
 
  <p>
  This tab is used to configure operation of the Digital Video Recorder.

diff --git a/docs/html/config_networks.html b/docs/html/config_networks.html
index a34e4b1b8a36bf52344df511eabcdce4b75b9d4f..0c58597e99fcdcc2ee7e9db1ba66c4e1ab384400 100644 (file)
--- a/docs/html/config_networks.html
+++ b/docs/html/config_networks.html
@@ -2,54 +2,88 @@
        <p>
                A network is the type of carrier for your television signals. Tvheadend supports several different types of network, notably:
                <dl>
-               <li>DVB-C : Cable TV, delivered via a cable to your house
-               <li>DVB-S : Satellite (includes S2), so any signal coming in via a dish
-               <li>DVB-T : Terrestrial, so over-the-air broadcasts received through a traditional television aerial
-               <li>ATSC : Over-the-air terrestrial, common in north and central America and parts of south Asia
-               <li>IPTV : IP, so over the Internet
+               <li><b>DVB-C</b> : Cable TV, delivered via a cable to your house
+               <li><b>DVB-S</b> : Satellite (includes S2), so any signal coming in via a dish
+               <li><b>DVB-T</b> : Terrestrial, so over-the-air broadcasts received through a traditional television aerial
+               <li><b>ATSC</b> : Over-the-air terrestrial, common in north and central America and parts of south Asia
+               <li><b>IPTV</b> : IP, so over the Internet
                </dl>
        </p>
        <p>
                <img src="docresources/configdvbnetwork.png">
        </p>
-       
+<br>
+<hr>
+<b>Buttons</b>
+<hr>
+Buttons have the following functions:
+<br><br>
+<dl>
+  <dt><b>Add</b>
+  <dd>
+  Add a new network. You can choose from any of the types described above.
+  <p>
+  <dt><b>Delete</b>
+  <dd>
+  Delete an existing network. This will also remove any association with an adapter.
+  <p>
+  <dt><b>Edit</b>
+  <dd>
+  Edit an existing network. This allows you to change any of the parameters you'd otherwise set when adding a new network, e.g. network discovery, idle scan, etc. - similar to using the check boxes to enable/disable functions.
+  <p>
+  <dt><b>Save</b>
+  <dd>
+  Saves any changes.
+  <p>
+  <dt><b>Undo</b>
+  <dd>
+  Undoes any changes.
+  <p>
+  </dl>
+<p>
+       <br>
+       <hr>
+       <b>Columns</b>
+       <hr>
        The columns have the following functions:
 
        <dl>
-               <dt>Network Name
+               <dt><b>Network Name</b>
                <dd>The name of the network. This can be set automatically or you can give it a name that means something to you (e.g. if you have multiple OTA networks).
-                       
-
-               <dt>Network Discovery
+               <p>     
+               <dt><b>Network Discovery</b>
                <dd>Whether automatic discovery is enabled for this network, i.e. whether Tvheadend looks for muxes or simply stays with the list of muxes as defined initially.
-
-               <dt>Skip initial Scan
+<p>
+               <dt><b>Skip initial Scan</b>
                <dd>Don't scan this network for muxes at Tvheadend start.
-
-               <dt>Idle Scan Muxes
+<p>
+               <dt><b>Idle Scan Muxes</b>
                <dd>When nothing else happens Tvheadend will continuously rotate among all muxes and tune to them to verify that they are still working. If your adapter have problems with lots of tuning, try to disable this.
-
-               <dt>Max Input Streams
+<p>
+               <dt><b>Ignore Provider's Channel Numbers</b>
+               <dd>Some providers will try to set a channel number so that every receiver is consistent - "tune to Channel x on 150". This option allows you to ignore this and let tvhheadend allocate a channel number itself.
+<p>
+               <dt><b>Max Input Streams</b>
                <dd>IPTV : maximum simultaneous streams that can be played.
-
-               <dt>Max Bandwidth
+<p>
+               <dt><b>Max Bandwidth</b>
                <dd>IPTV : maximum bandwidth allowed for streams. 
-
-               <dt>Max timeout
+<p>
+               <dt><b>Max timeout</b>
                <dd>IPTV : maximum timeout trying to play stream.
-
-               <dt>Network ID
+<p>
+               <dt><b>Network ID</b>
                <dd>If you experience problems caused by overlaps between multiple network
   providers this option can be used to filter which network ID is received
   by a given adapter.
-
-               <dt>Character Set
+<p>
+               <dt><b>Character Set</b>
                <dd>The character encoding for this network (e.g. UTF-8).
-
-               <dt>Priority
+<p>
+               <dt><b>Priority</b>
                <dd>IPTV : The network priority value (higher value = higher priority to use muxes/services from this network).
-
-               <dt>Streaming Priority
+<p>
+               <dt><b>Streaming Priority</b>
                <dd>IPTV : The network priority value for streamed channels through HTTP or HTSP (higher value = higher priority to use muxes/services from this
                     network). If not set, the standard network priority value is used.
 

diff --git a/docs/html/config_tvadapters.html b/docs/html/config_tvadapters.html
index a65428d4c539744c55c177ca84f86c4f1a6fdec0..3ace1e452162388a4de48897944bf1284a310be6 100644 (file)
--- a/docs/html/config_tvadapters.html
+++ b/docs/html/config_tvadapters.html
@@ -8,79 +8,86 @@
       you only have to click once in it.
 </ul>
 </p>
-
-<h4>The rows have the following functions</h4>
-
+<p>
+               <img src="docresources/configtvadapters.png">
+       </p>
+<br>
+<hr>
+<b>Rows</b>
+<hr>
+The rows have the following functions
+<br><br>
+<dt><u><i><b>Basic Settings</b></i></u></dt>
 <dl>
-  <dt>Enabled</dt>
-  <dd>If selected, the IPTV service will be enabled an use for channel
-      subscriptions.</dd>
-
-  <dt>Name</dt>
+  <dt><b>Enabled</b></dt>
+  <dd>If selected, this tuner/adapter will be enabled and will become available to receive broadcasts or programmes.</dd>
+<p>
+  <dt><b>Name</b></dt>
   <dd>The name of this tuner.</dd>
-
-  <dt>Over-the-Air EPG</dt>
+<p>
+  <dt><b>Over-the-Air EPG</b></dt>
   <dd>Enable over-the-air programme guide (EPG) scanning on this input device.</dd>
-
-  <dt>Networks</dt>
+<p>
+  <dt><b>Networks</b></dt>
   <dd>Associate this device with one or more networks.</dd>
-  
-  <dt>Priority</dt>
+ <p> 
+ <dt><b>Power Save</b></dt>
+  <dd>If enabled, allows the tuner to go to sleep when idle.</dd>
+ <p>
+ </dl>
+ <dt><u><i><b>Advanced Settings</b></i></u></dt>
+ <dl>
+  <dt><b>Priority</b></dt>
   <dd>The tuner priority value (higher value = higher priority to use this
       tuner).</dd>
-
-  <dt>Streaming Priority</dt>
+<p>
+  <dt><b>Streaming Priority</b></dt>
   <dd>The tuner priority value for streamed channels through HTTP or HTSP
       (higher value = higher priority to use this tuner). If not set (zero),
       the standard priority value is used.</dd>
 
 </dl>
-</p>
-
-<h4>LinuxDVB specific rows</h4>
-
-<dl>
-  <dt>Keep FE open</dt>
-  <dd>Enable to not close the LinuxDVB frontend device in the idle state.</dd>
-</dl>      
-
-<h4>SAT>IP specific rows</h4>
+</p>     
+<br>
+<hr>
+<b>SAT>IP Specific Rows</b>
+<hr>
 
 <dl>
-  <dt>Full Mux Rx mode supported</dt>
-  <dd>Enable, if the SAT>IP box supports the full mux rx mode (pids=all)
-      parameter.</dd>
-      
-  <dt>Signal scale (240 or 100)</dt>
-  <dd>Some SAT>IP boxes has only 0-100 scale. If your signal is too low, try
-      value 100 here.</dd>
-      
-  <dt>Maximum PIDs<dt>
+  <dt><b>Full Mux Rx mode supported</b></dt>
+  <dd>Enable if the SAT>IP box supports the full mux rx mode (pids=all)<br>
+       note: no comma after 'Enable'</dd>
+      <p>
+  <dt><b>Signal scale (240 or 100)</b></dt>
+  <dd>Some SAT>IP boxes only report a 0-100 (percentage) signal strength. If your signal strength reports as too low, try
+setting this to 100.</dd>
+     <p> 
+  <dt><b>Maximum PIDs</b><dt>
   <dd>Maximum supported PIDs in the filter of the SAT>IP box.</dd>
-  
-  <dt>Maximum length of PIDs<dt>
+  <p>
+  <dt><b>Maximum length of PIDs</b><dt>
   <dd>Maximum length in characters for the command setting PIDs to the
       SAT>IP box.</dd>
-
-  <dt>addpids/delpids supported</dt>
-  <dd>Enable, if the SAT>IP box supports the addpids/delpids command.
-
-  <dt>PIDs in setup</dt>
+<p>
+  <dt><b>Addpids/delpids supported</b></dt>
+  <dd>Enable if the SAT>IP box supports the addpids/delpids command.
+<p>
+  <dt><b>PIDs in setup</b></dt>
   <dd>Enable, if the SAT>IP box requires pids=0 parameter in the SETUP RTSP command.</dd>
-
-  <dt>Force pilot for DVB-S2</dt>
+<p>
+  <dt><b>Force pilot for DVB-S2</b></dt>
   <dd>Enable, if the SAT>IP box requiest plts=on parameter in the SETUP RTSP
       command for DVB-S2 muxes.</dd>
-
-  <dt>UDP RTP Port Number (2 ports)</dt>
+<p>
+  <dt><b>UDP RTP Port Number (2 ports)</b></dt>
   <dd>Force the local UDP Port number here. The number should be even (RTP port).
       The next odd number (+1) will be used as the RTCP port.</dd>
-
-  <dt>Satellite Positions</dt>
+<p>
+  <dt><b>Satellite Positions</b></dt>
   <dd>Select the number of satellite positions supported by the SAT>IP
       hardware and your coaxial cable wiring.</dd>
-
-  <dt>Master Tuner</dt>
+<p>
+  <dt><b>Master Tuner</b></dt>
   <dd>Select the master tuner.
      <p>The signal from the standard universal LNB can be split using
         a simple coaxial splitter (no multiswitch) to several outputs.
@@ -90,17 +97,17 @@
         a slave one and tvheadend will assure that this tuner will not
         use incompatible parameters (position, polarization, lo-hi).</p>
   </dd>
-
-  <dt>Next tune delay in ms (0-2000)</dt>
+<P>
+  <dt><b>Next tune delay in ms (0-2000)</b></dt>
   <dd>The delay before tuning in milliseconds after tuner stop. If the time
       after previous start and next start is greater than this value -
       the delay is not applied.</dt>
-
-  <dt>Send full PLAY cmd</dt>
+<p>
+  <dt><b>Send full PLAY cmd</b></dt>
   <dd>Send the full RTSP PLAY command after full RTSP SETUP command. Some
       device firmwares requires this to get MPEG-TS stream.</dd>
-
-  <dt>Force teardown delay<dt>
+<p>
+  <dt><b>Force teardown delay</b><dt>
   <dd>Force the delay between RTSP TEARDOWN and RTSP SETUP command (value
       from 'Next tune delay in ms' is used). Some devices are not able to handle
       quick continuous tuning.</dd>

diff --git a/src/webui/static/app/config.js b/src/webui/static/app/config.js
index e9338bcffb7df0694e2f4af055b27381a66c1eb3..166dbd3f2bdf6bd32db823a3a7862ca755d51c12 100644 (file)
--- a/src/webui/static/app/config.js
+++ b/src/webui/static/app/config.js
@@ -241,7 +241,7 @@ tvheadend.miscconf = function(panel, index) {
 
     var mpanel = new Ext.Panel({
         title: 'General',
-        iconCls: 'wrench',
+        iconCls: 'general',
         border: false,
         autoScroll: true,
         bodyStyle: 'padding:15px',

diff --git a/src/webui/static/app/dvr.js b/src/webui/static/app/dvr.js
index a9a0f9c406d9728aa75e198364b8d54ec1e29d57..eba281f3a967a128f6fb829125b7216e54cf67d2 100644 (file)
--- a/src/webui/static/app/dvr.js
+++ b/src/webui/static/app/dvr.js
@@ -372,7 +372,7 @@ tvheadend.dvr_settings = function(panel, index) {
         titleS: 'Digital Video Recorder Profile',
         titleP: 'Digital Video Recorder Profiles',
         titleC: 'Profile Name',
-        iconCls: 'drive',
+        iconCls: 'dvrprofiles',
         tabIndex: index,
         add: {
             url: 'api/dvr/config',

diff --git a/src/webui/static/app/ext.css b/src/webui/static/app/ext.css
index 3f7bd81b2d44f39305fff01fdb065997b7a8e9bd..f9df548599dbdf1be4495335d385e777dc6398e6 100644 (file)
--- a/src/webui/static/app/ext.css
+++ b/src/webui/static/app/ext.css
@@ -414,6 +414,34 @@
     background-image: url(../icons/accept.png) !important;
 }
 
+.general{
+    background-image: url(../icons/general.png) !important;
+}
+
+.dvrprofiles{
+    background-image: url(../icons/dvrprofiles.png) !important;
+}
+
+.recording{
+    background-image: url(../icons/recording.png) !important;
+}
+
+.timeshift{
+    background-image: url(../icons/timeshift.png) !important;
+}
+
+.stream{
+    background-image: url(../icons/stream.png) !important;
+}
+
+.connections{
+    background-image: url(../icons/connections.png) !important;
+}
+
+.subscriptions{
+    background-image: url(../icons/subscriptions.png) !important;
+}
+
 .x-linked {
     display: inline-block;
     background-image: url(../icons/linked.gif) !important;

diff --git a/src/webui/static/app/status.js b/src/webui/static/app/status.js
index 868f4f8f4767804949de957a8cc458dca91858b8..66f1e013b5bf41641d19649db931d48c23cffea3 100644 (file)
--- a/src/webui/static/app/status.js
+++ b/src/webui/static/app/status.js
@@ -179,7 +179,7 @@ tvheadend.status_subs = function(panel, index)
         header: false,
         layout: 'fit',
         title: 'Subscriptions',
-        iconCls: 'eye'
+        iconCls: 'subscriptions'
     });
 
     tvheadend.paneladd(panel, dpanel, index);
@@ -425,7 +425,7 @@ tvheadend.status_streams = function(panel, index)
         header: false,
         layout: 'fit',
         title: 'Stream',
-        iconCls: 'hardware'
+        iconCls: 'stream'
     });
 
     tvheadend.paneladd(panel, dpanel, index);
@@ -560,7 +560,7 @@ tvheadend.status_conns = function(panel, index) {
         header: false,
         layout: 'fit',
         title: 'Connections',
-        iconCls: 'eye'
+        iconCls: 'connections'
     });
 
     tvheadend.paneladd(panel, dpanel, index);

diff --git a/src/webui/static/app/timeshift.js b/src/webui/static/app/timeshift.js
index b7085125ce55ae3cb9634d09ae54af82f55fbcae..017512ce3e48a471ed1aaca4b25ceb13f1db51d8 100644 (file)
--- a/src/webui/static/app/timeshift.js
+++ b/src/webui/static/app/timeshift.js
@@ -130,7 +130,7 @@ tvheadend.timeshift = function(panel, index) {
 
     var confpanel = new Ext.form.FormPanel({
         title : 'Timeshift',
-        iconCls : 'clock',
+        iconCls : 'timeshift',
         border : false,
         bodyStyle : 'padding:15px',
         labelAlign : 'left',

diff --git a/src/webui/static/app/tvheadend.js b/src/webui/static/app/tvheadend.js
index 7779d906dd97336f441ff1c1449a67cf46b5f85f..cb92e758182323dde1d428532e2909be9f60a5df 100644 (file)
--- a/src/webui/static/app/tvheadend.js
+++ b/src/webui/static/app/tvheadend.js
@@ -386,7 +386,7 @@ function accessUpdate(o) {
             activeTab: 0,
             autoScroll: true,
             title: 'Recording',
-            iconCls: 'drive',
+            iconCls: 'recording',
             items: []
         });
         tvheadend.dvr_settings(tsdvr);

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

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

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

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

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

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

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