merged in changes from live version

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

diff --git a/app/views/layouts/frontpage.rhtml b/app/views/layouts/frontpage.rhtml
index de173c280e7560b8229113d4500ac9a89ff87a2d..0b6067f837c2d6ce6ca5c3b702981aee5bc7aa57 100644 (file)
--- a/app/views/layouts/frontpage.rhtml
+++ b/app/views/layouts/frontpage.rhtml
@@ -13,21 +13,20 @@
     <div id="header">
       <div id="top-bar">
        <% if session[:user]%>
-       <%= link_to User.find(session[:user]).login.capitalize,
+       <%= link_to User.find(session[:user]).login.downcase,
                   :controller => "account",
                   :action => "summary", :id => session[:user][:id] %>
-       &nbsp;&nbsp;<%= link_to( 'Log out', :controller => 'account', 
+       &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")%>
+      <!--&nbsp;&nbsp;<%= link_to "sign up", :controller => "account", 
+                                :action => "signup" %> -->
     <% end -%>
-      &nbsp;&nbsp;<%= link_to ("help/about", :controller => "site", 
-                               :action => 'about')%>
+      &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">