Improve page title for diary entries. Closes #2702.

[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 89b33ab05db12288d3ff0344821ee75ccb1d1843..dc621c631d3bca5aab9832ccaa1a33775c2bb645 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 %>
@@ -92,7 +98,8 @@
          <p>
          <%= t 'layouts.intro_3', 
                :ucl => link_to(t('layouts.intro_3_ucl'), "http://www.vr.ucl.ac.uk"), 
-              :bytemark => link_to(t('layouts.intro_3_bytemark'), "http://www.bytemark.co.uk") %>
+              :bytemark => link_to(t('layouts.intro_3_bytemark'), "http://www.bytemark.co.uk"),
+              :partners => link_to(t('layouts.intro_3_partners'), t('layouts.intro_3_partners_url')) %>
          </p>
        </div>
        <% end %>
@@ -115,7 +122,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://blog.openstreetmap.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>