X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/a42dc9f4826da27b21fa1f66ea6318110afaa0b2..c99992f85f1749e444298989a499eea254c4dae6:/app/views/layouts/site.rhtml diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml index 0ff110ced..8d0559772 100644 --- a/app/views/layouts/site.rhtml +++ b/app/views/layouts/site.rhtml @@ -1,3 +1,4 @@ + <%= javascript_include_tag 'main.js' %> @@ -6,84 +7,98 @@ <%= 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 %> - - <%= @content_for_layout %> - -
- - - <%= link_to 'Login', {:controller => 'user', :action => 'login'}, {:id => 'loginanchor'}%> / - <%= link_to 'Sign up', {:controller => 'user', :action => 'new'}, {:id => 'registeranchor'} %> - - -
- -
- -
- - + <% if flash[:notice] %> +
<%= flash[:notice] %>
+ <% end %> + + <%= yield %> -
- 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. +

+ + <% if @user %> + Welcome, <%= link_to @user.display_name, {:controller => 'user', :action => 'view', :display_name => @user.display_name}%> | + <%= link_to 'logout', {:controller => 'user', :action => 'logout', :referer => request.request_uri}, {:id => 'logoutanchor'}%> + <% else %> + <%= link_to 'log in', {:controller => 'user', :action => 'login', :referer => request.request_uri}, {:id => 'loginanchor'}%> | + <%= link_to 'sign up', {:controller => 'user', :action => 'new'}, {:id => 'registeranchor'} %> + <% 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'} %>
+ News blog
+ Shop
+
-
-
+
+
+Come to the first OpenStreetMap Conference, The State of the Map: 14th-15th July 2007, Manchester, UK. +
+
- + +