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
commit 94bf8a84fa
4 changed files with 49 additions and 49 deletions

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

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({

View File

@ -80,7 +80,6 @@
</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|}}
@ -118,11 +117,14 @@
{{action-menu model=service}} {{action-menu model=service}}
</td> </td>
</tr> </tr>
{{else}}
<tr>
<td colspan="6" class="text-muted text-center r-p10">
{{t 'stackSection.none'}}
</td>
</tr>
{{/each}} {{/each}}
</tbody> </tbody>
</table> </table>
{{else}}
<div class="text-muted text-center r-p10">{{t 'stackSection.none'}}</div>
{{/if}}
</div> </div>
{{/liquid-if}} {{/liquid-if}}

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}}