Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
mdhelp: move all images from docresources to static/img/doc
  • Loading branch information
perexg committed May 9, 2016
1 parent 693b811 commit 566abcc
Show file tree
Hide file tree
Showing 113 changed files with 56 additions and 58 deletions.
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -535,7 +535,7 @@ SRCS-${CONFIG_DBUS_1} += src/dbus.c

# File bundles
SRCS-${CONFIG_BUNDLE} += bundle.c
BUNDLES-yes += docs/html docs/docresources src/webui/static
BUNDLES-yes += src/webui/static
BUNDLES-yes += data/conf
BUNDLES-${CONFIG_DVBSCAN} += data/dvb-scan
BUNDLES = $(BUNDLES-yes)
Expand Down
4 changes: 2 additions & 2 deletions docs/class/access_entry.md
Expand Up @@ -9,7 +9,7 @@ if the username matches and the IP source address of the requesting peer
is within the prefix. There is also anonymous access, if the user is set
to asterisk. Only network prefix is matched then.

!['Access Entries Grid'](docresources/accessentriesgrid.png)
!['Access Entries Grid'](static/img/doc/accessentriesgrid.png)

---

Expand All @@ -29,7 +29,7 @@ Button | Function

<tvh_include>inc/add_grid_entry</tvh_include>

!['Access Entry Example'](docresources/accessentriesnewuser.png)
!['Access Entry Example'](static/img/doc/accessentriesnewuser.png)

If you would like to allow anonymous access to your Tvheadend
server you may set-up an anonymous account by entering an asterisk `*`
Expand Down
4 changes: 2 additions & 2 deletions docs/class/caclient.md
@@ -1,7 +1,7 @@
Tvheadend supports connecting to card clients via the cwc (newcamd) and
capmt (linux network dvbapi) protocols for so-called 'softcam' descrambling.

!['CA Client Configuration Example'](docresources/caclientconfig.png)
!['CA Client Configuration Example'](static/img/doc/caclientconfig.png)

---

Expand Down Expand Up @@ -57,7 +57,7 @@ menu bar, you will then be asked to select a client type. Once you've
selected a type you can then enter/select the desired options from the
resultant *Add* dialog.

!['Add CA Config'](docresources/configcaadd.png)
!['Add CA Config'](static/img/doc/configcaadd.png)

To edit an existing configuration, click on it from within the grid, the
*Parameters* panel should then appear on the right hand side.
Expand Down
6 changes: 3 additions & 3 deletions docs/class/channel.md
@@ -1,6 +1,6 @@
This tab lists all defined channels.

!['Channel lists'](docresources/configchannellist.png)
!['Channel lists'](static/img/doc/configchannellist.png)

---

Expand Down Expand Up @@ -31,12 +31,12 @@ press the *[Edit]* button, or edit the an entry directly in the grid.

The _Add_ and _Edit_ buttons use a dialog similar to the following.

!['Channel Edit (single)'](docresources/channeleditsingle.png)
!['Channel Edit (single)'](static/img/doc/channeleditsingle.png)

If you've selected multiple entries the *Edit Channel* dialog
will look slightly different.

!['Channel Edit (multiple)'](docresources/channeleditmultiple.png)
!['Channel Edit (multiple)'](static/img/doc/channeleditmultiple.png)

Ticking the additional check box (before each setting) will apply that
setting to all selected channels.
Expand Down
2 changes: 1 addition & 1 deletion docs/class/config.md
@@ -1,7 +1,7 @@
This tabs allow configuration of several general parameters that affect
the core Tvheadend functionality.

!['General Base' Tab Screenshot 1](docresources/configbaseall.png)
!['General Base' Tab Screenshot 1](static/img/doc/configbaseall.png)

---

Expand Down
6 changes: 3 additions & 3 deletions docs/class/dvrautorec.md
@@ -1,6 +1,6 @@
This tab controls EPG-driven recording rules.

!['Autorec' Tab](docresources/dvrautorecentries.png)
!['Autorec' Tab](static/img/doc/dvrautorecentries.png)

---

Expand All @@ -15,7 +15,7 @@ This tab controls EPG-driven recording rules.
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)
!['Autorec' example entry](static/img/doc/dvrautorecadd.png)

This uses a regular expression (regex) to match the program title
"BBC News" exactly, otherwise event titles containing the phrase would
Expand All @@ -37,7 +37,7 @@ automatically start being recorded.**

<tvh_include>inc/edit_grid_entries</tvh_include>

!['Edit Autorec'](docresources/editautorec.png)
!['Edit Autorec'](static/img/doc/editautorec.png)

---

Expand Down
2 changes: 1 addition & 1 deletion docs/class/dvrconfig.md
Expand Up @@ -4,5 +4,5 @@ This tab is used to configure operation of the Digital Video Recorder.
It is not used for scheduling or administration of individual
recordings.

!['Digital Video Recorder Profiles' Tab 1](docresources/configdvrtab.png)
!['Digital Video Recorder Profiles' Tab 1](static/img/doc/configdvrtab.png)

4 changes: 2 additions & 2 deletions docs/class/dvrentry.md
@@ -1,7 +1,7 @@
DVR entries are how Tvheadend manages upcoming/current, finished and
failed recordings.

!['Digital Video Recorder' Tabs](docresources/configdvrtabs4.png)
!['Digital Video Recorder' Tabs](static/img/doc/configdvrtabs4.png)

Each entry is moved between the tabs depending on its state:

Expand Down Expand Up @@ -87,7 +87,7 @@ the *Upcoming/Current Recordings* tab.

This is an example of a one-time recording entry:

!['Add new recording dialog'](docresources/addnewrecentry.png)
!['Add new recording dialog'](static/img/doc/addnewrecentry.png)

####Adding an Entry Using the EPG

Expand Down
4 changes: 2 additions & 2 deletions docs/class/dvrtimerec.md
@@ -1,6 +1,6 @@
This tab controls timer-driven recording rules.

![Timer Tab](docresources/timers.png)
![Timer Tab](static/img/doc/timers.png)

---

Expand All @@ -12,7 +12,7 @@ This tab controls timer-driven recording rules.

<tvh_include>inc/add_grid_entry</tvh_include>

![Timer add example](docresources/dvrtimeradd.png)
![Timer add example](static/img/doc/dvrtimeradd.png)

Note that when you create a rule/entry it will also generate a [DVR Entry](class/dvrentry).

Expand Down
2 changes: 1 addition & 1 deletion docs/class/imagecache.md
Expand Up @@ -3,7 +3,7 @@ to be served from the local webserver. This can be useful for
multi-client systems and, generally, to reduce hits on upstream
providers.

!['Configuration - Image Cache tab'](docresources/configimagecache.png)
!['Configuration - Image Cache tab'](static/img/doc/configimagecache.png)

---

Expand Down
4 changes: 2 additions & 2 deletions docs/class/ipblocking.md
@@ -1,7 +1,7 @@
This tab allows to configure blocked IP ranges. Users within these ranges
are not allowed to login (use any Tvheadend service).

!['Access Control - Entries tab'](docresources/accessconfigipblockentries.png)
!['Access Control - Entries tab'](static/img/doc/accessconfigipblockentries.png)

---

Expand All @@ -13,7 +13,7 @@ are not allowed to login (use any Tvheadend service).

<tvh_include>inc/add_grid_entry</tvh_include>

!['Add Entries Dialog'](docresources/accessipblockingedit.png)
!['Add Entries Dialog'](static/img/doc/accessipblockingedit.png)

**Tip**: You can enter a comma-separated list of network prefixes, if you're
unsure as to what to enter in the *Network prefix* field take a look at
Expand Down
2 changes: 1 addition & 1 deletion docs/class/linuxdvb_frontend_dvbc.md
@@ -1,7 +1,7 @@
This panel lists all the available Cable (DVB-C/C2/ISDB-C/ATSC-C) frontend
parameters.

!['DVB-C frontend parameters'](docresources/dvbcfrontendparams.png)
!['DVB-C frontend parameters'](static/img/doc/dvbcfrontendparams.png)

---

Expand Down
2 changes: 1 addition & 1 deletion docs/class/linuxdvb_frontend_dvbs.md
@@ -1,7 +1,7 @@
This panel lists all the available satellite (DVB-S/ISDB-S) frontend
parameters.

!['DVB-S frontend parameters'](docresources/dvbsfrontendparams.png)
!['DVB-S frontend parameters'](static/img/doc/dvbsfrontendparams.png)

---

Expand Down
2 changes: 1 addition & 1 deletion docs/class/linuxdvb_frontend_dvbt.md
@@ -1,7 +1,7 @@
This panel lists all the available Terrestrial (DVB-T/T2/ISDB-T/ATSC-T) frontend
parameters.

!['DVB-T frontend parameters'](docresources/dvbtfrontendparams.png)
!['DVB-T frontend parameters'](static/img/doc/dvbtfrontendparams.png)

---

Expand Down
2 changes: 1 addition & 1 deletion docs/class/linuxdvb_satconf.md
@@ -1,7 +1,7 @@
This panel tab lists all the available satellite (DVB-S/ISDB-S) configuration
parameters.

!['Example Configuration'](docresources/dvbsatconf.png)
!['Example Configuration'](static/img/doc/dvbsatconf.png)

---

Expand Down
6 changes: 3 additions & 3 deletions docs/class/mpegts_mux.md
Expand Up @@ -4,7 +4,7 @@ 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.

!['Mux List'](docresources/configdvbmux.png)
!['Mux List'](static/img/doc/configdvbmux.png)

---

Expand All @@ -19,11 +19,11 @@ streams - so an IP address, in effect.
To add a mux press the *[Add]* button from the menu bar and select the
network you want to add the mux to:

!['Network selection'](docresources/addmuxnetworkselection.png)
!['Network selection'](static/img/doc/addmuxnetworkselection.png)

Then enter the mux information:

!['Add Mux Dialog'](docresources/configaddmuxexample.png)
!['Add Mux Dialog'](static/img/doc/configaddmuxexample.png)

Pressing the *[Save]* button (at the bottom of the dialog)
will commit your changes and close the dialog, pressing the *[Apply]*
Expand Down
4 changes: 2 additions & 2 deletions docs/class/mpegts_mux_sched.md
@@ -1,7 +1,7 @@
Mux Schedulers enable Tvheadend to automatically play channels. This is
useful to get EPG, services or access rights updates.

!['Mux Schedule Entries'](docresources/configdvbmuxsched.png)
!['Mux Schedule Entries'](static/img/doc/configdvbmuxsched.png)

---

Expand Down Expand Up @@ -30,7 +30,7 @@ To edit an entry highlight (select) the entry from within the grid, and press th
A common set of fields is used for the Add or Edit functions, most of
which can be seen in the grid view:

!['Mux Add/Edit Example'](docresources/configdvbmuxsched1.png)
!['Mux Add/Edit Example'](static/img/doc/configdvbmuxsched1.png)

**Tip**: You can also edit entries directly within the grid.

Expand Down
8 changes: 4 additions & 4 deletions docs/class/mpegts_network.md
Expand Up @@ -20,7 +20,7 @@ supports several different types of network, notably:
Click the desired network type (above) to see all available
[parameters](#items).

!['Networks' Tab Screenshot](docresources/dvbinputsnetwork.png)
!['Networks' Tab Screenshot](static/img/doc/dvbinputsnetwork.png)

---

Expand All @@ -41,13 +41,13 @@ Button | Function
To create a network click the *[Add]* button from the menu bar and
then select the required network type:

!['Network selection'](docresources/networktypeselect.png)
!['Network selection'](static/img/doc/networktypeselect.png)

Then using the resultant dialog enter/select the desired network
options. A common set of fields is used for the *[Add]* dialog,
most of which can be seen in the grid view.

!['Add new network'](docresources/addnewnetwork.png)
!['Add new network'](static/img/doc/addnewnetwork.png)

Pressing the *[Save]* button (at the bottom of the dialog)
will commit your changes and close the dialog, pressing the *[Apply]*
Expand All @@ -69,7 +69,7 @@ For more detailed information on networks and how to set them up, see

<tvh_include>inc/edit_grid_entries</tvh_include>

!['Add/Edit Network' Dialog - DVB-S/2](docresources/dvbnetworkedit.png)
!['Add/Edit Network' Dialog - DVB-S/2](static/img/doc/dvbnetworkedit.png)

---

Expand Down
12 changes: 6 additions & 6 deletions docs/class/mpegts_service.md
@@ -1,6 +1,6 @@
Services are automatically pulled from muxes and can be mapped to Channels.

!['Services'](docresources/configdvbservices.png)
!['Services'](static/img/doc/configdvbservices.png)

---

Expand Down Expand Up @@ -28,13 +28,13 @@ There are a number of methods to mapping available services.
*Map all services* and *Map selected services* functions use the
following *Map services to channels* dialog:

!['Service mapper dialog'](docresources/mapservicesdialog.png)
!['Service mapper dialog'](static/img/doc/mapservicesdialog.png)

####Mapping All

Press the *[Map services]* button and then *[Map all services]*:

!['Map All Services'](docresources/mapservicesall.png)
!['Map All Services'](static/img/doc/mapservicesall.png)

The *Map services to channels* dialog will now appear, listing all available services and various
other [mapping options.](class/service_mapper) The ticked check boxes
Expand All @@ -51,7 +51,7 @@ you'll lose your selection!

<tvh_include>inc/selecting_entries_tip</tvh_include>

!['Map selected'](docresources/mapselectedservices.png)
!['Map selected'](static/img/doc/mapselectedservices.png)

The *Map services to channels* dialog will now appear, listing all available services and various
other [mapping options.](class/service_mapper) The ticked
Expand All @@ -77,7 +77,7 @@ the arrow will then display a list of options, move your mouse down to
"Filters", a text box should then appear, click on it and enter the
desired service's name.

!['Service filtering'](docresources/servicefilter.png)
!['Service filtering'](static/img/doc/servicefilter.png)

**Tip**: Remember to remove the filter when you're finished (uncheck the
check box next to the "Filters" option).
Expand All @@ -86,7 +86,7 @@ check box next to the "Filters" option).
channels will appear, check/untick the check box next to the channel
you'd like to associate/disassociate the service with.

!['Add service to channel example'](docresources/addservicetochannel.png)
!['Add service to channel example'](static/img/doc/addservicetochannel.png)

**3)** Press the *[Save]* button from the menu bar and you're done!

Expand Down
4 changes: 2 additions & 2 deletions docs/class/passwd.md
@@ -1,7 +1,7 @@
This tab is the second part of Tvheadend's access control mechanism. It is
where you set and maintain all user passwords (e.g. for streaming or DVR access).

!['Configuration - Passwords tab'](docresources/configpasswordentries.png)
!['Configuration - Passwords tab'](static/img/doc/configpasswordentries.png)

---

Expand All @@ -13,7 +13,7 @@ where you set and maintain all user passwords (e.g. for streaming or DVR access)

<tvh_include>inc/add_grid_entry</tvh_include>

!['Add Password dialog'](docresources/configpasswdadd.png)
!['Add Password dialog'](static/img/doc/configpasswdadd.png)

Be aware that the username you enter must match a username/entry in
the [Access Entries](class/access_entry) tab for it to apply. You may
Expand Down
8 changes: 4 additions & 4 deletions docs/class/profile.md
Expand Up @@ -13,7 +13,7 @@ DVR Profiles or as parameter for HTTP Streaming.
- [MP4/libav Profile](class/profile-libav-mp4)
- [Transcode Profile](class/profile-transcode)

!['Stream Profiles'](docresources/configstreamprofiles.png)
!['Stream Profiles'](static/img/doc/configstreamprofiles.png)

---

Expand All @@ -37,10 +37,10 @@ Button | Function
A common set of fields is used for the _Add_ or _Edit_ functions, most
of which can be seen in the grid view:

!['Add/Edit Stream Profiles' Dialog - mkv](docresources/configstreamprofiles1.png)
!['Add/Edit Stream Profiles' Dialog - mkv](static/img/doc/configstreamprofiles1.png)

!['Add/Edit Stream Profiles' Dialog - ts](docresources/configstreamprofiles2.png)
!['Add/Edit Stream Profiles' Dialog - ts](static/img/doc/configstreamprofiles2.png)

!['Add/Edit Stream Profiles' Dialog - transcode](docresources/configstreamprofiles3.png)
!['Add/Edit Stream Profiles' Dialog - transcode](static/img/doc/configstreamprofiles3.png)

---
2 changes: 1 addition & 1 deletion docs/class/satip_server.md
Expand Up @@ -12,7 +12,7 @@ client. Note that if you use a similar number for multiple networks, the
first matched network containing the mux with requested parameters will
win (also for unknown mux).

!['SAT\>IP Config tab'](docresources/satipconfig.png)
!['SAT\>IP Config tab'](static/img/doc/satipconfig.png)

---

Expand Down

0 comments on commit 566abcc

Please sign in to comment.