Watch mesos for templateBase

app/mixins/catalog-resource.js

@@ -11,8 +11,7 @@ export default Ember.Mixin.create({
   uniqueCatalogIds : null,
 
   templateBase: function() {
-    if ( this.get('projects.current.kubernetes') )
+    if ( this.get('projects.current.kubernetes') ) {
-    {
       return 'kubernetes';
     } else if ( this.get('projects.current.swarm') ) {
       return 'swarm';
@@ -21,7 +20,7 @@ export default Ember.Mixin.create({
     } else {
       return 'cattle';
     }
-  }.property('projects.current.{kubernetes,swarm}'),
+  }.property('projects.current.{kubernetes,swarm,mesos}'),
 
   uniqKeys: function (data, name) {
     let out = data.map((item) => item[name]);

app/utils/navigation-tree.js

@@ -285,24 +285,33 @@ const navTree = [
         icon: 'icon icon-folder-open',
         route: 'admin-tab.audit-logs',
       },
-      {
-        id: 'admin-processes',
-        localizedLabel: 'nav.admin.processes',
-        icon: 'icon icon-processes',
-        route: 'admin-tab.processes',
-      },
       {
         id: 'admin-accounts',
         localizedLabel: 'nav.admin.accounts',
         icon: 'icon icon-users',
         route: 'admin-tab.accounts',
       },
+      {
+        id: 'admin-processes',
+        localizedLabel: 'nav.admin.processes',
+        icon: 'icon icon-processes',
+        route: 'admin-tab.processes',
+      },
+      {
+        divider: true
+      },
       {
         id: 'admin-access',
         localizedLabel: 'nav.admin.access',
         icon: 'icon icon-key',
         route: 'admin-tab.auth',
       },
+      {
+        id: 'admin-ha',
+        localizedLabel: 'nav.admin.ha',
+        icon: 'icon icon-umbrella',
+        route: 'admin-tab.ha',
+      },
       {
         id: 'admin-machine',
         localizedLabel: 'nav.admin.machine',
@@ -315,12 +324,6 @@ const navTree = [
         icon: 'icon icon-network',
         route: 'admin-tab.settings',
       },
-      {
-        id: 'admin-ha',
-        localizedLabel: 'nav.admin.ha',
-        icon: 'icon icon-umbrella',
-        route: 'admin-tab.ha',
-      },
     ],
   },
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ui",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "private": true,
   "directories": {
     "doc": "doc",