Reworked menu system so its ordered right

opentrafficshaper/plugins/webserver/pages/configmanager.pm

@@ -44,14 +44,43 @@ use opentrafficshaper::plugins::configmanager qw( getOverrides getOverride getTr
 
 
 # Sidebar menu options for this module
-my $menu = {
-	'View Overrides' =>  {
-		'All Overrides' => '',
+my $menu = [
+	{
+		'name' => 'Limit Overrides',
+		'items' => [
+			{
+				'name' => 'View Overrides',
+				'link' => 'override-list'
+			},
+			{
+				'name' => 'Add Override',
+				'link' => 'override-add'
+			}
+		]
 	},
-	'Admin' =>  {
-		'Add Override' => 'override-add',
+	{
+		'name' => 'Limit Pools',
+		'items' => [
+			{
+				'name' => 'View Pools',
+				'link' => 'pools-list'
+			},
+			{
+				'name' => 'Add Pool',
+				'link' => 'pools-add'
+			}
+		]
 	},
-};
+	{
+		'name' => 'Admin',
+		'items' => [
+			{
+				'name' => 'Configuration',
+				'link' => 'configuration-list'
+			}
+		]
+	}
+];
 
 
 

opentrafficshaper/plugins/webserver/pages/limits.pm

@@ -56,15 +56,30 @@ use opentrafficshaper::plugins::configmanager qw(
 
 
 # Sidebar menu options for this module
-my $menu = {
-	'View Limits' =>  {
-		'All Limits' => '',
-		'Manual Limits' => './?source=plugin.webserver.limits',
-	},
-	'Admin' => {
-		'Add Limit' => 'limit-add',
+my $menu = [
+	{
+		'name' => 'View Limits',
+		'items' => [
+			{
+				'name' => 'All Limits',
+				'link' => ''
+			},
+			{
+				'name' => 'Manual Limits',
+				'link' => './?source=plugin.webserver.limits'
+			}
+		]
 	},
-};
+	{
+		'name' => 'Admin',
+		'items' => [
+			{
+				'name' => 'Add Limit',
+				'link' => 'limit-add'
+			}
+		]
+	}
+];
 
 
 

opentrafficshaper/plugins/webserver/webserver.pm

@@ -346,23 +346,25 @@ sub httpCreateResponse
 			# Check if menu exists
 			if (my $menu = $options->{'menu'}) {
 				$menuStr =<<EOF;
-					<div class="col-md-2">
+					<div class="col-xs-2">
 						<ul class="nav nav-pills nav-stacked">
 EOF
 				# Loop with sub menu sections
-				foreach my $section (keys %{$menu}) {
+				foreach my $section (@{$menu}) {
+					my $sectionName = encode_entities($section->{'name'});
 					$menuStr .=<<EOF;
-							<li class="nav-header">$section</li>
+							<li class="nav-header">$sectionName</li>
 EOF
 					# Loop with menu items
-					foreach my $item (keys %{$menu->{$section}}) {
-						my $link = "/" . $module . "/" . $menu->{$section}->{$item};
-						# Sanitize slightly
-						$link =~ s,/+$,,;
+					foreach my $item (@{$section->{'items'}}) {
+						my $itemName = encode_entities($item->{'name'});
+						# Sanitize link
+						my $itemLink = "/" . $module . "/" . $item->{'link'};
+						$itemLink =~ s,/+$,,;
 
 						# Build sections
 						$menuStr .=<<EOF;
-								<li><a href="$link">$item</a></li>
+								<li><a href="$itemLink">$itemName</a></li>
 EOF
 					}
 				}
@@ -437,7 +439,7 @@ $styleStr
 		<div style="padding: 15px 15px">
 			<div class="row">
 $menuStr
-				<div class="col-md-$mainCols">
+				<div class="col-xs-$mainCols">
 $content
 				</div>
 			</div>