diff options
Diffstat (limited to 'usr')
| -rwxr-xr-x | usr/local/www/fbegin.inc | 12 | ||||
| -rw-r--r-- | usr/local/www/themes/code-red/all.css | 4 | ||||
| -rw-r--r-- | usr/local/www/themes/metallic/all.css | 4 | ||||
| -rw-r--r-- | usr/local/www/themes/nervecenter/all.css | 4 | ||||
| -rw-r--r-- | usr/local/www/themes/pfsense-dropdown/all.css | 5 | ||||
| -rw-r--r-- | usr/local/www/themes/pfsense_ng/all.css | 9 | ||||
| -rw-r--r-- | usr/local/www/themes/pfsense_ng_fs/all.css | 9 | ||||
| -rw-r--r-- | usr/local/www/themes/the_wall/all.css | 4 | ||||
| -rw-r--r-- | usr/local/www/wizards/setup_wizard.xml | 32 |
9 files changed, 55 insertions, 28 deletions
diff --git a/usr/local/www/fbegin.inc b/usr/local/www/fbegin.inc index 55d8182..4710c29 100755 --- a/usr/local/www/fbegin.inc +++ b/usr/local/www/fbegin.inc @@ -241,6 +241,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://portal.pfsense.org/gold-subscription.php"); +$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); @@ -332,6 +336,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/themes/code-red/all.css b/usr/local/www/themes/code-red/all.css index 73bb54b..a68d44d 100644 --- a/usr/local/www/themes/code-red/all.css +++ b/usr/local/www/themes/code-red/all.css @@ -88,7 +88,7 @@ div.niceTitle font-weight: bold; font-size: 13px; font-family: "Trebuchet MS", sans-serif; - width: 250px; + width: 220px; left: 0; top: 0; padding: 4px; @@ -376,7 +376,7 @@ table#marquee div#container div#scroller { #navigation ul li { float: left; position: relative; - width: 7.5em; + width: 6.2em; } #navigation ul li div { font-size: 1em; diff --git a/usr/local/www/themes/metallic/all.css b/usr/local/www/themes/metallic/all.css index 4271df9..47b6b98 100644 --- a/usr/local/www/themes/metallic/all.css +++ b/usr/local/www/themes/metallic/all.css @@ -78,7 +78,7 @@ div.niceTitle font-weight: bold; font-size: 13px; font-family: "Trebuchet MS", sans-serif; - width: 250px; + width: 220px; left: 0; top: 0; padding: 4px; @@ -360,7 +360,7 @@ table#marquee div#container div#scroller { float: left; position: relative; /* width: 7.5em; */ - width: 7.47em; + width: 6.2em; } #navigation ul li div { font-size: 1em; diff --git a/usr/local/www/themes/nervecenter/all.css b/usr/local/www/themes/nervecenter/all.css index 6014477..541861a 100644 --- a/usr/local/www/themes/nervecenter/all.css +++ b/usr/local/www/themes/nervecenter/all.css @@ -88,7 +88,7 @@ div.niceTitle font-weight: bold; font-size: 13px; font-family: "Trebuchet MS", sans-serif; - width: 250px; + width: 220px; left: 0; top: 0; padding: 4px; @@ -382,7 +382,7 @@ table#marquee div#container div#scroller { #navigation ul li { float: left; position: relative; - width: 7.5em; + width: 6.2em; } #navigation ul li div { font-size: 1em; diff --git a/usr/local/www/themes/pfsense-dropdown/all.css b/usr/local/www/themes/pfsense-dropdown/all.css index a183f3d..e0f1c46 100644 --- a/usr/local/www/themes/pfsense-dropdown/all.css +++ b/usr/local/www/themes/pfsense-dropdown/all.css @@ -88,7 +88,7 @@ div.niceTitle font-weight: bold; font-size: 13px; font-family: "Trebuchet MS", sans-serif; - width: 250px; + width: 220px; left: 0; top: 0; padding: 4px; @@ -333,11 +333,12 @@ table#marquee div#container div#scroller { #navigation ul li { float: left; position: relative; - width: 7.5em; + width: 6.2em; } #navigation ul li div { font-size: 1em; font-weight: bold; + text-align: center; } /* Make the List inside the List Elements */ /* initially hidden with absolute position */ diff --git a/usr/local/www/themes/pfsense_ng/all.css b/usr/local/www/themes/pfsense_ng/all.css index 6f4aa64..80dd171 100644 --- a/usr/local/www/themes/pfsense_ng/all.css +++ b/usr/local/www/themes/pfsense_ng/all.css @@ -88,7 +88,7 @@ div.niceTitle font-weight: bold; font-size: 13px; font-family: "Trebuchet MS", sans-serif; - width: 250px; + width: 220px; left: 0; top: 0; padding: 4px; @@ -428,20 +428,21 @@ table#marquee div#container div#scroller { #navigation ul li { float: left; position: relative; - width: 7.0em; + width: 6.2em; top: 0px; } /* Text mainmenubar */ #navigation ul li div { background-image: url(images/mainmenu-right.gif); - background-position: 5% 50%; + background-position: 2% 50%; background-repeat: no-repeat; padding-top:0px; font-size: 12px; font-weight: normal; color: #ffffff; - text-align: center; + text-align: left; + padding-left: 13px; height: 13px; } diff --git a/usr/local/www/themes/pfsense_ng_fs/all.css b/usr/local/www/themes/pfsense_ng_fs/all.css index fac5255..c0898e9 100644 --- a/usr/local/www/themes/pfsense_ng_fs/all.css +++ b/usr/local/www/themes/pfsense_ng_fs/all.css @@ -88,7 +88,7 @@ div.niceTitle font-weight: bold; font-size: 13px; font-family: "Trebuchet MS", sans-serif; - width: 250px; + width: 220px; left: 0; top: 0; padding: 4px; @@ -389,20 +389,21 @@ table#marquee div#container div#scroller { #navigation ul li { float: left; position: relative; - width: 7.0em; + width: 6.2em; top: 0px; } /* Text mainmenubar */ #navigation ul li div { background-image: url(images/mainmenu-right.gif); - background-position: 5% 50%; + background-position: 2% 50%; background-repeat: no-repeat; padding-top:0px; font-size: 12px; font-weight: normal; color: #ffffff; - text-align: center; + text-align: left; + padding-left: 13px; height: 13px; } diff --git a/usr/local/www/themes/the_wall/all.css b/usr/local/www/themes/the_wall/all.css index e6856c9..60404d7 100644 --- a/usr/local/www/themes/the_wall/all.css +++ b/usr/local/www/themes/the_wall/all.css @@ -89,7 +89,7 @@ div.niceTitle font-weight: bold; font-size: 13px; font-family: "Trebuchet MS", sans-serif; - width: 250px; + width: 220px; left: 0; top: 0; padding: 4px; @@ -384,7 +384,7 @@ table#marquee div#container div#scroller { #navigation ul li { float: left; position: relative; - width: 7.5em; + width: 6.2em; } #navigation ul li div { font-size: 1em; diff --git a/usr/local/www/wizards/setup_wizard.xml b/usr/local/www/wizards/setup_wizard.xml index e69dbaf..b3db3f5 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.<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://portal.pfsense.org/gold-subscription.php" target="_blank"> pfSense Gold Subscriptions</a> to sign up now <br/> <br/> </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. <p> - <meta http-equiv="refresh" content="60; url=wizard.php?xml=setup_wizard.xml&stepid=8" > + <meta http-equiv="refresh" content="60; url=wizard.php?xml=setup_wizard.xml&stepid=9" > <p> The wizard will redirect to the next step once the reload is completed. </description> @@ -626,7 +638,7 @@ </stepafterformdisplay> </step> <step> - <id>9</id> + <id>10</id> <title>Wizard completed.</title> <stepbeforeformdisplay> <