Skip to content

Commit

Permalink
comment out fixed navbar option for now
Browse files Browse the repository at this point in the history
  • Loading branch information
jdillard committed Nov 24, 2015
1 parent 1ee99ee commit a8ddecc
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions src/usr/local/www/head.inc
Expand Up @@ -375,14 +375,14 @@ if (!$g['disablehelpmenu']) {
$help_menu[] = array(gettext("FreeBSD Handbook"), "https://www.pfsense.org/j.php?jumpto=fbsdhandbook"); $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); $help_menu = msort(array_merge($help_menu, return_ext_menu("Help")), 0);
} }

/*
$menuclass = "navbar navbar-static-top navbar-inverse"; $menuclass = "navbar navbar-static-top navbar-inverse";
if (isset($config['system']['webgui']['webguifixedmenu'])) { if (isset($config['system']['webgui']['webguifixedmenu'])) {
$menuclass = "navbar navbar-fixed-top navbar-inverse"; $menuclass = "navbar navbar-fixed-top navbar-inverse";
} }*/
?> ?>
<nav id="topmenu" class="<?=$menuclass?>"> <nav id="topmenu" class="navbar navbar-fixed-top navbar-inverse">
<div class="container"> <div class="container">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#pf-navbar"> <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#pf-navbar">
Expand Down
10 changes: 5 additions & 5 deletions src/usr/local/www/system.php
Expand Up @@ -89,7 +89,7 @@
$pconfig['timeservers'] = $config['system']['timeservers']; $pconfig['timeservers'] = $config['system']['timeservers'];
$pconfig['language'] = $config['system']['language']; $pconfig['language'] = $config['system']['language'];
$pconfig['webguicss'] = $config['system']['webgui']['webguicss']; $pconfig['webguicss'] = $config['system']['webgui']['webguicss'];
$pconfig['webguifixedmenu'] = $config['system']['webgui']['webguifixedmenu']; //$pconfig['webguifixedmenu'] = $config['system']['webgui']['webguifixedmenu'];
$pconfig['dnslocalhost'] = isset($config['system']['dnslocalhost']); $pconfig['dnslocalhost'] = isset($config['system']['dnslocalhost']);


if (!$pconfig['timezone']) { if (!$pconfig['timezone']) {
Expand Down Expand Up @@ -143,13 +143,13 @@ function is_timezone($elt) {
} else { } else {
unset($config['system']['webgui']['webguicss']); unset($config['system']['webgui']['webguicss']);
} }

/*
if ($_POST['webguifixedmenu']) { if ($_POST['webguifixedmenu']) {
$config['system']['webgui']['webguifixedmenu'] = $_POST['webguifixedmenu']; $config['system']['webgui']['webguifixedmenu'] = $_POST['webguifixedmenu'];
} else { } else {
unset($config['system']['webgui']['webguifixedmenu']); unset($config['system']['webgui']['webguifixedmenu']);
} }

*/
if ($_POST['hostname']) { if ($_POST['hostname']) {
if (!is_hostname($_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 '-'."); $input_errors[] = gettext("The hostname can only contain the characters A-Z, 0-9 and '-'. It may not start or end with '-'.");
Expand Down Expand Up @@ -478,14 +478,14 @@ function is_timezone($elt) {
$pconfig['webguicss'], $pconfig['webguicss'],
$csslist $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("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( $section->addInput(new Form_Select(
'webguifixedmenu', 'webguifixedmenu',
'Menu', 'Menu',
$pconfig['webguifixedmenu'], $pconfig['webguifixedmenu'],
["" => "Scrolls with page", "fixed" => "Fixed (Remains visible at top of page)"] ["" => "Scrolls with page", "fixed" => "Fixed (Remains visible at top of page)"]
)); ));

*/
$form->add($section); $form->add($section);


print $form; print $form;
Expand Down

0 comments on commit a8ddecc

Please sign in to comment.