diff options
| author | Asaad Mahmood <asaadmahmoodspin@users.noreply.github.com> | 2016-05-24 17:33:28 +0500 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-05-24 08:33:28 -0400 |
| commit | 79c0b206895ce6c5ffa498cdc80edbd821ff5469 (patch) | |
| tree | eecee477cb766302e1c8d487575665911a7646bc /webapp/components/admin_console/admin_navbar_dropdown.jsx | |
| parent | 32cb71989534c12a5363f8836949827558422902 (diff) | |
| download | chat-79c0b206895ce6c5ffa498cdc80edbd821ff5469.tar.gz chat-79c0b206895ce6c5ffa498cdc80edbd821ff5469.tar.bz2 chat-79c0b206895ce6c5ffa498cdc80edbd821ff5469.zip | |
Minor UI changes (#3078)
Updating navbar dropdown
Updating margin on login page
Diffstat (limited to 'webapp/components/admin_console/admin_navbar_dropdown.jsx')
| -rw-r--r-- | webapp/components/admin_console/admin_navbar_dropdown.jsx | 26 |
1 files changed, 14 insertions, 12 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' |