mirror of https://github.com/rancher/ui.git
Merge pull request #3689 from westlywright/custom.cluster.styles
Fix Style and Markup Issues - Node Options Custom Cluster
This commit is contained in:
Westly Wright
GitHub
commit
9af1c5ac04
|
|
@ -866,10 +866,10 @@
|
||||||
@questions={{model.clusterTemplateRevision.questions}}
|
@questions={{model.clusterTemplateRevision.questions}}
|
||||||
>
|
>
|
||||||
{{#input-or-display
|
{{#input-or-display
|
||||||
tagName="div"
|
tagName="div"
|
||||||
classNames="input-group"
|
classNames="input-group"
|
||||||
editable=notView
|
editable=notView
|
||||||
value=(concat config.services.etcd.backupConfig.intervalHours (concat " " (t "generic.hours")))
|
value=(concat config.services.etcd.backupConfig.intervalHours (concat " " (t "generic.hours")))
|
||||||
}}
|
}}
|
||||||
{{input-integer
|
{{input-integer
|
||||||
value=config.services.etcd.backupConfig.intervalHours
|
value=config.services.etcd.backupConfig.intervalHours
|
||||||
|
|
@ -902,10 +902,10 @@
|
||||||
@questions={{model.clusterTemplateRevision.questions}}
|
@questions={{model.clusterTemplateRevision.questions}}
|
||||||
>
|
>
|
||||||
{{#input-or-display
|
{{#input-or-display
|
||||||
tagName="div"
|
tagName="div"
|
||||||
classNames="input-group"
|
classNames="input-group"
|
||||||
editable=notView
|
editable=notView
|
||||||
value=config.services.etcd.backupConfig.retention
|
value=config.services.etcd.backupConfig.retention
|
||||||
}}
|
}}
|
||||||
<span class="input-group-addon bg-default">{{t "clusterNew.rke.etcd.backupConfig.retention.prefix"}}</span>
|
<span class="input-group-addon bg-default">{{t "clusterNew.rke.etcd.backupConfig.retention.prefix"}}</span>
|
||||||
{{input-integer
|
{{input-integer
|
||||||
|
|
@ -1028,95 +1028,81 @@
|
||||||
</div>
|
</div>
|
||||||
{{#advanced-section advanced=commandAdvanced}}
|
{{#advanced-section advanced=commandAdvanced}}
|
||||||
<div class="row mt-20">
|
<div class="row mt-20">
|
||||||
{{t "clusterNew.rke.address.title"}}
|
<div class="col span-6">
|
||||||
<p class="help-block">{{t "clusterNew.rke.address.detail"}}</p>
|
<label class="acc-label">
|
||||||
<ul class="list-unstyled">
|
{{t "clusterNew.rke.address.public.label"}}
|
||||||
<li>
|
</label>
|
||||||
<div class="row">
|
{{input
|
||||||
<div class="col span-6">
|
type="text"
|
||||||
<label class="acc-label">
|
value=address
|
||||||
{{t "clusterNew.rke.address.public.label"}}
|
placeholder=(t "clusterNew.rke.address.public.placeholder")
|
||||||
</label>
|
}}
|
||||||
{{input
|
<p class="help-block">{{t "clusterNew.rke.address.detail"}}</p>
|
||||||
type="text"
|
{{#unless isAddressValid}}
|
||||||
value=address
|
<BannerMessage
|
||||||
placeholder=(t "clusterNew.rke.address.public.placeholder")
|
@color="bg-warning"
|
||||||
}}
|
@message={{t "clusterNew.rke.address.warning"}}
|
||||||
{{#unless isAddressValid}}
|
/>
|
||||||
<div class="banner bg-warning">
|
{{/unless}}
|
||||||
<div class="banner-icon"><span class="icon icon-alert"></span></div>
|
</div>
|
||||||
<div class="banner-message">
|
<div class="col span-6">
|
||||||
<p>{{t "clusterNew.rke.address.warning"}}</p>
|
<label class="acc-label">
|
||||||
</div>
|
{{t "clusterNew.rke.address.private.label"}}
|
||||||
</div>
|
</label>
|
||||||
{{/unless}}
|
{{input
|
||||||
</div>
|
type="text"
|
||||||
<div class="col span-6">
|
value=internalAddress
|
||||||
<label class="acc-label">
|
placeholder=(t "clusterNew.rke.address.private.placeholder")
|
||||||
{{t "clusterNew.rke.address.private.label"}}
|
}}
|
||||||
</label>
|
{{#unless isInternalAddressValid}}
|
||||||
{{input
|
<BannerMessage
|
||||||
type="text"
|
@color="bg-warning"
|
||||||
value=internalAddress
|
@message={{t "clusterNew.rke.address.warning"}}
|
||||||
placeholder=(t "clusterNew.rke.address.private.placeholder")
|
/>
|
||||||
}}
|
{{/unless}}
|
||||||
{{#unless isInternalAddressValid}}
|
</div>
|
||||||
<div class="banner bg-warning">
|
|
||||||
<div class="banner-icon"><span class="icon icon-alert"></span></div>
|
|
||||||
<div class="banner-message">
|
|
||||||
<p>{{t "clusterNew.rke.address.warning"}}</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{{/unless}}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="row mt-20">
|
<div class="row mt-20">
|
||||||
{{t "clusterNew.rke.nodeName.title"}}
|
<div class="col span-6">
|
||||||
<p class="help-block">
|
<label class="acc-label">
|
||||||
{{t "clusterNew.rke.nodeName.detail"}}
|
{{t "clusterNew.rke.nodeName.title"}}
|
||||||
</p>
|
</label>
|
||||||
<ul class="list-unstyled">
|
{{input
|
||||||
<li>
|
type="text"
|
||||||
<div class="row">
|
value=nodeName
|
||||||
<div class="col span-6">
|
placeholder=(t "clusterNew.rke.nodeName.placeholder")
|
||||||
{{input
|
}}
|
||||||
type="text"
|
<p class="help-block">
|
||||||
value=nodeName
|
{{t "clusterNew.rke.nodeName.detail"}}
|
||||||
placeholder=(t "clusterNew.rke.nodeName.placeholder")
|
</p>
|
||||||
}}
|
{{#unless isNodeNameValid}}
|
||||||
{{#unless isNodeNameValid}}
|
{{top-errors errors=nodeNameErrors}}
|
||||||
{{top-errors errors=nodeNameErrors}}
|
{{/unless}}
|
||||||
{{/unless}}
|
</div>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="row mt-20">
|
<div class="row mt-20">
|
||||||
{{t "clusterNew.rke.labels.title"}}
|
<div class="col span-12">
|
||||||
<p class="help-block">
|
<label class="acc-label">
|
||||||
{{t "clusterNew.rke.labels.detail"}}
|
{{t "clusterNew.rke.labels.title"}}
|
||||||
</p>
|
</label>
|
||||||
<ul class="list-unstyled">
|
{{#form-user-labels
|
||||||
<li>
|
setLabels=(action "setLabels")
|
||||||
{{#form-user-labels
|
expandAll=al.expandAll
|
||||||
setLabels=(action "setLabels")
|
expand=(action expandFn)
|
||||||
expandAll=al.expandAll
|
detailKey="formUserLabels.nodeDetail"
|
||||||
expand=(action expandFn)
|
as | userLabelArray removeLabel addUserLabel |
|
||||||
detailKey="formUserLabels.nodeDetail"
|
}}
|
||||||
as | userLabelArray removeLabel addUserLabel |
|
{{#if userLabelArray.length}}
|
||||||
}}
|
<table class="table fixed no-lines small mb-10">
|
||||||
{{#if userLabelArray.length}}
|
<thead>
|
||||||
<table class="table fixed no-lines mt-20">
|
<tr class="hidden-sm">
|
||||||
<tr class="hidden-xs hidden-sm">
|
|
||||||
<th>{{t "formUserLabels.key.label"}}{{field-required}}</th>
|
<th>{{t "formUserLabels.key.label"}}{{field-required}}</th>
|
||||||
<th width="30"> </th>
|
<th width="30"> </th>
|
||||||
<th>{{t "formUserLabels.value.label"}}</th>
|
<th>{{t "formUserLabels.value.label"}}</th>
|
||||||
<th width="40"> </th>
|
<th width="40"> </th>
|
||||||
</tr>
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
{{#each userLabelArray as |label|}}
|
{{#each userLabelArray as |label|}}
|
||||||
<tr>
|
<tr>
|
||||||
<td data-title="key">
|
<td data-title="key">
|
||||||
|
|
@ -1130,10 +1116,8 @@
|
||||||
}}
|
}}
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
<td class="text-center">
|
<td class="valign-top text-center">
|
||||||
<p class="input-sm">
|
{{t "formKeyValue.separator"}}
|
||||||
{{t "formUserLabels.separator"}}
|
|
||||||
</p>
|
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
<td data-title="label">
|
<td data-title="label">
|
||||||
|
|
@ -1156,33 +1140,32 @@
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
{{/each}}
|
{{/each}}
|
||||||
</table>
|
</tbody>
|
||||||
<div class="protip pt-10">
|
</table>
|
||||||
{{t "formUserLabels.protip"}}
|
<div class="protip mb-5">
|
||||||
</div>
|
{{t "formUserLabels.protip"}}
|
||||||
{{/if}}
|
</div>
|
||||||
|
{{/if}}
|
||||||
|
|
||||||
<button class="btn bg-link icon-btn" {{action addUserLabel}}>
|
<button class="btn bg-link icon-btn" {{action addUserLabel}}>
|
||||||
<span class="darken">
|
<span class="darken">
|
||||||
<i class="icon icon-plus text-small"/>
|
<i class="icon icon-plus text-small"/>
|
||||||
</span>
|
</span>
|
||||||
<span>
|
<span>
|
||||||
{{t "formUserLabels.addAction"}}
|
{{t "formUserLabels.addAction"}}
|
||||||
</span>
|
</span>
|
||||||
</button>
|
</button>
|
||||||
{{/form-user-labels}}
|
{{/form-user-labels}}
|
||||||
|
|
||||||
<div class="row mt-20 mb-20">
|
</div>
|
||||||
{{t "clusterNew.rke.taints.title"}}
|
<div class="col span-12">
|
||||||
<p class="help-block">
|
<label class="acc-label">
|
||||||
{{t "clusterNew.rke.taints.detail"}}
|
{{t "clusterNew.rke.taints.title"}}
|
||||||
</p>
|
</label>
|
||||||
{{node-taints
|
{{node-taints
|
||||||
setTaints=(action "setTaints")
|
setTaints=(action "setTaints")
|
||||||
}}
|
}}
|
||||||
</div>
|
</div>
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
</div>
|
||||||
{{/advanced-section}}
|
{{/advanced-section}}
|
||||||
</li>
|
</li>
|
||||||
|
|
@ -1216,12 +1199,10 @@
|
||||||
{{/accordion-list}}
|
{{/accordion-list}}
|
||||||
|
|
||||||
{{#if newNodeCount}}
|
{{#if newNodeCount}}
|
||||||
<div class="banner bg-success">
|
<BannerMessage
|
||||||
<div class="banner-icon"><span class="icon icon-success"></span></div>
|
@color="bg-success"
|
||||||
<div class="banner-message">
|
@message={{t "clusterNew.rke.detected" count=newNodeCount}}
|
||||||
<p>{{t "clusterNew.rke.detected" count=newNodeCount}}</p>
|
/>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{{/if}}
|
{{/if}}
|
||||||
{{/if}} {{!-- endif (and isCustom (eq step 2)) --}}
|
{{/if}} {{!-- endif (and isCustom (eq step 2)) --}}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4016,10 +4016,10 @@ clusterNew:
|
||||||
detail: Optionally configure the public address and internal address for machines
|
detail: Optionally configure the public address and internal address for machines
|
||||||
warning: This doesn't look like an address
|
warning: This doesn't look like an address
|
||||||
public:
|
public:
|
||||||
label: Public Address
|
label: Node Public Address
|
||||||
placeholder: e.g. 1.2.3.4
|
placeholder: e.g. 1.2.3.4
|
||||||
private:
|
private:
|
||||||
label: Internal Address
|
label: Node Internal Address
|
||||||
placeholder: e.g. 1.2.3.4
|
placeholder: e.g. 1.2.3.4
|
||||||
label: '{appName} Kubernetes Engine'
|
label: '{appName} Kubernetes Engine'
|
||||||
shortLabel: Custom
|
shortLabel: Custom
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue