X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/fb1467a94487cfdfcb19e4f88e05be7aa88096f0..76df341f66b8ecdcb129d783245c8eabe37e2152:/app/views/layouts/site.rhtml diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml index e8e825153..52d51f3f8 100644 --- a/app/views/layouts/site.rhtml +++ b/app/views/layouts/site.rhtml @@ -1,101 +1,100 @@ + - <%= javascript_include_tag 'main.js' %> - - <%= javascript_include_tag 'tile.js' %> <%= javascript_include_tag 'site.js' %> - - - OpenStreetMap + + <%= 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 %> -

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

<%= @flash[:notice] %>

-<% end %> + <% if params[:controller] == 'site' and params[:action] == 'index' %> +

+ <% end %> - <%= @content_for_layout %> +

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

<%= flash[:notice] %>

+ <% end %> -

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

<%= 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 => 'list'}, {:id => 'traceanchor', :title => 'manage traces' } %>

+ <% 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};" } %> | + <%= link_to 'logout', {:controller => 'user', :action => 'logout', :referer => request.request_uri}, {:id => 'logoutanchor'}%> <% else %> -

View

Edit

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

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

- -

OpenStreetMap

The Free Wiki World Map

- + + +

<%= 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 } %>

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

+ +

OpenStreetMap

+ <%= link_to(image_tag("osm_logo.png", :size => "120x120", :border => 0), :controller => 'site', :action => 'index') %>
+

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', :display_name => nil} %>
+ News blog
+ Shop
+

- - + <%= yield :optionals %> +

+ -

+ - -

- - + +

+ +