From: John Dong <jdong@mit.edu>
Date: Fri, 31 Aug 2007 15:46:57 +0000 (-0400)
Subject: Merge head
X-Git-Url: https://projects.mako.cc/source/selectricity/commitdiff_plain/adf9b5ec96187af2108c42791319cbe2a3366506?hp=ce1489ae318bfe129070ecaf4e5c422015572caf

Merge head
---

diff --git a/app/views/layouts/frontpage.rhtml b/app/views/layouts/frontpage.rhtml
index 6531dc4..de173c2 100644
--- a/app/views/layouts/frontpage.rhtml
+++ b/app/views/layouts/frontpage.rhtml
@@ -12,9 +12,20 @@
 
     <div id="header">
       <div id="top-bar">
-        <a href="/account/login">login</a>
-          &nbsp;&nbsp;&nbsp;<a href="/account/signup">sign up</a>
-          &nbsp;&nbsp;&nbsp;<a href="/site/about">help/about</a>
+	<% if session[:user]%>
+	<%= link_to User.find(session[:user]).login.capitalize,
+                  :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 => "site", 
+                               :action => 'about')%>
       </div>
   	  <a href="index.html"><h1>selectricity: voting machinery for the masses</h1></a>
     </div>