diff options
Diffstat (limited to 'web/react/components/user_settings')
-rw-r--r-- | web/react/components/user_settings/user_settings_appearance.jsx | 9 | ||||
-rw-r--r-- | web/react/components/user_settings/user_settings_display.jsx | 25 |
2 files changed, 20 insertions, 14 deletions
diff --git a/web/react/components/user_settings/user_settings_appearance.jsx b/web/react/components/user_settings/user_settings_appearance.jsx index ad41ab771..7bfc9fdbd 100644 --- a/web/react/components/user_settings/user_settings_appearance.jsx +++ b/web/react/components/user_settings/user_settings_appearance.jsx @@ -74,6 +74,10 @@ export default class UserSettingsAppearance extends React.Component { this.props.setEnforceFocus(true); } + scrollToTop() { + $('.ps-container.modal-body').scrollTop(0); + $('.ps-container.modal-body').perfectScrollbar('update'); + } submitTheme(e) { e.preventDefault(); var user = UserStore.getCurrentUser(); @@ -88,9 +92,7 @@ export default class UserSettingsAppearance extends React.Component { this.props.setRequireConfirm(false); this.originalTheme = Object.assign({}, this.state.theme); - - $('.ps-container.modal-body').scrollTop(0); - $('.ps-container.modal-body').perfectScrollbar('update'); + this.scrollToTop(); }, (err) => { var state = this.getStateFromStores(); @@ -129,6 +131,7 @@ export default class UserSettingsAppearance extends React.Component { const state = this.getStateFromStores(); state.serverError = null; this.setState(state); + this.scrollToTop(); Utils.applyTheme(state.theme); diff --git a/web/react/components/user_settings/user_settings_display.jsx b/web/react/components/user_settings/user_settings_display.jsx index c464258de..96c3985d0 100644 --- a/web/react/components/user_settings/user_settings_display.jsx +++ b/web/react/components/user_settings/user_settings_display.jsx @@ -141,6 +141,9 @@ export default class UserSettingsDisplay extends React.Component { ); } + const showUsername = 'Show username (team default)'; + const showNickname = 'Show nickname if one exists, otherwise show first and last name'; + const showFullName = 'Show first and last name'; if (this.props.activeSection === 'name_format') { const nameFormat = [false, false, false]; if (this.state.nameFormat === 'nickname_full_name') { @@ -157,10 +160,10 @@ export default class UserSettingsDisplay extends React.Component { <label> <input type='radio' - checked={nameFormat[0]} - onChange={this.handleNameRadio.bind(this, 'nickname_full_name')} + checked={nameFormat[1]} + onChange={this.handleNameRadio.bind(this, 'username')} /> - {'Show nickname if one exists, otherwise show first and last name (team default)'} + {showUsername} </label> <br/> </div> @@ -168,10 +171,10 @@ export default class UserSettingsDisplay extends React.Component { <label> <input type='radio' - checked={nameFormat[1]} - onChange={this.handleNameRadio.bind(this, 'username')} + checked={nameFormat[0]} + onChange={this.handleNameRadio.bind(this, 'nickname_full_name')} /> - {'Show username'} + {showNickname} </label> <br/> </div> @@ -182,11 +185,11 @@ export default class UserSettingsDisplay extends React.Component { checked={nameFormat[2]} onChange={this.handleNameRadio.bind(this, 'full_name')} /> - {'Show first and last name'} + {showFullName} </label> <br/> </div> - <div><br/>{'Set what name to display in the Direct Messages list.'}</div> + <div><br/>{'Set how to display other user\'s names in posts and the Direct Messages list.'}</div> </div> ]; @@ -205,11 +208,11 @@ export default class UserSettingsDisplay extends React.Component { } else { let describe = ''; if (this.state.nameFormat === 'username') { - describe = 'Show username'; + describe = showUsername; } else if (this.state.nameFormat === 'full_name') { - describe = 'Show first and last name'; + describe = showFullName; } else { - describe = 'Show nickname if one exists, otherwise show first and last name (team default)'; + describe = showNickname; } nameFormatSection = ( |