X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ad6bbd511df682a572c140a3212a13d6badf9668..d1cc387080152269cb142d150e06b0a27f8b98be:/app/views/layouts/map.html.erb?ds=sidebyside

diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index 55953f004..d6ac18a66 100644
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -2,28 +2,41 @@
   <%= javascript_include_tag "index" %>
 <% end %>
 
+<% content_for(:body_class) { "map-layout" } %>
+
+<% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %>
+  <% content_for :greeting do %>
+    <%= link_to t("layouts.home"),
+                "#",
+                :id => "homeanchor",
+                :class => "set_position",
+                :data => { :lat => @user.home_lat,
+                           :lon => @user.home_lon,
+                           :zoom => 15 } %>
+  <% end %>
+<% end %>
+
 <% content_for :content do %>
   <div id="sidebar">
-    <%= form_tag url_for(:controller => :geocoder, :action => :search), :id => "search_form" do %>
+    <%= form_tag search_path, :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" %>
-        <%= link_to t('site.search.where_am_i'),
-                    { :controller => :geocoder, :action => :description },
-                    { :id => "describe_location", :title => t('site.search.where_am_i_title') } %>
+                           :placeholder => t('site.search.search') %>
+        <%= link_to t('site.search.where_am_i'), '#', { :id => "describe_location", :title => t('site.search.where_am_i_title') } %>
       </div>
     <% end %>
 
     <div id="sidebar_content">
       <% if STATUS == :database_offline or STATUS == :api_offline %>
-        <p class="alert"><%= t 'layouts.osm_offline' %></p>
+        <p class="error"><%= t 'layouts.osm_offline' %></p>
       <% elsif STATUS == :database_readonly or STATUS == :api_readonly %>
-        <p class="alert"><%= t 'layouts.osm_read_only' %></p>
+        <p class="error"><%= t 'layouts.osm_read_only' %></p>
       <% end %>
 
-      <%= content_for :sidebar %>
+      <%= render :partial => "layouts/flash" %>
+
+      <%= yield %>
     </div>
   </div>
 
@@ -52,3 +65,5 @@
     </table>
   </div>
 <% end %>
+
+<%= render :template => 'layouts/site' %>