Merge pull request #123 from vincent99/master

Fix use existing balancer, hide Services

Author: vincent99

app/components/page-nav/template.hbs

@@ -11,12 +11,14 @@
   <label>Containers</label>
 {{/link-to}}
 
-{{#if hasServices}}
-  {{#link-to "environments" title="Services" classNames="nav-services"}}
+{{!#if hasServices}}
+  {{!#link-to "environments" title="Services" classNames="nav-services"}}
+  <!--
     <i class="ss-layergroup"></i>
     <label>Services</label>
-  {{/link-to}}
-{{/if}}
+  -->
+  {{!/link-to}}
+{{!/if}}
 
 {{#link-to "balancing" title="Balancing" classNames="nav-balancing"}}
   <i class="ss-fork"></i>
@@ -27,3 +29,9 @@
   <i class="ss-hdd"></i>
   <label>Volumes</label>
 {{/link-to}}
+
+{{#link-to "registries" title="Registries" classNames="nav-registries"}}
+  <i class="ss-bookmark"></i>
+  <label>Registries</label>
+{{/link-to}}
+

app/loadbalancers/new/controller.js

@@ -119,19 +119,20 @@ export default Ember.ObjectController.extend(Cattle.NewOrEditMixin, EditLoadBala
       {
         errors.push('One or more listening ports are required');
       }
-    }
 
-    errors.pushObjects(this.get('balancer').validationErrors());
-    errors.pushObjects(this.get('config').validationErrors());
-    this.get('listenersArray').forEach((listener) => {
-      errors.pushObjects(listener.validationErrors());
-    });
+      errors.pushObjects(this.get('config').validationErrors());
+      this.get('listenersArray').forEach((listener) => {
+        errors.pushObjects(listener.validationErrors());
+      });
 
-    if ( (this.get('listenersArray')||[]).filterProperty('sourcePort',8080).get('length') > 0 )
-    {
-      errors.push('Port 8080 cannot currently be used as a source port');
+      if ( (this.get('listenersArray')||[]).filterProperty('sourcePort',8080).get('length') > 0 )
+      {
+        errors.push('Port 8080 cannot currently be used as a source port');
+      }
     }
 
+    errors.pushObjects(this.get('balancer').validationErrors());
+
     if ( errors.length )
     {
       this.set('errors',errors.uniq());

app/styles/layout.scss

@@ -471,12 +471,12 @@ $nav-7: #444;
   &.active { background-color: $nav-4; }
 }
 
-.nav-volumes {
-  border-left-color: $nav-5;
-  &.active { background-color: $nav-5; }
+.nav-registries {
+  border-left-color: $nav-4;
+  &.active { background-color: $nav-4; }
 }
 
-.nav-registries {
+.nav-volumes {
   border-left-color: $nav-5;
   &.active { background-color: $nav-5; }
 }

package.json

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