Rework the login page to make it a bit cleaner

[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 12b8bccc558e5d10b07e7c56f594cd7f81b32c5e..31b5af16f9f3a92aad912dc97b681ac0e32a2f33 100644 (file)
--- a/app/views/site/_search.html.erb
+++ b/app/views/site/_search.html.erb
@@ -5,11 +5,22 @@
   }
 
   function describeLocation() {
   }
 
   function describeLocation() {

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

 
     <%= remote_function(:loading => "startSearch()",
                         :url => { :controller => :geocoder, :action => :description },
 
     <%= remote_function(:loading => "startSearch()",
                         :url => { :controller => :geocoder, :action => :description },

-                        :with => "'lat=' + position.lat + '&lon=' + position.lon") %>
+                        :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] %>
   }
 
   <% if params[:query] %>


@@ -21,14 +32,22 @@
 
 <% content_for "optionals" do %>
   <div class="optionalbox">
 
 <% content_for "optionals" do %>
   <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>
+    <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 id="search_field">
     <div class="search_form">
     <div id="search_field">

-    <% form_remote_tag(:loading => "startSearch()",
+    <% form_remote_tag(:before => "setSearchViewbox()",
+                       :loading => "startSearch()",

                        :complete => "endSearch()",
                        :complete => "endSearch()",

-                       :url => { :controller => :geocoder, :action => :search }) do %>
+                       :url => { :controller => :geocoder, :action => :search },
+                       :html => { :method => "get", :action => url_for(:action => "index") }) do %>

       <%= text_field_tag :query, h(params[:query]) %>
       <%= 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 %>

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