Removing last hard-wirred.

app/helpers/application_helper.rb

@@ -6,7 +6,7 @@ module ApplicationHelper
      levels.delete_at(0)
 
      #links = "You are here: "
-     links  = content_tag('a', "HOME", :href => "/") if include_home
+     links  = content_tag('a', "HOME", :href => root_path ) if include_home
      
      nocrumb = ["collections", "albums", "photos", "tags", "new", "edit", "tags"]
 

app/views/layouts/application.html.erb

@@ -20,18 +20,12 @@
 	<% end %>
 	</div>
 	<h1>
-		<a href="/">
-		<% if ENV['LOGO'] %>
-		<%= image_tag ENV['LOGO'] %>
-		<% else %>
-		<%= ENV['TITLE'] || "Photos" %>
-		<% end %>
-		</a>
-		</h1>
-	<form action="/albums" method="get" id="search">
+		<%= link_to(if ENV['LOGO'] then image_tag(ENV['LOGO']) else (ENV['TITLE'] || "Photos") end, root_path) %>
+	</h1>
+	<% form_tag albums_path, { :id => :search } do -%>
 		<input type="text" name="q" class="textfield"/>
 		<input type="submit" value="Search" class="button" />
-    </form>
+	<% end -%>
     <hr class="seperator" />
 	<%= breadcrumbs %>
 </div>