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

diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index 1daae059e..a51daf753 100644
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -16,16 +16,13 @@
   <% 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>
-    <% end %>
+    <%= render :partial => "layouts/search", :locals => { :autofocus => true } %>
 
     <% if STATUS == :database_offline or STATUS == :api_offline %>
       <p class="error"><%= t 'layouts.osm_offline' %></p>
@@ -33,12 +30,42 @@
       <p class="error"><%= t 'layouts.osm_read_only' %></p>
     <% end %>
 
+    <div id="donate">
+      <a href="http://donate.openstreetmap.org/server2015/"><div class="sprite logo"></div></a>
+      <h2>
+        <a><span class="icon close"></span></a>
+        <a href="http://donate.openstreetmap.org/server2015/"><%= t 'layouts.donate_done_header' %></a>
+      </h2>
+      <p><a href="http://donate.openstreetmap.org/server2015/">
+        <%= t 'layouts.donate_done_line_1' %>
+      </a></p>
+      <p><a href="http://donate.openstreetmap.org/server2015/">
+        <%= t 'layouts.donate_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">
-      <%= render :partial => "layouts/flash" %>
       <%= 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>
@@ -55,7 +82,7 @@
   </div>
 
   <div id="attribution">
-    <table width="100%">
+    <table>
       <tr>
         <td class="attribution_license"><%= t 'site.index.license.license_url' %></td>
         <td class="attribution_project"><%= t 'site.index.license.project_url' %></td>