Sidekick fixes

app/components/new-container/component.js

@@ -43,6 +43,9 @@ export default Ember.Component.extend(NewOrEdit, SelectTab, {
       var ary = this.get('service.secondaryLaunchConfigs');
       ary.pushObject(this.get('store').createRecord({
         type: 'secondaryLaunchConfig',
+        tty: true,
+        stdinOpen: true,
+        restartPolicy: {name: 'always'},
       }));
       this.send('selectLaunchConfig', ary.get('length')-1);
     },
@@ -139,8 +142,12 @@ export default Ember.Component.extend(NewOrEdit, SelectTab, {
       (this.get('scaleLabels')||[]).forEach((row) => { out[row.key] = row.value; });
       (this.get('schedulingLabels')||[]).forEach((row) => { out[row.key] = row.value; });
 
+      var config = this.get('launchConfig');
+      if ( config )
+      {
         this.set('launchConfig.labels', out);
       }
+    }
   ),
 
   // ----------------------------------

app/components/new-container/template.hbs

@@ -1,18 +1,17 @@
-<section class="horizontal-form container-fluid">
 {{#unless isSidekick}}
+  <section class="horizontal-form container-fluid">
     <h2>Add
       {{#if isService}}
         Service
         {{#if hasSidekicks}}
           +
-          {{service.secondaryLaunchConfigs.length}} Sidekick{{if (not-eq service.secondaryLaunchConfigs.length 1) 's'}}
+          {{service.secondaryLaunchConfigs.length}} Sidekick Service{{if (not-eq service.secondaryLaunchConfigs.length 1) 's'}}
         {{/if}}
       {{else}}
         Container
       {{/if}}
     </h2>
     {{top-errors errors=errors}}
-  {{/unless}}
 
     {{#if (and isService (not isSidekick))}}
       {{form-scale
@@ -25,13 +24,15 @@
         setScale=(action  'setScale')
       }}
 
-    <div class="row form-group">
+      {{form-divider}}
+
+      {{#if hasSidekicks}}
+        <div class="row">
           <div class="col-sm-12 col-md-2 form-label r-mt5">
-        <label>Sidekicks</label>
+            <label>Service</label>
           </div>
 
           <div class="col-sm-12 col-md-8">
-        {{#if hasSidekicks}}
             <nav>
               <ul class="pagination pagination-sm r-m0">
                 <li class="{{if (eq launchConfigIndex -1) 'active'}}"><a href="#" {{action "selectLaunchConfig" -1}}>{{default-str service.name default="(Primary Service)"}}</a></li>
@@ -41,16 +42,12 @@
                 <li><a {{action "addSidekick"}} tooltip="Add Sidekick"><i class="icon icon-plus"/></a></li>
               </ul>
             </nav>
-        {{else}}
+          </div>
-          <button class="btn-circle-plus btn-circle-text" style="margin-right: 20px;" {{action "addSidekick"}}>Add Sidekick</button>
+        </div>
       {{/if}}
-      </div>
-    </div>
-
-    {{form-divider}}
-
     {{/if}}
   </section>
+{{/unless}}
 
 <div data-launchindex="-1">
   <section class="horizontal-form container-fluid">
@@ -165,6 +162,9 @@
 
 {{#unless isSidekick}}
   {{#save-cancel save="save" cancel="cancel"}}
+    {{#if isService}}
+      <button class="btn btn-default" {{action "addSidekick"}}>Add a Sidekick</button>
+    {{/if}}
     {{#if (not-eq launchConfigIndex -1)}}
       <button class="btn btn-default" {{action "removeSidekick"}}>Remove this Sidekick</button>
     {{/if}}