ascribe
/
onion
mirror of https://github.com/ascribe/onion.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/master' into AD-883-show-notificationsrequests-on-col

This commit is contained in:
diminator 2015-08-28 16:25:57 +02:00
parent 762c3f89b9 02ed21fef5
commit 9dddf0bf21
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/components/header.js
View File

@ -91,8 +91,9 @@ let Header = React.createClass({
},
render() {
let account = null;
let signup = null;
let account;
let signup;
let navRoutesLinks;
if (this.state.currentUser.username){
account = (
<DropdownButton eventKey="1" title={this.state.currentUser.username}>
@ -101,6 +102,7 @@ let Header = React.createClass({
<MenuItemLink eventKey="3" to="logout">{getLangText('Log out')}</MenuItemLink>
</DropdownButton>
);
navRoutesLinks = <NavRoutesLinks routes={this.props.routes} navbar right/>;
}
else {
account = <NavItemLink to="login">{getLangText('LOGIN')}</NavItemLink>;
@ -124,7 +126,7 @@ let Header = React.createClass({
{account}
{signup}
</Nav>
<NavRoutesLinks routes={this.props.routes} navbar right/>
{navRoutesLinks}
</CollapsibleNav>
</Navbar>
</div>