merged in changes from devel

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

diff --git a/app/views/layouts/main.rhtml b/app/views/layouts/main.rhtml
index bdb206a9fc8af29049a0d7e35190fb7602411df1..c34e797b6f60028658061777bfe2fad261e2f67e 100644 (file)
--- a/app/views/layouts/main.rhtml
+++ b/app/views/layouts/main.rhtml
@@ -17,8 +17,7 @@
   <div id="page-wrapper">
 
     <div id="left-side">
   <div id="page-wrapper">
 
     <div id="left-side">

-      <%= link_to "<h1>Selectricity</h1>",
-                  :controller => 'site', :action => 'index' %>
+      <%= link_to "<h1>Selectricity</h1>", :controller => 'front' %>

 
       <div id="left-side-content">
         <% if flash[:notice]%>
 
       <div id="left-side-content">
         <% if flash[:notice]%>


@@ -40,13 +39,13 @@
           <%= link_to "logout", :controller => "account",
                       :action => "logout" %> 
         <% else %>
           <%= link_to "logout", :controller => "account",
                       :action => "logout" %> 
         <% else %>

-          <%= link_to("login", :controller => "account", :action => "login")
-          %>/<%= link_to("sign up", :controller => "account", :action => "signup")%>
+          <%= link_to "login", :controller => "account", :action => "login" 
+          %>/<%= link_to "sign up", :controller => "account", :action => "signup" %>

         <% end %> 
         </div>
 
         <div id="bar-right">
         <% end %> 
         </div>
 
         <div id="bar-right">

-          <%= link_to("help/about", :controller => "site", :action => "about") %>
+          <%= link_to "help/about", :controller => 'about' %>

         </div>
       </div> <!-- end of top-bar -->
       
         </div>
       </div> <!-- end of top-bar -->