From: Mark Clarkstone Date: Tue, 27 Jun 2017 16:27:17 +0000 (+0100) Subject: mdhelp: more small changes + try to explain the *change parameters* flag better ... X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1d4b96ff65638cffedb45b07b8671a4e7ea18bc8;p=thirdparty%2Ftvheadend.git mdhelp: more small changes + try to explain the *change parameters* flag better + update screenies --- diff --git a/docs/class/mpegts_service.md b/docs/class/mpegts_service.md index e40f56a07..35c60a114 100644 --- a/docs/class/mpegts_service.md +++ b/docs/class/mpegts_service.md @@ -73,9 +73,6 @@ You can map/remove a service to/from an existing channel by doing the following: have a lot of services you may want to use [filtering](webui_general) to limit the number of grid entries. -**Tip**: Remember to remove the filter when you're finished (uncheck the -check box next to the "Filters" option). - **2.** Double click on the channel field, a drop down listing of all defined channels will appear, check/uncheck the check box next to the channel you'd like to associate/disassociate the service with. diff --git a/docs/class/satip_server.md b/docs/class/satip_server.md index 833c6d37f..d371f30f0 100644 --- a/docs/class/satip_server.md +++ b/docs/class/satip_server.md @@ -62,6 +62,6 @@ it to perform a service discovery. ### Custom M3U Playlist You may put your custom m3u playlist which is advertised to clients -in your tvheadend's configuration directory - filename *satip.m3u*. +in your tvheadend configuration directory - filename *satip.m3u*. --- diff --git a/docs/markdown/webui_general.md b/docs/markdown/webui_general.md index 862d356da..8e681bcd9 100644 --- a/docs/markdown/webui_general.md +++ b/docs/markdown/webui_general.md @@ -57,8 +57,8 @@ between data sets. the total number of items available. * The *Per page* drop-down allows you to control how many rows are -displayed within the grid. By default, this is set to 50. Note that -increasing the number of rows displayed can affect performance. +displayed within the grid. By default, this is set to 50, increasing +the number of rows displayed may affect performance. * The refresh icon allows you to refresh the currently-displayed rows. @@ -79,12 +79,13 @@ refresh the rows for you, every 30 seconds. * And the same drop-down menu also gives you access to a **filter** function if defined. The filter does simple pattern-matching on any string you provide. A small blue flag or triangle will appear in the top-left - corner to indicate that a filter is active. + corner to indicate that a filter is active. Filters persist until + cleared. * **Re-arrange** the columns by simply dragging he header to a new spot. * **Re-size** the columns by dragging the very edges of the column header as - required. + required. Note, a cookie is used to remember your column/filtering preferences. Clearing your cookies will reset the interface to default. @@ -95,29 +96,29 @@ your cookies will reset the interface to default. * Rows (in the grid) are multi-selectable, so you can carry out certain actions on more than one entry at the same time. So, for example, you can select - multiple items by using ctrl+click on each entry or click, + multiple items by using ctrl+click on each entry or click, shift+click to select a range, or ctrl+A to select all. -* To add an entry, click the *Add* button from the menu bar. You'll then - see a dialog, or in some cases (where a list/split panel is used), a - parameter panel. You can now fill in the desired/required fields, the - entry can then be saved (*Create/Save* button), applied (*Apply* button), +* To add an entry, click the *Add* button from the menu bar. You'll then + see a dialog, or in some cases - where a list/split panel is used - a + parameter panel. You can now fill in the desired/required fields, the + entry can then be saved (*Create/Save* button), applied (*Apply* button), or abandoned (*Cancel* button). -* To edit a single entry in the grid, double click on the desired field/cell. - It should now be editable. Once you've made your changes you can then +* To edit a single entry in the grid, double click on the desired field/cell. + It should now be editable. Once you've made your changes you can then save (*Save* button), apply (*Apply* button), or abandon (*Cancel* button). - After a cell is changed, a small red flag or triangle will appear in + After a cell is changed, a small red flag or triangle will appear in the top-left corner to indicate that it has been changed. To change a check box or radio button, click once. -* To edit multiple entries, select the desired entries (as explained above), and - then press the *Edit* button - a dialog will be displayed. You can now make - your changes to each field. These changes can then be kept (*Save* button), - applied (*Apply* button), or abandoned (*Undo* button). Remember to tick the - check box before each field when saving/applying, so that the changes are applied +* To edit multiple entries, select the desired entries (as explained above), and + then press the *Edit* button - a dialog will be displayed. You can now make + your changes to each field. These changes can then be kept (*Save* button), + applied (*Apply* button), or abandoned (*Undo* button). Remember to tick the + check box before each field when saving/applying, so that the changes are applied to all selected entries. * To delete entries, simply select the entry/entries and press the *Delete* button. diff --git a/docs/property/change_parameters.md b/docs/property/change_parameters.md index c8556d517..1c3316ba8 100644 --- a/docs/property/change_parameters.md +++ b/docs/property/change_parameters.md @@ -1,16 +1,17 @@ : -Allows you to control which parameters are merged. If the -*Change parameters* flag is turned on and a parameter -(permission flags, all types of profiles, channel tags and ranges) -for an entry is not set the parameter (value, list or range) is cleared -(unset). This allows the next matching entry (if any) in the sequence -to set it. +The *Change parameters* flag allows you to control which parameters +(permission flags, all types of profiles, channel tags and ranges) are +combined when multiple entries match a username/login. When the +change parameter flag is enabled (checked) for a parameter that +isn't set, the next matching entry (if any) in the sequence can set it. -For example, say you have a wildcard account with the theme set to Gray, -and an admin account with the Blue theme. Unchecking the theme checkbox -for the admin user would mean that the theme from the last matching -entry (which in this case would be the wildcard account) applies instead. +Username/Entry (matched in sequence) | "Change parameters" "Rights" checked? | Admin enabled/set? | Can access configuration tab? +---------------------------------------|-------------------------------------------|---------------------|------------------------------ +* (Anon entry). | Yes. | No. | No. +* (Another anon entry). | No. | Yes. | Yes, this is because the above entry "Change parameters" rights **is** checked and this user has admin rights. +John doe. | Yes. | Yes. | No, this is because the above entry "Change parameters" rights **isn't** checked even though this user has admin rights. +John doe (Another entry). | Yes. | No. | No, this is because the even though above entry "Change parameters" rights **is** checked this user has no admin rights. Option | Description/Properties ---------------------------|--------------------------- diff --git a/src/webui/static/img/doc/config/tab.png b/src/webui/static/img/doc/config/tab.png index 73c1c6ab9..b05c9862c 100644 Binary files a/src/webui/static/img/doc/config/tab.png and b/src/webui/static/img/doc/config/tab.png differ diff --git a/src/webui/static/img/doc/debugging/tab.png b/src/webui/static/img/doc/debugging/tab.png index c77094ac6..faa0e127c 100644 Binary files a/src/webui/static/img/doc/debugging/tab.png and b/src/webui/static/img/doc/debugging/tab.png differ diff --git a/src/webui/static/img/doc/dvrconfig/tab.png b/src/webui/static/img/doc/dvrconfig/tab.png index d9cf35790..26500f8f4 100644 Binary files a/src/webui/static/img/doc/dvrconfig/tab.png and b/src/webui/static/img/doc/dvrconfig/tab.png differ diff --git a/src/webui/static/img/doc/satip_server/tab.png b/src/webui/static/img/doc/satip_server/tab.png index e78d60b82..86a21a738 100644 Binary files a/src/webui/static/img/doc/satip_server/tab.png and b/src/webui/static/img/doc/satip_server/tab.png differ diff --git a/src/webui/static/img/doc/tv_adapters/params.png b/src/webui/static/img/doc/tv_adapters/params.png index c4228b3a1..646de175d 100644 Binary files a/src/webui/static/img/doc/tv_adapters/params.png and b/src/webui/static/img/doc/tv_adapters/params.png differ diff --git a/src/webui/static/img/doc/tv_adapters/tree.png b/src/webui/static/img/doc/tv_adapters/tree.png index 425d139ba..f38dc3c0c 100644 Binary files a/src/webui/static/img/doc/tv_adapters/tree.png and b/src/webui/static/img/doc/tv_adapters/tree.png differ