Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
wizard: description from ProfYaffle for hello page, added paragraphs
  • Loading branch information
perexg committed Dec 4, 2015
1 parent b6862b4 commit 4484874
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 3 deletions.
8 changes: 7 additions & 1 deletion src/webui/static/app/wizard.js
Expand Up @@ -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,
Expand Down
14 changes: 12 additions & 2 deletions src/wizard.c
Expand Up @@ -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)
Expand Down

0 comments on commit 4484874

Please sign in to comment.