diff options
Diffstat (limited to 'web/react/components')
| -rw-r--r-- | web/react/components/search_bar.jsx | 7 | ||||
| -rw-r--r-- | web/react/components/search_results.jsx | 7 | ||||
| -rw-r--r-- | web/react/components/setting_picture.jsx | 4 | ||||
| -rw-r--r-- | web/react/components/team_feature_tab.jsx | 4 | ||||
| -rw-r--r-- | web/react/components/team_settings_modal.jsx | 2 |
5 files changed, 21 insertions, 3 deletions
diff --git a/web/react/components/search_bar.jsx b/web/react/components/search_bar.jsx index e39cf5d46..b11b39e9e 100644 --- a/web/react/components/search_bar.jsx +++ b/web/react/components/search_bar.jsx @@ -48,6 +48,13 @@ module.exports = React.createClass({ }); AppDispatcher.handleServerAction({ + type: ActionTypes.RECIEVED_SEARCH_TERM, + term: null, + do_search: false, + is_mention_search: false + }); + + AppDispatcher.handleServerAction({ type: ActionTypes.RECIEVED_POST_SELECTED, results: null }); diff --git a/web/react/components/search_results.jsx b/web/react/components/search_results.jsx index 643ad112b..b1efd7685 100644 --- a/web/react/components/search_results.jsx +++ b/web/react/components/search_results.jsx @@ -24,6 +24,13 @@ var RhsHeaderSearch = React.createClass({ }); AppDispatcher.handleServerAction({ + type: ActionTypes.RECIEVED_SEARCH_TERM, + term: null, + do_search: false, + is_mention_search: false + }); + + AppDispatcher.handleServerAction({ type: ActionTypes.RECIEVED_POST_SELECTED, results: null }); 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> diff --git a/web/react/components/team_feature_tab.jsx b/web/react/components/team_feature_tab.jsx index ee0bfa874..4f28d84c6 100644 --- a/web/react/components/team_feature_tab.jsx +++ b/web/react/components/team_feature_tab.jsx @@ -133,10 +133,10 @@ module.exports = React.createClass({ <div> <div className='modal-header'> <button type='button' className='close' data-dismiss='modal' aria-label='Close'><span aria-hidden='true'>×</span></button> - <h4 className='modal-title' ref='title'><i className='modal-back'></i>Feature Settings</h4> + <h4 className='modal-title' ref='title'><i className='modal-back'></i>Advanced Features</h4> </div> <div ref='wrapper' className='user-settings'> - <h3 className='tab-header'>Feature Settings</h3> + <h3 className='tab-header'>Advanced Features</h3> <div className='divider-dark first'/> {valetSection} <div className='divider-dark'/> diff --git a/web/react/components/team_settings_modal.jsx b/web/react/components/team_settings_modal.jsx index c9f479a22..ef2564de0 100644 --- a/web/react/components/team_settings_modal.jsx +++ b/web/react/components/team_settings_modal.jsx @@ -27,8 +27,8 @@ module.exports = React.createClass({ }, render: function() { var tabs = []; - tabs.push({name: 'feature', uiName: 'Features', icon: 'glyphicon glyphicon-wrench'}); tabs.push({name: 'import', uiName: 'Import', icon: 'glyphicon glyphicon-upload'}); + tabs.push({name: 'feature', uiName: 'Advanced', icon: 'glyphicon glyphicon-wrench'}); return ( <div className='modal fade' ref='modal' id='team_settings' role='dialog' tabIndex='-1' aria-hidden='true'> |