From: Mark Clarkstone Date: Fri, 30 Nov 2018 23:13:56 +0000 (+0000) Subject: wizard: spruce it up a bit X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27c00888475f27ef21a1b58805804fa6ebdf3e99;p=thirdparty%2Ftvheadend.git wizard: spruce it up a bit --- diff --git a/docs/markdown/firstconfig.md b/docs/markdown/firstconfig.md index 947c36904..1bbc4e939 100644 --- a/docs/markdown/firstconfig.md +++ b/docs/markdown/firstconfig.md @@ -19,7 +19,7 @@ pressing the **Start wizard** button in **Configuration -> General -> Base**. [Introduction](introduction) before continuing with the wizard, as it contains lots of useful info! -### 1. Welcome/Language +### 1. Welcome The first part of the wizard is where you select the basic language settings, if you don't enter a preferred language, US English will be used as a @@ -52,7 +52,7 @@ is not recommended that you allow anonymous access to the admin account. If you plan on accessing Tvheadend over the Internet, make sure you use strong credentials and do not allow anonymous access at all. -### 3. Network Settings +### 3. Tuner and Network Many tuners are able to receive different signal types, If you receive your channels through an.. @@ -73,7 +73,7 @@ Internet m3u playlist | ```IPTV``` Selecting more than one tuner per device can thus result in unexpected behavior. -### 4. Assign Predefined Muxes to Networks +### 4. Predefined Muxes Assign predefined muxes to networks. To save you from manually entering muxes, Tvheadend includes predefined mux lists. Please select an option @@ -89,7 +89,7 @@ from the list for each network. * Networks already configured will not be shown. * Selecting the wrong list may cause the scan (on the next page) to fail. -### 5. Scanning for Services +### 5. Scanning Tvheadend should now be scanning for available services. Please wait until the scan completes. @@ -258,7 +258,7 @@ or record). See [Services](class/mpegts_service) for a detailed look into service mapping. -**Bouquets**: Many service providers use bouquets for channel management and just +**Bouquets**: Many service providers - mostly those using satellite - use bouquets for channel management and just like a standard set-top box Tvheadend can use these to automatically manage and keep your channels up-to-date. If you would like to use bouquets see [here](class/bouquet). diff --git a/docs/wizard/channels.md b/docs/wizard/channels.md index b813feb8a..4181ce883 100644 --- a/docs/wizard/channels.md +++ b/docs/wizard/channels.md @@ -1,4 +1,4 @@ -You are now finished. +**You are now Finished** You may further customize your settings by editing channel numbers, etc. @@ -9,6 +9,5 @@ If you require further help, check out [Tvheadend.org](http://tvheadend.org) or chat to us on [IRC](https://kiwiirc.com/client/chat.freenode.net/?nick=tvhhelp|?#hts). - Thank you for using Tvheadend (and don't forget to [donate](http://tvheadend.org/projects/tvheadend/wiki/Donate))! :) diff --git a/docs/wizard/channels2.md b/docs/wizard/channels2.md index d6c4e70dd..c0b2ba48a 100644 --- a/docs/wizard/channels2.md +++ b/docs/wizard/channels2.md @@ -1,4 +1,4 @@ -You are now finished. +**You are now Finished** You may further customize your settings by editing channel numbers, etc. @@ -6,6 +6,5 @@ If you require further help, check out [Tvheadend.org](http://tvheadend.org) or chat to us on [IRC](https://kiwiirc.com/client/chat.freenode.net/?nick=tvhhelp|?#hts). - Thank you for using Tvheadend (and don't forget to [donate](http://tvheadend.org/projects/tvheadend/wiki/Donate))! :) diff --git a/docs/wizard/hello.md b/docs/wizard/hello.md index 7190f31d3..08e8c4087 100644 --- a/docs/wizard/hello.md +++ b/docs/wizard/hello.md @@ -1,17 +1,15 @@ -Welcome to Tvheadend, your TV streaming server and video recorder. - -**This wizard should only be run on initial set-up.** Please cancel it if -you're not willing to touch the current configuration, as continuing in -such cases can lead to misconfiguration, and not all changes made thru -this wizard will take effect. - -If at any point you get stuck (or need a little more information), -press **[Help]**. - ---- +**Welcome to Tvheadend, Your TV Streaming Server and Video Recorder** Let's start by configuring the basic language settings. Please select the default user interface and EPG language(s). -**The interface will restart in your chosen language (if a translation -is available).** +* This wizard is optional, and can be cancelled at any time, but +recommended for new users. +* Running this wizard on existing configurations is NOT a good idea as +it may lead to confusion, misconfiguration and unexpected features! ;) +* The wizard will restart and reload the interface in your chosen +language, unfortunately not all translations are available/complete. +* If you get stuck at any point and need a little more information, +press [Help]. + + diff --git a/docs/wizard/login.md b/docs/wizard/login.md index 73008fd05..59d1db235 100644 --- a/docs/wizard/login.md +++ b/docs/wizard/login.md @@ -1,4 +1,4 @@ -Enter the access control details to secure your system. +**Enter Access Control Details to Secure Your System** The first part of this covers the network details for address-based access to the system; for example, @@ -9,8 +9,3 @@ or 0.0.0.0/0 or empty value for access from any system. This works alongside the second part, which is a familiar username/password combination, so provide these for both an administrator and regular (day-to-day) user. - ---- - -Be sure to have a quick read of the **[Help]** as it contains some -important security tips! diff --git a/docs/wizard/mapping.md b/docs/wizard/mapping.md index 74edeb12d..ee5c147a4 100644 --- a/docs/wizard/mapping.md +++ b/docs/wizard/mapping.md @@ -1,4 +1,4 @@ -Map all discovered services to channels. +**Map Services to Channels** In order for your frontend client(s) (such as Kodi, Movian, and similar) to see/play channels, you must first map discovered services to @@ -7,8 +7,3 @@ channels. If you would like Tvheadend to do this for you, check the **You can skip this step (do not check 'Map all services') and map services to channels manually.** - ---- - -You can see more info on the various options here by pressing the -**[Help]** button! diff --git a/docs/wizard/muxes.md b/docs/wizard/muxes.md index 6c8a87ae2..93a20a6d1 100644 --- a/docs/wizard/muxes.md +++ b/docs/wizard/muxes.md @@ -1,14 +1,13 @@ -Assign predefined muxes to networks. To save you from manually entering -muxes, Tvheadend includes predefined mux lists. Please select an option -from the list for each network. +**Assign Predefined Muxes to Networks** -Note, the pre-defined lists are not always up-to-date, this generally +To save you from manually entering muxes, Tvheadend includes predefined +mux lists. Please select an option from the list for each network. + + +Pre-defined lists are not always up-to-date, this generally isn't a problem provided that one of the muxes in list is active, and contains network information. + **If you don't see any options below, you need to go back and assign a network type to a tuner.** - ---- - -Don't forget to check out the **[Help]** for more info! diff --git a/docs/wizard/network.md b/docs/wizard/network.md index 02e4c9bde..631d9d528 100644 --- a/docs/wizard/network.md +++ b/docs/wizard/network.md @@ -1,7 +1,5 @@ +**Tuner and Network** + Now let's get your tuners configured. Go ahead and select a network for each of the tuners you would like to use. If you don't assign a network to a tuner it __won't__ be used. - ---- - -Don't forget to check out the **[Help]**! diff --git a/docs/wizard/status.md b/docs/wizard/status.md index 5201ec967..94119640f 100644 --- a/docs/wizard/status.md +++ b/docs/wizard/status.md @@ -1,7 +1,4 @@ +**Scanning** + Tvheadend is now scanning for available services. Please wait until the scan completes.. - - ---- - -While the scan progresses check out the **[Help]** for more info! diff --git a/src/webui/static/img/doc/firstconfig/wizard.png b/src/webui/static/img/doc/firstconfig/wizard.png index 012de400b..6b4d0571a 100644 Binary files a/src/webui/static/img/doc/firstconfig/wizard.png and b/src/webui/static/img/doc/firstconfig/wizard.png differ diff --git a/src/wizard.c b/src/wizard.c index bf3e86512..1f7db17b5 100644 --- a/src/wizard.c +++ b/src/wizard.c @@ -240,7 +240,7 @@ wizard_page_t *wizard_hello(const char *lang) }; wizard_page_t *page = page_init("hello", "wizard_hello", - N_("Wizard - Welcome/Language")); + N_("Welcome")); idclass_t *ic = (idclass_t *)page->idnode.in_class; wizard_hello_t *w; htsmsg_t *m; @@ -464,7 +464,7 @@ wizard_page_t *wizard_login(const char *lang) }; wizard_page_t *page = page_init("login", "wizard_login", - N_("Wizard - Access Control")); + N_("Access Control")); idclass_t *ic = (idclass_t *)page->idnode.in_class; wizard_login_t *w; access_entry_t *ae; @@ -667,7 +667,7 @@ wizard_page_t *wizard_network(const char *lang) PREV_BUTTON(login), NEXT_BUTTON(muxes), }; - wizard_page_t *page = page_init("network", "wizard_network", N_("Wizard - Network Settings")); + wizard_page_t *page = page_init("network", "wizard_network", N_("Tuner and Network")); idclass_t *ic = (idclass_t *)page->idnode.in_class; wizard_network_t *w; mpegts_network_t *mn; @@ -959,7 +959,7 @@ wizard_page_t *wizard_muxes(const char *lang) PREV_BUTTON(network), NEXT_BUTTON(status), }; - wizard_page_t *page = page_init("muxes", "wizard_muxes", N_("Wizard - Assign Predefined Muxes to Networks")); + wizard_page_t *page = page_init("muxes", "wizard_muxes", N_("Predefined Muxes")); idclass_t *ic = (idclass_t *)page->idnode.in_class; wizard_muxes_t *w; mpegts_network_t *mn; @@ -1044,7 +1044,7 @@ wizard_page_t *wizard_status(const char *lang) NEXT_BUTTON(mapping), {} }; - wizard_page_t *page = page_init("status", "wizard_status", N_("Wizard - Scanning for Services")); + wizard_page_t *page = page_init("status", "wizard_status", N_("Scanning")); idclass_t *ic = (idclass_t *)page->idnode.in_class; ic->ic_properties = props; ic->ic_groups = groups; @@ -1136,7 +1136,7 @@ wizard_page_t *wizard_mapping(const char *lang) NEXT_BUTTON(channels), {} }; - wizard_page_t *page = page_init("mapping", "wizard_mapping", N_("Wizard - Service Mapping")); + wizard_page_t *page = page_init("mapping", "wizard_mapping", N_("Service Mapping")); idclass_t *ic = (idclass_t *)page->idnode.in_class; wizard_mapping_t *w; ic->ic_properties = props; @@ -1189,7 +1189,7 @@ wizard_page_t *wizard_channels(const char *lang) LAST_BUTTON(), {} }; - wizard_page_t *page = page_init("channels", "wizard_channels", N_("Wizard - Finished")); + wizard_page_t *page = page_init("channels", "wizard_channels", N_("Finished")); idclass_t *ic = (idclass_t *)page->idnode.in_class; access_entry_t *ae;