make fixed nav a beta option

2 files changed, 13 insertions, 13 deletions

diff --git a/src/usr/local/www/head.inc b/src/usr/local/www/head.inc
index a2b7e20..2a4432e 100755
--- a/src/usr/local/www/head.inc
+++ b/src/usr/local/www/head.inc
@@ -376,14 +376,14 @@ if (!$g['disablehelpmenu']) {
 	$help_menu[] = array(gettext("FreeBSD Handbook"), "https://www.pfsense.org/j.php?jumpto=fbsdhandbook");
 	$help_menu = msort(array_merge($help_menu, return_ext_menu("Help")), 0);
 }
-/* 
-$menuclass = "navbar navbar-static-top navbar-inverse";
+
+$menuclass = "static";
 
 if (isset($config['system']['webgui']['webguifixedmenu'])) {
-	$menuclass = "navbar navbar-fixed-top navbar-inverse";
-}*/
+	$menuclass = "fixed";
+}
 ?>
-<nav id="topmenu" class="navbar navbar-fixed-top navbar-inverse">
+<nav id="topmenu" class="navbar navbar-<?=$menuclass?>-top navbar-inverse">
 	<div class="container">
 		<div class="navbar-header">
 			<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#pf-navbar">
@@ -434,7 +434,7 @@ if (isset($config['system']['webgui']['webguifixedmenu'])) {
 	</div>
 </nav>
 
-<div class="container">
+<div class="container <?=$menuclass?>">
 	<header class="header">
 
 <?php
diff --git a/src/usr/local/www/system.php b/src/usr/local/www/system.php
index d94413c..cc8a4f9 100644
--- a/src/usr/local/www/system.php
+++ b/src/usr/local/www/system.php
@@ -89,7 +89,7 @@ $pconfig['timezone'] = $config['system']['timezone'];
 $pconfig['timeservers'] = $config['system']['timeservers'];
 $pconfig['language'] = $config['system']['language'];
 $pconfig['webguicss'] = $config['system']['webgui']['webguicss'];
-//$pconfig['webguifixedmenu'] = $config['system']['webgui']['webguifixedmenu'];
+$pconfig['webguifixedmenu'] = $config['system']['webgui']['webguifixedmenu'];
 $pconfig['dnslocalhost'] = isset($config['system']['dnslocalhost']);
 
 if (!$pconfig['timezone']) {
@@ -143,13 +143,13 @@ if ($_POST) {
 	} else {
 		unset($config['system']['webgui']['webguicss']);
 	}
-	/*
+	
 	if ($_POST['webguifixedmenu']) {
 		$config['system']['webgui']['webguifixedmenu'] = $_POST['webguifixedmenu'];
 	} else {
 		unset($config['system']['webgui']['webguifixedmenu']);
 	}
-	*/
+	
 	if ($_POST['hostname']) {
 		if (!is_hostname($_POST['hostname'])) {
 			$input_errors[] = gettext("The hostname can only contain the characters A-Z, 0-9 and '-'. It may not start or end with '-'.");
@@ -475,15 +475,15 @@ $section->addInput(new Form_Select(
 	'Theme',
 	$pconfig['webguicss'],
 	$csslist
-))->setHelp("Choose an alternative css file (if installed) to change the appearance of the Web configurator. css files are located in /usr/local/www/bootstrap/css");
-/*
+))->setHelp("<span class=\"badge bg-danger\" title=\"This feature is in BETA\">BETA</span> Choose an alternative css file (if installed) to change the appearance of the Web configurator. css files are located in /usr/local/www/bootstrap/css");
+
 $section->addInput(new Form_Select(
 	'webguifixedmenu',
 	'Menu',
 	$pconfig['webguifixedmenu'],
 	["" => "Scrolls with page", "fixed" => "Fixed (Remains visible at top of page)"]
-));
-*/
+))->setHelp("<span class=\"badge bg-danger\" title=\"This feature is in BETA\">BETA</span>");
+
 $form->add($section);
 
 print $form;