X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f864203056d2988b46b202f2cc00783378ee140a..4769eec5aab27cdb0ae6ac1b7bb713da720feb93:/app/views/layouts/site.rhtml?ds=sidebyside diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml index 70752f5e1..f42048b88 100644 --- a/app/views/layouts/site.rhtml +++ b/app/views/layouts/site.rhtml @@ -1,3 +1,4 @@ + <%= javascript_include_tag 'main.js' %> @@ -10,92 +11,84 @@ + <% if params[:controller] == 'site' and params[:action] == 'index' %> +

+ <% end %>

-<% if @flash[:notice] %> -

<%= @flash[:notice] %>

-<% end %> + <% if flash[:notice] %> +

<%= flash[:notice] %>

+ <% end %> - <%= @content_for_layout %> + <%= 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 %> - - -

<% if @user %> -

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

<%= link_to 'Edit', {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => 'edit maps' } %>

<%= link_to 'GPS traces', {:controller => 'trace', :action => 'index'}, {:id => 'traceanchor', :title => 'manage traces' } %>

+ Welcome, <%= link_to @user.display_name, {:controller => 'user', :action => 'view', :display_name => @user.display_name}, {:id => 'loginanchor'}%> | + <%= link_to 'logout', {:controller => 'user', :action => 'logout', :next_controller => @controller.controller_name, :next_action => @controller.action_name}, {:id => 'loginanchor'}%> <% else %> -

View

Edit

GPS traces

+ <%= link_to 'log in', {:controller => 'user', :action => 'login', :next_controller => @controller.controller_name, :next_action => @controller.action_name}, {:id => 'loginanchor'}%> | + <%= link_to 'sign up', {:controller => 'user', :action => 'new'}, {:id => 'registeranchor'} %> <% end %> -

- -

OpenStreetMap

The Free Wiki World Map

- -

- <% 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. + + +

<%= link_to 'View', {:controller => 'site', :action => 'index'}, {:id => 'viewanchor', :title => 'view maps', :class => viewclass } %>
<%= link_to 'Edit', {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => 'edit maps', :class => editclass } %>
<%= link_to 'GPS traces', {:controller => 'trace', :action => 'list'}, {:id => 'traceanchor', :title => 'manage traces', :class => traceclass } %>

- <% end %> - -

- Help & Wiki
- News blog
- Shop
- - +

+ +

OpenStreetMap

The Free Wiki World Map

+ +

+ <% 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
+

+ <%= yield :optionals %> +

+ -

+ - -

- - + +

+ +