From 37348fce3a1af5a5ac1e1d74af921d8be61fee43 Mon Sep 17 00:00:00 2001
From: Bill Burke <bburke@redhat.com>
Date: Sun, 4 Aug 2013 21:53:26 -0400
Subject: [PATCH] small improvents

---
 .../src/main/webapp/saas/admin/js/controllers.js   |  6 ++++--
 .../src/main/webapp/saas/admin/partials/menu.html  |  6 ++++--
 .../webapp/saas/admin/partials/realm-menu.html     | 14 ++++++++++++--
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/examples/as7-eap-demo/server/src/main/webapp/saas/admin/js/controllers.js b/examples/as7-eap-demo/server/src/main/webapp/saas/admin/js/controllers.js
index dbcf2807c7..7335234f09 100755
--- a/examples/as7-eap-demo/server/src/main/webapp/saas/admin/js/controllers.js
+++ b/examples/as7-eap-demo/server/src/main/webapp/saas/admin/js/controllers.js
@@ -176,10 +176,12 @@ module.controller('RealmDropdownCtrl', function($scope, Realm, Current, Auth, $l
         var show = false;
         for (var key in Current.realms) {
             if (typeof Current.realms[key] != "function") {
+                if (Current.realms[key] == Current.realm) {
+                    $scope.currentRealmId = key;
+                }
                 show = true;
-                break;
             }
-         }
+        }
         return Auth.loggedIn && show;
     }
 });
diff --git a/examples/as7-eap-demo/server/src/main/webapp/saas/admin/partials/menu.html b/examples/as7-eap-demo/server/src/main/webapp/saas/admin/partials/menu.html
index f0e52ac84b..a7b51ae686 100755
--- a/examples/as7-eap-demo/server/src/main/webapp/saas/admin/partials/menu.html
+++ b/examples/as7-eap-demo/server/src/main/webapp/saas/admin/partials/menu.html
@@ -12,7 +12,9 @@
                                 </ul>
                             </li>
                         </ul> -->
-                        <h3 data-ng-show="showNav()"><span class="gray pull-left">Realm: </span></h3>
+                        <ul class="nav pull-left" data-ng-show="showNav()">
+                            <li class="divider-vertical-right"><a href="#/realms/{{currentRealmId}}">Realm</a></li>
+                        </ul>
                         <select class="nav pull-left" data-ng-show="showNav()" ng-change="changeRealm()" ng-model="current.realm" ng-options="name for (id, name) in current.realms">
                         </select>
                         <!-- <select class="nav pull-left" ng-options="r.name for r in current.realms"></select> -->
@@ -30,7 +32,7 @@
                         </li>
                     </ul>
                     <ul class="nav pull-right" data-ng-show="auth.loggedIn">
-                        <li class="divider-vertical-left" data-ng-class="path[0] == 'realms' && 'active'"
+                        <li class="divider-vertical-left" data-ng-class="path[0] == 'create' && path[1] == 'realm' && 'active'"
                             data-ng-show="auth.loggedIn"><a href="#/create/realm">New Realm</a></li>
                     </ul>
                 </nav>
diff --git a/examples/as7-eap-demo/server/src/main/webapp/saas/admin/partials/realm-menu.html b/examples/as7-eap-demo/server/src/main/webapp/saas/admin/partials/realm-menu.html
index bfdbbe5bf0..32bd251998 100755
--- a/examples/as7-eap-demo/server/src/main/webapp/saas/admin/partials/realm-menu.html
+++ b/examples/as7-eap-demo/server/src/main/webapp/saas/admin/partials/realm-menu.html
@@ -1,11 +1,21 @@
 <div data-ng-hide="createRealm">
     <nav id="local-nav">
         <ul class="nav nav-list">
-            <li data-ng-class="!path[2] && 'active'"><a href="#/realms/{{realm.id}}">Realm Settings</a>
+            <li data-ng-class="!path[2] && 'active'"><a href="#/realms/{{realm.id}}">Realm Settings</a></li>
+            <li data-ng-class="path[2] == 'roles' && 'active'"><a href="#/realms/{{realm.id}}/roles">Realm Roles</a>
+                <ul class="sub-items">
+                    <li data-ng-class="path[0] == 'create' && path[1] == 'role' && 'active'"><a
+                            href="#/create/role/{{realm.id}}">Add Role</a></li>
+                </ul>
             </li>
             <li data-ng-class="path[2] == 'users' && 'active'"><a href="#/realms/{{realm.id}}/users">Realm Users</a>
+                <ul class="sub-items">
+                    <li data-ng-class="path[0] == 'create' && path[1] == 'user' && 'active'"><a
+                            href="#/create/user/{{realm.id}}">Add User</a></li>
+                    <li data-ng-class="path[0] == 'find' && path[1] == 'user' && 'active'"><a
+                            href="#/find/user/{{realm.id}}">Find User</a></li>
+                </ul>
             </li>
-            <li data-ng-class="path[2] == 'roles' && 'active'"><a href="#/realms/{{realm.id}}/roles">Realm Roles</a></li>
         </ul>
     </nav>
 </div>
\ No newline at end of file