Merge branch 'master' into redesign

[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 a7d00f53fb4e85852e7c63c2ad42071577523225..2170705b00b20c7ff6a0186416172d5b39c18c14 100644 (file)
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -16,6 +16,10 @@
   <% end %>
 <% end %>
 
   <% end %>
 <% end %>
 

+<% content_for :header do %>
+  <%= render :partial => "layouts/search" %>
+<% end %>
+

 <% content_for :content do %>
   <div id="sidebar">
     <%= render :partial => "layouts/search" %>
 <% content_for :content do %>
   <div id="sidebar">
     <%= render :partial => "layouts/search" %>


@@ -28,6 +32,10 @@
 
     <div id="browse_status"></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 id="sidebar_content">
       <%= render :partial => "layouts/flash" %>
       <%= yield %>