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

Merge branch 'master' of bitbucket.org:ascribe/onion

This commit is contained in:
Tim Daubenschütz 2015-05-20 19:20:18 +02:00
parent a4a4482d18 ddc050507a
commit 284f729dca
3 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
css/main.css
View File

@ -1,3 +1,6 @@
#main {
padding-top: 70px;
}
/* Taken from http://stackoverflow.com/a/20548578 */
.vcenter {
@ -47,4 +50,4 @@
.ascribe-table-item-column > * {
display:table-cell;
vertical-align: middle;
}
}

4
js/components/ascribe_app.js
View File

@ -11,9 +11,9 @@ let AscribeApp = React.createClass({
return (
<div>
<Header />
<navigation>
<nav>
<Link to="pieces">pieces</Link>
</navigation>
</nav>
<RouteHandler />
</div>
);

32
js/components/header.js
View File

@ -21,7 +21,37 @@ let Header = React.createClass({
render() {
return (
<div>hello {this.state.currentUser.username}</div>
<nav className="navbar navbar-default navbar-fixed-top">
<div className="container">
<div className="navbar-header">
<button type="button" className="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span className="sr-only">Toggle navigation</span>
<span className="icon-bar"></span>
<span className="icon-bar"></span>
<span className="icon-bar"></span>
</button>
<a className="navbar-brand" href="#">
<span>ascribe</span>
<span className="glyph-ascribe-spool-chunked"></span>
</a>
</div>
<div id="navbar" className="navbar-collapse collapse">
<ul className="nav navbar-nav navbar-right">
<li className="dropdown">
<a href="#" className="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">{this.state.currentUser.username} <span className="caret"></span></a>
<ul className="dropdown-menu" role="menu">
<li><a href="/art/faq/">Account Settings</a></li>
<li className="divider"></li>
<li><a href="/art/faq/">FAQ</a></li>
<li><a href="/art/terms/">Terms of Service</a></li>
<li className="divider"></li>
<li><a href="/api/users/logout/">Log out</a></li>
</ul>
</li>
</ul>
</div>
</div>
</nav>
)
}
});