From 7b72ef82f560bc3ffa31b48a8afae6729004dffd Mon Sep 17 00:00:00 2001 From: n313893254 Date: Fri, 1 Feb 2019 10:32:01 +0800 Subject: [PATCH] Update for review --- .../driver-azureaks/template.hbs | 115 ++++++++++-------- translations/en-us.yaml | 34 ++---- translations/zh-hans.yaml | 34 ++---- 3 files changed, 82 insertions(+), 101 deletions(-) diff --git a/lib/shared/addon/components/cluster-driver/driver-azureaks/template.hbs b/lib/shared/addon/components/cluster-driver/driver-azureaks/template.hbs index 163a51f43..462d77d8c 100644 --- a/lib/shared/addon/components/cluster-driver/driver-azureaks/template.hbs +++ b/lib/shared/addon/components/cluster-driver/driver-azureaks/template.hbs @@ -3,8 +3,8 @@ {{#if (eq step 1) }} {{#accordion-list-item - title=(t 'clusterNew.azureaks.access.title') - detail=(t 'clusterNew.azureaks.access.detail') + title=(t "clusterNew.azureaks.access.title") + detail=(t "clusterNew.azureaks.access.detail") showExpand=false expandOnInit=true expandAll=al.expandAll @@ -12,7 +12,7 @@ }}
- + {{#input-or-display editable=isEditable value=config.subscriptionId @@ -20,14 +20,14 @@ {{input classNames="form-control" id="azureaks-subscription-id" - placeholder=(t 'clusterNew.azureaks.subscriptionId.placeholder') + placeholder=(t "clusterNew.azureaks.subscriptionId.placeholder") type="text" value=config.subscriptionId }} {{/input-or-display}}
- + {{#input-or-display editable=isEditable value=config.tenantId @@ -35,7 +35,7 @@ {{input type="text" classNames="form-control" id="azureaks-tenant-id" - placeholder=(t 'clusterNew.azureaks.tenant.placeholder') + placeholder=(t "clusterNew.azureaks.tenant.placeholder") value=config.tenantId }} {{/input-or-display}} @@ -44,7 +44,7 @@
- + {{#input-or-display editable=isEditable value=config.clientId @@ -52,7 +52,7 @@ {{input classNames="form-control" id="azureaks-client-id" - placeholder=(t 'clusterNew.azureaks.clientId.placeholder') + placeholder=(t "clusterNew.azureaks.clientId.placeholder") type="text" value=config.clientId }} @@ -60,11 +60,11 @@
- + {{input classNames="form-control" id="azureaks-client-secret" - placeholder=(t 'clusterNew.azureaks.clientSecret.placeholder') + placeholder=(t "clusterNew.azureaks.clientSecret.placeholder") type="password" value=config.clientSecret }} @@ -72,7 +72,7 @@
- + {{#input-or-display editable=isEditable value=config.location @@ -93,7 +93,7 @@ {{#unless editing}}
- {{banner-message color="bg-info" icon="icon-help" class="mb-0" message=(t 'clusterNew.azureaks.access.help' htmlSafe=true)}} + {{banner-message color="bg-info" icon="icon-help" class="mb-0" message=(t "clusterNew.azureaks.access.help" htmlSafe=true)}}
{{/unless}} @@ -110,26 +110,26 @@ {{#if (gte step 2) }} {{#accordion-list-item - title=(t 'clusterNew.customize.title') - detail=(t 'clusterNew.customize.detail') + title=(t "clusterNew.customize.title") + detail=(t "clusterNew.customize.detail") expandAll=al.expandAll expandOnInit=true expand=(action expandFn) }}
- + {{form-versions cluster=cluster - editing=(eq mode 'edit') + editing=(eq mode "edit") initialVersion=config.kubernetesVersion value=config.kubernetesVersion versions=versions }}
- + {{#input-or-display editable=isNew value=config.masterDnsPrefix @@ -137,7 +137,7 @@ {{input classNames="form-control" id="azureaks-master-dns-prefix" - placeholder=(t 'clusterNew.azureaks.dns.placeholder') + placeholder=(t "clusterNew.azureaks.dns.placeholder") type="text" value=config.masterDnsPrefix }} @@ -147,40 +147,40 @@
- +
-
- +
-
@@ -188,12 +188,11 @@
- + {{form-key-value initialMap=tags changed=(action 'setTags') addActionLabel="clusterNew.azureaks.tags.addActionLabel" - editing=editing }}
@@ -201,8 +200,8 @@ {{/accordion-list-item}} {{#accordion-list-item - title=(t 'clusterNew.nodes.title') - detail=(t 'clusterNew.nodes.detail') + title=(t "clusterNew.nodes.title") + detail=(t "clusterNew.nodes.detail") showExpand=false expandOnInit=true expandAll=al.expandAll @@ -211,7 +210,7 @@
- + {{#input-or-display editable=isNew value=config.adminUsername @@ -219,7 +218,7 @@ {{input classNames="form-control" id="azureaks-admin-username-prefix" - placeholder=(t 'clusterNew.azureaks.admin.placeholder') + placeholder=(t "clusterNew.azureaks.admin.placeholder") type="text" value=config.adminUsername }} @@ -227,7 +226,7 @@
- + {{#input-or-display editable=isNew value=config.agentVmSize @@ -304,7 +305,7 @@
{{t "clusterNew.azureaks.networking.label"}}
-