diff --git a/docs/docresources/accessconfig.png b/docs/docresources/accessconfig.png index 11b0f87d..4d0f0149 100644 Binary files a/docs/docresources/accessconfig.png and b/docs/docresources/accessconfig.png differ diff --git a/docs/docresources/accessconfigexample.png b/docs/docresources/accessconfigexample.png index ebb27433..2b0e27ef 100644 Binary files a/docs/docresources/accessconfigexample.png and b/docs/docresources/accessconfigexample.png differ diff --git a/docs/html/config_access.html b/docs/html/config_access.html index 167f3239..538246b4 100644 --- a/docs/html/config_access.html +++ b/docs/html/config_access.html @@ -32,84 +32,91 @@ The access rules are listed / edited in a grid.

+
+

+Columns +
The columns have the following functions: +

-
Enabled +
Enabled
Make the entry participate in access control. If disabled, the entry is inactive. -
Username +
Username
Name of user, if no username is needed for match it should contain a single asterisk (*). -
Password +
Password
Password to combine with user, if username is '*' (unused), the password should be the same. -
Prefix +
Network prefix
IPv4 prefix for matching based on source IP address. If set to 0.0.0.0/0 it will match everything. -
Streaming +
Streaming
Enables access to streaming function. The 'streaming' access is enough to make Showtime (over HTSP) work. -
Advanced Streaming +
Advanced Streaming
Enables access to advanced streaming function for HTTP - like direct service or whole MPEG-TS stream (mux).. -
Video Recorder +
Video Recorder
Enables access to all video recording functions. This also include administration of the auto recordings. -
DVR Config Profile +
DVR Config Profile
If set, the user will only be able to use the DVR config profile equal to this value. Note that this field is unset when the DVR Config Profile is removed. -
Web interface +
Web interface
Required for web user interface access. Also gives access to the EPG. -
Admin +
Admin
Enables access to the Configuration tab. -
Limit Connections +
Limit Connections
If nonzero, the user will be limited to this amount of streaming connection at a time. -
Min Channel Num +
Min Channel Num
If nonzero, the user will only be able to access channels with a channel number equal or greater to this value. -
Max Channel Num +
Max Channel Num
If nonzero, the user will only be able to access channels with a channel number equal or lower to this value. -
Channel Tag +
Channel Tag
If set, the user will only be able to access channels containing this channel tag. Note that this field is unset when the channel tag is removed. -
Comment +
Comment
Allows the administrator to set a comment only visible in this editor. It does not serve any active purpose.

+
+

Let's also take a look at an example:

diff --git a/docs/html/dvrfailed.html b/docs/html/config_dvrfailed.html similarity index 91% rename from docs/html/dvrfailed.html rename to docs/html/config_dvrfailed.html index a1479935..da40a3ea 100644 --- a/docs/html/dvrfailed.html +++ b/docs/html/config_dvrfailed.html @@ -5,8 +5,12 @@ This tab show your all failed recordings.

-Buttons have the following functions: - +
+

+Buttons +
+Buttons have the following functions: +

Delete
@@ -15,15 +19,14 @@ This tab show your all failed recordings.
Download
If clicked download selected failed recordings you can downloaded recordings to your disk. After clicked you ask to select path. -

- -
-

-The columns have the following functions: - - +
+

+Columns +
+The columns have the following functions: +

Details
diff --git a/docs/html/dvrfinished.html b/docs/html/config_dvrfinished.html similarity index 91% rename from docs/html/dvrfinished.html rename to docs/html/config_dvrfinished.html index a3ef3c10..e7beec6a 100644 --- a/docs/html/dvrfinished.html +++ b/docs/html/config_dvrfinished.html @@ -5,8 +5,12 @@ This tab show your all finished recordings.

-Buttons have the following functions: - +
+

+Buttons +
+Buttons have the following functions: +

Delete
@@ -16,12 +20,13 @@ This tab show your all finished recordings.
If clicked download selected finished recordings you can downloaded recordings to your disk. After clicked you ask to select path.
-
-

-The columns have the following functions: - - +
+

+Columns +
+The columns have the following functions: +

Details
diff --git a/docs/html/dvrupcoming.html b/docs/html/config_dvrupcoming.html similarity index 91% rename from docs/html/dvrupcoming.html rename to docs/html/config_dvrupcoming.html index 9b5fbecc..bd2182ad 100644 --- a/docs/html/dvrupcoming.html +++ b/docs/html/config_dvrupcoming.html @@ -5,21 +5,24 @@ This tab show your all upcoming/current recordings.

-Buttons have the following functions: - +
+

+Buttons +
+Buttons have the following functions: +

Delete
If clicked delete selected upcoming/current recordings you delete recordings. Before deleted show message: Do you really want to delete the selection ? Answer Yes or No. -

- -
-

-The columns have the following functions: - - +
+

+Columns +
+The columns have the following functions: +

Details
diff --git a/src/webui/static/app/dvr.js b/src/webui/static/app/dvr.js index 405bbca9..ca875e5d 100644 --- a/src/webui/static/app/dvr.js +++ b/src/webui/static/app/dvr.js @@ -189,7 +189,7 @@ tvheadend.dvr_upcoming = function(panel, index) { selected: selected, beforeedit: beforeedit, help: function() { - new tvheadend.help('DVR-Upcoming/Current Recordings', 'dvrupcoming.html'); + new tvheadend.help('DVR-Upcoming/Current Recordings', 'config_dvrupcoming.html'); }, }); @@ -271,7 +271,7 @@ tvheadend.dvr_finished = function(panel, index) { tbar: [downloadButton], selected: selected, help: function() { - new tvheadend.help('DVR-Finished Recordings', 'dvrfinished.html'); + new tvheadend.help('DVR-Finished Recordings', 'config_dvrfinished.html'); }, }); @@ -354,7 +354,7 @@ tvheadend.dvr_failed = function(panel, index) { tbar: [downloadButton], selected: selected, help: function() { - new tvheadend.help('DVR-Failed Recordings', 'dvrfailed.html'); + new tvheadend.help('DVR-Failed Recordings', 'config_dvrfailed.html'); }, });