mirror of https://github.com/rancher/ui.git
Bug fixes
reconcile host add/cancel differences on every add host page default backTo in host-new
This commit is contained in:
parent
9382324ef1
commit
e1f09704e5
|
|
@ -65,7 +65,7 @@ export default Ember.Route.extend({
|
|||
},
|
||||
|
||||
model(params) {
|
||||
this.set('backTo', params.backTo);
|
||||
this.set('backTo', (params.backTo || 'hosts'));
|
||||
var hs = this.get('host');
|
||||
|
||||
return hs.getModel(params);
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@
|
|||
{{#if isStep1}}
|
||||
{{top-errors errors=errors}}
|
||||
|
||||
<div class="footer-actions">
|
||||
<div class="footer-actions pt-20">
|
||||
<button {{action "awsLogin"}} name="submit" class="btn bg-primary">{{t 'machine.driverAmazon.loginAction'}}</button>
|
||||
<button {{action "cancel"}} class="btn bg-transparent">{{t 'generic.cancel'}}</button>
|
||||
</div>
|
||||
|
|
@ -122,7 +122,7 @@
|
|||
{{#if isStep3}}
|
||||
{{top-errors errors=errors}}
|
||||
|
||||
<div class="footer-actions">
|
||||
<div class="footer-actions pt-20">
|
||||
<button {{action "selectSubnet"}} class="btn bg-primary">{{t 'machine.driverAmazon.securityGroupSelect'}}</button>
|
||||
<button {{action "cancel"}} class="btn bg-transparent">{{t 'generic.cancel'}}</button>
|
||||
</div>
|
||||
|
|
@ -189,7 +189,7 @@
|
|||
{{#if isStep5}}
|
||||
{{top-errors errors=errors}}
|
||||
|
||||
<div class="footer-actions">
|
||||
<div class="footer-actions pt-20">
|
||||
<button {{action "selectSecurityGroup"}} class="btn bg-primary">{{t 'machine.driverAmazon.setInstanceAction'}}</button>
|
||||
<button {{action "cancel"}} class="btn bg-transparent">{{t 'generic.cancel'}}</button>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -9,15 +9,15 @@
|
|||
{{/if}}
|
||||
|
||||
{{#if step1}}
|
||||
<div class="box mt-20">
|
||||
<form>
|
||||
<h4>{{t 'machine.driverDigitalocean.accountSection'}}</h4>
|
||||
<div class="row">
|
||||
<div class="box mt-20">
|
||||
<h4>{{t 'machine.driverDigitalocean.accountSection'}}</h4>
|
||||
<div class="row">
|
||||
<label class="acc-label">{{t 'machine.driverDigitalocean.accessToken.label'}}</label>
|
||||
{{input type="password" value=model.secretValues.digitaloceanConfig.accessToken classNames="form-control" placeholder=(t 'machine.driverDigitalocean.accessToken.placeholder')}}
|
||||
<p class="text-info">{{t 'machine.driverDigitalocean.accessToken.help' htmlSafe=true}}</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{{top-errors errors=errors}}
|
||||
<div class="footer-actions">
|
||||
{{#if gettingData}}
|
||||
|
|
@ -28,7 +28,6 @@
|
|||
<button {{action "cancel"}} class="btn bg-transparent">{{t 'generic.cancel'}}</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
{{else}}
|
||||
<div class="container-fluid">
|
||||
<div class="box mt-20">
|
||||
|
|
|
|||
|
|
@ -115,10 +115,10 @@
|
|||
{{save-cancel save=driverSaveAction cancel="cancel"}}
|
||||
{{else}}
|
||||
{{save-cancel
|
||||
cancelDisabled=true
|
||||
createLabel='machine.driverPacket.loginAction'
|
||||
savingLabel='machine.driverPacket.authentication'
|
||||
save='authPacket'
|
||||
cancel='cancel'
|
||||
}}
|
||||
{{/if}}
|
||||
</section>
|
||||
|
|
|
|||
Loading…
Reference in New Issue