diff --git a/app/components/container-row/template.hbs b/app/components/container-row/template.hbs index 3b1f38b8b..11f1d662c 100644 --- a/app/components/container-row/template.hbs +++ b/app/components/container-row/template.hbs @@ -27,10 +27,8 @@ {{action-menu model=model showPrimary=showPrimaryActions}} {{/if}} - -{{!-- {{! make the alternating color match }} - --}} -{{!-- - --}} -{{partial "error-sub-row"}} + +{{#if model.showTransitioningMessage}} + {{error-sub-row fullColspan=fullColspan model=model}} +{{/if}} diff --git a/app/components/dns-row/template.hbs b/app/components/dns-row/template.hbs index aca9bd241..19d5a6eeb 100644 --- a/app/components/dns-row/template.hbs +++ b/app/components/dns-row/template.hbs @@ -37,7 +37,6 @@ {{#if showLabelRow}} - {{! make the alternating color match }} {{#each model.displayUserLabelStrings as |label|}} @@ -48,10 +47,11 @@ {{/if}} -{{partial "error-sub-row"}} +{{#if model.showTransitioningMessage}} + {{error-sub-row fullColspan=fullColspan model=model}} +{{/if}} {{#if canExpand}} - {{! make the alternating color match }} {{! checkbox and expand}} @@ -71,7 +71,6 @@ {{#if expanded}} - {{! make the alternating color match }} diff --git a/app/components/error-sub-row/component.js b/app/components/error-sub-row/component.js new file mode 100644 index 000000000..f1cccfc35 --- /dev/null +++ b/app/components/error-sub-row/component.js @@ -0,0 +1,14 @@ +import Ember from 'ember'; + +export default Ember.Component.extend({ + model: null, + fullColspan: null, + leftColspan: 1, + rightColspan: 1, + + tagName: '', + + mainColspan: Ember.computed('fullColspan', function() { + return (this.get('fullColspan')||2) - this.get('leftColspan') - this.get('rightColspan'); + }), +}); diff --git a/app/components/error-sub-row/template.hbs b/app/components/error-sub-row/template.hbs new file mode 100644 index 000000000..44e6d41e0 --- /dev/null +++ b/app/components/error-sub-row/template.hbs @@ -0,0 +1,11 @@ + + {{#if leftColspan}} + + {{/if}} + + {{model.transitioningMessage}} + + {{#if rightColspan}} + + {{/if}} + diff --git a/app/components/host-row/template.hbs b/app/components/host-row/template.hbs index 530a681d0..fe82806d1 100644 --- a/app/components/host-row/template.hbs +++ b/app/components/host-row/template.hbs @@ -1,8 +1,8 @@ - + {{check-box nodeId=model.id}} - + @@ -10,7 +10,6 @@ {{model.displayName}} -{{!-- labels--}} {{#if showLabelRow}} {{#each model.displayUserLabelStrings as |label|}} {{label}} @@ -30,7 +29,27 @@ {{model.memoryBlurb}} - {{model.dockerEngineVersion}} + {{#if (eq model.supportState 'unsupported')}} + + {{model.dockerEngineVersion}} + {{#tooltip-element type="tooltip-basic" model=(t 'hostPod.supportState.unsupported') tooltipTemplate='tooltip-static' aria-describedby="tooltip-base" tooltipFor="docker-version"}} + + + + {{/tooltip-element}} + + {{else if (eq model.supportState 'untested')}} + + {{model.dockerEngineVersion}} + {{#tooltip-element type="tooltip-basic" model=(t 'hostPod.supportState.unsupported') tooltipTemplate='tooltip-static' aria-describedby="tooltip-base" tooltipFor="docker-version"}} + + + + {{/tooltip-element}} + + {{else}} + {{model.dockerEngineVersion}} + {{/if}} @@ -41,7 +60,7 @@ values=model.instanceStates.byColor tooltipValues=model.instanceStates.byName }} - +

{{#if subMatches}} @@ -57,44 +76,31 @@ {{action-menu model=model showPrimary=false}} - -{{!-- {{#if showLabelRow}} - {{! make the alternating color match }} - - - {{#each model.displayUserLabelStrings as |label|}} - {{label}} - {{/each}} - {{#each model.requireAnyLabelStrings as |label|}} - {{label}} - {{/each}} - - {{! actions}} - -{{/if}} --}} - {{! make the alternating color match }} - - {{! checkbox and expand}} - - {{#liquid-if expanded}} - {{container-table - body=model.instances - stickyHeader=false - bulkActions=false - search=false - searchText=searchText - subRow=true - showHost=false - }} - {{/liquid-if}} - - {{! actions}} - +{{#if model.showTransitioningMessage}} + {{error-sub-row fullColspan=fullColspan model=model}} +{{/if}} - {{#if expanded}} - {{! make the alternating color match }} - - - - {{/if}} + + {{! checkbox and expand}} + + {{#liquid-if expanded}} + {{container-table + body=model.instances + stickyHeader=false + bulkActions=false + search=false + searchText=searchText + subRow=true + showHost=false + }} + {{/liquid-if}} + + {{! actions}} + + +{{#if expanded}} + + + +{{/if}} diff --git a/app/components/service-row/template.hbs b/app/components/service-row/template.hbs index 92d3d24e7..bc9a5c584 100644 --- a/app/components/service-row/template.hbs +++ b/app/components/service-row/template.hbs @@ -56,7 +56,6 @@ {{#if showLabelRow}} - {{! make the alternating color match }} {{#each model.displayUserLabelStrings as |label|}} @@ -67,10 +66,11 @@ {{/if}} -{{partial "error-sub-row"}} +{{#if model.showTransitioningMessage}} + {{error-sub-row fullColspan=fullColspan model=model}} +{{/if}} {{#if canExpand}} - {{! make the alternating color match }} {{! checkbox and expand}} @@ -90,7 +90,6 @@ {{#if expanded}} - {{! make the alternating color match }} diff --git a/app/helpers/parse-host-icon.js b/app/helpers/parse-host-icon.js index 9c99bf4b5..07d035d7e 100644 --- a/app/helpers/parse-host-icon.js +++ b/app/helpers/parse-host-icon.js @@ -1,7 +1,7 @@ import Ember from 'ember'; import C from 'ui/utils/constants'; export function parseHostIcon(params/*, hash*/) { - return C.MACHINE_DRIVER_IMAGES[params[0].toUpperCase()] || 'other'; + return C.MACHINE_DRIVER_IMAGES[(params[0]||'other').toUpperCase()] || 'other'; } export default Ember.Helper.helper(parseHostIcon); diff --git a/app/hosts/index/controller.js b/app/hosts/index/controller.js index f5a65b228..866ababcc 100644 --- a/app/hosts/index/controller.js +++ b/app/hosts/index/controller.js @@ -71,7 +71,7 @@ export default Ember.Controller.extend({ name: 'docker', sort: ['dockerEngineVersion','displayName'], searchField: 'dockerEngineVersion', - width: 90, + width: 110, translationKey: 'hostsPage.index.table.docker', }, { diff --git a/app/mixins/driver.js b/app/mixins/driver.js index 10db26ea5..6de267a98 100644 --- a/app/mixins/driver.js +++ b/app/mixins/driver.js @@ -223,7 +223,7 @@ export default Ember.Mixin.create(NewOrEdit, ManageLabels, { }); // The hostTemplate was the first one, wait for it then add hosts - this.get('model').waitForState('active').then(() => { + return this.get('model').waitForState('active').then(() => { return addHosts(); }); } else { diff --git a/app/scaling-groups/new/route.js b/app/scaling-groups/new/route.js index 0f514eaf6..6bff12cc8 100644 --- a/app/scaling-groups/new/route.js +++ b/app/scaling-groups/new/route.js @@ -96,7 +96,7 @@ export default Ember.Route.extend({ }, afterModel: function(model) { - model.set('service.secondaryLaunchConfigs', this.setUiId(model.get('service.secondaryLaunchConfigs'))); + model.set('service.secondaryLaunchConfigs', this.setUiId(model.get('service.secondaryLaunchConfigs')||[])); }, setUiId: function(configs) { diff --git a/app/styles/components/_tables.scss b/app/styles/components/_tables.scss index fc2fb4bcb..e492aa57c 100644 --- a/app/styles/components/_tables.scss +++ b/app/styles/components/_tables.scss @@ -12,7 +12,6 @@ $table-bg-hover : lighten($info, 15)!default; $table-bg-active : $table-bg-hover!default; $table-bg-selected : lighten($info, 30)!default; $table-border-color : lighten($mid-grey, 30)!default; -$table-body-separation : 50px; $table-body-separation : 25px; $group-row-height : 50px; @@ -21,6 +20,22 @@ $group-row-height : 50px; border-bottom: $table-border-color solid 2px; border-collapse: collapse; + // General padding + > THEAD > TR > TH, + > TBODY > TR > TD { + padding: 0; + transition: ease-in-out all 200ms; + + &:last-child { + height: 0; + } + } + + > TBODY > TR.main-row > TD { + height: $group-row-height; + } + + > TBODY { background: transparent; @@ -95,21 +110,6 @@ TABLE { text-align: left; } - // General padding - > THEAD > TR > TH, - > TBODY > TR > TD { - padding: 0; - height: $group-row-height; - transition: ease-in-out all 200ms; - - &:last-child { - height: 0; - } - } - > TBODY > TR > TD { - height: 50px; - } - &.cell-padding { border-spacing: 10px 0; border-collapse: separate; diff --git a/app/templates/error-sub-row.hbs b/app/templates/error-sub-row.hbs deleted file mode 100644 index 1fbebf986..000000000 --- a/app/templates/error-sub-row.hbs +++ /dev/null @@ -1,7 +0,0 @@ -{{#if model.showTransitioningMessage}} - - - {{model.transitioningMessage}} - - -{{/if}} \ No newline at end of file diff --git a/app/utils/packet-choices.js b/app/utils/packet-choices.js index cff0a98b9..327e4a3d4 100644 --- a/app/utils/packet-choices.js +++ b/app/utils/packet-choices.js @@ -313,55 +313,6 @@ export let PacketPlans = [ "hour": 1.25 } }, - { - "id": "3bc8a214-b807-4058-ad4a-6925f2411155", - "slug": "baremetal_2a", - "name": "Type 2A", - "description": "Our Type 2A configuration is a 96-core dual socket ARM 64 beast based on Cavium ThunderX chips", - "line": "baremetal", - "specs": { - "cpus": [ - { - "count": 2, - "type": "Cavium ThunderX CN8890 @2GHz" - } - ], - "memory": { - "total": "128GB" - }, - "drives": [ - { - "count": 1, - "size": "340GB", - "type": "SSD" - } - ], - "nics": [ - { - "count": 2, - "type": "10Gbps" - } - ], - "features": {} - }, - "available_in": [ - { - "href": "/facilities/8ea03255-89f9-4e62-9d3f-8817db82ceed" - }, - { - "href": "/facilities/8e6470b3-b75e-47d1-bb93-45b225750975" - }, - { - "href": "/facilities/2b70eb8f-fa18-47c0-aba7-222a842362fd" - }, - { - "href": "/facilities/e1e9c52e-a0bc-4117-b996-0fc94843ea09" - } - ], - "pricing": { - "hour": 0.5 - } - }, { "id": "741f3afb-bb2f-4694-93a0-fcbad7cd5e78", "slug": "baremetal_3",