stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #431 from c0mm0n/master

Browse source 
Help WebUI Fix
This commit is contained in:
perexg 2014-07-07 21:39:24 +02:00
commit 388b4d72de
10 changed files with 215 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
docs/docresources/configdvbmux.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 47 KiB

BIN
docs/docresources/configdvbmuxsched.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 18 KiB

BIN
docs/docresources/configdvbnetwork.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 35 KiB

BIN
docs/docresources/configdvbservices.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 42 KiB

58
docs/html/config_muxes.html Normal file
View file

@ -0,0 +1,58 @@
<div class="hts-doc-text">
<p>
Muxes are locations at which services can be found. On traditional networks (DVB-C, -T and -S), these are carrier signals on which the individual channels are multiplexed, hence the name. However, Tvheadend also uses the term 'mux' to describe a source for multiple IP streams - so an IP address, in effect.
</p>
<p>
<img src="docresources/configdvbmux.png">
</p>
The columns have the following functions:
<dl>
<dt>Play
<dd>Downloads a playlist file (M3U or XSPF, depending on your startup options) so you can tune to the mux from an external application.
<dt>Enabled
<dd>Whether or not the mux is enabled and thus available.
<dt>EPG
<dd>Whether or not to retrieve EPG information from the mux.
<dt>Network
<dd>The name of the network to which the mux belongs. Networks are defined in Configuration -> DVB Inputs -> Networks - DVB-S or ATSC, for example.
<dt>Original Network ID
<dd>The ONID is a code which uniquely identifies a network.
<dt>Transport Stream ID
<dd>The TSID is a code which identifies the network origination source or transmitter.
<dt>CRID Authority
<dd>The group responsible for the Content Reference Identifier for this mux. This is effectively a URL/URI to an authoritative source for programme data (e.g. series link).
<dt>Scan Status
<dd>Whether the mux is being scanned (ACTIVE), is planned to be scanned (PEND) or has reverted to idle scan (IDLE).
<dt>Scan Result
<dd>Whether there were any problems with the last scan of this mux.
<dt>URL
<dd>Mux URL.
<dt># Services
<dd>The number of services found on this mux.
<dt>Character Set
<dd>The character encoding for this mux (e.g. UTF-8).
<dt>Interface
<dd>IPTV : the network interface/card on which the IPTV source can be found.
<dt>ATSC
<dd>whether or not this is an ATSC IPTV source.
</dl>
</div>

28
docs/html/config_muxsched.html Normal file
View file

@ -0,0 +1,28 @@
<div class="hts-doc-text">
<p>
Mux Schedulers enable Tvheadend to automatically play channels.
This is useful to get EPG, services or access rights updates.
</p>
<p>
<img src="docresources/configdvbmuxsched.png">
</p>
The columns have the following functions:
<dl>
<dt>Enabled
<dd>If selected, schedule will be triggered.
If unselected, schedule will be ignored.
<dt>Mux
<dd>Select mux to be played from the available muxes.
<dt>Cron
<dd>Schedule frequency, using cron syntax.
<dd>Example : every day at 2am is : 0 2 * * *
<dt>Timeout
<dd>Time in seconds the selected mux will be played.
<dd>Example : 1 hour would be 3600.
</dl>
</div>

53
docs/html/config_networks.html Normal file
View file

@ -0,0 +1,53 @@
<div class="hts-doc-text">
<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
</dl>
</p>
<p>
<img src="docresources/configdvbnetwork.png">
</p>
The columns have the following functions:
<dl>
<dt>Network Name
<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
<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
<dd>Don't scan this network for muxes at Tvheadend start.
<dt>Idle Scan Muxes
<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
<dd>IPTV : maximum simultaneous streams that can be played.
<dt>Max Bandwidth
<dd>IPTV : maximum bandwidth allowed for streams.
<dt>Max timeout
<dd>IPTV : maximum timeout trying to play stream.
<dt>Network ID
<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
<dd>The character encoding for this network (e.g. UTF-8).
</dl>
</div>

61
docs/html/config_services.html Normal file
View file

@ -0,0 +1,61 @@
<div class="hts-doc-text">
<p>
Services are automatically pulled from muxes and can be mapped to Channels.
</p>
<p>
<img src="docresources/configdvbservices.png">
</p>
The columns have the following functions:
<dl>
<dt>Play
<dd>Opens a playlist (M3U of XSPF, depending on your startup options) to allow you to stream this service to another application, e.g. to watch a channel in VLC.
<dt>Details
<dd>Display details on this service, e.g. PID, streams, audio/video CODECs, languages, etc.
<dt>Enabled
<dd>Whether or not this service is available for use
<dt>Channel
<dd>The channel to which the service is mapped
<dt>Service Name
<dd>The name of the service, detected when the service was discovered
<dt>Encrypted
<dd>Whether or not the service is scrambled
<dt>Network
<dd>The network on which this service resides (i.e. whether it's a cable channel or a terrestrial one)
<dt>Mux
<dd>The mux which carries this service. This is typically the frequency of the carrier signal in kHz, with polarisation (H or V) as applicable.
<dt>Service ID
<dd>A unique identifier for this service within this mux/transport stream.
<dt>Local Channel Number
<dd>Channel number as assigned by the broadcaster.
<dt>Provider
<dd>Any supplied provider string, e.g. where multiple broadcasters share a platform, such as for free-to-air and pay TV.
<dt>CRID Authority
<dd>The group responsible for the Content Reference Identifier for this service. This is effectively a URL/URI to an authoritative source for programme data (e.g. series link).
<dt>Service Type
<dd>The service type flag as defined by the DVB specifications (e.g. 0x02 = radio, 0x11 = MPEG2 HD TV, 0x19 = H.264 HD TV)
<dt>Pref. CA PID
<dd>The Preferred Conditional Access Packet Identifier. Used for decrypting scrambled streams.
<dt>Character Set
<dd>The character encoding for this service (e.g. UTF-8).
</dl>
</div>

3
src/webui/static/app/chconf.js
View file

@ -216,6 +216,9 @@ tvheadend.channel_tab = function(panel)
titleS: 'Channel',
titleP: 'Channels',
tabIndex: 0,
help: function() {
new tvheadend.help('Channels', 'config_channels.html');
},
add: {
url: 'api/channel',
create: {}

12
src/webui/static/app/mpegts.js
View file

@ -33,6 +33,9 @@ tvheadend.networks = function(panel)
titleS: 'Network',
titleP: 'Networks',
tabIndex: 1,
help: function() {
new tvheadend.help('Networks', 'config_networks.html');
},
add: {
titleS: 'Network',
select: {
@ -63,6 +66,9 @@ tvheadend.muxes = function(panel)
titleP: 'Muxes',
tabIndex: 2,
hidemode: true,
help: function() {
new tvheadend.help('Muxes', 'config_muxes.html');
},
add: {
titleS: 'Mux',
select: {
@ -236,6 +242,9 @@ tvheadend.services = function(panel)
del: false,
selected: selected,
tbar: [mapButton],
help: function() {
new tvheadend.help('Services', 'config_services.html');
},
lcol: [
{
width: 50,
@ -264,6 +273,9 @@ tvheadend.mux_sched = function(panel)
titleS: 'Mux Scheduler',
titleP: 'Mux Schedulers',
tabIndex: 4,
help: function() {
new tvheadend.help('Mux Schedulers', 'config_muxsched.html');
},
hidemode: true,
add: {
url: 'api/mpegts/mux_sched',