X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/5f51982916827b84d73bfa8f3a98a9ee1d48d3ce..277d9e323c1c9c525c1cea4590dc71bc56aeed06:/app/views/layouts/hc.rhtml

diff --git a/app/views/layouts/hc.rhtml b/app/views/layouts/hc.rhtml
index 860992a..6046735 100755
--- a/app/views/layouts/hc.rhtml
+++ b/app/views/layouts/hc.rhtml
@@ -17,22 +17,23 @@
 
            <div id="links">
              <% if session[:user] %>
-               Welcome <strong><%= session[:user].login.capitalize %></strong>
+               Welcome <strong><%= User.find(session[:user]).login.capitalize %></strong>
              <% else %>
-               <%= link_to("Login",:controller => "user", :action => "login")
-	         %>/<%= link_to("Sign up", :controller => "user", :action => "signup")%>
+               <%= link_to("Login", :controller => "account", :action => "login")
+	         %>/<%= link_to("Sign up", :controller => "account", :action => "signup")%>
              <% end %> |
 	  
              <% if session[:user] %>
-               <%= link_to("Logout", :controller => "user", :action => "logout") %>  |
+               <%= link_to("Logout", :controller => "account", :action => "logout") %>  |
              <% end %>
              
 	     <%= link_to("Help/About", :controller => "site", :action => "about") %>
+	     <%= link_to( "Home", :controller => 'site', :action => 'index' )%>
            </div>
         </div>
         
-        <% if @flash[:notice]%>
-          <div id="notice"><%= @flash[:notice] %></div>
+        <% if flash[:notice]%>
+          <div id="notice"><%= flash[:notice] %></div>
         <% end%>
 
         <div id="main">