Merge branch 'master' of https://github.com/senaduka/ribica

front-ui/app/components/shared/loginStatus.js

@@ -32,19 +32,17 @@ var LoginStatus = React.createClass({
         UserActions.userLogout();
     },
   render : function() {
+
       
-          var content; 
+      var content; 
 
       if(this.state.loggedIn){
-content = (<div>Dobrodosli, {this.state.user.first_name} {this.state.user.last_name} | <a onClick={this.logout}>Odjavite se</a>
-                
-                </div>)
+          content = (<div style={{display: 'inline-block'}}>Dobrodosli, {this.state.user.first_name} {this.state.user.last_name} | <a onClick={this.logout}>Odjavite se</a></div>)
       } else {
-          content = (<div>
-      <Link to="registracija">Registracija</Link> | <Link to="login">Prijava</Link>
-      </div>)      
+          content = (<div style={{display: 'inline-block'}}><Link to="registracija">Registracija</Link> | <Link to="login">Prijava</Link></div>)      
       }
-      return (<div>{content}</div>)
+
+      return content;
   }
 })
 module.exports = LoginStatus;