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

Working changes for host launch templates and packet driver

This commit is contained in:
Westly Wright 2017-05-31 15:07:43 -07:00
parent a3ca4aa4a2
commit e51a6f63e6
No known key found for this signature in database
GPG Key ID: 4FAB3D8673DC54A3
11 changed files with 124 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/components/cloud-host-add-or-edit/template.hbs
View File

@ -1 +1 @@
{{partial (concat 'host/host-templates/' hostTemplate.driver)}}
{{partial 'host/host-templates/host-launch'}}

28
app/components/machine/driver-digitalocean/template.hbs
View File

@ -1,20 +1,20 @@
<section class="horizontal-form">
<div class="over-hr mt-20 mb-20">
<span>{{t 'machine.driverDigitalocean.instanceSection'}}</span>
</div>
<div class="row mb-20">
{{form-name-description
name=model.name
description=model.description
nameRequired=true
namePlaceholder="hostPartial.host.addCommon.new.form.name.placeholder"
descriptionShown=true
descriptionExpanded=true
}}
</div>
{{#if step1}}
<form>
<div class="over-hr mt-20 mb-20">
<span>{{t 'machine.driverDigitalocean.instanceSection'}}</span>
</div>
<div class="row mb-20">
{{form-name-description
name=model.name
description=model.description
nameRequired=true
namePlaceholder="hostPartial.host.addCommon.new.form.name.placeholder"
descriptionShown=true
descriptionExpanded=true
}}
</div>
<div class="over-hr mb-20">
<span>{{t 'machine.driverDigitalocean.accountSection'}}</span>

8
app/hosts/templates/launch/controller.js
View File

@ -3,12 +3,4 @@ import Ember from 'ember';
export default Ember.Controller.extend({
hostTemplate: Ember.computed.alias('model.template'),
machineConfig: Ember.computed.alias('model.config'),
actions: {
save() {
debugger;
},
cancel() {
this.transitionToRoute('hosts.templates.index');
},
}
});

14
app/hosts/templates/launch/route.js
View File

@ -20,5 +20,17 @@ export default Ember.Route.extend({
host: this.get('store').createRecord(tmp)
}
});
}
},
actions: {
cancel() {
this.transitionTo('hosts.templates.index');
},
goBack() {
if ( this.get('backTo') === 'waiting' ) {
this.transitionTo('authenticated.project.waiting');
} else {
this.transitionTo('hosts');
}
}
},
});

3
app/hosts/templates/launch/template.hbs
View File

@ -1,5 +1,6 @@
{{cloud-host-add-or-edit
host=model.host
hostTemplate=model.template
cancel=(action 'cancel')
cancel=(route-action 'cancel')
goBack=(route-action 'goBack')
}}

67
app/templates/host/host-templates/amazonec2.hbs
View File

@ -1,55 +1,14 @@
<div class="hosts-cloud-add">
<section class="header clearfix">
<div class="row">
<div class="mb-0">
<h1>
{{t 'hostsPage.cloudHostsPage.addPage.header'}}
</h1>
</div>
</div>
</section>
<section class="mt-20">
<form>
<section class="horizontal-form">
<div class="row addtl-info">
<div class="col span-4">
<div class="nav-boxes driver">
<div class="nav-box-item driver machine-driver active {{parse-host-icon hostTemplate.driver}}"></div>
</div>
</div>
<div class="col span-8">
<div>
<label for="">{{t 'hostsPage.cloudHostsPage.addPage.instance'}}</label>
{{hostOptions.instanceType}}
</div>
<hr/>
<div>
<label for="">{{t 'hostsPage.cloudHostsPage.addPage.zone'}}</label>
{{hostOptions.region}}
</div>
<hr/>
<div>
<label for="">{{t 'hostsPage.cloudHostsPage.addPage.storage'}}</label>
{{hostOptions.rootSize}}
</div>
</div>
</div>
<div class="container-fluid">
{{partial "host/add-common"}}
<hr />
<div class="row">
<div class="col span-12">
{{#advanced-section}}
{{form-user-labels initialLabels=clonedModel.labels setLabels=(action 'setLabels') expandAll=null}}
{{/advanced-section}}
</div>
</div>
</div>
{{top-errors errors=errors}}
{{save-cancel save="save" cancel="cancel" createLabel='hostsPage.cloudHostsPage.addPage.launch'}}
</section>
</form>
</section>
<div>
<label for="">{{t 'hostsPage.cloudHostsPage.addPage.instance'}}</label>
{{hostOptions.instanceType}}
</div>
<hr/>
<div>
<label for="">{{t 'hostsPage.cloudHostsPage.addPage.zone'}}</label>
{{hostOptions.region}}
</div>
<hr/>
<div>
<label for="">{{t 'hostsPage.cloudHostsPage.addPage.storage'}}</label>
{{hostOptions.rootSize}}
</div>

14
app/templates/host/host-templates/azure.hbs Normal file
View File

@ -0,0 +1,14 @@
<div>
<label for="">{{t 'hostsPage.cloudHostsPage.addPage.zone'}}</label>
{{hostOptions.location}}
</div>
<hr/>
<div>
<label for="">{{t 'hostsPage.cloudHostsPage.addPage.env'}}</label>
{{hostOptions.environment}}
</div>
<hr/>
<div>
<label for="">{{t 'hostsPage.cloudHostsPage.addPage.size'}}</label>
{{hostOptions.size}}
</div>

58
app/templates/host/host-templates/digitalocean.hbs
View File

@ -1,51 +1,9 @@
{{log hostOptions}}
<div class="hosts-cloud-add">
<section class="header clearfix">
<div class="row">
<div class="mb-0">
<h1>
{{t 'hostsPage.cloudHostsPage.addPage.header'}}
</h1>
</div>
</div>
</section>
<section class="mt-20">
<form>
<section class="horizontal-form">
<div class="row addtl-info">
<div class="col span-4">
<div class="nav-boxes driver">
<div class="nav-box-item driver machine-driver active {{parse-host-icon hostTemplate.driver}}"></div>
</div>
</div>
<div class="col span-8">
<div>
<label for="">{{t 'hostsPage.cloudHostsPage.addPage.instance'}}</label>
{{hostOptions.size}}
</div>
<hr/>
<div>
<label for="">{{t 'hostsPage.cloudHostsPage.addPage.zone'}}</label>
{{hostOptions.region}}
</div>
</div>
</div>
<div class="container-fluid">
{{partial "host/add-common"}}
<hr />
<div class="row">
<div class="col span-12">
{{#advanced-section}}
{{form-user-labels initialLabels=clonedModel.labels setLabels=(action 'setLabels') expandAll=null}}
{{/advanced-section}}
</div>
</div>
</div>
{{top-errors errors=errors}}
{{save-cancel save="save" cancel="cancel" createLabel='hostsPage.cloudHostsPage.addPage.launch'}}
</section>
</form>
</section>
<div>
<label for="">{{t 'hostsPage.cloudHostsPage.addPage.instance'}}</label>
{{hostOptions.size}}
</div>
<hr/>
<div>
<label for="">{{t 'hostsPage.cloudHostsPage.addPage.zone'}}</label>
{{hostOptions.region}}
</div>

42
app/templates/host/host-templates/host-launch.hbs Normal file
View File

@ -0,0 +1,42 @@
<div class="hosts-cloud-add">
<section class="header clearfix">
<div class="row">
<div class="mb-0">
<h1>
{{t 'hostsPage.cloudHostsPage.addPage.header'}}
</h1>
</div>
</div>
</section>
<section class="mt-20">
<form>
<section class="horizontal-form">
<div class="row addtl-info">
<div class="col span-4">
<div class="nav-boxes driver">
<div class="nav-box-item driver machine-driver active {{parse-host-icon hostTemplate.driver}}"></div>
</div>
</div>
<div class="col span-8">
{{partial (concat 'host/host-templates/' hostTemplate.driver)}}
</div>
</div>
<div class="container-fluid">
{{partial "host/add-common"}}
<hr />
<div class="row">
<div class="col span-12">
{{#advanced-section}}
{{form-user-labels initialLabels=clonedModel.labels setLabels=(action 'setLabels') expandAll=null}}
{{/advanced-section}}
</div>
</div>
</div>
{{top-errors errors=errors}}
{{save-cancel save="save" cancel="cancel" createLabel='hostsPage.cloudHostsPage.addPage.launch'}}
</section>
</form>
</section>
</div>

14
app/templates/host/host-templates/packet.hbs Normal file
View File

@ -0,0 +1,14 @@
<div>
<label for="">{{t 'hostsPage.cloudHostsPage.addPage.zone'}}</label>
{{hostOptions.facilityCode}}
</div>
<hr/>
<div>
<label for="">{{t 'hostsPage.cloudHostsPage.addPage.instance'}}</label>
{{hostOptions.plan}}
</div>
<hr/>
<div>
<label for="">{{t 'hostsPage.cloudHostsPage.addPage.os'}}</label>
{{hostOptions.os}}
</div>

3
translations/en-us.yaml
View File

@ -697,6 +697,9 @@ hostsPage:
storage: 'Storage:'
transfer: 'Transfer:'
zone: 'Zone:'
env: 'Environment:'
size: 'Size:'
os: 'OS:'
tabs:
fav: Favorites
browse: Browse