Commit 8b23648d authored by Jos Schellevis's avatar Jos Schellevis

Small menu updates

parent 9094a660
...@@ -31,9 +31,6 @@ require_once("functions.inc"); ...@@ -31,9 +31,6 @@ require_once("functions.inc");
require_once("shortcuts.inc"); require_once("shortcuts.inc");
require_once("service-utils.inc"); require_once("service-utils.inc");
/* $Id$ */
/* Determine automated help URL. Should output the page name and /* Determine automated help URL. Should output the page name and
parameters separately */ parameters separately */
$uri_split = ""; $uri_split = "";
...@@ -108,7 +105,7 @@ function output_menu($arrayitem, $target = null) { ...@@ -108,7 +105,7 @@ function output_menu($arrayitem, $target = null) {
$class = "list-group-item"; $class = "list-group-item";
$check = substr($item[1],1,-4); $check = substr($item[1],1,-3);
if (stripos($_SERVER['PHP_SELF'], $check) !== false) { if (stripos($_SERVER['PHP_SELF'], $check) !== false) {
$class .= " active"; $class .= " active";
} }
...@@ -132,7 +129,7 @@ function active_menu($arrayitem, $pagename) { ...@@ -132,7 +129,7 @@ function active_menu($arrayitem, $pagename) {
$pagename = "/".ltrim($pagename,"/"); $pagename = "/".ltrim($pagename,"/");
foreach ($arrayitem as $item) { foreach ($arrayitem as $item) {
$check = substr($item[1],1,-4); $check = substr($item[1],1,-3);
if (stripos($pagename, $check) !== false) { if (stripos($pagename, $check) !== false) {
return true; return true;
...@@ -228,7 +225,7 @@ $vpn_menu = msort(array_merge($vpn_menu, return_ext_menu("VPN")),0); ...@@ -228,7 +225,7 @@ $vpn_menu = msort(array_merge($vpn_menu, return_ext_menu("VPN")),0);
// Status // Status
$status_menu = array(); $status_menu = array();
if (count($config['captiveportal']) > 0) //if (count($config['captiveportal']) > 0)
$status_menu[] = array(gettext("Captive Portal"), "/status_captiveportal.php"); $status_menu[] = array(gettext("Captive Portal"), "/status_captiveportal.php");
$status_menu[] = array(gettext("CARP (failover)"), "/carp_status.php"); $status_menu[] = array(gettext("CARP (failover)"), "/carp_status.php");
$status_menu[] = array(gettext("Dashboard"), "/index.php"); $status_menu[] = array(gettext("Dashboard"), "/index.php");
......
...@@ -570,6 +570,7 @@ include("head.inc"); ...@@ -570,6 +570,7 @@ include("head.inc");
?> ?>
<body>
<script type="text/javascript" src="/javascript/row_helper.js"> <script type="text/javascript" src="/javascript/row_helper.js">
</script> </script>
...@@ -685,9 +686,7 @@ include("head.inc"); ...@@ -685,9 +686,7 @@ include("head.inc");
} }
//]]> //]]>
</script> </script>
</head>
<body>
<?php include("fbegin.inc"); ?> <?php include("fbegin.inc"); ?>
<section class="page-content-main"> <section class="page-content-main">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment