diff options
Diffstat (limited to 'web')
4 files changed, 28 insertions, 5 deletions
diff --git a/web/react/components/user_settings_appearance.jsx b/web/react/components/user_settings_appearance.jsx index 0a17f1687..ba2d97ea8 100644 --- a/web/react/components/user_settings_appearance.jsx +++ b/web/react/components/user_settings_appearance.jsx @@ -1,3 +1,6 @@ +// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved. +// See License.txt for license information. + var UserStore = require('../stores/user_store.jsx'); var SettingItemMin = require('./setting_item_min.jsx'); var SettingItemMax = require('./setting_item_max.jsx'); diff --git a/web/react/components/user_settings_general.jsx b/web/react/components/user_settings_general.jsx index 5e7bbcb51..fed11fbe9 100644 --- a/web/react/components/user_settings_general.jsx +++ b/web/react/components/user_settings_general.jsx @@ -1,4 +1,8 @@ +// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved. +// See License.txt for license information. + var UserStore = require('../stores/user_store.jsx'); +var ConfigStore = require('../stores/config_store.jsx'); var SettingItemMin = require('./setting_item_min.jsx'); var SettingItemMax = require('./setting_item_max.jsx'); var SettingPicture = require('./setting_picture.jsx'); @@ -183,9 +187,10 @@ module.exports = React.createClass({ }, getInitialState: function() { var user = this.props.user; + var emailEnabled = !ConfigStore.getSettingAsBoolean('ByPassEmail', false); return {username: user.username, firstName: user.first_name, lastName: user.last_name, nickname: user.nickname, - email: user.email, picture: null, loadingPicture: false}; + email: user.email, picture: null, loadingPicture: false, emailEnabled: emailEnabled}; }, render: function() { var user = this.props.user; @@ -334,12 +339,21 @@ module.exports = React.createClass({ } var emailSection; if (this.props.activeSection === 'email') { + let helpText = <div>Email is used for notifications, and requires verification if changed.</div>; + + if (!this.state.emailEnabled) { + helpText = <div className='text-danger'><br />Email has been disabled by your system administrator. No notification emails will be sent until it is enabled.</div>; + } + inputs.push( - <div className='form-group'> - <label className='col-sm-5 control-label'>Primary Email</label> - <div className='col-sm-7'> - <input className='form-control' type='text' onChange={this.updateEmail} value={this.state.email}/> + <div> + <div className='form-group'> + <label className='col-sm-5 control-label'>Primary Email</label> + <div className='col-sm-7'> + <input className='form-control' type='text' onChange={this.updateEmail} value={this.state.email}/> + </div> </div> + {helpText} </div> ); diff --git a/web/react/components/user_settings_notifications.jsx b/web/react/components/user_settings_notifications.jsx index 6637bbcb5..b89f72987 100644 --- a/web/react/components/user_settings_notifications.jsx +++ b/web/react/components/user_settings_notifications.jsx @@ -1,3 +1,6 @@ +// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved. +// See License.txt for license information. + var UserStore = require('../stores/user_store.jsx'); var SettingItemMin = require('./setting_item_min.jsx'); var SettingItemMax = require('./setting_item_max.jsx'); diff --git a/web/react/components/user_settings_security.jsx b/web/react/components/user_settings_security.jsx index 39d707d90..ae8a5f0bc 100644 --- a/web/react/components/user_settings_security.jsx +++ b/web/react/components/user_settings_security.jsx @@ -1,3 +1,6 @@ +// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved. +// See License.txt for license information. + var SettingItemMin = require('./setting_item_min.jsx'); var SettingItemMax = require('./setting_item_max.jsx'); var client = require('../utils/client.jsx'); |