Use correct key for z15 and greater.

[rails.git] / app / views / layouts / site.rhtml
diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml

index aededb662a6dc64bb3a6882e0a3d4900995ba89d..d1d3bba7931878a22644057f5cb9ba8aeb0d25e1 100644 (file)
--- a/app/views/layouts/site.rhtml
+++ b/app/views/layouts/site.rhtml
@@ -1,5 +1,5 @@
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
    <head>
      <%= javascript_include_tag 'prototype' %>
      <%= javascript_include_tag 'site' %>
@@ -7,6 +7,7 @@
      <%= stylesheet_link_tag 'site' %>
      <%= stylesheet_link_tag 'print', :media => "print" %>
      <%= tag("link", { :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Search", :href => "/opensearch/osm.xml" }) %>
+    <%= yield :head %>
      <title>OpenStreetMap<%= ' | '+ h(@title) if @title %></title>
    </head>
    <body>
@@ -97,7 +98,7 @@
        <% end %>
  
        <% if false %>
-      <div id="donate">
+      <div id="donate" class="notice">
          Support OpenStreetMap by
          <a href="http://donate.openstreetmap.org/">donating</a>
          to the Hardware Upgrade Fund.
@@ -111,16 +112,23 @@
          <%= yield :left_menu %>
        </div>
  
-      <%= yield :optionals %>
-
-      <div class="button" style="width: 115px">
-        <a href="http://donate.openstreetmap.org/"><img src="images/donate.png" border="0" alt="Make a Donation" /></a>
+      <div id="sotm" class="notice">
+        Come to the 2009 OpenStreetMap
+        Conference, <a href="http://www.stateofthemap.org">The State
+        of the Map</a>, July 10-12 in Amsterdam!
        </div>
  
-      <div id="cclogo" class="button" style="width: 88px">
-        <a href="http://creativecommons.org/licenses/by-sa/2.0/"><img src="/images/cc_button.png" border="0" alt="" /></a>
-      </div>
+      <%= yield :optionals %>
+
+      <center>
+        <div class="button" style="width: 115px">
+          <a href="http://donate.openstreetmap.org/"><img src="/images/donate.png" border="0" alt="Make a Donation" /></a>
+        </div>
  
+        <div id="cclogo" class="button" style="width: 88px">
+          <a href="http://creativecommons.org/licenses/by-sa/2.0/"><img src="/images/cc_button.png" border="0" alt="" /></a>
+        </div>
+      </center>
      </div>
    </body>
  </html>