Merge remote-tracking branch 'openstreetmap/pull/954'

[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 fb4f79eb66e8a039fdd75fb5857f3f47b08f9ed6..8665ba02f1b13a2fdfab970cae733e8afd4fa848 100644 (file)
--- a/app/views/layouts/_search.html.erb
+++ b/app/views/layouts/_search.html.erb
@@ -9,18 +9,21 @@
   </form>
 
   <form method="GET" action="<%= directions_path %>" class="directions_form">
   </form>
 
   <form method="GET" action="<%= directions_path %>" class="directions_form">

-    <div width="100%" align="right" style="height:30px"><%= link_to tag('span', { :class => "icon close"}), root_path, { :title => t('site.search.close_directions_title') } %></div>
+    <div class="header"><span class="icon close"></span></div>

 
     <div class="line">
 
     <div class="line">

-      <%= image_tag "marker-green.png", :class => 'routing_marker', :id => 'marker_from', :draggable => 'true' %>
+      <%= image_tag "marker-green.png", :class => "routing_marker", :data => { :type =>  "from" }, :draggable => "true" %>

       <span class="force_width"><%= text_field_tag "route_from", params[:from], :placeholder => t('site.search.from') %></span>
     </div>
     <div class="line">
       <span class="force_width"><%= text_field_tag "route_from", params[:from], :placeholder => t('site.search.from') %></span>
     </div>
     <div class="line">

-      <%= image_tag "marker-red.png"  , :class => 'routing_marker', :id => 'marker_to'  , :draggable => 'true' %>
+      <%= image_tag "marker-red.png", :class => "routing_marker", :data => { :type => "to" }, :draggable => "true" %>

       <span class="force_width"><%= text_field_tag "route_to"  , params[:to]  , :placeholder => t('site.search.to') %></span>
     </div>
       <span class="force_width"><%= text_field_tag "route_to"  , params[:to]  , :placeholder => t('site.search.to') %></span>
     </div>

-    <select class='routing_engines' name='routing_engines'></select>
-    <div width="100%" align="right"><%= submit_tag t('site.search.submit_text') %></div>
-    <%= image_tag "searching-small.gif", :class => 'spinner', :style => "vertical-align: middle; display: none;" %>
+    <div class="line">
+      <select class="routing_engines" name="routing_engines"></select>
+      <%= submit_tag t('site.search.submit_text'), :class => "routing_go" %>
+    </div>
+
+    <div class="loader_copy"><div class="loader"><%= image_tag "searching.gif" %></div></div>

   </form>
 </div>
   </form>
 </div>