Clean up

[rails.git] / app / views / site / _search.html.erb

diff --git a/app/views/site/_search.html.erb b/app/views/site/_search.html.erb
index 31b5af16f9f3a92aad912dc97b681ac0e32a2f33..c208b3219837fb184713b6c7d659769acaff6d07 100644 (file)
--- a/app/views/site/_search.html.erb
+++ b/app/views/site/_search.html.erb
@@ -1,59 +1,16 @@
-<script type="text/javascript">
-<!--
-  function startSearch() {
-    updateSidebar("<%= t 'site.sidebar.search_results' %>", "");
-  }
-
-  function describeLocation() {
-    var args = getArgs($("viewanchor").href);
-
-    <%= remote_function(:loading => "startSearch()",
-                        :url => { :controller => :geocoder, :action => :description },
-                        :with => "'lat=' + args['lat'] + '&lon=' + args['lon'] + '&zoom=' + args['zoom']") %>
-  }
-
-  function setSearchViewbox() {
-    <% if params[:action] == 'index' %>
-    var extent = getMapExtent();
-
-    $("minlon").value = extent.left;
-    $("minlat").value = extent.bottom;
-    $("maxlon").value = extent.right;
-    $("maxlat").value = extent.top;
-    <% end %>
-  }
-
-  <% if params[:query] %>
-  <%= remote_function(:loading => "startSearch()",
-                      :url => { :controller => :geocoder, :action => :search, :query => h(params[:query]) }) %>
-  <% end %>
-// -->
-</script>
-
-<% content_for "optionals" do %>
+<% content_for :optionals do %>

   <div class="optionalbox">
   <div class="optionalbox">

-    <span class="whereami"><a href="javascript:describeLocation()" title="<%= t 'site.search.where_am_i_title' %>"><%= t 'site.search.where_am_i' %></a></span>
-    <h1><%= t 'site.search.search' %></h1>
-    <div class="search_form">
+    <div class="search_container">

     <div id="search_field">
     <div id="search_field">

-    <% form_remote_tag(:before => "setSearchViewbox()",
-                       :loading => "startSearch()",
-                       :complete => "endSearch()",
-                       :url => { :controller => :geocoder, :action => :search },
-                       :html => { :method => "get", :action => url_for(:action => "index") }) do %>
-      <%= text_field_tag :query, h(params[:query]) %>
-      <% if params[:action] == 'index' %>
-        <%= hidden_field_tag :minlon %>
-        <%= hidden_field_tag :minlat %>
-        <%= hidden_field_tag :maxlon %>
-        <%= hidden_field_tag :maxlat %>
-      <% end %>
+    <%= form_tag url_for(:controller => :geocoder, :action => :search), :id => "search_form" do %>

       <%= submit_tag t('site.search.submit_text') %>
       <%= submit_tag t('site.search.submit_text') %>

+      <%= text_field_tag :query, h(params[:query]), :tabindex => "1", :placeholder => t('site.search.search'), :autofocus => "autofocus" %>

     <% end %>
     </div>
     </div>
     <% end %>
     </div>
     </div>

-    <p class="search_help">
-      <%= t 'site.search.search_help' %>
+    <p class='search_help deemphasize'>
+      <%= raw(t 'site.search.search_help') %>
+      <%= link_to t('site.search.where_am_i'), { :controller => :geocoder, :action => :description }, { :id => "describe_location", :title => t('site.search.where_am_i_title') } %>

     </p>
   </div>
 <% end %>
     </p>
   </div>
 <% end %>