From fc093b3ab813e910d6584e3e2112596e353ed3d3 Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Wed, 6 Apr 2016 17:20:47 +0200
Subject: [PATCH] enabled active navigation in web

---
 resources/WebContent/page/index.tmpl        | 12 ++++++++----
 src/wa/server/WAAbstractPage.java           |  2 +-
 src/wa/server/page/struct/WANavigation.java |  9 +++++++++
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/resources/WebContent/page/index.tmpl b/resources/WebContent/page/index.tmpl
index 11a0452..1d5288f 100755
--- a/resources/WebContent/page/index.tmpl
+++ b/resources/WebContent/page/index.tmpl
@@ -31,10 +31,12 @@
 	<ul class="nav navbar-nav navbar-left">
 		{{#top-nav}}
 		{{^.getSubNavs().length}}
-		<li><a href="{{.getUrl()}}">{{.getName()}}</a></li>
+		<li class="{{#.isActive()}}active{{/.isActive()}}">
+			<a href="{{.getUrl()}}">{{.getName()}}</a>
+		</li>
 		{{/.getSubNavs().length}}
 		{{#.getSubNavs().length}}
-		<li class="dropdown">
+		<li class="dropdown {{#.isActive()}}active{{/.isActive()}}">
 			<a href="#" class="dropdown-toggle" data-toggle="dropdown">
 				{{.getName()}} <b class="caret"></b>
 			</a>
@@ -95,10 +97,12 @@
 		<ul class="side-menu nav nav-pills nav-stacked">
 			{{#side-nav}}
 			{{^.getSubNavs().length}}
-			<li><a href="{{.getUrl()}}">{{.getName()}}</a></li>
+			<li class="{{#.isActive()}}active{{/.isActive()}}">
+				<a href="{{.getUrl()}}">{{.getName()}}</a>
+			</li>
 			{{/.getSubNavs().length}}
 			{{#.getSubNavs().length}}
-			<li class="">
+			<li class="{{#.isActive()}}active{{/.isActive()}}">
 				<a data-toggle="collapse" data-parent="#side-bar" href="#{{.getName()}}_collapse">
 					{{.getName()}} <b class="caret"></b>
 				</a>
diff --git a/src/wa/server/WAAbstractPage.java b/src/wa/server/WAAbstractPage.java
index 32e7e0d..ba10e40 100755
--- a/src/wa/server/WAAbstractPage.java
+++ b/src/wa/server/WAAbstractPage.java
@@ -102,7 +102,7 @@ public class WAAbstractPage implements HttpPage{
             tmpl.set("top-nav", context.getNavigationInstance().getSubNavs());
             tmpl.set("side-nav-show", true);
             if(!breadcrumb.isEmpty())
-                tmpl.set("side-nav", breadcrumb.get(0).getSubNavs());
+                tmpl.set("side-nav", breadcrumb.get(0).createNavInstance(request).getSubNavs());
             tmpl.set("breadcrumb", breadcrumb);
             tmpl.set("alerts", context.getAlerts());
             //tmpl.set("footer", null);
diff --git a/src/wa/server/page/struct/WANavigation.java b/src/wa/server/page/struct/WANavigation.java
index fd44cb6..e0eafa7 100755
--- a/src/wa/server/page/struct/WANavigation.java
+++ b/src/wa/server/page/struct/WANavigation.java
@@ -202,5 +202,14 @@ public class WANavigation implements Iterable{
         public String getName(){                 return nav.getName(); }
         public String getUrl(){                  return nav.getUrl(); }
         public Object getResource(){             return nav.getResource(); }
+
+
+        public boolean equals(Object o){
+            if (o instanceof WANavigation)
+                return nav.equals(o);
+            else if (o instanceof NavInstance)
+                return nav.equals(((NavInstance) o).nav);
+            return false;
+        }
     }
 }