Changed the Selectricity header into a link, and modified the config/routes.rb file...

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

diff --git a/app/views/layouts/hc.rhtml b/app/views/layouts/hc.rhtml
index 13b2e729109fc1d704d242418b840284a3f2d791..c04eb87b058656a5bbd00ff1b173deefd302215a 100755 (executable)
--- a/app/views/layouts/hc.rhtml
+++ b/app/views/layouts/hc.rhtml
@@ -11,13 +11,13 @@
            <% 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] %>
-<% breakpoint %>
                Welcome <strong><%= User.find(session[:user]).login.capitalize %></strong>
              <% else %>
                <%= link_to("Login", :controller => "account", :action => "login")
@@ -29,11 +29,12 @@
              <% 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">