views, router

js/apps/system/_admin/aardvark/APP/frontend/js/routers/router.js

@@ -27,12 +27,13 @@
       "services": "applications",
       "applications/:mount": "applicationDetail",
       "graphs": "graphManagement",
-      "graph/:name": "showGraph",
+      "graphs/:name": "showGraph",
       "users": "userManagement",
       "userProfile": "userProfile",
       "cluster": "cluster",
       "nodes": "nodes",
       "node/:name": "node",
+      "node/:name/logs": "logs",
       "logs": "logs",
       "test": "test"
     },

js/apps/system/_admin/aardvark/APP/frontend/js/templates/navigationView.ejs

@@ -13,7 +13,9 @@
       <a id="services" class="tab" href="#services"><i class="fa fa-cogs"></i>Services</a>
     </li>
     <li class="users-menu"><a id="users" class="tab" href="#manage"><i class="fa fa-users"></i>Users</a></li>
-    <li class="logs-menu"><a id="logs" class="tab" href="#manage"><i class="fa fa-list"></i>Logs</a></li>
+    <% if (!isCluster) { %>
+      <li class="logs-menu"><a id="logs" class="tab" href="#manage"><i class="fa fa-list"></i>Logs</a></li>
+    <% } %>
     <li class="query-menu"><a id="settings" class="tab" href="#settings"><i class="fa fa-cog"></i></a></li>
     <!--
     <li class="navbar-spacer big"></li>
@@ -25,7 +27,7 @@
           <a id="shell" class="tab" href="#shell">JS Shell</a>
         </li>
 
-        <% if (isCluster) { %>
+        <% if (!isCluster) { %>
           <% if (currentDB.get('isSystem')) { %>
             <li class="dropdown-item">
               <a id="logs" class="tab" href="#logs">Logs</a>

js/apps/system/_admin/aardvark/APP/frontend/js/templates/subNavigationView.ejs

@@ -4,10 +4,6 @@
     <li class="subMenuEntry pull-left">
       <div class="breadcrumb"></div>
     </li>
-    <li class="subMenuEntry pull-right">
-      <div class="usermenu" id="userBar"></div>
-      <div class="notificationmenu" id="notificationBar"></div>
-    </li>
     <li class="subMenuEntry pull-right">
       <a class="health-info">HEALTH: </a>
       <a class="health-state">GOOD</a>
@@ -15,6 +11,10 @@
         <i class="fa fa-check-circle"></i>
       </a>
     </li>
+    <li class="subMenuEntry pull-right" style="margin-right: 10px;">
+      <div class="usermenu" id="userBar"></div>
+      <div class="notificationmenu" id="notificationBar"></div>
+    </li>
   </ul>
 
   <ul class="subMenuEntries bottom">