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

Merge pull request #1596 from lvuch/lv0123 

rke cluster nodes
This commit is contained in:
Vincent Fiduccia 2018-01-23 15:07:40 -07:00 committed by GitHub
parent af30552efb 53e185cbb9
commit 5bd75a493e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/styles/components/_tables.scss
View File

@ -286,7 +286,7 @@ TABLE {
}
> TR.suffix {
background-color: $table-bg-accent;
display: table-row;
}
}

12
lib/global-admin/addon/clusters/new/rke/controller.js
View File

@ -30,6 +30,12 @@ const headersAll = [
translationKey: 'generic.name',
scope: 'embedded',
},
{
name: 'all',
sort: false,
searchField: null,
translationKey: 'clustersPage.addPage.rke.new.headers.labels.all',
},
{
name: 'etcd',
sort: false,
@ -49,12 +55,6 @@ const headersAll = [
translationKey: 'clustersPage.addPage.rke.new.headers.labels.worker',
scope: 'embedded',
},
{
name: 'all',
sort: false,
searchField: null,
translationKey: 'clustersPage.addPage.rke.new.headers.labels.all',
},
];
const workerHeaders = headersAll.filter((x) => x.scope === 'embedded');

16
lib/global-admin/addon/clusters/new/rke/template.hbs
View File

@ -51,7 +51,11 @@
<td data-title="{{dt.name}}">
{{host.displayName}}
</td>
{{#if (eq scope "dedicated")}}
<td data-title="{{dt.all}}">
{{input type="checkbox" checked=(array-includes host.role 'worker' 'controlplane' 'etcd') change=(action 'selectAllRoles' host)}}
</td>
{{/if}}
{{#if (eq scope "dedicated")}}
<td data-title="{{dt.etcd}}">
{{!-- disabled=(not-eq host.state "active") --}}
@ -66,19 +70,15 @@
{{!-- disabled=(not-eq host.state "active") --}}
{{input type="checkbox" checked=(array-includes host.role 'worker') change=(action 'addRole' host 'worker')}}
</td>
{{#if (eq scope "dedicated")}}
<td data-title="{{dt.all}}">
{{input type="checkbox" checked=(array-includes host.role 'worker' 'controlplane' 'etcd') change=(action 'selectAllRoles' host)}}
</td>
{{/if}}
</tr>
{{else if (eq kind "nomatch")}}
<tr><td colspan="{{sortable.fullColspan}}" class="text-center text-muted lacsso pt-20 pb-20">{{t 'nodesPage.table.noMatch'}}</td></tr>
{{else if (eq kind "norows")}}
<tr><td colspan="{{sortable.fullColspan}}" class="text-center text-muted lacsso pt-20 pb-20" style="height:200px;">{{t 'nodesPage.table.noData'}}</td></tr>
{{else if (eq kind "suffix")}}
<tr class="suffix">
<td colspan="2" class="text-right pr-20">{{t 'clustersPage.addPage.rke.minimums.label'}}:</td>
<tr class="banner bg-info suffix">
<td colspan="3" class="text-right pr-20">{{t 'clustersPage.addPage.rke.minimums.label'}}:</td>
{{#if (eq scope "dedicated")}}
<td class="{{if etcdSafe "text-success" "text-error"}}">
<i class="icon {{if etcdSafe "icon-success" "icon-x-circle"}}"></i>