X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2709027882c3f36a1d6a442c2c4b706b54b1edeb..a424b6282f1587eb02f2add29b85958a86fc79c1:/app/views/layouts/site.rhtml diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml index 249db6576..e39c31b69 100644 --- a/app/views/layouts/site.rhtml +++ b/app/views/layouts/site.rhtml @@ -1,101 +1,106 @@ + <%= javascript_include_tag 'main.js' %> - + <%= javascript_include_tag 'tile.js' %> <%= javascript_include_tag 'site.js' %> - OpenStreetMap + OpenStreetMap<%= ' | '+@title if @title %> + <% if params[:controller] == 'site' and params[:action] == 'index' %> +
+ <% end %>
-<% if flash[:notice] %> -
<%= flash[:notice] %>
-<% end %> + <% if flash[:notice] %> +
<%= flash[:notice] %>
+ <% end %> - <%= yield %> + <%= yield %> -
+ - - <% if @user %> - Welcome, <%= @user.display_name %> | - <%= link_to 'logout', {:controller => 'user', :action => 'logout'}, {:id => 'loginanchor'}%> - <% else %> - <%= link_to 'log in', {:controller => 'user', :action => 'login'}, {:id => 'loginanchor'}%> | - <%= link_to 'sign up', {:controller => 'user', :action => 'new'}, {:id => 'registeranchor'} %> - <% end %> - - -
-
- <% 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. -

- <% end %> -
- Help & Wiki
- News blog
- Shop
-
+
- + + <% 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. +

+ <% end %> + +
+ 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. +
+
-
- <%= yield :optionals %> - - - + + + +