X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f864203056d2988b46b202f2cc00783378ee140a..f42111e2025edc04fe8440eab10aa6b737754288:/app/views/layouts/site.rhtml diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml index 70752f5e1..d32490729 100644 --- a/app/views/layouts/site.rhtml +++ b/app/views/layouts/site.rhtml @@ -10,92 +10,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 %> - - -
- -
- -
- - - <% 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. + + +

+
    + <% viewclass = '' + editclass = '' + traceclass = '' + viewclass = 'active' if params['controller'] == 'site' and params['action'] == 'index' + editclass = 'active' if params['controller'] == 'site' and params['action'] == 'edit' + traceclass = 'active' if params['controller'] == 'trace' + %> +
  • <%= 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
-
- +
+ + <% 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 %> -
- -
- - - - + +
+ +