X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1c4c93b2c3e57f6fdd5d6fe9f64c389afee39a2f..79d3ee46545f1a5b60d40bfe8a803974a97d0a09:/app/views/layouts/site.rhtml?ds=sidebyside diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml index ebdcf8d19..91fcea0ea 100644 --- a/app/views/layouts/site.rhtml +++ b/app/views/layouts/site.rhtml @@ -1,51 +1,58 @@ - + - <%= 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 params[:controller] == 'site' and params[:action] == 'index' %> -
- <% end %>
- <% if flash[:notice] %> -
<%= flash[:notice] %>
+ <% if @notice || flash[:notice] %> +
<%= @notice || flash[:notice] %>
<% end %> <%= yield %> -
- <% if @user %> - 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'}%> + <% 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 %> - <%= link_to 'log in', {:controller => 'user', :action => 'login', :next_controller => @controller.controller_name, :next_action => @controller.action_name}, {:id => 'loginanchor'}%> | + <%= 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 %>
@@ -54,47 +61,66 @@ + <% 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. +

+ 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
-
- + <% if OSM_STATUS == :database_offline or OSM_STATUS == :api_offline %> +
+ The OpenStreetMap database is currently offline while + essential database maintenance work is carried out. +
+ <% elsif OSM_STATUS == :api_readonly %> +
+ The OpenStreetMap database is currently in read-only mode while + essential database maintenance work is carried out. +
+ <% end %> -
-
-Come the the first OpenStreetMap Conference - The State of the Map 14th-15th July, 2007, Manchester, UK. -
+ +
+ Help & Wiki
+ News blog
+ Shop
+ <%= yield :left_menu %> +
<%= yield :optionals %>