Restore prohibition on low-zoom notes

[rails.git] / app / views / layouts / slim.html.erb
diff --git a/app/views/layouts/slim.html.erb b/app/views/layouts/slim.html.erb

index ba02104f4056fc113e53850942f842df9f6068aa..72cfcec317be9448ae96fb9068de83f5833bd0a3 100644 (file)
--- a/app/views/layouts/slim.html.erb
+++ b/app/views/layouts/slim.html.erb
@@ -1,17 +1,23 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html>
  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= I18n.locale %>" lang="<%= I18n.locale %>" dir="<%= dir %>">
    <%= render :partial => "layouts/head" %>
    <body class="slim">
      <div id="slim_container">
        <div id="slim_container_content">
  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= I18n.locale %>" lang="<%= I18n.locale %>" dir="<%= dir %>">
    <%= render :partial => "layouts/head" %>
    <body class="slim">
      <div id="slim_container">
        <div id="slim_container_content">
+        <div id="slim_header">
+          <h1><%= image_tag("osm_logo.png", :size => "60x60", :border => 0, :alt => t('layouts.logo.alt_text')) %><%= t 'layouts.project_name.h1' %></h1>
+        </div>
+
          <div id="slim_content">
            <%= render :partial => "layouts/flash", :locals => { :flash => flash } %>
  
          <div id="slim_content">
            <%= render :partial => "layouts/flash", :locals => { :flash => flash } %>
  
-          <%= yield %>
-        </div>
+          <% if content_for? :heading %>
+          <div class="content-heading">
+            <%= yield :heading %>
+          </div>
+          <% end %>
  
  
-        <div id="slim_header">
-          <h1><%= image_tag("osm_logo.png", :size => "60x60", :border => 0, :alt => t('layouts.logo.alt_text')) %><%= t 'layouts.project_name.h1' %></h1>
+          <%= yield %>
          </div>
        </div>
      </div>
          </div>
        </div>
      </div>