Add a 30 second timeout to all data browser requests to avoid attempts

[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 d1983a9f0ba2e4cb72c62517bfe7406fd5b9b9a1..d4626d143e6e49d2a9a38ce9d6d56f37f8fe0797 100644 (file)
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -18,8 +18,14 @@
    </head>
    <body>
      <div id="content">
-      <% if @notice || flash[:notice] %>
-        <div id="notice"><%= @notice || flash[:notice] %></div>
+      <% if flash[:error] %>
+        <div id="error"><%= flash[:error] %></div>
+      <% end %>
+      <% if flash[:warning] %>
+        <div id="warning"><%= flash[:warning] %></div>
+      <% end %>
+      <% if flash[:notice] %>
+        <div id="notice"><%= flash[:notice] %></div>
        <% end %>
  
        <%= yield %>
@@ -115,7 +121,7 @@
  
        <div id="left_menu" class="left_menu">
          <a href="<%= t 'layouts.help_wiki_url' %>" title="<%= t 'layouts.help_wiki_tooltip' %>"><%= t 'layouts.help_wiki' %></a><br />
-        <a href="http://www.opengeodata.org" title="<%= t 'layouts.news_blog_tooltip' %>"><%= t 'layouts.news_blog' %></a><br />
+        <a href="http://blogs.openstreetmap.org/" title="<%= t 'layouts.news_blog_tooltip' %>"><%= t 'layouts.news_blog' %></a><br />
          <a href="<%= t 'layouts.shop_url' %>" title="<%= t 'layouts.shop_tooltip' %>"><%= t 'layouts.shop' %></a><br />
          <%= yield :left_menu %>
        </div>