Make sure we don't inherit old tags when parsing XML for objects

[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 9927782ca66f49c825aaaa2a8f13a5023e066332..f43d3b3950bda3276898b671a9a57da5c2dbb797 100644 (file)
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -1,7 +1,7 @@
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= I18n.locale %>" lang="<%= I18n.locale %>" dir="<%= t'html.dir' %>">
    <%= render :partial => "layouts/head" %>
-  <body>
+  <body class="<%= params[:controller] %>">
      <div id="small-title">
        <%= link_to(image_tag("osm_logo.png", :size => "16x16", :border => 0, :alt => t('layouts.logo.alt_text')), :controller => 'site', :action => 'index') %>
        <h1><%= t 'layouts.project_name.h1' %></h1>
@@ -64,11 +64,9 @@
  
      <div id="left">
        <div id="logo">
-        <center>
-          <h1><%= t 'layouts.project_name.h1' %></h1>
-          <%= link_to(image_tag("osm_logo.png", :size => "120x120", :border => 0, :alt => t('layouts.logo.alt_text')), :controller => 'site', :action => 'index') %><br/>
-          <h2 class="nowrap"><%= t('layouts.tag_line') %></h2>
-        </center>
+        <%= link_to(image_tag("osm_logo.png", :size => "120x120", :border => 0, :alt => t('layouts.logo.alt_text')), :controller => 'site', :action => 'index') %><br/>
+        <h1><%= t 'layouts.project_name.h1' %></h1>
+        <h2 class="nowrap"><%= t('layouts.tag_line') %></h2>
        </div>
  
        <%= yield :optionals %>
@@ -103,7 +101,7 @@
  
        <% if false %>
        <div id="donate" class="notice">
-        <%= t 'layouts.donate', :link => "<a href=\"http://donate.openstreetmap.org/\">#{t('layouts.donate_link_text')}</a>" %>
+        <%= raw t 'layouts.donate', :link => "<a href=\"http://donate.openstreetmap.org/\">#{t('layouts.donate_link_text')}</a>" %>
        </div>
        <% end %>
  
@@ -126,12 +124,10 @@
      </div>
  
      <script type="text/javascript">
-    document.observe("dom:loaded", function () {
-      var auth_token = $$("meta[name=csrf-token]")[0].content;
+    $(document).ready(function () {
+      var auth_token = $("meta[name=csrf-token]").attr("content");
  
-      $$("form input[name=authenticity_token]").each(function (input) {
-        input.value = auth_token;
-      });
+      $("form input[name=authenticity_token]").val(auth_token);
      });
      </script>