From fa8be5de0d4ab6527186ac484c21b46b708f09a4 Mon Sep 17 00:00:00 2001 From: Matt Smith Date: Tue, 19 Aug 2014 13:33:24 -0500 Subject: non-css parts of gold menu --- usr/local/www/fbegin.inc | 12 ++++++++++++ usr/local/www/wizards/setup_wizard.xml | 32 ++++++++++++++++++++++---------- 2 files changed, 34 insertions(+), 10 deletions(-) diff --git a/usr/local/www/fbegin.inc b/usr/local/www/fbegin.inc index 6ec1dd0..3050baf 100755 --- a/usr/local/www/fbegin.inc +++ b/usr/local/www/fbegin.inc @@ -236,6 +236,10 @@ if (isset($config['system']['developer'])) { } $diagnostics_menu = msort(array_merge($diagnostics_menu, return_ext_menu("Diagnostics")),0); +$gold_menu = array(); +$gold_menu[] = array(gettext("pfSense Gold"), "https://www.pfsense.org/gold"); +$gold_menu = msort(array_merge($gold_menu, return_ext_menu("Gold")),0); + if(! $g['disablehelpmenu']) { $help_menu = array(); $help_menu[] = array(gettext("About this Page"), $helpurl); @@ -327,6 +331,14 @@ if(! $g['disablehelpmenu']) { ?> +
  • +
    + +
  • diff --git a/usr/local/www/wizards/setup_wizard.xml b/usr/local/www/wizards/setup_wizard.xml index 30515e9..c4c4abf 100644 --- a/usr/local/www/wizards/setup_wizard.xml +++ b/usr/local/www/wizards/setup_wizard.xml @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -9 +10 1 pfSense Setup Wizard @@ -51,6 +51,18 @@ 2 + Bling your pfSense with pfSense Gold + true + Feel the power of a pfSense Gold subscription. Receive special benefits while supporting ongoing development of the Open Source pfSense project.<br/> <br/> Benefits include access to our AutoConfigBackup secure cloud based backup service for up to 10 hosts, pre-publication access to the updated pfSense: The Definitive Guide book in PDF, fully updated for the pfSense 2.1 release, and a monthly online MeetUp! Video conference to discuss and demonstrate advanced features and architectures using pfSense. <br/> <br/> Go to <a href="https://www.pfsense.org/gold" target="_blank"> pfSense Gold Subscriptions</a> to sign up now <br/> <br/> + + + Next + submit + + + + + 3 General Information On this screen you will set the general pfSense parameters. @@ -129,7 +141,7 @@ - 3 + 4 Time Server Information Please enter the time, date and time zone. @@ -161,7 +173,7 @@ - 4 + 5 true Configure WAN Interface On this screen we will configure the Wide Area Network information. @@ -483,13 +495,13 @@ $config['interfaces']['wan']['ipaddr'] = $_POST['selectedtype']; write_config(); if(!$config['interfaces']['lan']) - Header("Location: /wizard.php?xml=setup_wizard.xml&stepid=5&next=Next"); + Header("Location: /wizard.php?xml=setup_wizard.xml&stepid=6&next=Next"); } ]]> - 5 + 6 Configure LAN Interface On this screen we will configure the Local Area Network information. @@ -534,7 +546,7 @@ - 6 + 7 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. @@ -566,7 +578,7 @@ - 7 + 8 Reload configuration true Click 'Reload' to reload pfSense with new changes. @@ -578,11 +590,11 @@ - 8 + 9 Reload in progress A reload is now in progress. Please wait. <p> - <meta http-equiv="refresh" content="5; url=wizard.php?xml=setup_wizard.xml&stepid=8" > + <meta http-equiv="refresh" content="5; url=wizard.php?xml=setup_wizard.xml&stepid=9" > <p> The wizard will redirect to the next step once the reload is completed. @@ -628,7 +640,7 @@ - 9 + 10 Wizard completed.