Remove calls to map.setCenter

[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 d6c1e38fa08b24e8449be7c3292e4ae890c3e91a..bcab7e4047b7eed6073886aaf0644585478cb435 100644 (file)
--- a/app/views/site/_search.html.erb
+++ b/app/views/site/_search.html.erb
@@ -1,51 +1,31 @@
 <script type="text/javascript">
 <!--
 <script type="text/javascript">
 <!--

-  function startSearch() {
-    updateSidebar("<%= t 'site.sidebar.search_results' %>", "<p class='search_results_entry'><%= t 'site.search.searching' %><\/p>");
-
-    $("search_field").style.display = "none";
-    $("search_active").style.display = "inline";
-  }
-
-  function endSearch() {
-    $("search_field").style.display = "inline";
-    $("search_active").style.display = "none";
-  }
-

   function describeLocation() {
   function describeLocation() {

-    var position = getPosition();
+    var args = getArgs($("#viewanchor").attr("href"));

 
 

-    <%= remote_function(:loading => "startSearch()",
-                        :complete => "endSearch()",
-                        :url => { :controller => :geocoder, :action => :description },
-                        :with => "'lat=' + position.lat + '&lon=' + position.lon") %>
+    $("#sidebar_title").html("<%= t 'site.sidebar.search_results' %>");
+    $("#sidebar_content").load("<%= url_for :controller => :geocoder, :action => :description %>", {
+      lat: args["lat"],
+      lon: args["lon"],
+      zoom: args["zoom"]
+    }, openSidebar);

   }
   }

-
-  <% if params[:query] %>
-  <%= remote_function(:loading => "startSearch()",
-                      :complete => "endSearch()",
-                      :url => { :controller => :geocoder, :action => :search, :query => h(params[:query]) }) %>
-  <% end %>

 // -->
 </script>
 
 // -->
 </script>
 

-<% content_for "optionals" do %>
+<% content_for :optionals do %>

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

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

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

-    <% form_remote_tag(:loading => "startSearch()",
-                       :complete => "endSearch()",
-                       :url => { :controller => :geocoder, :action => :search }) do %>
-      <%= text_field_tag :query, h(params[:query]) %>
+    <%= 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') %>

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

-    <p id="search_active"><%= t 'site.search.searching' %></p>

     </div>
     </div>

-    <p class="search_help">
-      <%= t 'site.search.search_help' %>
+    <p class='search_help deemphasize'>
+      <%= raw(t 'site.search.search_help') %>
+      <span class="whereami"><a href="javascript:describeLocation()" title="<%= t 'site.search.where_am_i_title' %>"><%= t 'site.search.where_am_i' %></a></span>

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