diff options
Diffstat (limited to 'webapp/components')
| -rw-r--r-- | webapp/components/admin_console/admin_navbar_dropdown.jsx | 26 | ||||
| -rw-r--r-- | webapp/components/login/login.jsx | 5 | ||||
| -rw-r--r-- | webapp/components/navbar_dropdown.jsx | 4 |
3 files changed, 22 insertions, 13 deletions
diff --git a/webapp/components/admin_console/admin_navbar_dropdown.jsx b/webapp/components/admin_console/admin_navbar_dropdown.jsx index 37b8f2135..a923efc70 100644 --- a/webapp/components/admin_console/admin_navbar_dropdown.jsx +++ b/webapp/components/admin_console/admin_navbar_dropdown.jsx @@ -53,13 +53,6 @@ export default class AdminNavbarDropdown extends React.Component { var teams = []; if (this.state.teamMembers && this.state.teamMembers.length > 0) { - teams.push( - <li - key='teamDiv' - className='divider' - ></li> - ); - for (var index in this.state.teamMembers) { if (this.state.teamMembers.hasOwnProperty(index)) { var teamMember = this.state.teamMembers[index]; @@ -69,12 +62,23 @@ export default class AdminNavbarDropdown extends React.Component { <Link to={'/' + team.name + '/channels/town-square'} > + <FormattedMessage + id='navbar_dropdown.switchTo' + defaultMessage='Switch to ' + /> {team.display_name} </Link> </li> ); } } + + teams.push( + <li + key='teamDiv' + className='divider' + ></li> + ); } return ( @@ -99,20 +103,18 @@ export default class AdminNavbarDropdown extends React.Component { className='dropdown-menu' role='menu' > + {teams} <li> <Link to={'/select_team'} > + <i className='fa fa-exchange'/> <FormattedMessage id='admin.nav.switch' - defaultMessage='Switch to {display_name}' - values={{ - display_name: global.window.mm_config.SiteName - }} + defaultMessage='Switch Teams' /> </Link> </li> - {teams} <li key='teamDiv' className='divider' diff --git a/webapp/components/login/login.jsx b/webapp/components/login/login.jsx index 8dbcf33ac..fa86adaed 100644 --- a/webapp/components/login/login.jsx +++ b/webapp/components/login/login.jsx @@ -291,7 +291,10 @@ export default class Login extends React.Component { if (global.window.mm_config.EnableOpenServer === 'true') { loginControls.push( - <div key='signup'> + <div + className='form-group' + key='signup' + > <span> <FormattedMessage id='login.noAccount' diff --git a/webapp/components/navbar_dropdown.jsx b/webapp/components/navbar_dropdown.jsx index a2592787c..2c67bbdf3 100644 --- a/webapp/components/navbar_dropdown.jsx +++ b/webapp/components/navbar_dropdown.jsx @@ -218,6 +218,10 @@ export default class NavbarDropdown extends React.Component { <Link to={'/' + team.name + '/channels/town-square'} > + <FormattedMessage + id='navbar_dropdown.switchTo' + defaultMessage='Switch to ' + /> {team.display_name} </Link> </li> |