diff options
author | Christopher Speller <crspeller@gmail.com> | 2015-08-31 09:03:31 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2015-08-31 09:03:31 -0400 |
commit | fc73e13ac319587a9f45833b49fad706ec3aa7df (patch) | |
tree | ccea7e3fb186a6762c992d3794258a35d2eddd8e /web/react/components/setting_item_max.jsx | |
parent | 9e887674a1e2e5d2b6449109594af02086eb0047 (diff) | |
parent | 28381e1de6e19daefc96e3a7992c6ab1d7b256d1 (diff) | |
download | chat-fc73e13ac319587a9f45833b49fad706ec3aa7df.tar.gz chat-fc73e13ac319587a9f45833b49fad706ec3aa7df.tar.bz2 chat-fc73e13ac319587a9f45833b49fad706ec3aa7df.zip |
Merge pull request #485 from nickago/MM-1899
MM-1899 Enabled and added help text for settings items
Diffstat (limited to 'web/react/components/setting_item_max.jsx')
-rw-r--r-- | web/react/components/setting_item_max.jsx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/web/react/components/setting_item_max.jsx b/web/react/components/setting_item_max.jsx index 1599041b0..b978cdb0c 100644 --- a/web/react/components/setting_item_max.jsx +++ b/web/react/components/setting_item_max.jsx @@ -5,6 +5,7 @@ module.exports = React.createClass({ render: function() { var clientError = this.props.client_error ? <div className='form-group'><label className='col-sm-12 has-error'>{ this.props.client_error }</label></div> : null; var server_error = this.props.server_error ? <div className='form-group'><label className='col-sm-12 has-error'>{ this.props.server_error }</label></div> : null; + var extraInfo = this.props.extraInfo ? this.props.extraInfo : null; var inputs = this.props.inputs; @@ -15,6 +16,7 @@ module.exports = React.createClass({ <ul className="setting-list"> <li className="setting-list-item"> {inputs} + {extraInfo} </li> <li className="setting-list-item"> <hr /> |