X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/2cf15b549e985f090648b449ca660b6d6e264f50..2005709c5a9097f303f3bf8ce9321dcb60e552b3:/app/views/layouts/site.rhtml diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml index 52e7b6b24..34d2ecb30 100644 --- a/app/views/layouts/site.rhtml +++ b/app/views/layouts/site.rhtml @@ -1,5 +1,5 @@ - + <%= javascript_include_tag 'prototype' %> <%= javascript_include_tag 'site' %> @@ -7,12 +7,13 @@ <%= stylesheet_link_tag 'site' %> <%= stylesheet_link_tag 'print', :media => "print" %> <%= tag("link", { :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Search", :href => "/opensearch/osm.xml" }) %> + <%= yield :head %> OpenStreetMap<%= ' | '+ h(@title) if @title %>
- <% if flash[:notice] %> -
<%= flash[:notice] %>
+ <% if @notice || flash[:notice] %> +
<%= @notice || flash[:notice] %>
<% end %> <%= yield %> @@ -68,11 +69,19 @@ <% unless @user %>
- OpenStreetMap is a free editable map of the whole world. It is made by people like you. -

- OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth. -

- OpenStreetMap's hosting is kindly supported by the UCL VR Centre and bytemark. +

+ OpenStreetMap is a free editable map of the whole world. It + is made by people like you. +

+

+ OpenStreetMap allows you to view, edit and use geographical + data in a collaborative way from anywhere on Earth. +

+

+ OpenStreetMap's hosting is kindly supported by the + UCL VR Centre and + bytemark. +

<% end %> @@ -88,6 +97,14 @@
<% end %> + <% if false %> + + <% end %> +
Help & Wiki
News blog
@@ -95,28 +112,17 @@ <%= yield :left_menu %>
-
-
- Come to the second OpenStreetMap Conference, The State of the Map: 12th-13th July 2008, Limerick, Ireland. -
-
- <%= yield :optionals %> - - + +