X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/4cc2b63d5c38158e6beb114147be723425ec412e..0d52b82d4e2103fd77400c0619266c5321c0c90e:/app/views/layouts/map.html.erb

diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index 09c7d0d8e..a7d00f53f 100644
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -2,25 +2,35 @@
   <%= 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 %>
-      <%= submit_tag t('site.search.submit_text') %>
-      <div id='query_wrapper'>
-        <%= text_field_tag :query, params[:query],
-                           :placeholder => t('site.search.search'),
-                           :autofocus => "autofocus" %>
-      </div>
+    <%= render :partial => "layouts/search" %>
+
+    <% if STATUS == :database_offline or STATUS == :api_offline %>
+      <p class="error"><%= t 'layouts.osm_offline' %></p>
+    <% elsif STATUS == :database_readonly or STATUS == :api_readonly %>
+      <p class="error"><%= t 'layouts.osm_read_only' %></p>
     <% end %>
 
-    <div id="sidebar_content">
-      <% if STATUS == :database_offline or STATUS == :api_offline %>
-        <p class="alert"><%= t 'layouts.osm_offline' %></p>
-      <% elsif STATUS == :database_readonly or STATUS == :api_readonly %>
-        <p class="alert"><%= t 'layouts.osm_read_only' %></p>
-      <% end %>
+    <div id="browse_status"></div>
 
-      <%= content_for :sidebar %>
+    <div id="sidebar_content">
+      <%= render :partial => "layouts/flash" %>
+      <%= yield %>
     </div>
   </div>
 
@@ -49,3 +59,5 @@
     </table>
   </div>
 <% end %>
+
+<%= render :template => 'layouts/site' %>