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: '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.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'},
];

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

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

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

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