From 7b6ab769641ed21bbd239e76135a3e6a8ebe1840 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Mon, 13 Feb 2017 09:20:14 +0100 Subject: [PATCH] wizard: somewhat restyle and improve UX --- src/wizard/openvpn.xml | 56 +++++++++++------------------------------- src/wizard/system.xml | 54 ++++++++++++++++++---------------------- src/www/head.inc | 12 ++++----- src/www/index.php | 26 +++++++++++++++----- src/www/wizard.php | 40 +++++++++--------------------- 5 files changed, 76 insertions(+), 112 deletions(-) diff --git a/src/wizard/openvpn.xml b/src/wizard/openvpn.xml index 00538500c..226bf8766 100644 --- a/src/wizard/openvpn.xml +++ b/src/wizard/openvpn.xml @@ -1,5 +1,5 @@ - + /* Copyright (C) 2014 Deciso B.V. @@ -32,9 +32,7 @@ 12 1 - OpenVPN Wizard: Authentication Type Selection - OpenVPN Remote Access Server Setup Wizard - on + Authentication Type Selection listtopic @@ -70,9 +68,7 @@ 2 - OpenVPN Wizard: LDAP Server Selection - OpenVPN Remote Access Server Setup Wizard - on + LDAP Server Selection listtopic @@ -105,9 +101,7 @@ 3 - OpenVPN Wizard: Add LDAP Server - OpenVPN Remote Access Server Setup Wizard - on + Add LDAP Server listtopic @@ -231,9 +225,7 @@ 4 - OpenVPN Wizard: RADIUS Server Selection - OpenVPN Remote Access Server Setup Wizard - on + RADIUS Server Selection listtopic @@ -266,9 +258,7 @@ 5 - OpenVPN Wizard: Add RADIUS Server - OpenVPN Remote Access Server Setup Wizard - on + Add RADIUS Server listtopic @@ -314,9 +304,7 @@ 6 - OpenVPN Wizard: Certificate Authority Selection - OpenVPN Remote Access Server Setup Wizard - on + Certificate Authority Selection Choose a Certificate Authority (CA) @@ -342,9 +330,7 @@ 7 - OpenVPN Wizard: Add Certificate Authority - OpenVPN Remote Access Server Setup Wizard - on + Add Certificate Authority Create a New Certificate Authority (CA) Certificate @@ -443,9 +429,7 @@ 8 - OpenVPN Wizard: Server Certificate Selection - OpenVPN Remote Access Server Setup Wizard - on + Server Certificate Selection Choose a Server Certificate @@ -471,9 +455,7 @@ 9 - OpenVPN Wizard: Add a Server Certificate - OpenVPN Remote Access Server Setup Wizard - on + Add a Server Certificate Create a New Server Certificate @@ -572,9 +554,7 @@ 10 - OpenVPN Wizard: Server Setup - OpenVPN Remote Access Server Setup Wizard - on + Server Setup listtopic @@ -906,9 +886,7 @@ 11 - OpenVPN Wizard: Firewall Rule Configuration - OpenVPN Remote Access Server Setup Wizard - on + Firewall Rule Configuration listtopic @@ -948,14 +926,8 @@ 12 - OpenVPN Wizard: Finished! - OpenVPN Remote Access Server Setup Wizard - on + Finished! - - listtopic - Configuration Complete! - text Your configuration is now complete. @@ -967,4 +939,4 @@ step12_submitphpaction(); - + diff --git a/src/wizard/system.xml b/src/wizard/system.xml index 790b9eba0..9224c05d3 100644 --- a/src/wizard/system.xml +++ b/src/wizard/system.xml @@ -1,5 +1,5 @@ - + /* Copyright (C) 2014 Deciso B.V. @@ -31,10 +31,12 @@ 9 1 - OPNsense Setup Wizard - true - This wizard will guide you through the initial configuration of OPNsense.<br/><br/> The wizard may be stopped at any time by clicking the logo image at the top of the screen. + General Setup + + text + This wizard will guide you through the initial system configuration. The wizard may be stopped at any time by clicking the logo image at the top of the screen. + Next submit @@ -50,7 +52,6 @@ 2 General Information - On this screen you will set the general OPNsense parameters. Hostname @@ -134,7 +135,6 @@ 3 Time Server Information - Please enter the time, date and time zone. Time server hostname @@ -167,7 +167,6 @@ 4 true Configure WAN Interface - On this screen we will configure the Wide Area Network information. var selectedItem = 0; if(jQuery('#ipaddress').val() == 'dhcp') { @@ -544,8 +543,7 @@ 6 - Set Admin WebGUI Password - On this screen we will set the admin password, which is used to access the WebGUI and also SSH services if you wish to enable them. + Set Admin Web GUI Password Admin Password @@ -576,10 +574,12 @@ 7 - Reload configuration - true - Click 'Reload' to reload OPNsense with new changes. + Reload Configuration + + text + Click 'Reload' to reload to apply the changes. + Reload submit @@ -629,27 +629,21 @@ 8 Reload in progress - - <p>A reload is now in progress. Please wait.</p> - <meta http-equiv="refresh" content="5;url=wizard.php?xml=system&stepid=8"> - <p>The wizard will redirect to the next step once the reload is completed.</p> - + + + text + A reload is now in progress. The wizard will redirect you to the dashboard once the reload is completed. + + + refresh + + 5;/index.php?wizard_done + + - - 9 - Wizard completed. - - - Please consider donating to the project to help us with our overhead costs.

- See OPNsense.org to donate or purchase services offered by the OPNsense team.

- Click here to continue on to OPNsense web GUI. - ]]> - - - + diff --git a/src/www/head.inc b/src/www/head.inc index 59ae0f4e1..67f071796 100644 --- a/src/www/head.inc +++ b/src/www/head.inc @@ -15,18 +15,18 @@ function system_get_language_code() { // link menu system $menu = new OPNsense\Base\Menu\MenuSystem(); +/* XXX generating breadcrumbs requires getItems() call */ $menuSystem = $menu->getItems($_SERVER['REQUEST_URI']); +$menuBreadcrumbs = $menu->getBreadcrumbs(); -/* XXX workaround for dashboard */ -if (!isset($menuBreadcrumbs)) { - /* XXX generating breadcrumbs requires getItems() call */ - $menuBreadcrumbs = $menu->getBreadcrumbs(); +if (isset($extraBreadcrumb)) { + $menuBreadcrumbs[] = array('name' => $extraBreadcrumb); } -$themename = htmlspecialchars(get_current_theme()); +$themename = html_safe(get_current_theme()); $pagetitle = gentitle(array_reverse($menuBreadcrumbs), ' | '); -$pagetitle .= sprintf(' | %s.%s', $config['system']['hostname'], $config['system']['domain']); +$pagetitle .= html_safe(sprintf(' | %s.%s', $config['system']['hostname'], $config['system']['domain'])); ?> diff --git a/src/www/index.php b/src/www/index.php index 7216a9c0a..0d5f92556 100644 --- a/src/www/index.php +++ b/src/www/index.php @@ -100,7 +100,9 @@ include("head.inc"); include("fbegin.inc");?> +?> +