X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f2bf38606e281290fee8273e247afc54f08a0a47..1b2bfb6e9242d5ec8ff5ab65d44b5761d95d1942:/app/views/layouts/_search.html.erb

diff --git a/app/views/layouts/_search.html.erb b/app/views/layouts/_search.html.erb
index 6e1aa5dc2..02d6406cf 100644
--- a/app/views/layouts/_search.html.erb
+++ b/app/views/layouts/_search.html.erb
@@ -1,32 +1,26 @@
 <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') %>
-
+    <%= link_to image_tag('directions.png', :class => 'button'), directions_path, { :class => "button switch_link", :title => t('site.search.get_directions_title') } %>
+    <%= submit_tag t('site.search.submit_text'), :class => 'float' %>
     <div class='query_wrapper'>
-      <%= text_field_tag "query", params[:query], :placeholder => t("site.search.search"), :autofocus => autofocus %>
+      <%= text_field_tag "query", params[:query], :placeholder => t("site.search.search"), :autofocus => autofocus, :class => 'overflow' %>
+      <%= link_to t('site.search.where_am_i'), '#', { :class => "describe_location", :title => t('site.search.where_am_i_title') } %>
     </div>
   </form>
 
   <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>
-
-    <%= submit_tag t('site.search.submit_text') %>
+    <div style="width:100%; text-align:right; height:30px;"><%= link_to tag('span', { :class => "icon close"}), root_path, { :title => t('site.search.close_directions_title'), :class => "directions_close" } %></div>
 
-    <div class='query_wrapper'>
+    <div class="line">
       <%= 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') %>
+      <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' %>
-      <%= 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;" %>
+      <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 style="width:100%; text-align:right;"><%= submit_tag t('site.search.submit_text') %></div>
+    <div class="loader_copy" style="display:none;"><div class="loader"><%= image_tag "searching.gif", :style => "vertical-align: middle;" %></div></div>
   </form>
 </div>