merged changes back from live

[selectricity-live] / app / views / layouts / frontpage.rhtml

diff --git a/app/views/layouts/frontpage.rhtml b/app/views/layouts/frontpage.rhtml
index 8f14c3ae32c014fce8213e22a4698978b27552ac..2ebf153290e7e5179464a6a4f5dec9af534f17e7 100644 (file)
--- a/app/views/layouts/frontpage.rhtml
+++ b/app/views/layouts/frontpage.rhtml
@@ -11,7 +11,22 @@
     <div id="page-wrapper">
 
     <div id="header">
-         <a href="index.html"><h1>selectricity: voting machinery for the masses</h1></a>
+      <div id="top-bar">
+       <% if session[:user]%>
+       <%= link_to User.find(session[:user]).login.downcase,
+                  :controller => "account",
+                  :action => "summary", :id => session[:user][:id] %>
+       &nbsp;&nbsp;<%= link_to( 'log out', :controller => 'account', 
+                       :action => 'logout' )%>
+       <% else %>
+      <%= link_to("login", :controller => "account", :action => "login")
+      %>
+      &nbsp;&nbsp;<%= link_to "sign up", :controller => "account", 
+                                :action => "signup" %>
+    <% end -%>
+      &nbsp;&nbsp;<%= link_to "help/about", :controller => 'about' %>
+      </div>
+         <a href="/"><h1>selectricity: voting machinery for the masses</h1></a>
     </div>
   
   <div id="body">