Toggle between Link / Short Link / HTML

[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 3391a102bb6f8a8231bae7e0d24bdb989c8c03ad..52adf66e1817e31df290976d10bb5f4883da5d21 100644 (file)
--- a/app/views/site/_search.html.erb
+++ b/app/views/site/_search.html.erb
@@ -1,7 +1,7 @@
 <script type="text/javascript">
 <!--
   function describeLocation() {
-    var args = getArgs($("#viewanchor").attr("href"));
+    var args = querystring.parse($("#viewanchor").attr("href").split('?')[1]);
 
     $("#sidebar_title").html("<%= t 'site.sidebar.search_results' %>");
     $("#sidebar_content").load("<%= url_for :controller => :geocoder, :action => :description %>", {
@@ -10,51 +10,22 @@
       zoom: args["zoom"]
     }, openSidebar);
   }
-
-  function doSearch(query) {
-    $("#sidebar_title").html("<%= t 'site.sidebar.search_results' %>");
-
-    <% if params[:action] == 'index' -%>
-    var extent = getMapExtent();
-
-    $("#sidebar_content").load("<%= url_for :controller => :geocoder, :action => :search %>", {
-      query: $("#query").val(),
-      minlon: extent.left,
-      minlat: extent.bottom,
-      maxlon: extent.right,
-      maxlat: extent.top
-    }, openSidebar);
-    <% else -%>
-    $("#sidebar_content").load("<%= url_for :controller => :geocoder, :action => :search %>", {
-      query: $("#query").val()
-    }, openSidebar);
-    <% end -%>
-  }
-
-  $(document).ready(function () {
-    $("#search_form").submit(function (event) {
-      doSearch($("#query").val());
-
-      return false;
-    });
-  });
 // -->
 </script>
 
 <% content_for :optionals do %>
   <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_container">
     <div id="search_field">
-    <%= form_tag "#", :id => "search_form" do %>
-      <%= text_field_tag :query, h(params[:query]), :tabindex => "1" %>
+    <%= form_tag url_for(:controller => :geocoder, :action => :search), :id => "search_form" do %>
       <%= 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>
-    <p class="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 %>