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

Merge pull request #2669 from barpilot/empty-provider 

Don't show empty row when no cluster driver.
This commit is contained in:
Westly Wright 2019-02-20 05:38:43 -07:00 committed by GitHub
parent 12fe46caa5 8c6ef4f250
commit c93f38f347
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 96 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
lib/shared/addon/components/cru-cluster/template.hbs
View File

@ -13,7 +13,9 @@
{{#unless initialProvider}}
<div class="row nav nav-boxes checked-active inline-form">
<div class="col span-8 col-inline mb-0">
<div class="col span-8 col-inline mt-0 mb-0">
{{#if (gte providerGroups.cloudGroup.length 1)}}
<div class="row nav checked-active inline-form">
<div>
<label class="acc-label">{{t 'clusterNew.driverLabels.cloud'}}</label>
</div>
@ -27,7 +29,8 @@
{{/if}}
{{/link-to}}
{{else}}
<div class={{concat "disabled error-loading-driver mb-20 mt-10 col span-3 col-inline nav-box-item driver " choice.name}}>
<div
class={{concat "disabled error-loading-driver mb-20 mt-10 col span-3 col-inline nav-box-item driver " choice.name}}>
{{#tooltip-element type="tooltip-basic" model=choice.scriptError tooltipTemplate='tooltip-static' aria-describedby="tooltip-base" tooltipFor="tooltipDriverError"}}
<span class="icon icon-alert"></span>
{{/tooltip-element}}
@ -40,8 +43,55 @@
{{/unless}}
{{/each}}
</div>
{{/if}}
<div class="col span-2 col-inline mb-0">
{{#if (gte providerGroups.rkeGroup.length 1)}}
<div class="row">
<div>
<label class="acc-label">{{t 'clusterNew.driverLabels.infra'}}</label>
</div>
{{#each (get providerGroups "rkeGroup") as |choice|}}
{{#link-to (query-params provider=choice.name) class=(concat "mb-20 mt-10 col span-3 col-inline nav-box-item driver " choice.name)}}
<div class="machine-driver {{if choice.genericIcon 'generic'}} {{choice.name}}"></div>
<p class="driver-name">{{driver-name choice.name}}</p>
{{/link-to}}
{{/each}}
</div>
{{/if}}
{{#if (gte providerGroups.externalGroup.length 1)}}
<div class="row">
<div>
<label class="acc-label">{{t 'clusterNew.driverLabels.external'}}</label>
</div>
{{#each (get providerGroups "externalGroup") as |choice|}}
{{#unless choice.scriptError}}
{{#link-to (query-params provider=choice.name) class=(concat "mb-20 mt-10 col span-3 col-inline nav-box-item driver " choice.name)}}
<div class="machine-driver {{choice.name}}"></div>
<p class="driver-name">{{driver-name choice.name}}</p>
{{#if choice.genericIcon}}
<p class="text-link text-bold">{{driver-name choice.name}}</p>
{{/if}}
{{/link-to}}
{{else}}
<div
class={{concat "disabled error-loading-driver mb-20 mt-10 col span-3 col-inline nav-box-item driver " choice.name}}>
{{#tooltip-element type="tooltip-basic" model=choice.scriptError tooltipTemplate='tooltip-static' aria-describedby="tooltip-base" tooltipFor="tooltipDriverError"}}
<span class="icon icon-alert"></span>
{{/tooltip-element}}
<div class="machine-driver {{choice.name}}"></div>
<p class="driver-name">{{driver-name choice.name}}</p>
{{#if choice.genericIcon}}
<p class="text-link text-bold">{{driver-name choice.name}}</p>
{{/if}}
</div>
{{/unless}}
{{/each}}
</div>
{{/if}}
</div>
<div class="col span-2 col-inline mt-0 mb-0">
<div class="row">
<div>
<label class="acc-label">{{t 'clusterNew.driverLabels.import'}}</label>
</div>
@ -56,22 +106,7 @@
{{/each}}
</div>
</div>
<div class="row nav nav-boxes checked-active inline-form">
<div class="col span-8 col-inline mt-0">
<div>
<label class="acc-label">{{t 'clusterNew.driverLabels.infra'}}</label>
</div>
{{#each (get providerGroups "rkeGroup") as |choice|}}
{{#link-to (query-params provider=choice.name) class=(concat "mb-20 mt-10 col span-3 col-inline nav-box-item driver " choice.name)}}
<div class="machine-driver {{if choice.genericIcon 'generic'}} {{choice.name}}"></div>
<p class="driver-name">{{driver-name choice.name}}</p>
{{/link-to}}
{{/each}}
</div>
<div class="col span-2 col-inline mt-0">
<div class="row">
<div>
<label class="acc-label">{{t 'clusterNew.driverLabels.custom'}}</label>
</div>
@ -86,38 +121,7 @@
{{/each}}
</div>
</div>
{{#if (gte providerGroups.externalGroup.length 1)}}
<div class="row nav nav-boxes checked-active inline-form">
<div class="col span-10 col-inline mb-0">
<div>
<label class="acc-label">{{t 'clusterNew.driverLabels.external'}}</label>
</div>
{{#each (get providerGroups "externalGroup") as |choice|}}
{{#unless choice.scriptError}}
{{#link-to (query-params provider=choice.name) class=(concat "mb-20 mt-10 col span-3 col-inline nav-box-item driver " choice.name)}}
<div class="machine-driver {{choice.name}}"></div>
<p class="driver-name">{{driver-name choice.name}}</p>
{{#if choice.genericIcon}}
<p class="text-link text-bold">{{driver-name choice.name}}</p>
{{/if}}
{{/link-to}}
{{else}}
<div class={{concat "disabled error-loading-driver mb-20 mt-10 col span-3 col-inline nav-box-item driver " choice.name}}>
{{#tooltip-element type="tooltip-basic" model=choice.scriptError tooltipTemplate='tooltip-static' aria-describedby="tooltip-base" tooltipFor="tooltipDriverError"}}
<span class="icon icon-alert"></span>
{{/tooltip-element}}
<div class="machine-driver {{choice.name}}"></div>
<p class="driver-name">{{driver-name choice.name}}</p>
{{#if choice.genericIcon}}
<p class="text-link text-bold">{{driver-name choice.name}}</p>
{{/if}}
</div>
{{/unless}}
{{/each}}
</div>
</div>
{{/if}}
{{/unless}}