X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/25bfcc0f6b5344acb4039457f8492df7fbada7fc..277d9e323c1c9c525c1cea4590dc71bc56aeed06:/app/views/layouts/hc.rhtml
diff --git a/app/views/layouts/hc.rhtml b/app/views/layouts/hc.rhtml
index b090bf1..6046735 100755
--- a/app/views/layouts/hc.rhtml
+++ b/app/views/layouts/hc.rhtml
@@ -3,7 +3,6 @@
<%= @page_title || "Selectricity" %>
<%= stylesheet_link_tag "hc", :media => "all" %>
- <% #engine_stylesheet 'login_engine' %>
<%= javascript_include_tag "prototype", "effects", "dragdrop", "controls" %>
@@ -18,22 +17,23 @@
<% if session[:user] %>
- Welcome <%= session[:user].login.capitalize %>
+ Welcome <%= User.find(session[:user]).login.capitalize %>
<% 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' )%>
- <% if @flash[:notice]%>
- <%= @flash[:notice] %>
+ <% if flash[:notice]%>
+ <%= flash[:notice] %>
<% end%>