X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7d7416894a3a0605c0399e84153a320aabfa48d7..621cb8a1effa92f6a9df1c387d035b22e16c7941:/app/views/layouts/slim.html.erb?ds=sidebyside diff --git a/app/views/layouts/slim.html.erb b/app/views/layouts/slim.html.erb index a97e526b1..72cfcec31 100644 --- a/app/views/layouts/slim.html.erb +++ b/app/views/layouts/slim.html.erb @@ -1,46 +1,25 @@ - - - - - <%= javascript_strings %> - <%= javascript_include_tag 'prototype' %> - <%= javascript_include_tag 'site' %> - <%= javascript_include_tag 'menu' %> - - <%= stylesheet_link_tag 'common' %> - - <%= stylesheet_link_tag 'small', :media => "only screen and (max-width: 481px)" %> - <%= stylesheet_link_tag 'large', :media => "screen and (min-width: 482px)" %> - <%= 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." }) %> - <%= style_rules %> - <%= yield :head %> - <%= t 'layouts.project_name.title' %><%= ' | '+ h(@title) if @title %> - + + + <%= render :partial => "layouts/head" %>
+
+

<%= image_tag("osm_logo.png", :size => "60x60", :border => 0, :alt => t('layouts.logo.alt_text')) %><%= t 'layouts.project_name.h1' %>

+
+
- <% if flash[:error] %> -
<%= flash[:error] %>
- <% end %> - <% if flash[:warning] %> -
<%= flash[:warning] %>
- <% end %> - <% if flash[:notice] %> -
<%= flash[:notice] %>
+ <%= render :partial => "layouts/flash", :locals => { :flash => flash } %> + + <% if content_for? :heading %> +
+ <%= yield :heading %> +
<% end %> <%= yield %>
- -
-

<%= image_tag("osm_logo.png", :size => "60x60", :border => 0, :alt => t('layouts.logo.alt_text')) %><%= t 'layouts.project_name.h1' %>

-
- -