diff --git a/app/admin-tab/auth/activedirectory/controller.js b/app/admin-tab/auth/activedirectory/controller.js index 224d5a4e3..5c85741c6 100644 --- a/app/admin-tab/auth/activedirectory/controller.js +++ b/app/admin-tab/auth/activedirectory/controller.js @@ -6,6 +6,7 @@ var TLS_PORT = 636; export default Ember.Controller.extend({ access: Ember.inject.service(), + settings: Ember.inject.service(), confirmDisable: false, errors: null, @@ -15,7 +16,7 @@ export default Ember.Controller.extend({ error: null, originalModel: null, - providerName: 'Active Directory', + providerName: 'ldap.providerName.ad', addUserInput: '', addOrgInput: '', diff --git a/app/admin-tab/auth/openldap/controller.js b/app/admin-tab/auth/openldap/controller.js index e7c6b2912..03e95222e 100644 --- a/app/admin-tab/auth/openldap/controller.js +++ b/app/admin-tab/auth/openldap/controller.js @@ -1,6 +1,6 @@ import ActiveDirectory from 'ui/admin-tab/auth/activedirectory/controller'; export default ActiveDirectory.extend({ - providerName: 'OpenLDAP', + providerName: 'ldap.providerName.openldap', isOpenLdap: true, }); diff --git a/app/applications-tab/route.js b/app/applications-tab/route.js index 3ce5c13a7..99359451e 100644 --- a/app/applications-tab/route.js +++ b/app/applications-tab/route.js @@ -3,6 +3,19 @@ import Ember from 'ember'; export default Ember.Route.extend({ projects: Ember.inject.service(), + beforeModel() { + this._super(...arguments); + + let project = this.get('projects.current'); + let auth = this.modelFor('authenticated'); + + // Check for waiting only if cattle, because other orchestrations have system services menus that link here + if ( !project.get('kubernetes') && !project.get('swarm') && !project.get('mesos') ) + { + return project.checkForWaiting(auth.get('hosts'),auth.get('machines')); + } + }, + model: function() { var store = this.get('store'); return Ember.RSVP.all([ diff --git a/app/components/disk-row/component.js b/app/components/disk-row/component.js new file mode 100644 index 000000000..ebb460758 --- /dev/null +++ b/app/components/disk-row/component.js @@ -0,0 +1,31 @@ +import Ember from 'ember'; + +export default Ember.Component.extend({ + driverChoices: null, + disk: null, + + gigs: null, + tagName: 'tr', + + actions: { + remove() { + this.sendAction('remove'); + }, + + setSize(gigs) { + this.set('gigs', gigs); + } + }, + + didInitAttrs() { + if ( this.get('disk.size') ) { + this.set('gigs', parseInt(this.get('disk.size',10))); + } else { + this.set('gigs', 10); + } + }, + + gigsChanged: function() { + this.set('disk.size', this.get('gigs')+'g'); + }.observes('gigs'), +}); diff --git a/app/components/disk-row/template.hbs b/app/components/disk-row/template.hbs new file mode 100644 index 000000000..553970379 --- /dev/null +++ b/app/components/disk-row/template.hbs @@ -0,0 +1,39 @@ + + {{#if disk.root}} + {{t 'formDisks.name.rootDisk'}} + {{else}} + {{input class="form-control input-sm" type="text" value=disk.name placeholder=(t 'formDisks.name.placeholder')}} + {{/if}} + + +  + + +
+ {{#if disk.root}} + {{t 'formDisks.size.rootDisk'}} + {{else}} +
{{input-slider initialValue=gigs changed=(action "setSize") valueMin=10 valueMax=500 step=10}}
+
+
+ {{input type="text" value=gigs classNames="form-control r-pr0"}} +
GB
+
+
+ {{/if}} +
+ + +  + + + {{new-select + classNames="form-control" + content=driverChoices + value=disk.driver + }} + + + + + diff --git a/app/components/edit-aliasservice/template.hbs b/app/components/edit-aliasservice/template.hbs index ff7c5eb5f..8bea5f8b0 100644 --- a/app/components/edit-aliasservice/template.hbs +++ b/app/components/edit-aliasservice/template.hbs @@ -23,5 +23,5 @@ }} - {{save-cancel save="save" cancel="cancel"}} + {{save-cancel editing=editing save="save" cancel="cancel"}} {{/liquid-if}} diff --git a/app/components/edit-balancerservice/template.hbs b/app/components/edit-balancerservice/template.hbs index 9f0026f04..60c4657b8 100644 --- a/app/components/edit-balancerservice/template.hbs +++ b/app/components/edit-balancerservice/template.hbs @@ -79,5 +79,5 @@ - {{save-cancel save="save" cancel="cancel"}} + {{save-cancel editing=editing save="save" cancel="cancel"}} {{/liquid-if}} diff --git a/app/components/edit-container/template.hbs b/app/components/edit-container/template.hbs index 130cb6b2a..0a879f1bc 100644 --- a/app/components/edit-container/template.hbs +++ b/app/components/edit-container/template.hbs @@ -21,5 +21,5 @@ {{form-container-links initialLinks=model.instanceLinks instance=model.instance allHosts=model.allHosts editing=true changed=(action "setLinks")}} - {{save-cancel save="save" cancel="cancel"}} + {{save-cancel editing=editing save="save" cancel="cancel"}} {{/liquid-if}} diff --git a/app/components/edit-environment/template.hbs b/app/components/edit-environment/template.hbs index 7e04eba4f..8847b1305 100644 --- a/app/components/edit-environment/template.hbs +++ b/app/components/edit-environment/template.hbs @@ -21,4 +21,4 @@ -{{save-cancel save="save" cancel="cancel"}} +{{save-cancel editing=editing save="save" cancel="cancel"}} diff --git a/app/components/edit-externalservice/template.hbs b/app/components/edit-externalservice/template.hbs index 5131f7a5d..9fee9211d 100644 --- a/app/components/edit-externalservice/template.hbs +++ b/app/components/edit-externalservice/template.hbs @@ -13,4 +13,4 @@ }} -{{save-cancel save="save" cancel="cancel"}} +{{save-cancel editing=editing save="save" cancel="cancel"}} diff --git a/app/components/edit-host/template.hbs b/app/components/edit-host/template.hbs index 4de937f0d..d4598d5aa 100644 --- a/app/components/edit-host/template.hbs +++ b/app/components/edit-host/template.hbs @@ -44,4 +44,4 @@ -{{save-cancel save="save" cancel="cancel"}} +{{save-cancel editing=editing save="save" cancel="cancel"}} diff --git a/app/components/edit-registry/template.hbs b/app/components/edit-registry/template.hbs index bd102a903..9063cd91d 100644 --- a/app/components/edit-registry/template.hbs +++ b/app/components/edit-registry/template.hbs @@ -41,4 +41,4 @@ -{{save-cancel save="save" cancel="cancel"}} +{{save-cancel editing=editing save="save" cancel="cancel"}} diff --git a/app/components/edit-service/template.hbs b/app/components/edit-service/template.hbs index cfc55f3e7..e4278921e 100644 --- a/app/components/edit-service/template.hbs +++ b/app/components/edit-service/template.hbs @@ -29,5 +29,5 @@ {{top-errors errors=errors}} - {{save-cancel save="save" cancel="cancel"}} + {{save-cancel editing=editing save="save" cancel="cancel"}} {{/liquid-if}} diff --git a/app/components/form-disks/component.js b/app/components/form-disks/component.js index 17d83d5f9..a4432f876 100644 --- a/app/components/form-disks/component.js +++ b/app/components/form-disks/component.js @@ -71,15 +71,11 @@ export default Ember.Component.extend({ this.get('instance.disks').pushObject({ name: '', root: false, - size: 40, + size: '40g', driver: this.get('availableDrivers').objectAt(0) }); }, - setDiskSize(disk,size) { - Ember.set(disk, 'size', size+'g'); - }, - removeDisk(obj) { this.get('instance.disks').removeObject(obj); }, diff --git a/app/components/form-disks/template.hbs b/app/components/form-disks/template.hbs index 035e5ba1f..d4c51f0ed 100644 --- a/app/components/form-disks/template.hbs +++ b/app/components/form-disks/template.hbs @@ -14,42 +14,7 @@ {{#each disksArray as |disk|}} - - - {{#if disk.root}} - {{t 'formDisks.name.rootDisk'}} - {{else}} - {{input class="form-control input-sm" type="text" value=disk.name placeholder=(t 'formDisks.name.placeholder')}} - {{/if}} - - -   - - -
- {{#if disk.root}} - {{t 'formDisks.size.rootDisk'}} - {{else}} -
{{input-slider initialValue=disk.size changed=(action "setDiskSize" disk) valueMin=10 valueMax=500 step=10}}
-
{{str-replace disk.size match="g" with=" GB"}}
- {{/if}} -
- - -   - - - {{new-select - classNames="form-control" - content=driverChoices - value=disk.driver - }} - - - - - - + {{disk-row disk=disk driverChoices=driverChoices remove=(action "removeDisk" disk)}} {{/each}} {{/if}} diff --git a/app/components/form-launch-config-switch/template.hbs b/app/components/form-launch-config-switch/template.hbs index 7bcca6289..ed9317dc7 100644 --- a/app/components/form-launch-config-switch/template.hbs +++ b/app/components/form-launch-config-switch/template.hbs @@ -9,7 +9,7 @@ {{#if showAdd}}
  • {{t 'newContainer.addSidekickContainer'}}
    • {{#if hasVm}} -
  • {{t 'newContainer.addSidekickVM'}}
    • +
  • {{t 'newContainer.addSidekickVm'}}
    • {{/if}} {{/if}} diff --git a/app/components/schema/input-boolean/template.hbs b/app/components/schema/input-boolean/template.hbs index 43e420968..3fce42c2b 100644 --- a/app/components/schema/input-boolean/template.hbs +++ b/app/components/schema/input-boolean/template.hbs @@ -1,6 +1,6 @@ \ No newline at end of file + {{radio-button selection=value value=false}} {{t 'schema.inputBoolean.n'}} + diff --git a/app/components/stack-section/template.hbs b/app/components/stack-section/template.hbs index 90ad9eb63..daa7e1463 100644 --- a/app/components/stack-section/template.hbs +++ b/app/components/stack-section/template.hbs @@ -54,7 +54,7 @@ {{#link-to "service.new" (query-params environmentId=model.id) classNames="btn btn-default btn-sm"}}{{t 'stackSection.add.service'}}{{/link-to}}