mirror of https://github.com/rancher/ui.git
searchable, ec2, node select
This commit is contained in:
parent
896cc21a12
commit
1058d1940a
|
|
@ -124,13 +124,6 @@ $dropdown-caret-color : $mid-grey !default;
|
|||
cursor: default;
|
||||
transition: ease-in-out all .25s;
|
||||
}
|
||||
|
||||
&:nth-child(2) {
|
||||
margin-top: 4px;
|
||||
}
|
||||
&:last-child {
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
}
|
||||
}
|
||||
.resource-actions-tabbable {
|
||||
|
|
|
|||
|
|
@ -52,7 +52,9 @@
|
|||
z-index: 2;
|
||||
border: 1px solid $accent-border;
|
||||
border-top: none;
|
||||
padding: 2px 0 5px;
|
||||
|
||||
@expand .dropdown-menu;
|
||||
|
||||
input {
|
||||
margin-bottom: 10px;
|
||||
border-left: none;
|
||||
|
|
@ -73,6 +75,14 @@
|
|||
padding: 0px 0;
|
||||
padding-left: $indent;
|
||||
position: relative;
|
||||
border-bottom: 1px $border solid;
|
||||
padding: 8px 18px;
|
||||
font-size: 14px;
|
||||
|
||||
&:last-child {
|
||||
border-bottom: 0;
|
||||
}
|
||||
|
||||
.icon-check {
|
||||
margin-left: -15px;
|
||||
margin-right: 5px;
|
||||
|
|
|
|||
|
|
@ -30,12 +30,6 @@ 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,
|
||||
|
|
@ -55,6 +49,12 @@ 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');
|
||||
|
|
|
|||
|
|
@ -51,11 +51,7 @@
|
|||
<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") --}}
|
||||
|
|
@ -70,7 +66,11 @@
|
|||
{{!-- 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>
|
||||
|
|
|
|||
|
|
@ -115,10 +115,9 @@
|
|||
{{/if}}
|
||||
</div>
|
||||
<div class="row {{if isStep3 'inline-form'}}">
|
||||
<div class="col span-2 col-inline">
|
||||
<label class="acc-label">{{t 'machine.driverAmazon.subnet'}}</label>
|
||||
</div>
|
||||
<div class="col span-10">
|
||||
|
||||
<label class="acc-label pt-20">{{t 'machine.driverAmazon.subnet'}}</label>
|
||||
|
||||
{{#if isStep3}}
|
||||
{{#if subnetChoices.length}}
|
||||
{{#each subnetChoices as |choice|}}
|
||||
|
|
@ -147,8 +146,7 @@
|
|||
{{/each}}
|
||||
</label>
|
||||
</div>
|
||||
{{!-- <hr class="mt-20 mb-20" />
|
||||
--}} {{/if}}
|
||||
{{/if}}
|
||||
{{/each}}
|
||||
{{/if}}
|
||||
{{else}}
|
||||
|
|
@ -160,7 +158,7 @@
|
|||
{{/if}}
|
||||
</div>
|
||||
{{/if}}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
{{#if isStep3}}
|
||||
|
|
@ -181,7 +179,7 @@
|
|||
|
||||
<section class="horizontal-form {{unless isGteStep5 'hide'}}" style="padding-top: 0">
|
||||
<div class="box mt-20">
|
||||
<span>{{t 'machine.driverAmazon.securityGroupSection'}}</span>
|
||||
<h4>{{t 'machine.driverAmazon.securityGroupSection'}}</h4>
|
||||
|
||||
<div class="row {{if isStep5 'inline-form'}}">
|
||||
{{!-- <div class="col span-2 col-inline"> --}}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<td class="pr-20">
|
||||
<td>
|
||||
{{t kind}}
|
||||
</td>
|
||||
<td class="pr-20">
|
||||
<td class="pr-10">
|
||||
{{#if owner}}
|
||||
{{owner.displayName}}
|
||||
{{else if editing}}
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
{{member.role.user.displayName}}
|
||||
{{/if}}
|
||||
</td>
|
||||
<td class="pr-20">
|
||||
<td class="pr-10">
|
||||
{{#if owner}}
|
||||
{{if (eq type 'project') 'Project Owner' 'Cluster Owner'}}
|
||||
{{else if (or hasCustom member.customRolesExisting)}}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
{{input disabled=readOnly class=(concat 'form-control input-search search ' class) placeholder=placeholder type="text" autocomplete="off" value=filter}}
|
||||
|
||||
{{#if showOptions}}
|
||||
<section class="searchable-options {{if showSearch '' 'pt-10'}}">
|
||||
<section class="searchable-options">
|
||||
{{#if prompt}}
|
||||
<div
|
||||
class="searchable-option searchable-prompt"
|
||||
|
|
|
|||
Loading…
Reference in New Issue