X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e6af088dda8e85f53b11ffbaddb11edf08e4a046..4d1633585feddb414a967f0df83be5c63cc0ffad:/app/views/layouts/site.rhtml?ds=sidebyside diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml index 54b7af10c..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,17 +13,17 @@ <% if params[:controller] == 'site' and params[:action] == 'index' %>
<% end %> +
<% if flash[:notice] %>
<%= flash[:notice] %>
<% end %> <%= yield %> -
- <% if @user %> + <% if @user and @user.id %> Welcome, <%= link_to @user.display_name, {:controller => 'user', :action => 'view', :display_name => @user.display_name}%> | <% @inbox_weight = 'bold' if @user.get_new_messages.length > 0 %> <%= link_to "inbox (#{@user.get_new_messages.length})", {:controller => 'message', :action => 'inbox', :display_name => @user.display_name}, {:style => "font-weight: #{@inbox_weight};" } %> | @@ -37,12 +36,13 @@
+ <% 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, - - - - + + + + - +