- Added methods deleteCustomFilter and _fillCustomFilters to controller InfoCenter

- Added method deleteCustomFilter to model Filters_model
- Changed parameter filterId to filter_id in FilterWidget, infocenterData
- Changed CSS and JS in views/widgets/navigationMenu.php to allow two links in one menu item
- Changed NavigationMenuWidget to allow two links in one menu item

application/views/widgets/navigationMenu.php

@@ -1,8 +1,8 @@
 <div class="navbar-default sidebar" role="navigation">
 	<div class="sidebar-nav navbar-collapse">
 		<ul class="nav" id="side-menu">
-			<li id="collapseicon" class="text-right" style="cursor: pointer; color: #337ab7"><i
-						class="fa fa-angle-double-left fa-fw"></i>
+			<li id="collapseicon" class="text-right" style="cursor: pointer; color: #337ab7">
+				<i class="fa fa-angle-double-left fa-fw"></i>
 			</li>
 			<?php NavigationMenuWidget::printNavigationMenu(); ?>
 		</ul>
@@ -10,7 +10,7 @@
 	<i id="collapseinicon" class="fa fa-angle-double-right fa-fw"></i>
 </div>
 <style>
-	#collapseinicon{
+	#collapseinicon {
 		display: none;
 		cursor: pointer;
 		color: #337ab7;
@@ -22,25 +22,46 @@
 		height: 20px;
 		background-color: #F8F8F8;
 	}
+
+	.nav > li > span {
+		position: relative;
+		display: block;
+	}
+
+	.nav > li > span > a {
+		display: inline;
+		padding-top: 10px;
+		padding-bottom: 10px;
+		padding-right: 123px;
+	}
+
+	.menuSubscriptLink {
+		font-size: 10px;
+		padding-left: 0px !important;
+		padding-right: 0px !important;
+	}
+
+	.sidebar ul li span a.active {
+		background-color: transparent;
+		font-weight: bold;
+		text-decoration: underline;
+	}
+
 </style>
 <script>
-	//hiding/showing navigation menu - works only with sb admin 2 template!!
-	$("#collapseicon").click(
-		function ()
-		{
-			$("#page-wrapper").css('margin-left', '0px');
-			$("#side-menu").hide();
-			$("#collapseinicon").show();
-		}
-	);
 
-	$("#collapseinicon").click(
-		function ()
-		{
-			$("#page-wrapper").css('margin-left', '250px');
-			$("#side-menu").show();
-			$("#collapseinicon").hide();
-		}
-	);
+	// Hiding/showing navigation menu - works only with sb admin 2 template!!
 
-</script>
+	$("#collapseicon").click(function() {
+		$("#page-wrapper").css('margin-left', '0px');
+		$("#side-menu").hide();
+		$("#collapseinicon").show();
+	});
+
+	$("#collapseinicon").click(function() {
+		$("#page-wrapper").css('margin-left', '250px');
+		$("#side-menu").show();
+		$("#collapseinicon").hide();
+	});
+
+</script>