Merge head

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

diff --git a/app/views/layouts/frontpage.rhtml b/app/views/layouts/frontpage.rhtml
index 6531dc47bd9df4819177645ee3ac750d8f4ecb42..de173c280e7560b8229113d4500ac9a89ff87a2d 100644 (file)
--- a/app/views/layouts/frontpage.rhtml
+++ b/app/views/layouts/frontpage.rhtml
@@ -12,9 +12,20 @@
 
     <div id="header">
       <div id="top-bar">
 
     <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>
       </div>
          <a href="index.html"><h1>selectricity: voting machinery for the masses</h1></a>
     </div>