X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6020e0519e20580364374d209420d519181621b2..76df341f66b8ecdcb129d783245c8eabe37e2152:/app/views/layouts/site.rhtml?ds=sidebyside diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml index 4194e14f7..52d51f3f8 100644 --- a/app/views/layouts/site.rhtml +++ b/app/views/layouts/site.rhtml @@ -1,12 +1,11 @@ - + - <%= javascript_include_tag 'main.js' %> - - <%= javascript_include_tag 'tile.js' %> <%= javascript_include_tag 'site.js' %> - - + + <%= stylesheet_link_tag 'site.css' %> + <%= tag("link", { :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Placename Search", :href => "/opensearch/osm.xml" }) %> + <%= tag("link", { :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Postcode Search", :href => "/opensearch/osm-postcode.xml" }) %> OpenStreetMap<%= ' | '+@title if @title %> @@ -14,13 +13,13 @@ <% if params[:controller] == 'site' and params[:action] == 'index' %>

<% end %> +

<% if flash[:notice] %>

<%= flash[:notice] %>

<% end %> <%= yield %> -

@@ -37,12 +36,13 @@

<%= link_to 'View', {:controller => 'site', :action => 'index'}, {:id => 'viewanchor', :title => 'view maps', :class => viewclass } %>

OpenStreetMap

<%= link_to(image_tag("osm_logo.png", :size => "120x120", :border => 0), :controller => 'site', :action => 'index') %>
-

The Free Wiki World Map

+ <% unless @user %>

OpenStreetMap is a free editable map of the whole world. It is made by people like you. @@ -70,18 +71,11 @@

<% end %> -

- Help & Wiki
- <%= link_to "Users' diaries", {:controller => 'diary_entry', :action => 'list'} %>
+

+ Help & Wiki
+ <%= link_to "Users' diaries", {:controller => 'diary_entry', :action => 'list', :display_name => nil} %>
News blog
Shop
-

- - -

-Come to the first OpenStreetMap Conference, The State of the Map: 14th-15th July 2007, Manchester, UK. -

@@ -90,13 +84,13 @@ Come to the first OpenStreetMap Conference, - - - - + + + + -