From c9a584f3709202b3bb9caa2f4ad9bfe64ad4a0ed Mon Sep 17 00:00:00 2001 From: Westly Wright Date: Fri, 30 Mar 2018 12:00:08 -0700 Subject: [PATCH] whitespace --- .../addon/templates/-shibboleth-config.hbs | 67 +++++++++-------- .../driver-googlegke/template.hbs | 75 ++++++++++--------- .../components/cru-certificate/template.hbs | 36 ++++----- .../addon/components/input-files/template.hbs | 23 +++--- .../addon/components/save-cancel/component.js | 33 ++++---- 5 files changed, 121 insertions(+), 113 deletions(-) diff --git a/lib/global-admin/addon/templates/-shibboleth-config.hbs b/lib/global-admin/addon/templates/-shibboleth-config.hbs index 17c6284a5..b818137ad 100644 --- a/lib/global-admin/addon/templates/-shibboleth-config.hbs +++ b/lib/global-admin/addon/templates/-shibboleth-config.hbs @@ -14,18 +14,18 @@
- - {{input type="text" value=config.displayNameField classNames="form-control"}} + + {{input type="text" value=config.displayNameField classNames="form-control"}}
- - {{input type="text" value=config.userNameField classNames="form-control"}} + + {{input type="text" value=config.userNameField classNames="form-control"}}
-
-
+
+
- - {{input type="text" value=config.uidField classNames="form-control"}} + + {{input type="text" value=config.uidField classNames="form-control"}}
@@ -37,10 +37,11 @@
{{input-text-file - value=config.spKey - accept="text/*, .pem, .pkey, .key" - minHeight=60 - placeholder="inputCertificate.key.placeholder" + value=config.spKey + accept="text/*, .pem, .pkey, .key" + minHeight=60 + placeholder="inputCertificate.key.placeholder" + classNames="box" }}
@@ -48,10 +49,11 @@
{{input-text-file - accept="text/*, .pem, .crt" - value=config.spCert - minHeight=60 - placeholder="inputCertificate.cert.placeholder" + accept="text/*, .pem, .crt" + value=config.spCert + minHeight=60 + placeholder="inputCertificate.cert.placeholder" + classNames="box" }}
@@ -59,28 +61,29 @@
{{input-text-file - accept="text/xml" - value=config.idpMetadataContent - minHeight=60 - placeholder="inputCertificate.metaXML.placeholder" + accept="text/xml" + value=config.idpMetadataContent + minHeight=60 + placeholder="inputCertificate.metaXML.placeholder" + classNames="box" }}
-
- - -
+
+ +
+

{{t 'authPage.shibboleth.disabled.testAuth.header'}}

diff --git a/lib/shared/addon/components/cluster-driver/driver-googlegke/template.hbs b/lib/shared/addon/components/cluster-driver/driver-googlegke/template.hbs index ac9302e88..bac4d43da 100644 --- a/lib/shared/addon/components/cluster-driver/driver-googlegke/template.hbs +++ b/lib/shared/addon/components/cluster-driver/driver-googlegke/template.hbs @@ -1,14 +1,15 @@ {{#if (eq step 1)}} {{#input-text-file - label='clusterNew.googlegke.credential.label' - value=config.credential - accept="text/*, .json" - minHeight=60 - canChangeName=false - nameRequired=true - placeholder="clusterNew.googlegke.credential.placeholder" - fileChosen=(action "clickNext") - as |section| + classNames="box" + label='clusterNew.googlegke.credential.label' + value=config.credential + accept="text/*, .json" + minHeight=60 + canChangeName=false + nameRequired=true + placeholder="clusterNew.googlegke.credential.placeholder" + fileChosen=(action "clickNext") + as |section| }} {{#if (eq section 'description')}}
@@ -21,20 +22,20 @@ {{top-errors errors=errors}} {{save-cancel - createLabel="clusterNew.googlegke.checkServiceAccount" - savingLabel="clusterNew.googlegke.checkingServiceAccount" - save=(action "checkServiceAccount") - cancel=close + createLabel="clusterNew.googlegke.checkServiceAccount" + savingLabel="clusterNew.googlegke.checkingServiceAccount" + save=(action "checkServiceAccount") + cancel=close }} {{else}} {{#accordion-list showExpandAll=false as |al expandFn|}} {{#accordion-list-item - title=(t 'clusterNew.customize.title') - detail=(t 'clusterNew.customize.detail') - everExpanded=true - expandAll=al.expandAll - expand=(action expandFn) + title=(t 'clusterNew.customize.title') + detail=(t 'clusterNew.customize.detail') + everExpanded=true + expandAll=al.expandAll + expand=(action expandFn) }}
@@ -70,12 +71,12 @@ {{/accordion-list-item}} {{#accordion-list-item - title=(t 'clusterNew.nodes.title') - detail=(t 'clusterNew.nodes.detail') - showExpand=false - expandOnInit=true - expandAll=al.expandAll - expand=(action expandFn) + title=(t 'clusterNew.nodes.title') + detail=(t 'clusterNew.nodes.detail') + showExpand=false + expandOnInit=true + expandAll=al.expandAll + expand=(action expandFn) }}
@@ -84,13 +85,13 @@ {{config.zone}} {{else}} {{new-select - classNames="form-control" - optionValuePath="name" - optionLabelPath="name" - content=zoneChoices - value=config.zone - prompt="clusterNew.googlegke.zone.prompt" - localizedPrompt=true + classNames="form-control" + optionValuePath="name" + optionLabelPath="name" + content=zoneChoices + value=config.zone + prompt="clusterNew.googlegke.zone.prompt" + localizedPrompt=true }} {{/if}}
@@ -122,12 +123,12 @@
- {{#if editing}} - {{config.diskSizeGb}}{{t 'generic.gigabyte'}} - {{else}} - {{input-number min=1 value=config.diskSizeGb}} - {{t 'generic.gigabyte'}} - {{/if}} + {{#if editing}} + {{config.diskSizeGb}}{{t 'generic.gigabyte'}} + {{else}} + {{input-number min=1 value=config.diskSizeGb}} + {{t 'generic.gigabyte'}} + {{/if}}
diff --git a/lib/shared/addon/components/cru-certificate/template.hbs b/lib/shared/addon/components/cru-certificate/template.hbs index 3606c89fa..1008b8dda 100644 --- a/lib/shared/addon/components/cru-certificate/template.hbs +++ b/lib/shared/addon/components/cru-certificate/template.hbs @@ -15,10 +15,10 @@ {{/if}} {{else}} {{form-name-description - model=primaryResource - nameRequired=true - namePlaceholder="newSecret.name.placeholder" - descriptionPlaceholder="newSecret.description.placeholder" + model=primaryResource + nameRequired=true + namePlaceholder="newSecret.name.placeholder" + descriptionPlaceholder="newSecret.description.placeholder" }} {{/if}} @@ -30,12 +30,13 @@
{{input-text-file - value=model.key - canChangeName=false - accept="text/plain,.pem,.pkey,.key" - minHeight=60 - placeholder="newCertificate.key.placeholder" - shouldChangeName=false + classNames="box" + value=model.key + canChangeName=false + accept="text/plain,.pem,.pkey,.key" + minHeight=60 + placeholder="newCertificate.key.placeholder" + shouldChangeName=false }}
@@ -47,13 +48,14 @@
{{input-text-file - value=model.certs - multiple=true - canChangeName=false - accept="application/x-x509-ca-cert,text/plain,.pem,.crt" - minHeight=60 - placeholder="newCertificate.cert.placeholder" - shouldChangeName=false + classNames="box" + value=model.certs + multiple=true + canChangeName=false + accept="application/x-x509-ca-cert,text/plain,.pem,.crt" + minHeight=60 + placeholder="newCertificate.cert.placeholder" + shouldChangeName=false }} diff --git a/lib/shared/addon/components/input-files/template.hbs b/lib/shared/addon/components/input-files/template.hbs index 7ca3546b9..a2f61c334 100644 --- a/lib/shared/addon/components/input-files/template.hbs +++ b/lib/shared/addon/components/input-files/template.hbs @@ -19,18 +19,19 @@ {{#each ary as |file|}} {{#input-text-file - accept=accept - classNames='mb-20' - name=file.name - inputName=true - namePlaceholder=namePlaceholder - canChangeName=true - shouldChangeName=(not file.uploaded) - canUpload=false - value=file.value - placeholder=valuePlaceholder + classNames="box" + accept=accept + classNames='mb-20' + name=file.name + inputName=true + namePlaceholder=namePlaceholder + canChangeName=true + shouldChangeName=(not file.uploaded) + canUpload=false + value=file.value + placeholder=valuePlaceholder }} - + {{/input-text-file}} {{/each}} diff --git a/lib/shared/addon/components/save-cancel/component.js b/lib/shared/addon/components/save-cancel/component.js index f857eb58a..cb955111c 100644 --- a/lib/shared/addon/components/save-cancel/component.js +++ b/lib/shared/addon/components/save-cancel/component.js @@ -4,23 +4,24 @@ import layout from './template'; export default Component.extend({ layout, - editing: null, - createLabel: 'saveCancel.create', - savingLabel: 'saveCancel.saving', - editLabel: 'saveCancel.edit', - cancelLabel: 'saveCancel.cancel', - saveDisabled: false, - cancelDisabled: false, - savedLabel: 'saveCancel.saved', - saveColor: 'bg-primary', - savedColor: 'bg-success', - cancelColor: 'bg-transparent', - forFooter: true, - classNames: ['text-center', 'pt-20'], - classNamesBindings: ['forFooter:footer-actions'], - saving: false, - saved: false, + classNames: ['text-center', 'pt-20'], + classNamesBindings: ['forFooter: footer-actions'], + + cancelColor: 'bg-transparent', + cancelDisabled: false, + cancelLabel: 'saveCancel.cancel', + createLabel: 'saveCancel.create', + editLabel: 'saveCancel.edit', + editing: null, + forFooter: true, + saveColor: 'bg-primary', + saveDisabled: false, + saved: false, + savedColor: 'bg-success', + savedLabel: 'saveCancel.saved', + saving: false, + savingLabel: 'saveCancel.saving', actions: { save() {