keycloak-uncached

diff --git a/forms/common-themes/src/main/resources/theme/base/account/template.ftl b/forms/common-themes/src/main/resources/theme/base/account/template.ftl
index 6e83617..86d9ce9 100644
--- a/forms/common-themes/src/main/resources/theme/base/account/template.ftl
+++ b/forms/common-themes/src/main/resources/theme/base/account/template.ftl
@@ -36,7 +36,7 @@
             <#if referrer?has_content && referrer.url?has_content>
                 <a class="navbar-brand" href="${referrer.url}">
             <#else>
-                <a class="navbar-brand" href="#">
+                <a class="navbar-brand" href="/auth/admin">
             </#if>
               <span>RED HAT&reg; JBOSS&reg; IDENTITY AND ACCESS MANAGEMENT</span>
             <!--  <img src="${url.resourcesPath}/img/brand.svg" alt="Red Hat&reg; JBoss&reg; Identity and Access Management" />-->
@@ -80,7 +80,7 @@
                 <#if referrer?has_content && referrer.url?has_content>
                 <a href="${referrer.url}" id="referrer">Home</a>
                 <#else>
-                <a href="#">Home</a>
+                <a href="/auth/admin">Home</a>
                 </#if>
               </li>
             </ul>

diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/realm.js b/forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/realm.js
index c8f27c3..3d04ba1 100755
--- a/forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/realm.js
+++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/realm.js
@@ -3,6 +3,27 @@ module.controller('GlobalCtrl', function($scope, $http, Auth, Current, $location
     $scope.resourceUrl = resourceUrl;
     $scope.auth = Auth;
     $scope.serverInfo = ServerInfo.get();
+    
+    $scope.menuGoHome = function() {
+    	$scope.homeClass = 'active';
+    	$scope.serverInfoClass = '';
+    	$location.url('/');    	
+    }
+    
+    $scope.menuGoServerInfo = function() {
+    	$scope.homeClass = '';
+    	$scope.serverInfoClass = 'active';
+    	$location.url('/server-info');    	
+    }
+    
+    if($location.path().indexOf('server-info') === -1) {
+		$scope.homeClass = 'active';
+    	$scope.serverInfoClass = '';
+	}
+    else {
+    	$scope.homeClass = '';
+    	$scope.serverInfoClass = 'active';
+    }
 
     function getAccess(role) {
         if (!Current.realm) {

diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/menu.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/menu.html
index e8dba0c..c295f5b 100755
--- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/menu.html
+++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/menu.html
@@ -1,5 +1,5 @@
 <div class="navbar-header">
-<a class="navbar-brand" href="#">
+<a class="navbar-brand" href="/auth/admin">
   <span>RED HAT&reg; JBOSS&reg; IDENTITY AND ACCESS MANAGEMENT</span>
 <!--  <img src="${resourceUrl}/img/brand.svg" alt="Red Hat&reg; JBoss&reg; Identity and Access Management" />-->
 </a>
@@ -13,15 +13,17 @@
     </a>
     <ul class="dropdown-menu">
         <li><a href="{{authUrl}}/realms/{{auth.user.realm}}/account?referrer=security-admin-console">Manage Account</a></li>
-        <li><a href="#/server-info">Server Info</a></li>
         <li class="divider"></li>
         <li><a href="" ng-click="auth.authz.logout()">Sign Out</a></li>
     </ul>
   </li>
 </ul>
 <ul class="nav navbar-nav navbar-primary">
-  <li class="active">
-    <a href="#" class="active">Home</a>
+  <li ng-class="homeClass">
+    <a href ng-class="homeClass" ng-click="menuGoHome()">Home</a>
+  </li>
+  <li ng-class="serverInfoClass">
+    <a href ng-class="serverInfoClass" ng-click="menuGoServerInfo()">Server Info</a>
   </li>
 </ul>
 </div>