diff options
author | Asaad Mahmood <asaad@spinpunch.com> | 2015-12-14 19:04:08 +0500 |
---|---|---|
committer | Asaad Mahmood <asaad@spinpunch.com> | 2015-12-14 19:04:08 +0500 |
commit | 3d8d152aa0d84d1150ee0a174641c0a4697307f1 (patch) | |
tree | bdcdc81111fd7c8f2b3dd912402006b2d66b50cf /web/react/components/sidebar_right_menu.jsx | |
parent | def79636f8e41204c32bf4b628b254aec5377ef5 (diff) | |
parent | b9a4966e7d287ddaa16ccd7d553e2ada13edc289 (diff) | |
download | chat-3d8d152aa0d84d1150ee0a174641c0a4697307f1.tar.gz chat-3d8d152aa0d84d1150ee0a174641c0a4697307f1.tar.bz2 chat-3d8d152aa0d84d1150ee0a174641c0a4697307f1.zip |
Merge branch 'master' of https://github.com/mattermost/platform into code-themes
Diffstat (limited to 'web/react/components/sidebar_right_menu.jsx')
-rw-r--r-- | web/react/components/sidebar_right_menu.jsx | 43 |
1 files changed, 28 insertions, 15 deletions
diff --git a/web/react/components/sidebar_right_menu.jsx b/web/react/components/sidebar_right_menu.jsx index d93d146d8..20c2bf696 100644 --- a/web/react/components/sidebar_right_menu.jsx +++ b/web/react/components/sidebar_right_menu.jsx @@ -49,7 +49,7 @@ export default class SidebarRightMenu extends React.Component { href='#' onClick={EventHelpers.showInviteMemberModal} > - <i className='fa fa-user'></i>Invite New Member + <i className='fa fa-user'></i>{'Invite New Member'} </a> </li> ); @@ -75,7 +75,7 @@ export default class SidebarRightMenu extends React.Component { href='#' data-toggle='modal' data-target='#team_settings' - ><i className='fa fa-globe'></i>Team Settings</a> + ><i className='fa fa-globe'></i>{'Team Settings'}</a> </li> ); manageLink = ( @@ -93,7 +93,7 @@ export default class SidebarRightMenu extends React.Component { <a href={'/admin_console?' + utils.getSessionIndex()} > - <i className='fa fa-wrench'></i>System Console</a> + <i className='fa fa-wrench'></i>{'System Console'}</a> </li> ); } @@ -107,6 +107,27 @@ export default class SidebarRightMenu extends React.Component { teamDisplayName = this.props.teamDisplayName; } + let helpLink = null; + if (global.window.mm_config.HelpLink) { + helpLink = ( + <li> + <a + target='_blank' + href={global.window.mm_config.HelpLink} + ><i className='fa fa-question'></i>{'Help'}</a></li> + ); + } + + let reportLink = null; + if (global.window.mm_config.ReportAProblemLink) { + reportLink = ( + <li> + <a + target='_blank' + href={global.window.mm_config.ReportAProblemLink} + ><i className='fa fa-phone'></i>{'Report a Problem'}</a></li> + ); + } return ( <div> <div className='team__header theme'> @@ -123,7 +144,7 @@ export default class SidebarRightMenu extends React.Component { href='#' onClick={() => this.setState({showUserSettingsModal: true})} > - <i className='fa fa-cog'></i>Account Settings + <i className='fa fa-cog'></i>{'Account Settings'} </a> </li> {teamSettingsLink} @@ -135,18 +156,10 @@ export default class SidebarRightMenu extends React.Component { <a href='#' onClick={this.handleLogoutClick} - ><i className='fa fa-sign-out'></i>Logout</a></li> + ><i className='fa fa-sign-out'></i>{'Logout'}</a></li> <li className='divider'></li> - <li> - <a - target='_blank' - href='/static/help/help.html' - ><i className='fa fa-question'></i>Help</a></li> - <li> - <a - target='_blank' - href='/static/help/report_problem.html' - ><i className='fa fa-phone'></i>Report a Problem</a></li> + {helpLink} + {reportLink} </ul> </div> <UserSettingsModal |