From: Jaroslav Kysela <perex@perex.cz>
Date: Fri, 4 Dec 2015 12:19:32 +0000 (+0100)
Subject: wizard: description from ProfYaffle for hello page, added paragraphs
X-Git-Tag: v4.2.1~1372
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=44848741758b8c61af9bdc49146fc123499dba95;p=thirdparty%2Ftvheadend.git

wizard: description from ProfYaffle for hello page, added paragraphs
---

diff --git a/src/webui/static/app/wizard.js b/src/webui/static/app/wizard.js
index 745ca1fa5..7f9690213 100644
--- a/src/webui/static/app/wizard.js
+++ b/src/webui/static/app/wizard.js
@@ -71,7 +71,13 @@ tvheadend.wizard_start = function(page) {
         var text = getvalue(data, 'description');
         var c = '';
         if (icon)
-          c += '<img class="x-wizard-icon" src="' + icon + '"/>';
+            c += '<img class="x-wizard-icon" src="' + icon + '"/>';
+        if (text) {
+            var a = text.split('\n');
+            text = '';
+            for (var i = 0; i < a.length; i++)
+                text += '<p>' + a[i] + '</p>';
+        }
         c += '<div class="x-wizard-description">' + text + '</div>';
         var p = new Ext.Panel({
             width: 570,
diff --git a/src/wizard.c b/src/wizard.c
index 962cb0603..a6db071bf 100644
--- a/src/wizard.c
+++ b/src/wizard.c
@@ -96,8 +96,18 @@ static int hello_set_network(void *o, const void *v)
 }
 
 DESCRIPTION_FCN(hello, N_("\
-Enter allowed network (like 192.168.1.0/24) and user logins for administrator and ordinary user. \
-If the username is empty, anonymous access will be allowed.\
+Enter the access control details to secure your system. \
+The first part of this covers the IPv4 network details \
+for address-based access to the system; for example, \
+192.168.1.0/24 to allow local access only to 192.168.1.x clients, \
+or 0.0.0.0/0 or empty value for access from any system.\n\
+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. \
+You can leave the username and password blank if you don't want \
+this part, and would prefer anonymous access to anyone.\n\
+This wizard should be run only on the initial setup. Please, cancel \
+it, if you are not willing to touch the current configuration.\
 "))
 
 wizard_page_t *wizard_hello(void)