whitespace

This commit is contained in:
Westly Wright 2018-03-30 12:00:08 -07:00
parent bd364a3bca
commit c9a584f370
No known key found for this signature in database
GPG Key ID: 4FAB3D8673DC54A3
5 changed files with 121 additions and 113 deletions

View File

@ -14,18 +14,18 @@
<hr /> <hr />
<div class="row"> <div class="row">
<div class="col span-6"> <div class="col span-6">
<label class="acc-label pb-5">{{t 'authPage.shibboleth.disabled.name.labelText'}}{{field-required}}</label> <label class="acc-label pb-5">{{t 'authPage.shibboleth.disabled.name.labelText'}}{{field-required}}</label>
{{input type="text" value=config.displayNameField classNames="form-control"}} {{input type="text" value=config.displayNameField classNames="form-control"}}
</div> </div>
<div class="col span-6"> <div class="col span-6">
<label class="acc-label pb-5">{{t 'authPage.shibboleth.disabled.username.labelText'}}{{field-required}}</label> <label class="acc-label pb-5">{{t 'authPage.shibboleth.disabled.username.labelText'}}{{field-required}}</label>
{{input type="text" value=config.userNameField classNames="form-control"}} {{input type="text" value=config.userNameField classNames="form-control"}}
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col span-6"> <div class="col span-6">
<label class="acc-label pb-5">{{t 'authPage.shibboleth.disabled.uid.labelText'}}{{field-required}}</label> <label class="acc-label pb-5">{{t 'authPage.shibboleth.disabled.uid.labelText'}}{{field-required}}</label>
{{input type="text" value=config.uidField classNames="form-control"}} {{input type="text" value=config.uidField classNames="form-control"}}
</div> </div>
<div class="col span-6"> <div class="col span-6">
<label class="acc-label pb-5">{{t 'authPage.shibboleth.disabled.groups.labelText'}}{{field-required}}</label> <label class="acc-label pb-5">{{t 'authPage.shibboleth.disabled.groups.labelText'}}{{field-required}}</label>
@ -37,10 +37,11 @@
<div class="inline-form"> <div class="inline-form">
<label class="acc-label pb-5">{{t 'inputCertificate.key.label'}}{{field-required}}</label> <label class="acc-label pb-5">{{t 'inputCertificate.key.label'}}{{field-required}}</label>
{{input-text-file {{input-text-file
value=config.spKey value=config.spKey
accept="text/*, .pem, .pkey, .key" accept="text/*, .pem, .pkey, .key"
minHeight=60 minHeight=60
placeholder="inputCertificate.key.placeholder" placeholder="inputCertificate.key.placeholder"
classNames="box"
}} }}
</div> </div>
</div> </div>
@ -48,10 +49,11 @@
<div class="inline-form"> <div class="inline-form">
<label class="acc-label pb-5">{{t 'inputCertificate.cert.label'}}{{field-required}}</label> <label class="acc-label pb-5">{{t 'inputCertificate.cert.label'}}{{field-required}}</label>
{{input-text-file {{input-text-file
accept="text/*, .pem, .crt" accept="text/*, .pem, .crt"
value=config.spCert value=config.spCert
minHeight=60 minHeight=60
placeholder="inputCertificate.cert.placeholder" placeholder="inputCertificate.cert.placeholder"
classNames="box"
}} }}
</div> </div>
</div> </div>
@ -59,28 +61,29 @@
<div class="inline-form"> <div class="inline-form">
<label class="acc-label pb-5">{{t 'inputCertificate.metaXML.label'}}{{field-required}}</label> <label class="acc-label pb-5">{{t 'inputCertificate.metaXML.label'}}{{field-required}}</label>
{{input-text-file {{input-text-file
accept="text/xml" accept="text/xml"
value=config.idpMetadataContent value=config.idpMetadataContent
minHeight=60 minHeight=60
placeholder="inputCertificate.metaXML.placeholder" placeholder="inputCertificate.metaXML.placeholder"
classNames="box"
}} }}
</div> </div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="inline-form"> <div class="inline-form">
<label class="acc-label pb-5">&nbsp;</label> <label class="acc-label pb-5">&nbsp;</label>
<button class="btn bg-primary" style="display: block;margin: 0 auto;" {{action "save"}}> <button class="btn bg-primary" style="display: block;margin: 0 auto;" {{action "save"}}>
{{#if saving}} {{#if saving}}
<i class="icon icon-spinner icon-spin"></i> {{t 'generic.saving'}} <i class="icon icon-spinner icon-spin"></i> {{t 'generic.saving'}}
{{else if saved}} {{else if saved}}
{{t 'generic.saved'}} {{t 'generic.saved'}}
{{else}} {{else}}
{{t 'generic.save'}} {{t 'generic.save'}}
{{/if}} {{/if}}
</button> </button>
</div>
</div> </div>
</div>
</section> </section>
<section class="box mt-30"> <section class="box mt-30">
<h3>{{t 'authPage.shibboleth.disabled.testAuth.header'}}</h3> <h3>{{t 'authPage.shibboleth.disabled.testAuth.header'}}</h3>

View File

@ -1,14 +1,15 @@
{{#if (eq step 1)}} {{#if (eq step 1)}}
{{#input-text-file {{#input-text-file
label='clusterNew.googlegke.credential.label' classNames="box"
value=config.credential label='clusterNew.googlegke.credential.label'
accept="text/*, .json" value=config.credential
minHeight=60 accept="text/*, .json"
canChangeName=false minHeight=60
nameRequired=true canChangeName=false
placeholder="clusterNew.googlegke.credential.placeholder" nameRequired=true
fileChosen=(action "clickNext") placeholder="clusterNew.googlegke.credential.placeholder"
as |section| fileChosen=(action "clickNext")
as |section|
}} }}
{{#if (eq section 'description')}} {{#if (eq section 'description')}}
<div class="row help"> <div class="row help">
@ -21,20 +22,20 @@
{{top-errors errors=errors}} {{top-errors errors=errors}}
{{save-cancel {{save-cancel
createLabel="clusterNew.googlegke.checkServiceAccount" createLabel="clusterNew.googlegke.checkServiceAccount"
savingLabel="clusterNew.googlegke.checkingServiceAccount" savingLabel="clusterNew.googlegke.checkingServiceAccount"
save=(action "checkServiceAccount") save=(action "checkServiceAccount")
cancel=close cancel=close
}} }}
{{else}} {{else}}
{{#accordion-list showExpandAll=false as |al expandFn|}} {{#accordion-list showExpandAll=false as |al expandFn|}}
{{#accordion-list-item {{#accordion-list-item
title=(t 'clusterNew.customize.title') title=(t 'clusterNew.customize.title')
detail=(t 'clusterNew.customize.detail') detail=(t 'clusterNew.customize.detail')
everExpanded=true everExpanded=true
expandAll=al.expandAll expandAll=al.expandAll
expand=(action expandFn) expand=(action expandFn)
}} }}
<div class="row"> <div class="row">
<div class="col span-6"> <div class="col span-6">
@ -70,12 +71,12 @@
{{/accordion-list-item}} {{/accordion-list-item}}
{{#accordion-list-item {{#accordion-list-item
title=(t 'clusterNew.nodes.title') title=(t 'clusterNew.nodes.title')
detail=(t 'clusterNew.nodes.detail') detail=(t 'clusterNew.nodes.detail')
showExpand=false showExpand=false
expandOnInit=true expandOnInit=true
expandAll=al.expandAll expandAll=al.expandAll
expand=(action expandFn) expand=(action expandFn)
}} }}
<div class="row"> <div class="row">
<div class="col span-6"> <div class="col span-6">
@ -84,13 +85,13 @@
{{config.zone}} {{config.zone}}
{{else}} {{else}}
{{new-select {{new-select
classNames="form-control" classNames="form-control"
optionValuePath="name" optionValuePath="name"
optionLabelPath="name" optionLabelPath="name"
content=zoneChoices content=zoneChoices
value=config.zone value=config.zone
prompt="clusterNew.googlegke.zone.prompt" prompt="clusterNew.googlegke.zone.prompt"
localizedPrompt=true localizedPrompt=true
}} }}
{{/if}} {{/if}}
</div> </div>
@ -122,12 +123,12 @@
<div class="col span-6"> <div class="col span-6">
<label class="acc-label">{{t 'clusterNew.googlegke.diskSizeGb.label'}}</label> <label class="acc-label">{{t 'clusterNew.googlegke.diskSizeGb.label'}}</label>
<div class="input-group"> <div class="input-group">
{{#if editing}} {{#if editing}}
{{config.diskSizeGb}}{{t 'generic.gigabyte'}} {{config.diskSizeGb}}{{t 'generic.gigabyte'}}
{{else}} {{else}}
{{input-number min=1 value=config.diskSizeGb}} {{input-number min=1 value=config.diskSizeGb}}
<span class="input-group-addon bg-default">{{t 'generic.gigabyte'}}</span> <span class="input-group-addon bg-default">{{t 'generic.gigabyte'}}</span>
{{/if}} {{/if}}
</div> </div>
</div> </div>
</div> </div>

View File

@ -15,10 +15,10 @@
{{/if}} {{/if}}
{{else}} {{else}}
{{form-name-description {{form-name-description
model=primaryResource model=primaryResource
nameRequired=true nameRequired=true
namePlaceholder="newSecret.name.placeholder" namePlaceholder="newSecret.name.placeholder"
descriptionPlaceholder="newSecret.description.placeholder" descriptionPlaceholder="newSecret.description.placeholder"
}} }}
{{/if}} {{/if}}
@ -30,12 +30,13 @@
<label class="acc-label pt-5">{{t 'newCertificate.key.label'}}{{#if isNew}}{{field-required}}{{/if}}</label> <label class="acc-label pt-5">{{t 'newCertificate.key.label'}}{{#if isNew}}{{field-required}}{{/if}}</label>
</div> </div>
{{input-text-file {{input-text-file
value=model.key classNames="box"
canChangeName=false value=model.key
accept="text/plain,.pem,.pkey,.key" canChangeName=false
minHeight=60 accept="text/plain,.pem,.pkey,.key"
placeholder="newCertificate.key.placeholder" minHeight=60
shouldChangeName=false placeholder="newCertificate.key.placeholder"
shouldChangeName=false
}} }}
</div> </div>
@ -47,13 +48,14 @@
</span> </span>
</div> </div>
{{input-text-file {{input-text-file
value=model.certs classNames="box"
multiple=true value=model.certs
canChangeName=false multiple=true
accept="application/x-x509-ca-cert,text/plain,.pem,.crt" canChangeName=false
minHeight=60 accept="application/x-x509-ca-cert,text/plain,.pem,.crt"
placeholder="newCertificate.cert.placeholder" minHeight=60
shouldChangeName=false placeholder="newCertificate.cert.placeholder"
shouldChangeName=false
}} }}
</div> </div>
</div> </div>

View File

@ -19,18 +19,19 @@
{{#each ary as |file|}} {{#each ary as |file|}}
{{#input-text-file {{#input-text-file
accept=accept classNames="box"
classNames='mb-20' accept=accept
name=file.name classNames='mb-20'
inputName=true name=file.name
namePlaceholder=namePlaceholder inputName=true
canChangeName=true namePlaceholder=namePlaceholder
shouldChangeName=(not file.uploaded) canChangeName=true
canUpload=false shouldChangeName=(not file.uploaded)
value=file.value canUpload=false
placeholder=valuePlaceholder value=file.value
placeholder=valuePlaceholder
}} }}
<button class="btn bg-primary" {{action "remove" file}}><i class="icon icon-minus"></i></button> <button class="btn bg-primary" {{action "remove" file}}><i class="icon icon-minus"></i></button>
{{/input-text-file}} {{/input-text-file}}
{{/each}} {{/each}}

View File

@ -4,23 +4,24 @@ import layout from './template';
export default Component.extend({ export default Component.extend({
layout, 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'], classNames: ['text-center', 'pt-20'],
saving: false, classNamesBindings: ['forFooter: footer-actions'],
saved: false,
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: { actions: {
save() { save() {