Final touches.

2 files changed, 33 insertions, 23 deletions

diff --git a/usr/local/www/wizards/openvpn_wizard.inc b/usr/local/www/wizards/openvpn_wizard.inc
index 7bde7a1..acffa5e 100644
--- a/usr/local/www/wizards/openvpn_wizard.inc
+++ b/usr/local/www/wizards/openvpn_wizard.inc
@@ -42,7 +42,7 @@ function step2_submitphpaction() {
 
 	if (isset($_POST['next'])) {
 		$_POST['uselist'] = "";
-		$stepid++;
+		$stepid +=3;
 	}
 }
 
diff --git a/usr/local/www/wizards/openvpn_wizard.xml b/usr/local/www/wizards/openvpn_wizard.xml
index 36532b9..8c6a75b 100644
--- a/usr/local/www/wizards/openvpn_wizard.xml
+++ b/usr/local/www/wizards/openvpn_wizard.xml
@@ -34,8 +34,8 @@
 <totalsteps>12</totalsteps>
 <step>
 	<id>1</id>
-	<title>OpenVPN Remote Access Server Setup Wizard</title>
-	<description>Choose the type of user authentication you wish to use.</description>
+	<title>Choose the type of user authentication you wish to use.</title>
+	<description>OpenVPN Remote Access Server Setup Wizard</description>
 	<fields>
 		<field>
 			<type>select</type>
@@ -68,8 +68,8 @@
 </step>
 <step>
 	<id>2</id>
-	<title>OpenVPN Remote Access Server Setup Wizard</title>
-	<description>Choose an LDAP authentication server</description>
+	<description>OpenVPN Remote Access Server Setup Wizard</description>
+	<disableheader>on</disableheader>
 	<fields>
 		<field>
 			<type>listtopic</type>
@@ -103,8 +103,8 @@
 </step>
 <step>
 	<id>3</id>
-	<title>OpenVPN Remote Access Server Setup Wizard</title>
-	<description>Create an LDAP authentication server</description>
+	<description>OpenVPN Remote Access Server Setup Wizard</description>
+	<disableheader>on</disableheader>
 	<fields>
 		<field>
 			<type>listtopic</type>
@@ -203,8 +203,8 @@
 </step>
 <step>
         <id>4</id>
-	<title>OpenVPN Remote Access Server Setup Wizard</title>
-        <description>Choose RADIUS authentication server</description>
+	<description>OpenVPN Remote Access Server Setup Wizard</description>
+	<disableheader>on</disableheader>
         <fields>
 		<field>
                         <type>listtopic</type>
@@ -238,8 +238,8 @@
 </step>
 <step>
 	<id>5</id>
-	<title>OpenVPN Remote Access Server Setup Wizard</title>
-        <description>Add an RADIUS authentication server</description>
+	<description>OpenVPN Remote Access Server Setup Wizard</description>
+	<disableheader>on</disableheader>
 	<fields>
                 <field>
                         <type>listtopic</type>
@@ -281,10 +281,14 @@
 </step>
 <step>
 	<id>6</id>
-	<title>OpenVPN Remote Access Server Setup Wizard</title>
-	<description>Select certificate authority.</description>
+	<description>OpenVPN Remote Access Server Setup Wizard</description>
+	<disableheader>on</disableheader>
 	<fields>
 		<field>
+			<name>Choose Certificate Authority</name>
+			<type>listtopic</type>
+		</field>
+		<field>
 			<type>certca_selection</type>
 			<name>certca</name>
 			<displayname>Certificate Authority</displayname>
@@ -305,8 +309,8 @@
 </step>
 <step>
 	<id>7</id>
-	<title>OpenVPN Remote Access Server Setup Wizard</title>
-        <description>Create a certificate authority.</description>
+	<description>OpenVPN Remote Access Server Setup Wizard</description>
+	<disableheader>on</disableheader>
         <fields>
 		<field>
 			<name>Create a new CA certificate</name>
@@ -403,10 +407,14 @@
 </step>
 <step>
 	<id>8</id>
-	<title>OpenVPN Remote Access Server Setup Wizard</title>
-	<description>Select certificate to be used with server.</description>
+	<description>OpenVPN Remote Access Server Setup Wizard</description>
+	<disableheader>on</disableheader>
 	<fields>
 		<field>
+                        <name>Choose Certificate</name>
+                        <type>listtopic</type>
+                </field>
+		<field>
 			<type>cert_selection</type>
 			<name>certname</name>
 			<displayname>Certificate</displayname>
@@ -427,8 +435,8 @@
 </step>
 <step>
         <id>9</id>
-        <title>OpenVPN Remote Access Server Setup Wizard</title>
-        <description>Create a certificate to be used by server.</description>
+	<description>OpenVPN Remote Access Server Setup Wizard</description>
+	<disableheader>on</disableheader>
         <fields>
 		<field>
 			<name>Create a new certificate</name>
@@ -524,8 +532,8 @@
 </step>
 <step>
 	<id>10</id>
-	<title>OpenVPN Remote Access Server Setup Wizard</title>
-	<description>On this screen we will configure the Local Area Network information.</description>
+	<description>OpenVPN Remote Access Server Setup Wizard</description>
+	<disableheader>on</disableheader>
 	<fields>
 		<field>
 			<type>listtopic</type>
@@ -794,7 +802,8 @@
 </step>
 <step>
 	<id>11</id>
-	<title>OpenVPN Remote Access Server Setup Wizard</title>
+	<description>OpenVPN Remote Access Server Setup Wizard</description>
+	<disableheader>on</disableheader>
 	<fields>
 		<field>
 			<type>listtopic</type>
@@ -826,7 +835,8 @@
 </step>
 <step>
 	<id>12</id>
-	<title>OpenVPN Remote Access Server Setup Wizard</title>
+	<description>OpenVPN Remote Access Server Setup Wizard</description>
+	<disableheader>on</disableheader>
 	<fields>
 		<field>
 			<type>text</type>