cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Show the header block on slim layout pages

Browse source
This commit is contained in:
Tom Hughes 2013-01-30 18:17:04 +00:00
parent c4e879c884
commit 773f145edc
2 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/assets/stylesheets/common.css.scss
View file

@ -802,12 +802,16 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
#slim_content { #slim_content {
margin: 10px; margin: 10px;
margin-top: 90px; margin-top: 95px;
max-width: 50em; max-width: 50em;
.content-heading {
margin-bottom: 15px;
}
} }
#slim_header { #slim_header {
margin: 10px; margin: 30px 10px;
position: absolute; position: absolute;
top: 0px; top: 0px;
margin-right: 5px; margin-right: 5px;

16
app/views/layouts/slim.html.erb
View file

@ -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 %>"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= I18n.locale %>" lang="<%= I18n.locale %>" dir="<%= dir %>">
<%= render :partial => "layouts/head" %> <%= render :partial => "layouts/head" %>
<body class="slim"> <body class="slim">
<div id="slim_container"> <div id="slim_container">
<div id="slim_container_content"> <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"> <div id="slim_content">
<%= render :partial => "layouts/flash", :locals => { :flash => flash } %> <%= render :partial => "layouts/flash", :locals => { :flash => flash } %>
<%= yield %> <% if content_for? :heading %>
</div> <div class="content-heading">
<%= yield :heading %>
</div>
<% end %>
<div id="slim_header"> <%= yield %>
<h1><%= image_tag("osm_logo.png", :size => "60x60", :border => 0, :alt => t('layouts.logo.alt_text')) %><%= t 'layouts.project_name.h1' %></h1>
</div> </div>
</div> </div>
</div> </div>