<% if @page_title %>
<h3><%= @page_title %></h3>
<% else %>
- <h3>Selectricity<br />
- <font size="-1">Voting Machinery for the Masses</font></h3>
+ <span id="headertext"><%= link_to('<h3>Selectricity<br />
+ <font size="-1">Voting Machinery for the Masses</font></h3>', :controller =>
+ 'site', :action => 'index')%></span>
<% end %>
<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">