X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ecbe27b373bbe241af332d51a663192fd71a2520..1f7bd08f4a8a6a626a0c1d7ed60f2dcd6a6801e8:/app/views/layouts/map.html.erb

diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index 8be2aff81..471557053 100644
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -4,28 +4,69 @@
 
 <% 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 :header do %>
+  <%= render :partial => "layouts/search", :locals => { :autofocus => false } %>
+<% end %>
+
 <% content_for :content do %>
   <div id="sidebar">
-    <%= 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') %>
-        <%= link_to t('site.search.where_am_i'), '#', { :id => "describe_location", :title => t('site.search.where_am_i_title') } %>
-      </div>
+    <%= render :partial => "layouts/search", :locals => { :autofocus => true } %>
+
+    <% 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="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="sotm">
+      <a href="http://www.stateofthemap.org/?l=en"><%= image_tag "sotm.png" %></a>
+      <h2>
+        <a><span class="icon close"></span></a>
+        <a href="http://www.stateofthemap.org/?l=en"><%= t 'layouts.sotm_header' %></a>
+      </h2>
+      <p><a href="http://www.stateofthemap.org/?l=en">
+        <%= t 'layouts.sotm_line_1' %>
+      <br />
+        <%= t 'layouts.sotm_line_2' %>
+      <br />
+        <%= t 'layouts.sotm_line_3' %>
+      </a></p>
+    </div>
 
+    <div id="flash">
       <%= render :partial => "layouts/flash" %>
+    </div>
+
+    <div id="browse_status"></div>
+
+    <div id="sidebar_loader" style="display: none;">
+      <img alt="<%= t('browse.start_rjs.loading') %>" class="loader" src="<%= image_path("searching.gif") %>">
+    </div>
 
+    <div id="sidebar_content">
       <%= yield %>
     </div>
+
+    <% unless @user %>
+      <div class="welcome">
+        <h2><a><span class="icon close"></span></a><%= t 'layouts.intro_header' %></h2>
+        <p><%= t 'layouts.intro_text' %></p>
+        <a class="button learn-more" href="<%= about_path %>"><%= t('layouts.learn_more') %></a>
+        <a class="button sign-up" href="<%= user_new_path %>"><%= t('layouts.start_mapping') %></a>
+      </div>
+    <% end %>
   </div>
 
   <noscript>