From: Andy Allan Date: Thu, 27 Jan 2011 14:53:39 +0000 (+0000) Subject: Try a different approach - grab the layout and stylesheet from slim1, and ditch the... X-Git-Tag: live~6234^2~91 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/873fe81f711338cbe25da1888192091b7a2cc497?ds=sidebyside Try a different approach - grab the layout and stylesheet from slim1, and ditch the rest --- diff --git a/app/views/layouts/slim.html.erb b/app/views/layouts/slim.html.erb new file mode 100644 index 000000000..e738f4c92 --- /dev/null +++ b/app/views/layouts/slim.html.erb @@ -0,0 +1,44 @@ + + + + + <%= 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 %> + + + +
+ <% if flash[:error] %> +
<%= flash[:error] %>
+ <% end %> + <% if flash[:warning] %> +
<%= flash[:warning] %>
+ <% end %> + <% if flash[:notice] %> +
<%= flash[:notice] %>
+ <% end %> + + <%= yield %> +
+ +
+

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

+
+ + + + + diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css index 4dd97a68c..c3f1c274e 100644 --- a/public/stylesheets/common.css +++ b/public/stylesheets/common.css @@ -547,6 +547,24 @@ hr { text-align: left; } +#slim_content { + margin: 10px; + position: absolute; + top: 90px; + max-width: 50em; +} + +#slim_header { + margin: 10px; + background: url('../images/tab_bottom.gif') repeat-x bottom; +} + +#slim_header img { + vertical-align: middle; + margin-right: 5px; + margin-bottom: 5px; +} + /* Rules for the changeset list shown by the history tab etc */ #changeset_list, #keyvalue {