Merge remote-tracking branch 'upstream/master' into routing-merge

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

diff --git a/app/views/layouts/_search.html.erb b/app/views/layouts/_search.html.erb
index e1c85f3b7b1dd3b9a412bd2e56ad36da8d30cec9..6e1aa5dc23fbeaee8036b44d1dfd9de371c8121a 100644 (file)
--- a/app/views/layouts/_search.html.erb
+++ b/app/views/layouts/_search.html.erb
@@ -1,25 +1,32 @@
-<%= form_tag search_path, :class => "search_form" do %>
-  <div class='query_options search'>
-    <%= link_to t('site.search.where_am_i'), '#', { :class => "describe_location", :title => t('site.search.where_am_i_title') } %>
-    &middot;
-    <%= link_to t('site.search.get_directions'), '#', { :class => "get_directions", :title => t('site.search.get_directions_title') } %>
-  </div>
-  <div class='query_options routing'>
-    <%= link_to t('site.search.close_directions'), '#', { :class => "close_directions", :title => t('site.search.close_directions_title') } %>
-  </div>
+<div class="search_forms">
+  <form method="GET" action="<%= search_path %>" class="search_form">
+    <div class='query_options'>
+      <%= link_to t('site.search.where_am_i'), '#', { :class => "describe_location", :title => t('site.search.where_am_i_title') } %>
+      &middot;
+      <%= link_to t('site.search.get_directions'), directions_path, { :class => "geolink", :title => t('site.search.get_directions_title') } %>
+    </div>
 
-  <%= submit_tag t('site.search.submit_text') %>
+    <%= submit_tag t('site.search.submit_text') %>
 
-  <div class='query_wrapper search'>
-    <%= text_field_tag "query", params[:query], :placeholder => t("site.search.search"), :autofocus => autofocus %>
-  </div>
+    <div class='query_wrapper'>
+      <%= text_field_tag "query", params[:query], :placeholder => t("site.search.search"), :autofocus => autofocus %>
+    </div>
+  </form>
 
-  <div class='query_wrapper routing'>
-    <%= image_tag "marker-green.png", :class => 'routing_marker', :id => 'marker_from', :draggable => 'true' %>
-    <%= text_field_tag "route_from", params[:from], :placeholder => "From", :onchange=>"OSM.routing.geocode('route_from',event)" %>
-    <%= image_tag "marker-red.png"  , :class => 'routing_marker', :id => 'marker_to'  , :draggable => 'true' %>
-    <%= text_field_tag "route_to"  , params[:to]  , :placeholder => "To"  , :onchange=>"OSM.routing.geocode('route_to'  ,event)" %>
-    <select class='routing_engines' name='routing_engines' onchange="OSM.routing.selectEngine(event)"></select>
-  </div>
+  <form method="GET" action="<%= directions_path %>" class="directions_form">
+    <div class='query_options'>
+      <%= link_to t('site.search.close_directions'), root_path, { :class => "geolink", :title => t('site.search.close_directions_title') } %>
+    </div>
 
-<% end %>
+    <%= submit_tag t('site.search.submit_text') %>
+
+    <div class='query_wrapper'>
+      <%= image_tag "marker-green.png", :class => 'routing_marker', :id => 'marker_from', :draggable => 'true' %>
+      <%= text_field_tag "route_from", params[:from], :placeholder => t('site.search.from') %>
+      <%= image_tag "marker-red.png"  , :class => 'routing_marker', :id => 'marker_to'  , :draggable => 'true' %>
+      <%= text_field_tag "route_to"  , params[:to]  , :placeholder => t('site.search.to') %>
+      <select class='routing_engines' name='routing_engines'></select>
+      <%= image_tag "searching-small.gif", :class => 'spinner', :style => "vertical-align: middle; display: none;" %>
+    </div>
+  </form>
+</div>