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

Merge pull request #871 from vincent99/master 

Bugs
This commit is contained in:
Vincent Fiduccia 2016-10-21 17:25:30 -07:00 committed by GitHub
parent 34cff754d0 4cbeb4c895
commit 94bf8a84fa
4 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/components/form-engine-opts/component.js
View File

@ -20,6 +20,7 @@ export default Ember.Component.extend({
{label: this.get('intl').t('formEngineOpts.engineInstallUrl.recommended'), value: def}, {label: this.get('intl').t('formEngineOpts.engineInstallUrl.recommended'), value: def},
{label: 'v1.10.x', value: 'https://releases.rancher.com/install-docker/1.10.sh'}, {label: 'v1.10.x', value: 'https://releases.rancher.com/install-docker/1.10.sh'},
{label: 'v1.11.x', value: 'https://releases.rancher.com/install-docker/1.11.sh'}, {label: 'v1.11.x', value: 'https://releases.rancher.com/install-docker/1.11.sh'},
{label: 'v1.12.x', value: 'https://releases.rancher.com/install-docker/1.12.sh'},
{label: this.get('intl').t('formEngineOpts.engineInstallUrl.latest'), value: 'https://get.docker.com'}, {label: this.get('intl').t('formEngineOpts.engineInstallUrl.latest'), value: 'https://get.docker.com'},
]; ];

3
app/components/machine/driver-azure/component.js
View File

@ -32,8 +32,7 @@ export default Ember.Component.extend(Driver, {
subscriptionId : '', subscriptionId : '',
clientId : '', clientId : '',
clientSecret : '', clientSecret : '',
openPorts : '', openPort : ['500/udp','4500/udp'],
// openPorts : '500/udp,4500/udp',
}); });
this.set('model', this.get('store').createRecord({ this.set('model', this.get('store').createRecord({

90
app/components/stack-section/template.hbs
View File

@ -80,49 +80,51 @@
</div> </div>
{{/if}} {{/if}}
{{/if}} {{/if}}
{{#if model.services.length}} <table class="grid fixed sized" style="margin-bottom: 0">
<table class="grid fixed sized" style="margin-bottom: 0"> <tbody>
<tbody> {{#each sortedServices as |service|}}
{{#each sortedServices as |service|}} <tr>
<tr> <td data-title="{{t 'stackSection.table.dataTitle.state'}}:" class="state">
<td data-title="{{t 'stackSection.table.dataTitle.state'}}:" class="state"> {{badge-state model=service}}
{{badge-state model=service}} </td>
</td> <td data-title="{{t 'stackSection.table.dataTitle.serviceName'}}:" class="force-wrap">
<td data-title="{{t 'stackSection.table.dataTitle.serviceName'}}:" class="force-wrap"> {{#link-to "service" service.stackId service.id}}{{service.displayName}}{{/link-to}}
{{#link-to "service" service.stackId service.id}}{{service.displayName}}{{/link-to}} {{#if service.hasSidekicks}}
{{#if service.hasSidekicks}} {{t 'stackSection.sidekick' numSidekicks=service.secondaryLaunchConfigs.length}}
{{t 'stackSection.sidekick' numSidekicks=service.secondaryLaunchConfigs.length}} {{/if}}
{{/if}} {{#if service.showTransitioningMessage}}
{{#if service.showTransitioningMessage}} <span class="{{service.stateColor}}">({{service.transitioningMessage}})</span>
<span class="{{service.stateColor}}">({{service.transitioningMessage}})</span> {{/if}}
{{/if}} <button type="button" class="btn-link" role="button" {{action 'addtlInfo' service}}>
<button type="button" class="btn-link" role="button" {{action 'addtlInfo' service}}> <i class="icon icon-info addtl-info-trigger"/>
<i class="icon icon-info addtl-info-trigger"/> </button>
</button> {{#if service.isError}}
{{#if service.isError}} {{#link-to "service.log" service.stackId service.id class="btn-link"}}<i class="icon icon-alert"/>{{/link-to}}
{{#link-to "service.log" service.stackId service.id class="btn-link"}}<i class="icon icon-alert"/>{{/link-to}} {{/if}}
{{/if}} </td>
</td> <td data-title="{{t 'stackSection.table.dataTitle.details'}}:" class="force-wrap service-detail">{{service.displayDetail}}{{service.displayPorts}}</td>
<td data-title="{{t 'stackSection.table.dataTitle.details'}}:" class="force-wrap service-detail">{{service.displayDetail}}{{service.displayPorts}}</td> <td data-title="{{t 'stackSection.table.dataTitle.kind'}}:">
<td data-title="{{t 'stackSection.table.dataTitle.kind'}}:"> {{#if service.displayType}}
{{#if service.displayType}} {{service.displayType}}
{{service.displayType}} {{/if}}
{{/if}} </td>
</td> <td data-title="{{t 'stackSection.table.dataTitle.containers'}}:">
<td data-title="{{t 'stackSection.table.dataTitle.containers'}}:"> {{#if service.hasContainers}}
{{#if service.hasContainers}} {{default-str service.instances.length default="0"}} {{t 'stackSection.container' numContainers=service.instances.length}}
{{default-str service.instances.length default="0"}} {{t 'stackSection.container' numContainers=service.instances.length}} {{/if}}
{{/if}} </td>
</td> <td data-title="{{t 'stackSection.table.dataTitle.actions'}}:" class="actions wide">
<td data-title="{{t 'stackSection.table.dataTitle.actions'}}:" class="actions wide"> {{action-menu model=service}}
{{action-menu model=service}} </td>
</td> </tr>
</tr> {{else}}
{{/each}} <tr>
</tbody> <td colspan="6" class="text-muted text-center r-p10">
</table> {{t 'stackSection.none'}}
{{else}} </td>
<div class="text-muted text-center r-p10">{{t 'stackSection.none'}}</div> </tr>
{{/if}} {{/each}}
</tbody>
</table>
</div> </div>
{{/liquid-if}} {{/liquid-if}}

4
app/components/upgrade-btn/template.hbs
View File

@ -1,3 +1 @@
{{#tooltip-element type="tooltip-basic" model=currentVersion tooltipTemplate='tooltip-static' aria-describedby="tooltip-base"}} {{t (concat-str 'upgradeBtn.status.' upgradeStatus character='')}}
{{t (concat-str 'upgradeBtn.status.' upgradeStatus character='')}}
{{/tooltip-element}}