Merge branch 'master' into openstreetbugs

[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 0fea3793fa689c607804996d4e8e81e19b19f983..f487e8f4a2d2a407bb7d7c285bfa1400c7017aca 100644 (file)
--- a/app/views/site/_search.html.erb
+++ b/app/views/site/_search.html.erb
@@ -32,8 +32,8 @@
 
 <% 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()" title="<%= t 'site.search.where_am_i_title' %>"><%= 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">
     <% form_remote_tag(:before => "setSearchViewbox()",
     <div class="search_form">
     <div id="search_field">
     <% form_remote_tag(:before => "setSearchViewbox()",


@@ -41,7 +41,7 @@
                        :complete => "endSearch()",
                        :url => { :controller => :geocoder, :action => :search },
                        :html => { :method => "get", :action => url_for(:action => "index") }) do %>
                        :complete => "endSearch()",
                        :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]), :tabindex => "1" %>

       <% if params[:action] == 'index' %>
         <%= hidden_field_tag :minlon %>
         <%= hidden_field_tag :minlat %>
       <% if params[:action] == 'index' %>
         <%= hidden_field_tag :minlon %>
         <%= hidden_field_tag :minlat %>