Disable image upload during setup for non persistent file storage

closes #5550

- passes config.fileStorage into gh-profile-image component
- does not render input tag if fileStorage is set to false
This commit is contained in:
cobbspur 2015-07-17 13:57:09 +01:00
parent 0659300a23
commit def08d7939
4 changed files with 9 additions and 10 deletions

View File

@ -18,6 +18,7 @@ export default Ember.Component.extend({
email: '', email: '',
size: 90, size: 90,
hasUploadedImage: false, hasUploadedImage: false,
fileStorage: true,
ghostPaths: Ember.inject.service('ghost-paths'), ghostPaths: Ember.inject.service('ghost-paths'),
hasEmail: Ember.computed.notEmpty('email'), hasEmail: Ember.computed.notEmpty('email'),

View File

@ -1,12 +1,12 @@
<figure class="account-image js-file-upload"> <figure class="account-image js-file-upload">
{{#unless hasUploadedImage}} {{#unless hasUploadedImage}}
<div class="placeholder-img" style={{defaultImage}}></div> <div class="placeholder-img" style={{defaultImage}}></div>
{{#if hasEmail}} {{#if hasEmail}}
<div id="account-image" class="gravatar-img" style={{imageBackground}}> <div id="account-image" class="gravatar-img" style={{imageBackground}}>
<span class="sr-only">User image</span> <span class="sr-only">User image</span>
</div> </div>
{{/if}} {{/if}}
{{/unless}} {{/unless}}
<div class="js-img-preview"></div> <div class="js-img-preview"></div>
@ -16,5 +16,5 @@
<span class="sr-only">Upload an image</span> <span class="sr-only">Upload an image</span>
</i> </i>
</span> </span>
<input type="file" class="file-uploader js-file-input" name="uploadimage"> {{#if fileStorage}}<input type="file" class="file-uploader js-file-input" name="uploadimage">{{/if}}
</figure> </figure>

View File

@ -1,5 +1,4 @@
<div class="gh-flow"> <div class="gh-flow">
<header class="gh-flow-head"> <header class="gh-flow-head">
<nav class="gh-flow-nav"> <nav class="gh-flow-nav">
{{!-- TODO: this should only appear on screens 2 & 3 --}} {{!-- TODO: this should only appear on screens 2 & 3 --}}
@ -23,5 +22,4 @@
<div class="gh-flow-content-wrap"> <div class="gh-flow-content-wrap">
{{outlet}} {{outlet}}
</div> </div>
</div> </div>

View File

@ -8,7 +8,7 @@
<input style="display:none;" type="text" name="fakeusernameremembered"/> <input style="display:none;" type="text" name="fakeusernameremembered"/>
<input style="display:none;" type="password" name="fakepasswordremembered"/> <input style="display:none;" type="password" name="fakepasswordremembered"/>
{{gh-profile-image email=email setImage="setImage"}} {{gh-profile-image fileStorage=config.fileStorage email=email setImage="setImage"}}
{{#gh-form-group errors=errors property="email"}} {{#gh-form-group errors=errors property="email"}}
<label for="email-address">Email address</label> <label for="email-address">Email address</label>
<span class="input-icon icon-mail"> <span class="input-icon icon-mail">