From: Jaroslav Kysela Date: Mon, 9 May 2016 07:17:12 +0000 (+0200) Subject: mdhelp: move all images from docresources to static/img/doc X-Git-Tag: v4.2.1~548 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=566abccfd5d468e38aa184fdc19b56bfcb8c4403;p=thirdparty%2Ftvheadend.git mdhelp: move all images from docresources to static/img/doc --- diff --git a/Makefile b/Makefile index af0f897ee..b0aec405d 100644 --- a/Makefile +++ b/Makefile @@ -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) diff --git a/docs/class/access_entry.md b/docs/class/access_entry.md index 2057109c1..0525498f4 100644 --- a/docs/class/access_entry.md +++ b/docs/class/access_entry.md @@ -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) --- @@ -29,7 +29,7 @@ Button | Function inc/add_grid_entry -!['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 `*` diff --git a/docs/class/caclient.md b/docs/class/caclient.md index d0bfe1e74..8d6e7fd7c 100644 --- a/docs/class/caclient.md +++ b/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) --- @@ -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. diff --git a/docs/class/channel.md b/docs/class/channel.md index 3351d8c44..8ad3259a4 100644 --- a/docs/class/channel.md +++ b/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) --- @@ -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. diff --git a/docs/class/config.md b/docs/class/config.md index bba148360..7c0aa7c54 100644 --- a/docs/class/config.md +++ b/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) --- diff --git a/docs/class/dvrautorec.md b/docs/class/dvrautorec.md index d9b13b55c..7b14cecef 100644 --- a/docs/class/dvrautorec.md +++ b/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) --- @@ -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 @@ -37,7 +37,7 @@ automatically start being recorded.** inc/edit_grid_entries -!['Edit Autorec'](docresources/editautorec.png) +!['Edit Autorec'](static/img/doc/editautorec.png) --- diff --git a/docs/class/dvrconfig.md b/docs/class/dvrconfig.md index d50440651..73a3d052d 100644 --- a/docs/class/dvrconfig.md +++ b/docs/class/dvrconfig.md @@ -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) diff --git a/docs/class/dvrentry.md b/docs/class/dvrentry.md index 4dcea3123..23d09d795 100644 --- a/docs/class/dvrentry.md +++ b/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: @@ -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 diff --git a/docs/class/dvrtimerec.md b/docs/class/dvrtimerec.md index 106be7b37..ad5db0cae 100644 --- a/docs/class/dvrtimerec.md +++ b/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) --- @@ -12,7 +12,7 @@ This tab controls timer-driven recording rules. inc/add_grid_entry -![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). diff --git a/docs/class/imagecache.md b/docs/class/imagecache.md index 816f905a6..390819e85 100644 --- a/docs/class/imagecache.md +++ b/docs/class/imagecache.md @@ -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) --- diff --git a/docs/class/ipblocking.md b/docs/class/ipblocking.md index aee13ecb7..53ba90def 100644 --- a/docs/class/ipblocking.md +++ b/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) --- @@ -13,7 +13,7 @@ are not allowed to login (use any Tvheadend service). inc/add_grid_entry -!['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 diff --git a/docs/class/linuxdvb_frontend_dvbc.md b/docs/class/linuxdvb_frontend_dvbc.md index 19bfe54be..54443c3bc 100644 --- a/docs/class/linuxdvb_frontend_dvbc.md +++ b/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) --- diff --git a/docs/class/linuxdvb_frontend_dvbs.md b/docs/class/linuxdvb_frontend_dvbs.md index d773785b7..cab5173f9 100644 --- a/docs/class/linuxdvb_frontend_dvbs.md +++ b/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) --- diff --git a/docs/class/linuxdvb_frontend_dvbt.md b/docs/class/linuxdvb_frontend_dvbt.md index b2d53a915..936d18fd9 100644 --- a/docs/class/linuxdvb_frontend_dvbt.md +++ b/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) --- diff --git a/docs/class/linuxdvb_satconf.md b/docs/class/linuxdvb_satconf.md index d49ec89cc..20665e436 100644 --- a/docs/class/linuxdvb_satconf.md +++ b/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) --- diff --git a/docs/class/mpegts_mux.md b/docs/class/mpegts_mux.md index 9c65d3611..fb58053cf 100644 --- a/docs/class/mpegts_mux.md +++ b/docs/class/mpegts_mux.md @@ -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) --- @@ -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]* diff --git a/docs/class/mpegts_mux_sched.md b/docs/class/mpegts_mux_sched.md index 43986aa5a..4581fb4bf 100644 --- a/docs/class/mpegts_mux_sched.md +++ b/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) --- @@ -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. diff --git a/docs/class/mpegts_network.md b/docs/class/mpegts_network.md index a59cb76a2..2e93dd454 100644 --- a/docs/class/mpegts_network.md +++ b/docs/class/mpegts_network.md @@ -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) --- @@ -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]* @@ -69,7 +69,7 @@ For more detailed information on networks and how to set them up, see inc/edit_grid_entries -!['Add/Edit Network' Dialog - DVB-S/2](docresources/dvbnetworkedit.png) +!['Add/Edit Network' Dialog - DVB-S/2](static/img/doc/dvbnetworkedit.png) --- diff --git a/docs/class/mpegts_service.md b/docs/class/mpegts_service.md index f17a9e9eb..11c0e8516 100644 --- a/docs/class/mpegts_service.md +++ b/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) --- @@ -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 @@ -51,7 +51,7 @@ you'll lose your selection! inc/selecting_entries_tip -!['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 @@ -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). @@ -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! diff --git a/docs/class/passwd.md b/docs/class/passwd.md index 98a2cd8e5..56a2c65c2 100644 --- a/docs/class/passwd.md +++ b/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) --- @@ -13,7 +13,7 @@ where you set and maintain all user passwords (e.g. for streaming or DVR access) inc/add_grid_entry -!['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 diff --git a/docs/class/profile.md b/docs/class/profile.md index 009151eb0..f198b7968 100644 --- a/docs/class/profile.md +++ b/docs/class/profile.md @@ -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) --- @@ -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) --- diff --git a/docs/class/satip_server.md b/docs/class/satip_server.md index 39f68555c..7fa9fcc7e 100644 --- a/docs/class/satip_server.md +++ b/docs/class/satip_server.md @@ -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) --- diff --git a/docs/markdown/epg.md b/docs/markdown/epg.md index f6a0b9eed..832efb733 100644 --- a/docs/markdown/epg.md +++ b/docs/markdown/epg.md @@ -8,7 +8,7 @@ such as XMLTV. The EPG tab displays a filterable grid containing all events, sorted based on start time. -!['Electronic Program Guide' Tab](docresources/epg.png) +!['Electronic Program Guide' Tab](static/img/doc/epg.png) --- @@ -147,13 +147,13 @@ for recording by clicking on the *[Record program]* button. For EPG providers that supply series link information there will also be a *[Record series]* button that will record all entries in the series. -![EPG Detail 1](docresources/epg2.png) +![EPG Detail 1](static/img/doc/epg2.png) For events without any series link information, an *[Autorec]* button will be provided to create a pseudo-series link using the autorec feature. -![EPG Detail 2](docresources/epg3.png) +![EPG Detail 2](static/img/doc/epg3.png) If you schedule any kind of recording from this point, you can choose a specific DVR profile that will apply to the recording or autorec rule. @@ -187,7 +187,7 @@ record your favourite show every week, for example) you can press the A popup with details about the to-be-created autorecording rule needs to be confirmed before the rule takes effect. -![Autorec Dialogue Box](docresources/autorecpopup.png) +![Autorec Dialogue Box](static/img/doc/autorecpopup.png) You can change or delete the autorec rules in the **Digital Video Recorder** tab. Use that editor if you temporarily want to disable an diff --git a/docs/markdown/status_connections.md b/docs/markdown/status_connections.md index f0673a835..40635d9ea 100644 --- a/docs/markdown/status_connections.md +++ b/docs/markdown/status_connections.md @@ -4,7 +4,7 @@ This tab shows information about all active connections. This is a read-only tab; nothing is configurable. -!['Status - Subscriptions' Tab](docresources/statusconnections.png) +!['Status - Subscriptions' Tab](static/img/doc/statusconnections.png) --- diff --git a/docs/markdown/status_service_mapper.md b/docs/markdown/status_service_mapper.md index 75689a589..473faf77b 100644 --- a/docs/markdown/status_service_mapper.md +++ b/docs/markdown/status_service_mapper.md @@ -4,7 +4,7 @@ This tab shows information about current service mapping activity. This is a read-only tab; nothing is configurable. -!['Status - Subscriptions' Tab](docresources/statusservicemapper.png) +!['Status - Subscriptions' Tab](static/img/doc/statusservicemapper.png) --- diff --git a/docs/markdown/status_stream.md b/docs/markdown/status_stream.md index dc3e69b07..077bb1abe 100644 --- a/docs/markdown/status_stream.md +++ b/docs/markdown/status_stream.md @@ -4,7 +4,7 @@ This tab shows information about all currently-open streams. This is a read-only tab; nothing is configurable. -!['Status - Stream' Tab](docresources/statusstream.png) +!['Status - Stream' Tab](static/img/doc/statusstream.png) --- diff --git a/docs/markdown/status_subscriptions.md b/docs/markdown/status_subscriptions.md index 17d323d6c..c9bbb128b 100644 --- a/docs/markdown/status_subscriptions.md +++ b/docs/markdown/status_subscriptions.md @@ -4,7 +4,7 @@ This tab shows information about all active subscriptions to Tvheadend. This is a read-only tab; nothing is configurable. -!['Status - Subscriptions' Tab](docresources/statussubscriptions.png) +!['Status - Subscriptions' Tab](static/img/doc/statussubscriptions.png) --- diff --git a/docs/markdown/tv_adapters.md b/docs/markdown/tv_adapters.md index 36994cdd1..bb098fbbe 100644 --- a/docs/markdown/tv_adapters.md +++ b/docs/markdown/tv_adapters.md @@ -2,7 +2,7 @@ The adapters and tuners are listed and edited in a tree. -!['TV Adapter tree'](docresources/tvadaptertree.png) +!['TV Adapter tree'](static/img/doc/tvadaptertree.png) --- @@ -23,7 +23,7 @@ The device tree lists the available frontends, LNB configuration and so on related to your device(s) in sections. Clicking on these sections will display all available parameters and various device information. -!['TV Adapter params'](docresources/tvadapterparams.png) +!['TV Adapter params'](static/img/doc/tvadapterparams.png) **Tip**: Remember to save your changes *before* switching panels. diff --git a/docs/docresources/accessconfig.png b/src/webui/static/img/doc/accessconfig.png similarity index 100% rename from docs/docresources/accessconfig.png rename to src/webui/static/img/doc/accessconfig.png diff --git a/docs/docresources/accessconfigexample.png b/src/webui/static/img/doc/accessconfigexample.png similarity index 100% rename from docs/docresources/accessconfigexample.png rename to src/webui/static/img/doc/accessconfigexample.png diff --git a/docs/docresources/accessconfigipblockentries.png b/src/webui/static/img/doc/accessconfigipblockentries.png similarity index 100% rename from docs/docresources/accessconfigipblockentries.png rename to src/webui/static/img/doc/accessconfigipblockentries.png diff --git a/docs/docresources/accessentriesgrid.png b/src/webui/static/img/doc/accessentriesgrid.png similarity index 100% rename from docs/docresources/accessentriesgrid.png rename to src/webui/static/img/doc/accessentriesgrid.png diff --git a/docs/docresources/accessentriesnewuser.png b/src/webui/static/img/doc/accessentriesnewuser.png similarity index 100% rename from docs/docresources/accessentriesnewuser.png rename to src/webui/static/img/doc/accessentriesnewuser.png diff --git a/docs/docresources/accessipblockingedit.png b/src/webui/static/img/doc/accessipblockingedit.png similarity index 100% rename from docs/docresources/accessipblockingedit.png rename to src/webui/static/img/doc/accessipblockingedit.png diff --git a/docs/docresources/addmuxnetworkselection.png b/src/webui/static/img/doc/addmuxnetworkselection.png similarity index 100% rename from docs/docresources/addmuxnetworkselection.png rename to src/webui/static/img/doc/addmuxnetworkselection.png diff --git a/docs/docresources/addnewnetwork.png b/src/webui/static/img/doc/addnewnetwork.png similarity index 100% rename from docs/docresources/addnewnetwork.png rename to src/webui/static/img/doc/addnewnetwork.png diff --git a/docs/docresources/addnewrecentry.png b/src/webui/static/img/doc/addnewrecentry.png similarity index 100% rename from docs/docresources/addnewrecentry.png rename to src/webui/static/img/doc/addnewrecentry.png diff --git a/docs/docresources/addservicetochannel.png b/src/webui/static/img/doc/addservicetochannel.png similarity index 100% rename from docs/docresources/addservicetochannel.png rename to src/webui/static/img/doc/addservicetochannel.png diff --git a/docs/docresources/autorec.png b/src/webui/static/img/doc/autorec.png similarity index 100% rename from docs/docresources/autorec.png rename to src/webui/static/img/doc/autorec.png diff --git a/docs/docresources/autorecpopup.png b/src/webui/static/img/doc/autorecpopup.png similarity index 100% rename from docs/docresources/autorecpopup.png rename to src/webui/static/img/doc/autorecpopup.png diff --git a/docs/docresources/caclientconfig.png b/src/webui/static/img/doc/caclientconfig.png similarity index 100% rename from docs/docresources/caclientconfig.png rename to src/webui/static/img/doc/caclientconfig.png diff --git a/docs/docresources/channeleditmultiple.png b/src/webui/static/img/doc/channeleditmultiple.png similarity index 100% rename from docs/docresources/channeleditmultiple.png rename to src/webui/static/img/doc/channeleditmultiple.png diff --git a/docs/docresources/channeleditsingle.png b/src/webui/static/img/doc/channeleditsingle.png similarity index 100% rename from docs/docresources/channeleditsingle.png rename to src/webui/static/img/doc/channeleditsingle.png diff --git a/docs/docresources/channeltab.png b/src/webui/static/img/doc/channeltab.png similarity index 100% rename from docs/docresources/channeltab.png rename to src/webui/static/img/doc/channeltab.png diff --git a/docs/docresources/configaddmuxexample.png b/src/webui/static/img/doc/configaddmuxexample.png similarity index 100% rename from docs/docresources/configaddmuxexample.png rename to src/webui/static/img/doc/configaddmuxexample.png diff --git a/docs/docresources/configbaseall.png b/src/webui/static/img/doc/configbaseall.png similarity index 100% rename from docs/docresources/configbaseall.png rename to src/webui/static/img/doc/configbaseall.png diff --git a/docs/docresources/configcaadd.png b/src/webui/static/img/doc/configcaadd.png similarity index 100% rename from docs/docresources/configcaadd.png rename to src/webui/static/img/doc/configcaadd.png diff --git a/docs/docresources/configcapmt.png b/src/webui/static/img/doc/configcapmt.png similarity index 100% rename from docs/docresources/configcapmt.png rename to src/webui/static/img/doc/configcapmt.png diff --git a/docs/docresources/configchannellist.png b/src/webui/static/img/doc/configchannellist.png similarity index 100% rename from docs/docresources/configchannellist.png rename to src/webui/static/img/doc/configchannellist.png diff --git a/docs/docresources/configcwc.png b/src/webui/static/img/doc/configcwc.png similarity index 100% rename from docs/docresources/configcwc.png rename to src/webui/static/img/doc/configcwc.png diff --git a/docs/docresources/configdvbmux.png b/src/webui/static/img/doc/configdvbmux.png similarity index 100% rename from docs/docresources/configdvbmux.png rename to src/webui/static/img/doc/configdvbmux.png diff --git a/docs/docresources/configdvbmuxsched.png b/src/webui/static/img/doc/configdvbmuxsched.png similarity index 100% rename from docs/docresources/configdvbmuxsched.png rename to src/webui/static/img/doc/configdvbmuxsched.png diff --git a/docs/docresources/configdvbmuxsched1.png b/src/webui/static/img/doc/configdvbmuxsched1.png similarity index 100% rename from docs/docresources/configdvbmuxsched1.png rename to src/webui/static/img/doc/configdvbmuxsched1.png diff --git a/docs/docresources/configdvbnetwork.png b/src/webui/static/img/doc/configdvbnetwork.png similarity index 100% rename from docs/docresources/configdvbnetwork.png rename to src/webui/static/img/doc/configdvbnetwork.png diff --git a/docs/docresources/configdvbnetwork_iptv.png b/src/webui/static/img/doc/configdvbnetwork_iptv.png similarity index 100% rename from docs/docresources/configdvbnetwork_iptv.png rename to src/webui/static/img/doc/configdvbnetwork_iptv.png diff --git a/docs/docresources/configdvbnetwork_iptvauto.png b/src/webui/static/img/doc/configdvbnetwork_iptvauto.png similarity index 100% rename from docs/docresources/configdvbnetwork_iptvauto.png rename to src/webui/static/img/doc/configdvbnetwork_iptvauto.png diff --git a/docs/docresources/configdvbservices.png b/src/webui/static/img/doc/configdvbservices.png similarity index 100% rename from docs/docresources/configdvbservices.png rename to src/webui/static/img/doc/configdvbservices.png diff --git a/docs/docresources/configdvbtab.png b/src/webui/static/img/doc/configdvbtab.png similarity index 100% rename from docs/docresources/configdvbtab.png rename to src/webui/static/img/doc/configdvbtab.png diff --git a/docs/docresources/configdvrtab1.png b/src/webui/static/img/doc/configdvrtab1.png similarity index 100% rename from docs/docresources/configdvrtab1.png rename to src/webui/static/img/doc/configdvrtab1.png diff --git a/docs/docresources/configdvrtab2.png b/src/webui/static/img/doc/configdvrtab2.png similarity index 100% rename from docs/docresources/configdvrtab2.png rename to src/webui/static/img/doc/configdvrtab2.png diff --git a/docs/docresources/configdvrtab3.png b/src/webui/static/img/doc/configdvrtab3.png similarity index 100% rename from docs/docresources/configdvrtab3.png rename to src/webui/static/img/doc/configdvrtab3.png diff --git a/docs/docresources/configdvrtabs4.png b/src/webui/static/img/doc/configdvrtabs4.png similarity index 100% rename from docs/docresources/configdvrtabs4.png rename to src/webui/static/img/doc/configdvrtabs4.png diff --git a/docs/docresources/configgeneraltab1.png b/src/webui/static/img/doc/configgeneraltab1.png similarity index 100% rename from docs/docresources/configgeneraltab1.png rename to src/webui/static/img/doc/configgeneraltab1.png diff --git a/docs/docresources/configgeneraltab2.png b/src/webui/static/img/doc/configgeneraltab2.png similarity index 100% rename from docs/docresources/configgeneraltab2.png rename to src/webui/static/img/doc/configgeneraltab2.png diff --git a/docs/docresources/configimagecache.png b/src/webui/static/img/doc/configimagecache.png similarity index 100% rename from docs/docresources/configimagecache.png rename to src/webui/static/img/doc/configimagecache.png diff --git a/docs/docresources/configpasswdadd.png b/src/webui/static/img/doc/configpasswdadd.png similarity index 100% rename from docs/docresources/configpasswdadd.png rename to src/webui/static/img/doc/configpasswdadd.png diff --git a/docs/docresources/configpasswordentries.png b/src/webui/static/img/doc/configpasswordentries.png similarity index 100% rename from docs/docresources/configpasswordentries.png rename to src/webui/static/img/doc/configpasswordentries.png diff --git a/docs/docresources/configstreamprofiles.png b/src/webui/static/img/doc/configstreamprofiles.png similarity index 100% rename from docs/docresources/configstreamprofiles.png rename to src/webui/static/img/doc/configstreamprofiles.png diff --git a/docs/docresources/configtabs.png b/src/webui/static/img/doc/configtabs.png similarity index 100% rename from docs/docresources/configtabs.png rename to src/webui/static/img/doc/configtabs.png diff --git a/docs/docresources/configtimeshifttab.png b/src/webui/static/img/doc/configtimeshifttab.png similarity index 100% rename from docs/docresources/configtimeshifttab.png rename to src/webui/static/img/doc/configtimeshifttab.png diff --git a/docs/docresources/configtvadapters.png b/src/webui/static/img/doc/configtvadapters.png similarity index 100% rename from docs/docresources/configtvadapters.png rename to src/webui/static/img/doc/configtvadapters.png diff --git a/docs/docresources/configtvhlog.png b/src/webui/static/img/doc/configtvhlog.png similarity index 100% rename from docs/docresources/configtvhlog.png rename to src/webui/static/img/doc/configtvhlog.png diff --git a/docs/docresources/dvbcfrontendparams.png b/src/webui/static/img/doc/dvbcfrontendparams.png similarity index 100% rename from docs/docresources/dvbcfrontendparams.png rename to src/webui/static/img/doc/dvbcfrontendparams.png diff --git a/docs/docresources/dvbinputsnetwork.png b/src/webui/static/img/doc/dvbinputsnetwork.png similarity index 100% rename from docs/docresources/dvbinputsnetwork.png rename to src/webui/static/img/doc/dvbinputsnetwork.png diff --git a/docs/docresources/dvbnetworkedit.png b/src/webui/static/img/doc/dvbnetworkedit.png similarity index 100% rename from docs/docresources/dvbnetworkedit.png rename to src/webui/static/img/doc/dvbnetworkedit.png diff --git a/docs/docresources/dvbsatconf.png b/src/webui/static/img/doc/dvbsatconf.png similarity index 100% rename from docs/docresources/dvbsatconf.png rename to src/webui/static/img/doc/dvbsatconf.png diff --git a/docs/docresources/dvbsfrontendparams.png b/src/webui/static/img/doc/dvbsfrontendparams.png similarity index 100% rename from docs/docresources/dvbsfrontendparams.png rename to src/webui/static/img/doc/dvbsfrontendparams.png diff --git a/docs/docresources/dvbtfrontendparams.png b/src/webui/static/img/doc/dvbtfrontendparams.png similarity index 100% rename from docs/docresources/dvbtfrontendparams.png rename to src/webui/static/img/doc/dvbtfrontendparams.png diff --git a/docs/docresources/dvrautorecadd.png b/src/webui/static/img/doc/dvrautorecadd.png similarity index 100% rename from docs/docresources/dvrautorecadd.png rename to src/webui/static/img/doc/dvrautorecadd.png diff --git a/docs/docresources/dvrautorecentries.png b/src/webui/static/img/doc/dvrautorecentries.png similarity index 100% rename from docs/docresources/dvrautorecentries.png rename to src/webui/static/img/doc/dvrautorecentries.png diff --git a/docs/docresources/dvrlog.png b/src/webui/static/img/doc/dvrlog.png similarity index 100% rename from docs/docresources/dvrlog.png rename to src/webui/static/img/doc/dvrlog.png diff --git a/docs/docresources/dvrlog2.png b/src/webui/static/img/doc/dvrlog2.png similarity index 100% rename from docs/docresources/dvrlog2.png rename to src/webui/static/img/doc/dvrlog2.png diff --git a/docs/docresources/dvrlog3.png b/src/webui/static/img/doc/dvrlog3.png similarity index 100% rename from docs/docresources/dvrlog3.png rename to src/webui/static/img/doc/dvrlog3.png diff --git a/docs/docresources/dvrlog4.png b/src/webui/static/img/doc/dvrlog4.png similarity index 100% rename from docs/docresources/dvrlog4.png rename to src/webui/static/img/doc/dvrlog4.png diff --git a/docs/docresources/dvrlogentry.png b/src/webui/static/img/doc/dvrlogentry.png similarity index 100% rename from docs/docresources/dvrlogentry.png rename to src/webui/static/img/doc/dvrlogentry.png diff --git a/docs/docresources/dvrtimeradd.png b/src/webui/static/img/doc/dvrtimeradd.png similarity index 100% rename from docs/docresources/dvrtimeradd.png rename to src/webui/static/img/doc/dvrtimeradd.png diff --git a/docs/docresources/editautorec.png b/src/webui/static/img/doc/editautorec.png similarity index 100% rename from docs/docresources/editautorec.png rename to src/webui/static/img/doc/editautorec.png diff --git a/docs/docresources/epg.png b/src/webui/static/img/doc/epg.png similarity index 100% rename from docs/docresources/epg.png rename to src/webui/static/img/doc/epg.png diff --git a/docs/docresources/epg2.png b/src/webui/static/img/doc/epg2.png similarity index 100% rename from docs/docresources/epg2.png rename to src/webui/static/img/doc/epg2.png diff --git a/docs/docresources/epg3.png b/src/webui/static/img/doc/epg3.png similarity index 100% rename from docs/docresources/epg3.png rename to src/webui/static/img/doc/epg3.png diff --git a/docs/docresources/failedrecordings1.png b/src/webui/static/img/doc/failedrecordings1.png similarity index 100% rename from docs/docresources/failedrecordings1.png rename to src/webui/static/img/doc/failedrecordings1.png diff --git a/docs/docresources/failedrecordings2.png b/src/webui/static/img/doc/failedrecordings2.png similarity index 100% rename from docs/docresources/failedrecordings2.png rename to src/webui/static/img/doc/failedrecordings2.png diff --git a/docs/docresources/finishedrecordings1.png b/src/webui/static/img/doc/finishedrecordings1.png similarity index 100% rename from docs/docresources/finishedrecordings1.png rename to src/webui/static/img/doc/finishedrecordings1.png diff --git a/docs/docresources/finishedrecordings2.png b/src/webui/static/img/doc/finishedrecordings2.png similarity index 100% rename from docs/docresources/finishedrecordings2.png rename to src/webui/static/img/doc/finishedrecordings2.png diff --git a/docs/docresources/mapselectedservices.png b/src/webui/static/img/doc/mapselectedservices.png similarity index 100% rename from docs/docresources/mapselectedservices.png rename to src/webui/static/img/doc/mapselectedservices.png diff --git a/docs/docresources/mapservicesall.png b/src/webui/static/img/doc/mapservicesall.png similarity index 100% rename from docs/docresources/mapservicesall.png rename to src/webui/static/img/doc/mapservicesall.png diff --git a/docs/docresources/mapservicesdialog.png b/src/webui/static/img/doc/mapservicesdialog.png similarity index 100% rename from docs/docresources/mapservicesdialog.png rename to src/webui/static/img/doc/mapservicesdialog.png diff --git a/docs/docresources/muxbylocation.png b/src/webui/static/img/doc/muxbylocation.png similarity index 100% rename from docs/docresources/muxbylocation.png rename to src/webui/static/img/doc/muxbylocation.png diff --git a/docs/docresources/networktypeselect.png b/src/webui/static/img/doc/networktypeselect.png similarity index 100% rename from docs/docresources/networktypeselect.png rename to src/webui/static/img/doc/networktypeselect.png diff --git a/docs/docresources/satipconfig.png b/src/webui/static/img/doc/satipconfig.png similarity index 100% rename from docs/docresources/satipconfig.png rename to src/webui/static/img/doc/satipconfig.png diff --git a/docs/docresources/serviceedit.png b/src/webui/static/img/doc/serviceedit.png similarity index 100% rename from docs/docresources/serviceedit.png rename to src/webui/static/img/doc/serviceedit.png diff --git a/docs/docresources/serviceedit2.png b/src/webui/static/img/doc/serviceedit2.png similarity index 100% rename from docs/docresources/serviceedit2.png rename to src/webui/static/img/doc/serviceedit2.png diff --git a/docs/docresources/servicefilter.png b/src/webui/static/img/doc/servicefilter.png similarity index 100% rename from docs/docresources/servicefilter.png rename to src/webui/static/img/doc/servicefilter.png diff --git a/docs/docresources/tagstab.png b/src/webui/static/img/doc/tagstab.png similarity index 100% rename from docs/docresources/tagstab.png rename to src/webui/static/img/doc/tagstab.png diff --git a/docs/docresources/timers.png b/src/webui/static/img/doc/timers.png similarity index 100% rename from docs/docresources/timers.png rename to src/webui/static/img/doc/timers.png diff --git a/docs/docresources/timeschedules.png b/src/webui/static/img/doc/timeschedules.png similarity index 100% rename from docs/docresources/timeschedules.png rename to src/webui/static/img/doc/timeschedules.png diff --git a/docs/docresources/tvadapterparams.png b/src/webui/static/img/doc/tvadapterparams.png similarity index 100% rename from docs/docresources/tvadapterparams.png rename to src/webui/static/img/doc/tvadapterparams.png diff --git a/docs/docresources/tvadaptertree.png b/src/webui/static/img/doc/tvadaptertree.png similarity index 100% rename from docs/docresources/tvadaptertree.png rename to src/webui/static/img/doc/tvadaptertree.png diff --git a/docs/docresources/upcomingrecordings1.png b/src/webui/static/img/doc/upcomingrecordings1.png similarity index 100% rename from docs/docresources/upcomingrecordings1.png rename to src/webui/static/img/doc/upcomingrecordings1.png diff --git a/docs/docresources/upcomingrecordings2.png b/src/webui/static/img/doc/upcomingrecordings2.png similarity index 100% rename from docs/docresources/upcomingrecordings2.png rename to src/webui/static/img/doc/upcomingrecordings2.png diff --git a/docs/docresources/upcomingrecordings3.png b/src/webui/static/img/doc/upcomingrecordings3.png similarity index 100% rename from docs/docresources/upcomingrecordings3.png rename to src/webui/static/img/doc/upcomingrecordings3.png diff --git a/docs/docresources/xmltvtab.png b/src/webui/static/img/doc/xmltvtab.png similarity index 100% rename from docs/docresources/xmltvtab.png rename to src/webui/static/img/doc/xmltvtab.png diff --git a/src/webui/webui.c b/src/webui/webui.c index d68cefcdf..ffdbde915 100644 --- a/src/webui/webui.c +++ b/src/webui/webui.c @@ -1875,8 +1875,6 @@ webui_init(int xspf) http_path_add("/redir", NULL, http_redir, ACCESS_ANONYMOUS); webui_static_content("/static", "src/webui/static"); - webui_static_content("/docs", "docs/html"); - webui_static_content("/docresources", "docs/docresources"); simpleui_start(); extjs_start();