Modified the methods in graphs controller so they would work for Selectricity, but...

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

diff --git a/app/views/layouts/hc.rhtml b/app/views/layouts/hc.rhtml
index 860992a4dbd25a495ac247035a25aa807b7a4a40..604673539b2fcbfc7b508907f91b5a136f6d3a32 100755 (executable)
--- 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">