merge everything back from mainline branch

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

diff --git a/app/views/layouts/frontpage.rhtml b/app/views/layouts/frontpage.rhtml
index 2ebf153290e7e5179464a6a4f5dec9af534f17e7..9abd31e2c58156fce26eb827b2f300fe6c2a5a90 100644 (file)
--- a/app/views/layouts/frontpage.rhtml
+++ b/app/views/layouts/frontpage.rhtml
@@ -21,8 +21,8 @@
        <% else %>
       <%= link_to("login", :controller => "account", :action => "login")
       %>
        <% else %>
       <%= link_to("login", :controller => "account", :action => "login")
       %>

-      &nbsp;&nbsp;<%= link_to "sign up", :controller => "account", 
-                                :action => "signup" %>
+      <!--&nbsp;&nbsp;<%= link_to "sign up", :controller => "account", 
+                                :action => "signup" %> -->

     <% end -%>
       &nbsp;&nbsp;<%= link_to "help/about", :controller => 'about' %>
       </div>
     <% end -%>
       &nbsp;&nbsp;<%= link_to "help/about", :controller => 'about' %>
       </div>


@@ -33,7 +33,7 @@
     <%= @content_for_layout %>
   </div>
   
     <%= @content_for_layout %>
   </div>
   

-  <%= render_partial 'layouts/footer' %>
+  <%= render :partial => 'layouts/footer' %>

 </div>
 </body>
 
 </div>
 </body>