diff options
author | Louise Crow <louise.crow@gmail.com> | 2012-11-05 15:37:33 +0000 |
---|---|---|
committer | Louise Crow <louise.crow@gmail.com> | 2012-11-05 15:37:33 +0000 |
commit | a5a2d9d5c12ae06071c5fa6bdc9018e80e866f9f (patch) | |
tree | d0ccffbffd7521130c888fe90ecc80e3498b8c91 | |
parent | fecc3f1e60d46f703421624da576da5ad36cf419 (diff) | |
parent | 09fb1273801f449c9428b0d5d82e2189dd53a15e (diff) |
Merge branch 'feature/fix-search-page' into develop
-rw-r--r-- | app/views/general/_frontpage_search_box.rhtml | 8 | ||||
-rw-r--r-- | app/views/layouts/default.rhtml | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/app/views/general/_frontpage_search_box.rhtml b/app/views/general/_frontpage_search_box.rhtml index 14ba2c8be..6e45364d2 100644 --- a/app/views/general/_frontpage_search_box.rhtml +++ b/app/views/general/_frontpage_search_box.rhtml @@ -4,9 +4,9 @@ <strong>{{number_of_authorities}} authorities</strong>", :number_of_requests => InfoRequest.visible.count, :number_of_authorities => PublicBody.visible.count) %> </h2> -<% form_tag({:action => "search_redirect"}, {:id => "search_form"}) do %> +<form id="navigation_search_form" method="post" action="/search"> <div> - <%= text_field_tag 'query', params[:query], { :size => 30 } %> - <%= submit_tag _('Search') %> + <input id="query" type="text" size="30" name="query"> + <input type="submit" value="<%= _('Search') %>"> </div> -<% end %> +</form> diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml index 3dd5a2749..76bdbd2dd 100644 --- a/app/views/layouts/default.rhtml +++ b/app/views/layouts/default.rhtml @@ -100,12 +100,12 @@ <% end %> <div id="navigation_search"> - <% form_tag({:controller => "general", :action => "search_redirect"}, {:id => "navigation_search_form"}) do %> - <p> - <%= text_field_tag 'query', params[:query], { :size => 40, :id => "navigation_search_query" } %> - <%= submit_tag 'search', :id => "navigation_search_button" %> - </p> - <% end %> + <form id="navigation_search_form" method="post" action="/search"> + <p> + <%= text_field_tag 'query', params[:query], { :size => 40, :id => "navigation_search_query" } %> + <input id="navigation_search_button" type="submit" value="search"> + </p> + </form> </div> <%= render :partial => 'general/orglink' %> |