Rename showData to updateData in start.js.erb to resolve name clash

[rails.git] / app / views / layouts / site.html.erb

diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index 33e95f6a2ff3d6b82bf456db13b5e8721042c1ef..8b2299c179712261384c7e860b097bed32c86bb9 100644 (file)
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -51,6 +51,9 @@
         <% Editors::ALL_EDITORS.each do |editor| %>
           <li><%= link_to t('layouts.edit_with', :editor => t("editor.#{editor}.description")), {:controller => 'site', :action => 'edit', :editor => editor}, {:id => editor + 'anchor', :class => "geolink llz object"} %></li>
         <% end %>
+        <% unless STATUS == :api_offline or STATUS == :database_offline %>
+          <li><%= link_to_function(t('browse.start_rjs.data_layer_name'), 'showData()') %></li>
+        <% end %>
       </ul>
     </div>
 
@@ -86,21 +89,25 @@
       <% end %>
 
       <% if STATUS == :database_offline or STATUS == :api_offline %>
-      <div id="alert">
-        <%= t 'layouts.osm_offline' %>
+      <div class="sidebar-alert">
+        <p><%= t 'layouts.osm_offline' %></p>
       </div>
       <% elsif STATUS == :database_readonly or STATUS == :api_readonly %>
-      <div id="alert">
-        <%= t 'layouts.osm_read_only' %>
+      <div id="sidebar-alert">
+        <p><%= t 'layouts.osm_read_only' %></p>
       </div>
       <% end %>
 
       <% if false %>
-      <div id="donate" class="notice">
-        <%= raw t 'layouts.donate', :link => "<a href=\"http://donate.openstreetmap.org/\">#{t('layouts.donate_link_text')}</a>" %>
+      <div class="sidebar-notice">
+        <p><%= raw t 'layouts.donate', :link => "<a href=\"http://donate.openstreetmap.org/\">#{t('layouts.donate_link_text')}</a>" %></p>
       </div>
       <% end %>
 
+      <div class="sidebar-notice">
+        Scheduled service notice: OpenStreetMap database will be in read-only mode from April 1st to April 4th <a href='http://blog.osmfoundation.org/2012/03/27/service-schedule-march-april-2012/comment-page-1/'>[more]</a>
+      </div>
+
       <div id="left_menu" class="left_menu">
         <ul>
           <%= yield :left_menu %>