summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Smith <mgsmith@netgate.com>2014-08-19 13:33:24 -0500
committerMatt Smith <mgsmith@netgate.com>2014-08-19 13:33:24 -0500
commitfa8be5de0d4ab6527186ac484c21b46b708f09a4 (patch)
tree98d34f1cac816152e85eecb859b2ade1ced3b10f
parentbdde98fcbd7f14cddd0abb600407edd03dce2356 (diff)
downloadpfsense-fa8be5de0d4ab6527186ac484c21b46b708f09a4.zip
pfsense-fa8be5de0d4ab6527186ac484c21b46b708f09a4.tar.gz
non-css parts of gold menu
-rwxr-xr-xusr/local/www/fbegin.inc12
-rw-r--r--usr/local/www/wizards/setup_wizard.xml32
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']) {
?>
</ul>
</li>
+ <li class="drop">
+ <div><?php echo gettext("Gold"); ?></div>
+ <ul id="diag" class="subdrop">
+ <?php
+ output_menu($gold_menu, "_blank");
+ ?>
+ </ul>
+ </li>
<?php if(! $g['disablehelpmenu']): ?>
<li class="lastdrop">
<div><?php echo gettext("Help"); ?></div>
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.
*/
</copyright>
-<totalsteps>9</totalsteps>
+<totalsteps>10</totalsteps>
<step>
<id>1</id>
<title>pfSense Setup Wizard</title>
@@ -51,6 +51,18 @@
</step>
<step>
<id>2</id>
+ <title>Bling your pfSense with pfSense Gold</title>
+ <disableheader>true</disableheader>
+ <description>Feel the power of a pfSense Gold subscription. Receive special benefits while supporting ongoing development of the Open Source pfSense project.&lt;br/&gt; &lt;br/&gt; 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. &lt;br/&gt; &lt;br/&gt; Go to &lt;a href="https://www.pfsense.org/gold" target="_blank"&gt; pfSense Gold Subscriptions&lt;/a&gt; to sign up now &lt;br/&gt; &lt;br/&gt; </description>
+ <fields>
+ <field>
+ <name>Next</name>
+ <type>submit</type>
+ </field>
+ </fields>
+</step>
+<step>
+ <id>3</id>
<title>General Information</title>
<description>On this screen you will set the general pfSense parameters.</description>
<fields>
@@ -129,7 +141,7 @@
</stepsubmitphpaction>
</step>
<step>
- <id>3</id>
+ <id>4</id>
<title>Time Server Information</title>
<description>Please enter the time, date and time zone.</description>
<fields>
@@ -161,7 +173,7 @@
</stepsubmitphpaction>
</step>
<step>
- <id>4</id>
+ <id>5</id>
<disableallfieldsbydefault>true</disableallfieldsbydefault>
<title>Configure WAN Interface</title>
<description>On this screen we will configure the Wide Area Network information.</description>
@@ -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");
}
]]>
</stepsubmitbeforesave>
</step>
<step>
- <id>5</id>
+ <id>6</id>
<title>Configure LAN Interface</title>
<description>On this screen we will configure the Local Area Network information.</description>
<fields>
@@ -534,7 +546,7 @@
</stepsubmitphpaction>
</step>
<step>
- <id>6</id>
+ <id>7</id>
<title>Set Admin WebGUI Password</title>
<description>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.</description>
<fields>
@@ -566,7 +578,7 @@
</stepsubmitphpaction>
</step>
<step>
- <id>7</id>
+ <id>8</id>
<title>Reload configuration</title>
<disableheader>true</disableheader>
<description>Click 'Reload' to reload pfSense with new changes.</description>
@@ -578,11 +590,11 @@
</fields>
</step>
<step>
- <id>8</id>
+ <id>9</id>
<title>Reload in progress</title>
<description>
A reload is now in progress. Please wait. &lt;p&gt;
- &lt;meta http-equiv="refresh" content="5; url=wizard.php?xml=setup_wizard.xml&amp;stepid=8" &gt;
+ &lt;meta http-equiv="refresh" content="5; url=wizard.php?xml=setup_wizard.xml&amp;stepid=9" &gt;
&lt;p&gt;
The wizard will redirect to the next step once the reload is completed.
</description>
@@ -628,7 +640,7 @@
</stepafterformdisplay>
</step>
<step>
- <id>9</id>
+ <id>10</id>
<title>Wizard completed.</title>
<stepbeforeformdisplay>
<![CDATA[
OpenPOWER on IntegriCloud