diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2015-08-24 07:11:59 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2015-08-24 07:11:59 -0400 |
| commit | 7d8a9bf0e8c79d752691e267a0438a9c707a0554 (patch) | |
| tree | 4f0ccbcec9a87ce5f12ecd5fff57822d27856594 /web/react/components | |
| parent | 9843bcc0bf25733a8f7a7315a7e24a1dba1a22db (diff) | |
| parent | aaa0bb9d4dcaca0212a7bf1a7dc3dbd9b78fb6c5 (diff) | |
| download | chat-7d8a9bf0e8c79d752691e267a0438a9c707a0554.tar.gz chat-7d8a9bf0e8c79d752691e267a0438a9c707a0554.tar.bz2 chat-7d8a9bf0e8c79d752691e267a0438a9c707a0554.zip | |
Merge pull request #439 from nickago/MM-1822
MM-1822 Added help text to profile picture screen
Diffstat (limited to 'web/react/components')
| -rw-r--r-- | web/react/components/setting_picture.jsx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/web/react/components/setting_picture.jsx b/web/react/components/setting_picture.jsx index e97b67706..5b12ad7e9 100644 --- a/web/react/components/setting_picture.jsx +++ b/web/react/components/setting_picture.jsx @@ -48,6 +48,7 @@ module.exports = React.createClass({ } confirmButton = <a className={confirmButtonClass} onClick={this.props.submit}>Save</a>; } + var helpText = 'Upload a profile picture in either JPG or PNG format, at least ' + config.ProfileWidth + 'px in width and ' + config.ProfileHeight + 'px height.' var self = this; return ( @@ -59,6 +60,9 @@ module.exports = React.createClass({ {img} </li> <li className='setting-list-item'> + {helpText} + </li> + <li className='setting-list-item'> {serverError} {clientError} <span className='btn btn-sm btn-primary btn-file sel-btn'>Select<input ref='input' accept='.jpg,.png,.bmp' type='file' onChange={this.props.pictureChange}/></span> |