X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/79d096499cc5f85d36bf40db37b95d3acd45d7b8..8815700a773665fe861c1bdc5543948de1148829:/app/views/layouts/site.rhtml?ds=sidebyside diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml index 5f0e848ac..073b76388 100644 --- a/app/views/layouts/site.rhtml +++ b/app/views/layouts/site.rhtml @@ -1,101 +1,112 @@ + - <%= javascript_include_tag 'main.js' %> - - <%= javascript_include_tag 'tile.js' %> - <%= javascript_include_tag 'site.js' %> - - - OpenStreetMap + <%= javascript_include_tag 'prototype' %> + <%= javascript_include_tag 'site' %> + + <%= stylesheet_link_tag 'site' %> + <%= stylesheet_link_tag 'print', :media => "print" %> + <%= tag("link", { :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Search", :href => "/opensearch/osm.xml" }) %> + OpenStreetMap<%= ' | '+ h(@title) if @title %> -

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

<%= @flash[:notice] %>

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

<%= flash[:notice] %>

+ <% end %> -

+ <%= yield %> + - - <% if @user %> - Welcome, <%= @user.email %> | - <%= link_to 'Logout', {:controller => 'user', :action => 'logout'}, {:id => 'loginanchor'}%> - <% else %> - <%= link_to 'Login', {: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 => 'index'}, {:id => 'traceanchor', :title => 'manage traces' } %>

+ <% if @user and @user.id %> + Welcome, <%= link_to h(@user.display_name), {:controller => 'user', :action => 'view', :display_name => @user.display_name}%> | + <% @inbox_weight = 'bold' if @user.new_messages.size > 0 %> + <%= yield :greeting %> + <%= link_to "inbox (#{@user.new_messages.size})", {: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

GPS 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_remote 'Export', {:url => {:controller => 'export', :action => 'start'}}, {:id => 'exportanchor', :title => 'export map data', :class => exportclass, :href => url_for(:controller => 'site', :action => 'export')} %>
<%= link_to 'GPS Traces', {:controller => 'trace', :action => 'list'}, {:id => 'traceanchor', :title => 'manage traces', :class => traceclass} %>
<%= link_to 'User Diaries', {:controller => 'diary_entry', :action => 'list'}, {:id => 'diaryanchor', :title => 'view user diaries', :class => diaryclass} %>

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

+ <% if API_STATUS == :offline %> +

+ The OpenStreetMap database is currently offline while + essential database maintenance work is carried out. +

+ <% elsif API_STATUS == :readonly %> +

+ The OpenStreetMap database is currently in read-only mode while + essential database maintenance work is carried out. +

+ <% end %> -

- +

+ Help & Wiki
+ News blog
+ Shop
+ <%= yield :left_menu %> +

- + <%= yield :optionals %> +

+ -

+ - -

- - + +

+ +