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

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 2020-01-02 09:21:20 -07:00 committed by GitHub
parent 382f72d648 181c21a2a4
commit 9af1c5ac04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 106 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
lib/shared/addon/components/cluster-driver/driver-rke/template.hbs
View File

@ -1028,11 +1028,6 @@
</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"}}
<p class="help-block">{{t "clusterNew.rke.address.detail"}}</p>
<ul class="list-unstyled">
<li>
<div class="row">
<div class="col span-6"> <div class="col span-6">
<label class="acc-label"> <label class="acc-label">
{{t "clusterNew.rke.address.public.label"}} {{t "clusterNew.rke.address.public.label"}}
@ -1042,13 +1037,12 @@
value=address value=address
placeholder=(t "clusterNew.rke.address.public.placeholder") placeholder=(t "clusterNew.rke.address.public.placeholder")
}} }}
<p class="help-block">{{t "clusterNew.rke.address.detail"}}</p>
{{#unless isAddressValid}} {{#unless isAddressValid}}
<div class="banner bg-warning"> <BannerMessage
<div class="banner-icon"><span class="icon icon-alert"></span></div> @color="bg-warning"
<div class="banner-message"> @message={{t "clusterNew.rke.address.warning"}}
<p>{{t "clusterNew.rke.address.warning"}}</p> />
</div>
</div>
{{/unless}} {{/unless}}
</div> </div>
<div class="col span-6"> <div class="col span-6">
@ -1061,47 +1055,36 @@
placeholder=(t "clusterNew.rke.address.private.placeholder") placeholder=(t "clusterNew.rke.address.private.placeholder")
}} }}
{{#unless isInternalAddressValid}} {{#unless isInternalAddressValid}}
<div class="banner bg-warning"> <BannerMessage
<div class="banner-icon"><span class="icon icon-alert"></span></div> @color="bg-warning"
<div class="banner-message"> @message={{t "clusterNew.rke.address.warning"}}
<p>{{t "clusterNew.rke.address.warning"}}</p> />
</div>
</div>
{{/unless}} {{/unless}}
</div> </div>
</div> </div>
</li>
</ul>
</div>
<div class="row mt-20"> <div class="row mt-20">
{{t "clusterNew.rke.nodeName.title"}}
<p class="help-block">
{{t "clusterNew.rke.nodeName.detail"}}
</p>
<ul class="list-unstyled">
<li>
<div class="row">
<div class="col span-6"> <div class="col span-6">
<label class="acc-label">
{{t "clusterNew.rke.nodeName.title"}}
</label>
{{input {{input
type="text" type="text"
value=nodeName value=nodeName
placeholder=(t "clusterNew.rke.nodeName.placeholder") placeholder=(t "clusterNew.rke.nodeName.placeholder")
}} }}
<p class="help-block">
{{t "clusterNew.rke.nodeName.detail"}}
</p>
{{#unless isNodeNameValid}} {{#unless isNodeNameValid}}
{{top-errors errors=nodeNameErrors}} {{top-errors errors=nodeNameErrors}}
{{/unless}} {{/unless}}
</div> </div>
</div> </div>
</li>
</ul>
</div>
<div class="row mt-20"> <div class="row mt-20">
<div class="col span-12">
<label class="acc-label">
{{t "clusterNew.rke.labels.title"}} {{t "clusterNew.rke.labels.title"}}
<p class="help-block"> </label>
{{t "clusterNew.rke.labels.detail"}}
</p>
<ul class="list-unstyled">
<li>
{{#form-user-labels {{#form-user-labels
setLabels=(action "setLabels") setLabels=(action "setLabels")
expandAll=al.expandAll expandAll=al.expandAll
@ -1110,13 +1093,16 @@
as | userLabelArray removeLabel addUserLabel | as | userLabelArray removeLabel addUserLabel |
}} }}
{{#if userLabelArray.length}} {{#if userLabelArray.length}}
<table class="table fixed no-lines mt-20"> <table class="table fixed no-lines small mb-10">
<tr class="hidden-xs hidden-sm"> <thead>
<tr class="hidden-sm">
<th>{{t "formUserLabels.key.label"}}{{field-required}}</th> <th>{{t "formUserLabels.key.label"}}{{field-required}}</th>
<th width="30">&nbsp;</th> <th width="30">&nbsp;</th>
<th>{{t "formUserLabels.value.label"}}</th> <th>{{t "formUserLabels.value.label"}}</th>
<th width="40">&nbsp;</th> <th width="40">&nbsp;</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,8 +1140,9 @@
</td> </td>
</tr> </tr>
{{/each}} {{/each}}
</tbody>
</table> </table>
<div class="protip pt-10"> <div class="protip mb-5">
{{t "formUserLabels.protip"}} {{t "formUserLabels.protip"}}
</div> </div>
{{/if}} {{/if}}
@ -1172,17 +1157,15 @@
</button> </button>
{{/form-user-labels}} {{/form-user-labels}}
<div class="row mt-20 mb-20"> </div>
<div class="col span-12">
<label class="acc-label">
{{t "clusterNew.rke.taints.title"}} {{t "clusterNew.rke.taints.title"}}
<p class="help-block"> </label>
{{t "clusterNew.rke.taints.detail"}}
</p>
{{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)) --}}

4
translations/en-us.yaml
View File

@ -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