rancher
/
ui
mirror of https://github.com/rancher/ui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Sidekick fixes

This commit is contained in:
Vincent Fiduccia 2015-10-19 14:05:23 -07:00
parent cd87a82884
commit ae3b66ca8d
2 changed files with 46 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/components/new-container/component.js
View File

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

76
app/components/new-container/template.hbs
View File

@ -1,56 +1,53 @@
<section class="horizontal-form container-fluid"> {{#unless isSidekick}}
{{#unless isSidekick}} <section class="horizontal-form container-fluid">
<h2>Add <h2>Add
{{#if isService}} {{#if isService}}
Service Service
{{#if hasSidekicks}} {{#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}} {{/if}}
{{else}} {{else}}
Container Container
{{/if}} {{/if}}
</h2> </h2>
{{top-errors errors=errors}} {{top-errors errors=errors}}
{{/unless}}
{{#if (and isService (not isSidekick))}} {{#if (and isService (not isSidekick))}}
{{form-scale {{form-scale
initialLabels=launchConfig.labels initialLabels=launchConfig.labels
initialScale=service.scale initialScale=service.scale
isGlobal=isGlobal isGlobal=isGlobal
errors=scaleErrors errors=scaleErrors
setLabels=(action 'setLabels' 'scale') setLabels=(action 'setLabels' 'scale')
setGlobal=(action 'setGlobal') setGlobal=(action 'setGlobal')
setScale=(action 'setScale') setScale=(action 'setScale')
}} }}
<div class="row form-group"> {{form-divider}}
<div class="col-sm-12 col-md-2 form-label r-mt5">
<label>Sidekicks</label>
</div>
<div class="col-sm-12 col-md-8"> {{#if hasSidekicks}}
{{#if hasSidekicks}} <div class="row">
<nav> <div class="col-sm-12 col-md-2 form-label r-mt5">
<ul class="pagination pagination-sm r-m0"> <label>Service</label>
<li class="{{if (eq launchConfigIndex -1) 'active'}}"><a href="#" {{action "selectLaunchConfig" -1}}>{{default-str service.name default="(Primary Service)"}}</a></li> </div>
{{#each service.secondaryLaunchConfigs as |slc index|}}
<li class="{{if (eq launchConfigIndex index) 'active'}}"><a href="#" {{action "selectLaunchConfig" index}}>{{default-str slc.name (concat-str '(Sidekick #' (one-louder index) ')')}}</a></li>
{{/each}}
<li><a {{action "addSidekick"}} tooltip="Add Sidekick"><i class="icon icon-plus"/></a></li>
</ul>
</nav>
{{else}}
<button class="btn-circle-plus btn-circle-text" style="margin-right: 20px;" {{action "addSidekick"}}>Add Sidekick</button>
{{/if}}
</div>
</div>
{{form-divider}} <div class="col-sm-12 col-md-8">
<nav>
{{/if}} <ul class="pagination pagination-sm r-m0">
</section> <li class="{{if (eq launchConfigIndex -1) 'active'}}"><a href="#" {{action "selectLaunchConfig" -1}}>{{default-str service.name default="(Primary Service)"}}</a></li>
{{#each service.secondaryLaunchConfigs as |slc index|}}
<li class="{{if (eq launchConfigIndex index) 'active'}}"><a href="#" {{action "selectLaunchConfig" index}}>{{default-str slc.name (concat-str '(Sidekick #' (one-louder index) ')')}}</a></li>
{{/each}}
<li><a {{action "addSidekick"}} tooltip="Add Sidekick"><i class="icon icon-plus"/></a></li>
</ul>
</nav>
</div>
</div>
{{/if}}
{{/if}}
</section>
{{/unless}}
<div data-launchindex="-1"> <div data-launchindex="-1">
<section class="horizontal-form container-fluid"> <section class="horizontal-form container-fluid">
@ -165,6 +162,9 @@
{{#unless isSidekick}} {{#unless isSidekick}}
{{#save-cancel save="save" cancel="cancel"}} {{#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)}} {{#if (not-eq launchConfigIndex -1)}}
<button class="btn btn-default" {{action "removeSidekick"}}>Remove this Sidekick</button> <button class="btn btn-default" {{action "removeSidekick"}}>Remove this Sidekick</button>
{{/if}} {{/if}}