fix bug/typo in plurality results around candidate.id and candidate_id

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

diff --git a/app/views/layouts/frontpage.rhtml b/app/views/layouts/frontpage.rhtml
index 6531dc47bd9df4819177645ee3ac750d8f4ecb42..9abd31e2c58156fce26eb827b2f300fe6c2a5a90 100644 (file)
--- a/app/views/layouts/frontpage.rhtml
+++ b/app/views/layouts/frontpage.rhtml
@@ -12,18 +12,28 @@
 
     <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.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="index.html"><h1>selectricity: voting machinery for the masses</h1></a>
+         <a href="/"><h1>selectricity: voting machinery for the masses</h1></a>
     </div>
   
   <div id="body">
     <%= @content_for_layout %>
   </div>
   
-  <%= render_partial 'layouts/footer' %>
+  <%= render :partial => 'layouts/footer' %>
 </div>
 </body>