Skip to content

Commit

Permalink
navigation on top
Browse files Browse the repository at this point in the history
  • Loading branch information
stoyan committed Jan 11, 2012
1 parent f3ffa07 commit e691a3c
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions views/layout.erb
Expand Up @@ -11,18 +11,23 @@
<div class="container">
<a class="brand" href="/">Simple Wiki</a>
<nav>
<% if signed_in? %>
<ul class="nav">
<li><a href="/contents">Contents</a></li>
<li><a href="/new">New page</a></li>
<li><a href="/new">New page</a></li>
<% if @edit %>
<li><a href="<%= url("/edit/#{@page.title}") %>">Edit page</a></li>
<% end %>
</ul>

<form action="<%= url('/search') %>" method="get" class="pull-left">
<input name="q" type="search" class="input-small span4" placeholder="Search...">
<button class="hide" type="submit">Search</button>
</form>
<% end %>

<p class="pull-right">
<% if signed_in? %>
<% if signed_in? %>
<%= current_user %>
<img class="nav" src="http://twivatar.herokuapp.com/<%= current_user %>/mini" />
<a href="/logout">Logout</a>
Expand All @@ -41,11 +46,6 @@
<%= yield %>
</div>
</div>
<footer>
<% if @edit and @access_token %>
<a href="<%= url("/edit/#{@page.title}") %>">Edit page</a>
<% end %>
</footer>
</div>
</body>
</html>

0 comments on commit e691a3c

Please sign in to comment.