Merge remote-tracking branch 'origin/master' into routing

Conflicts:
	app/views/layouts/_search.html.erb

diff --cc app/assets/javascripts/index.js
Simple merge

diff --cc app/assets/stylesheets/common.css.scss
Simple merge

diff --cc app/views/layouts/_search.html.erb
index 839b3dceca6106b270fef6d3ed06be633fc29e84,ed548e21c78c8671918b7f5223a2a21ceb597030..9ac3eae33ab244c2854755714e7104f8922d8a8d
--- 1/app/views/layouts/_search.html.erb
--- 2/app/views/layouts/_search.html.erb
+++ b/app/views/layouts/_search.html.erb
@@@ -1,26 -1,7 +1,28 @@@
- <%= form_tag search_path, :class => "search_form" do %>
+ <form method="GET" action="<%= search_path %>" class="search_form">
++
 +  <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>
 +
    <%= submit_tag t('site.search.submit_text') %>
 -  <div class='query_wrapper'>
 +
 +  <div class='query_wrapper search'>
      <%= text_field_tag "query", params[:query], :placeholder => t("site.search.search"), :autofocus => autofocus %>
 -    <%= link_to t('site.search.where_am_i'), '#', { :class => "describe_location", :title => t('site.search.where_am_i_title') } %>
    </div>
- <% end %>
 +
 +  <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 => t('site.search.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 => t('site.search.to')  , :onchange=>"OSM.routing.geocode('route_to'  ,event)" %>
 +    <select class='routing_engines' name='routing_engines' onchange="OSM.routing.selectEngine(event)"></select>
 +    <%= image_tag "searching-small.gif", :class => 'spinner', :style => "vertical-align: middle; display: none;" %>
 +  </div>
 +
+ </form>

diff --cc config/locales/de.yml
Simple merge

diff --cc config/locales/en.yml
Simple merge