Merged 14009:14059 from trunk.

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

index aededb662a6dc64bb3a6882e0a3d4900995ba89d..cc8f7192d6953c06be92ae39af19114badfdca1a 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,8 @@
      <%= 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" }) %>
+    <%= tag("meta", { :name => "description", :content => "OpenStreetMap is the free wiki world map." }) %>
+    <%= yield :head %>
      <title>OpenStreetMap<%= ' | '+ h(@title) if @title %></title>
    </head>
    <body>
@@ -113,14 +115,15 @@
  
        <%= 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>
-
-      <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 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">
+          <%= link_to image_tag("cc_button.png", :alt => "CC by-sa 2.0", :border => "0"), "http://creativecommons.org/licenses/by-sa/2.0/" %>
+        </div>
+      </center>
      </div>
    </body>
  </html>