mdhelp: add a common set of button table rows. mdhelp: use the (above) button rows...

diff --git a/docs/class/config.md b/docs/class/config.md
index 36d249bf0d537b1d27629b333880ca5aae0172d5..0b5c50429e0c37e58e3147891dc279cacc179224 100644 (file)
--- a/docs/class/config.md
+++ b/docs/class/config.md
@@ -11,10 +11,9 @@ The tab has the following buttons:
 
 Button                 | Function
 -----------------------|-------------------
-**Save**               | Save all changes (this will reload the web interface).
-**Undo**               | Revert all changes since last save.
+**Save**       | Save the current configuration.
+**Undo**       | Undo changes since the last save.
 **Start wizard**       | Display the first-run set-up wizard.
-**View Level**| Change the interface view level to show/hide more advanced options.
-**Help**               | Display this help page.
+<tvh_include>inc/common_button_table_end</tvh_include>
 
 ---

diff --git a/docs/class/dvrautorec.md b/docs/class/dvrautorec.md
index 0ef8c8d6aa27d77d4fe59cc0b995c3eb67d7a67d..6d4dc80ed5374fdd52c4722c8f132cc13f2e15bf 100644 (file)
--- a/docs/class/dvrautorec.md
+++ b/docs/class/dvrautorec.md
@@ -4,34 +4,24 @@ This tab controls EPG-driven recording rules.
 
 ---
 
-###Menu Bar/Buttons
+<tvh_include>inc/common_button_table_start</tvh_include>
 
-The tab has the following buttons:
-
-Button                 | Function
------------------------|-------------------
-**Save**               | Save any changes made to the grid/entries.
-**Undo**               | Revert any changes made since the last save.
-**Add**                | Display the *Add Autorec* dialog.
-**Delete**             | Delete the selected entry/entries.
-**Edit**               | Edit the selected entry.
-**View Level**| Change the interface view level to show/hide more advanced options.
-**Help**               | Display this help page.
+<tvh_include>inc/common_button_table_end</tvh_include>
 
 ---
 
-###Adding an Entry/Rule
+<tvh_include>inc/add_grid_entry</tvh_include>
 
-You can add an entry by pressing the *[Add]* button from the menu bar.
+####An Example
 
-For example, if you wanted to record any programs matching "BBC News" on 
+If you wanted to record any programs matching "BBC News" on 
 BBC One you would enter something like this into the add entry dialog: 
 
 !['Autorec' example entry](docresources/dvrautorecadd.png)
 
 This uses a regular expression (regex) to match the program title 
 "BBC News" exactly, otherwise event titles containing the phrase would 
-also match (e.g "BBC News at One", "BBC News at Six" etc).
+also match, e.g "BBC News at One" and "BBC News at Six" etc.
 
 Regular expressions examples:
 
@@ -47,20 +37,11 @@ automatically start being recorded.**
 
 ---
 
-###Editing an Entry
-
-Highlight (select) the desired entry within the grid, then click the *[Edit]* 
-button from the menu bar.
-
-**Tip**: You can quickly make changes to an entry by double-clicking on 
-the desired field within the grid. See *Editing Fields* on the [Web interface Guide - General](webui_general) 
-page for details.
+<tvh_include>inc/edit_grid_entries</tvh_include>
 
 ---
 
-###Deleting an Entry
-
-Highlight (select) the desired entry within the grid, then click the *[Delete]* 
-button from the menu bar.
+<tvh_include>inc/del_grid_entries</tvh_include>
 
 ---
+

diff --git a/docs/class/dvrentry.md b/docs/class/dvrentry.md
index dce4172df25580a778abab6a3cb4546f725ded90..b70a7e0d4e0b5a9f6a764f9048017cb847231ca1 100644 (file)
--- a/docs/class/dvrentry.md
+++ b/docs/class/dvrentry.md
@@ -37,7 +37,7 @@ Button                       | Function
 -----------------------------|---------
 **Delete**                   | Delete the selected grid entries.
 **Edit**                     | Edit the selected grid entries.
-**View Level**               | Change the interface view level to show/hide more advanced options.
+<tvh_include>inc/common_button_table_end</tvh_include>
 
 The following functions are only available in the 
 **Upcoming/Current Recordings** tab.

diff --git a/docs/class/dvrtimerec.md b/docs/class/dvrtimerec.md
index 3fb552874329865467291099b59090b130ca8752..72ee69e6e2dbc5c9c2379ef7fac529eb7efff499 100644 (file)
--- a/docs/class/dvrtimerec.md
+++ b/docs/class/dvrtimerec.md
@@ -1,28 +1,18 @@
 This tab controls timer-driven recording rules.
 
-![Timer Tab](docresources/timeschedules.png)
+![Timer Tab](docresources/timers.png)
 
 ---
 
-###Menu Bar/Buttons
+<tvh_include>inc/common_button_table_start</tvh_include>
 
-The tab has the following buttons:
-
-Button                 | Function
------------------------|-------------------
-**Save**               | Save any changes made to the grid/entries.
-**Undo**               | Revert any changes made since the last save.
-**Add**                | Display the *Add Timer* dialog.
-**Delete**             | Delete the selected entry/entries.
-**Edit**               | Edit the selected entry.
-**View Level**| Change the interface view level to show/hide more advanced options.
-**Help**               | Display this help page.
+<tvh_include>inc/common_button_table_end</tvh_include>
 
 ---
 
-###Adding an Entry
+<tvh_include>inc/add_grid_entry</tvh_include>
 
-You can add an entry by pressing the *[Add]* button from the menu bar.
+####An Example
 
 ![Timer add example](docresources/dvrtimeradd.png)
 
@@ -30,20 +20,11 @@ Note that when you create a rule/entry it will also generate a [DVR Entry](class
 
 ---
 
-###Editing an Entry
-
-Highlight (select) the desired entry within the grid, then click the *[Edit]* 
-button from the menu bar.
-
-**Tip**: You can quickly make changes to an entry by double-clicking on 
-the desired field within the grid. See *Editing Fields* on the [Web interface Guide - General](webui_general) 
-page for details.
+<tvh_include>inc/edit_grid_entries</tvh_include>
 
 ---
 
-###Deleting an Entry
-
-Highlight (select) the desired entry within the grid, then click the *[Delete]* 
-button from the menu bar.
+<tvh_include>inc/del_grid_entries</tvh_include>
 
 ---
+

diff --git a/docs/class/ipblocking.md b/docs/class/ipblocking.md
index 15d2f1de57914b2f78278a8eafee695849c7f256..aee13ecb7679fe070462bc527153eefc5331a9d5 100644 (file)
--- a/docs/class/ipblocking.md
+++ b/docs/class/ipblocking.md
@@ -5,7 +5,9 @@ are not allowed to login (use any Tvheadend service).
 
 ---
 
-<tvh_include>inc/buttons1</tvh_include>
+<tvh_include>inc/common_button_table_start</tvh_include>
+
+<tvh_include>inc/common_button_table_end</tvh_include>
 
 ---
 

diff --git a/docs/class/linuxdvb_frontend_dvbc.md b/docs/class/linuxdvb_frontend_dvbc.md
index 228c36af8af0c5e45f9915cf978efbcba3d30d48..19bfe54be496b420c9ebd6558bbaaf152fa95737 100644 (file)
--- a/docs/class/linuxdvb_frontend_dvbc.md
+++ b/docs/class/linuxdvb_frontend_dvbc.md
@@ -20,6 +20,6 @@ The following buttons are available:
 Button         | Function
 ---------------|---------
 **Save**       | Save the current configuration.
-**Help**       | Display this help page. 
+<tvh_include>inc/common_button_table_end</tvh_include>
 
 ---

diff --git a/docs/class/linuxdvb_frontend_dvbs.md b/docs/class/linuxdvb_frontend_dvbs.md
index 2647493f3be87eb4e5360a857426f14a45a66f01..d773785b7bfca208d8f2737bec9359fad674c8c8 100644 (file)
--- a/docs/class/linuxdvb_frontend_dvbs.md
+++ b/docs/class/linuxdvb_frontend_dvbs.md
@@ -20,6 +20,6 @@ The following buttons are available:
 Button         | Function
 ---------------|---------
 **Save**       | Save the current configuration.
-**Help**       | Display this help page. 
+<tvh_include>inc/common_button_table_end</tvh_include>
 
 ---

diff --git a/docs/class/linuxdvb_satconf.md b/docs/class/linuxdvb_satconf.md
index 90e2cdab8b75e4a659ffdf9399d84fd285253782..d49ec89cc75efce5989cf5fdddbf8ce5f7e3b7cd 100644 (file)
--- a/docs/class/linuxdvb_satconf.md
+++ b/docs/class/linuxdvb_satconf.md
@@ -12,7 +12,7 @@ The following buttons are available:
 Button         | Function
 ---------------|---------
 **Save**       | Save the current configuration.
-**Help**       | Display this help page. 
+<tvh_include>inc/common_button_table_end</tvh_include>
 
 ---
 

diff --git a/docs/docresources/dvrautorecentries.png b/docs/docresources/dvrautorecentries.png
index c85127250acb8da11009d56b948d3aaa0f4d72de..83343723558954325834b8effab9b76cfa5448ee 100644 (file)
Binary files a/docs/docresources/dvrautorecentries.png and b/docs/docresources/dvrautorecentries.png differ

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

diff --git a/docs/markdown/inc/common_button_table_end.md b/docs/markdown/inc/common_button_table_end.md
new file mode 100644 (file)
index 0000000..4416c0f
--- /dev/null
+++ b/docs/markdown/inc/common_button_table_end.md
@@ -0,0 +1 @@
+**View Level**         | Change the interface view level to show/hide more advanced options.\n**Help**               | Display this help page.

diff --git a/docs/markdown/inc/buttons1.md b/docs/markdown/inc/common_button_table_start.md
similarity index 60%
rename from docs/markdown/inc/buttons1.md
rename to docs/markdown/inc/common_button_table_start.md
index 4413507b3ca2de3cddf239ebbe5192f347fdccc9..60ba8241c7c2392e4d17174c3a8399ca630338b9 100644 (file)
--- a/docs/markdown/inc/buttons1.md
+++ b/docs/markdown/inc/common_button_table_start.md
@@ -1,6 +1,6 @@
 ###Menu Bar/Buttons
 
-The tab has the following buttons:
+The following functions are available:
 
 Button                 | Function
 -----------------------|-------------------
@@ -8,6 +8,4 @@ Button                 | Function
 **Undo**               | Revert any changes made since the last save.
 **Add**                | Display the *Add entry* dialog.
 **Delete**             | Delete the selected entry/entries.
-**Edit**               | Edit the selected entry.
-**View Level**         | Change the interface view level to show/hide more advanced options.
-**Help**               | Display this help page.
+**Edit**               | Edit the selected entries.

diff --git a/docs/markdown/tv_adapters.md b/docs/markdown/tv_adapters.md
index 723dcfcdcf9f8c35337df9743766823a1fc8d02e..5495e810e89c703ff63b299050d07a4f20623fd0 100644 (file)
--- a/docs/markdown/tv_adapters.md
+++ b/docs/markdown/tv_adapters.md
@@ -13,8 +13,7 @@ The following buttons are available:
 Button         | Function
 ---------------|---------
 **Save**       | Save the current configuration.
-**View Level**| Change the interface view level to show/hide more advanced options.
-**Help**       | Display this help page.
+<tvh_include>inc/common_button_table_end</tvh_include>
 
 ---
 

diff --git a/src/dvr/dvr_autorec.c b/src/dvr/dvr_autorec.c
index dc592fad6e0149cbadf65e88cecebb191fcd672c..d0a28e6015c0dcde7fe9e1cf673c8743c3bd5d17 100644 (file)
--- a/src/dvr/dvr_autorec.c
+++ b/src/dvr/dvr_autorec.c
@@ -1041,7 +1041,9 @@ const idclass_t dvr_autorec_entry_class = {
       .id       = "channel",
       .name     = N_("Channel"),
       .desc     = N_("The channel on which this rule applies, i.e. the "
-                     "channel you're aiming to record."),
+                     "channel you're aiming to record. You can leave "
+                     "this field blank to apply the rule to all "
+                     "channels."),
       .set      = dvr_autorec_entry_class_channel_set,
       .get      = dvr_autorec_entry_class_channel_get,
       .rend     = dvr_autorec_entry_class_channel_rend,