fixes for search

diff --git a/app/controllers/way_tag_controller.rb b/app/controllers/way_tag_controller.rb
index 5c6ac6617149371eceb339334522cd07b5b6be7d..02e7a685260cfbb015183099e258973427031b4b 100644 (file)
--- a/app/controllers/way_tag_controller.rb
+++ b/app/controllers/way_tag_controller.rb
@@ -1,4 +1,5 @@
 class WayTagController < ApplicationController
+  layout 'site'
 
   def search
     @tags = WayTag.find(:all, :limit => 11, :conditions => ["match(v) against (?)", params[:query][:query].to_s] )

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index 78623603a23b201c8219b57b6b45e82e3b1e8370..6971e5faa468e43a15ba5c948847b6b59ff095eb 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -1,7 +1,7 @@
 
 
 <div id="geocoder">
-  <%= start_form_tag :controller => 'site', :action => 'search' %>
+  <%= start_form_tag :controller => 'way_tag', :action => 'search' %>
   <%= text_field 'query', 'query'%>
   <%= submit_tag 'Search' %>
   <%= end_form_tag %>

diff --git a/app/views/way_tag/search.rhtml b/app/views/way_tag/search.rhtml
index 4c7f38d99825237f6312266034284ee50acc7c60..2a475fda98f138c86d3b471a4d5f65f24695553b 100644 (file)
--- a/app/views/way_tag/search.rhtml
+++ b/app/views/way_tag/search.rhtml
@@ -1,7 +1,7 @@
 <h2>Search results</h5>
 fixme postcodes and geonames
 
-<%= start_form_tag :controller => 'site', :action => 'search' %>
+<%= start_form_tag :controller => 'way_tag', :action => 'search' %>
 <%= text_field 'query', 'query'%>
 <%= submit_tag 'Search' %>
 <%= end_form_tag %>

diff --git a/config/routes.rb b/config/routes.rb
index ca19c966879978dc478a4207c4a41c3f23d6066f..9d26eb0fac7134aaef2349582dd0b558547700a6 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -44,11 +44,11 @@ ActionController::Routing::Routes.draw do |map|
   map.connect '/traces/mine/tag/:tag', :controller => 'trace', :action => 'mine'
   map.connect '/traces/mine/tag/:tag/page/:page', :controller => 'trace', :action => 'mine'
   map.connect '/traces/rss', :controller => 'trace', :action => 'georss'
-  map.connect '/traces/user/:display_name/', :controller => 'trace', :action => 'list', :id => nil\r
-  map.connect '/traces/user/:display_name/page/:page', :controller => 'trace', :action => 'list', :id => nil\r
-  map.connect '/traces/user/:display_name/:id', :controller => 'trace', :action => 'view', :id => nil
-  map.connect '/traces/user/:display_name/:id/picture', :controller => 'trace', :action => 'picture', :id => nil
-  map.connect '/traces/user/:display_name/:id/icon', :controller => 'trace', :action => 'icon', :id => nil
+  map.connect '/user/:display_name/traces', :controller => 'trace', :action => 'list', :id => nil\r
+  map.connect '/user/:display_name/traces/page/:page', :controller => 'trace', :action => 'list', :id => nil\r
+  map.connect '/user/:display_name/traces/:id', :controller => 'trace', :action => 'view', :id => nil
+  map.connect '/user/:display_name/traces/:id/picture', :controller => 'trace', :action => 'picture', :id => nil
+  map.connect '/user/:display_name/traces/:id/icon', :controller => 'trace', :action => 'icon', :id => nil
   map.connect '/traces/tag/:tag', :controller => 'trace', :action => 'list', :id => nil
   map.connect '/traces/tag/:tag/page/:page', :controller => 'trace', :action => 'list', :id => nil\r
 
@@ -57,5 +57,6 @@ ActionController::Routing::Routes.draw do |map|
   map.connect '/test/populate/:table/:count', :controller => 'test', :action => 'populate', :from => 1
 
   # fall through
-  map.connect ':controller/:action/:id'
+  map.connect ':controller/:id/:action'
+  map.connect ':controller/:action'
 end