Consolidated list highlight colours to one parameter.

[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 55953f004e510269fb474a34b414c21f6d9caf6b..e72214cbefe86fae1d9e6c816bd99766fec39c3c 100644 (file)
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -2,29 +2,56 @@
   <%= 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 :header do %>
+  <%= render :partial => "layouts/search", :locals => { :autofocus => false } %>
+<% 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" %>
-        <%= link_to t('site.search.where_am_i'),
-                    { :controller => :geocoder, :action => :description },
-                    { :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="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="flash">
+      <%= render :partial => "layouts/flash" %>
+    </div>
 
-      <%= content_for :sidebar %>
+    <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>
@@ -52,3 +79,5 @@
     </table>
   </div>
 <% end %>
+
+<%= render :template => 'layouts/site' %>