diff options
author | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-08-03 13:52:24 -0700 |
---|---|---|
committer | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-08-04 12:59:41 -0700 |
commit | 3cd0c3b73b5df0d59e7c12044ddc4948a42b071c (patch) | |
tree | 0d46519edf145034b704a0684bb1d46af63f7071 /web/react/components/setting_picture.jsx | |
parent | 344ab9813907e1b3f7d9dceee84978f832813bef (diff) | |
download | chat-3cd0c3b73b5df0d59e7c12044ddc4948a42b071c.tar.gz chat-3cd0c3b73b5df0d59e7c12044ddc4948a42b071c.tar.bz2 chat-3cd0c3b73b5df0d59e7c12044ddc4948a42b071c.zip |
Minor cosmetic refactoring to the General Tab of user settings
Diffstat (limited to 'web/react/components/setting_picture.jsx')
-rw-r--r-- | web/react/components/setting_picture.jsx | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/web/react/components/setting_picture.jsx b/web/react/components/setting_picture.jsx index 136421fa7..e97b67706 100644 --- a/web/react/components/setting_picture.jsx +++ b/web/react/components/setting_picture.jsx @@ -20,8 +20,14 @@ module.exports = React.createClass({ } }, render: function() { - var client_error = this.props.client_error ? <div className='form-group has-error'><label className='control-label'>{ this.props.client_error }</label></div> : null; - var server_error = this.props.server_error ? <div className='form-group has-error'><label className='control-label'>{ this.props.server_error }</label></div> : null; + var clientError = null; + if (this.props.client_error) { + clientError = <div className='form-group has-error'><label className='control-label'>{this.props.client_error}</label></div>; + } + var serverError = null; + if (this.props.server_error) { + serverError = <div className='form-group has-error'><label className='control-label'>{this.props.server_error}</label></div>; + } var img = null; if (this.props.picture) { @@ -30,8 +36,20 @@ module.exports = React.createClass({ img = (<img ref='image' className='profile-img' src={this.props.src}/>); } - var self = this; + var confirmButton; + if (this.props.loadingPicture) { + confirmButton = <img className='spinner' src='/static/images/load.gif'/>; + } else { + var confirmButtonClass = 'btn btn-sm'; + if (this.props.submitActive) { + confirmButtonClass += ' btn-primary'; + } else { + confirmButtonClass += ' btn-inactive disabled'; + } + confirmButton = <a className={confirmButtonClass} onClick={this.props.submit}>Save</a>; + } + var self = this; return ( <ul className='section-max'> <li className='col-xs-12 section-title'>{this.props.title}</li> @@ -41,14 +59,10 @@ module.exports = React.createClass({ {img} </li> <li className='setting-list-item'> - {server_error} - {client_error} + {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> - {!this.props.loadingPicture ? - <a className={this.props.submitActive ? 'btn btn-sm btn-primary' : 'btn btn-sm btn-inactive disabled'} onClick={this.props.submit}>Save</a> - : - <img className="spinner" src="/static/images/load.gif"/> - } + {confirmButton} <a className='btn btn-sm theme' href='#' onClick={self.props.updateSection}>Cancel</a> </li> </ul> |