Simplify layouting

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

diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index cedfdb9c2bf043daba9692564ecb9b9614db7602..d5666ed09be0f0b258b0546669696897c648fe9f 100644 (file)
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -1,11 +1,17 @@
+<% content_for :head do %>
+  <%= javascript_include_tag "index" %>
+<% end %>
+
 <% content_for :content do %>
   <div id="sidebar">
     <%= form_tag url_for(:controller => :geocoder, :action => :search), :id => "search_form" do %>
       <%= submit_tag t('site.search.submit_text') %>
       <div id='query_wrapper'>
         <%= text_field_tag :query, params[:query],
-                           :placeholder => t('site.search.search'),
-                           :autofocus => "autofocus" %>
+                           :placeholder => t('site.search.search') %>
+        <%= link_to t('site.search.where_am_i'),
+                    { :controller => :geocoder, :action => :description },
+                    { :id => "describe_location", :title => t('site.search.where_am_i_title') } %>
       </div>
     <% end %>
 
@@ -16,7 +22,7 @@
         <p class="alert"><%= t 'layouts.osm_read_only' %></p>
       <% end %>
 
-      <%= content_for :sidebar %>
+      <%= yield %>
     </div>
   </div>
 
@@ -45,3 +51,5 @@
     </table>
   </div>
 <% end %>
+
+<%= render :template => 'layouts/site' %>