X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9ec1b1bea5fc3aff0b159518f75375f878e24410..63c2d9a5292e6b19a02bce9fdf80f93dea8a8347:/app/views/layouts/site.rhtml?ds=sidebyside diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml index e39c31b69..7aa2db7b9 100644 --- a/app/views/layouts/site.rhtml +++ b/app/views/layouts/site.rhtml @@ -1,33 +1,29 @@ - + - <%= javascript_include_tag 'main.js' %> - - <%= javascript_include_tag 'tile.js' %> - <%= javascript_include_tag 'site.js' %> - - - OpenStreetMap<%= ' | '+@title if @title %> + <%= 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 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};" } %> | + 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', :referer => request.request_uri}, {:id => 'loginanchor'}%> | @@ -37,17 +33,26 @@
@@ -57,9 +62,10 @@

OpenStreetMap

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

The Free Wiki World Map

 +

The Free Wiki World Map

+ <% unless @user %>
OpenStreetMap is a free editable map of the whole world. It is made by people like you. @@ -70,33 +76,37 @@
<% end %> -
- Help & Wiki
- <%= link_to "Users' diaries", {:controller => 'diary_entry', :action => 'list', :display_name => nil} %>
+ <% 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 to the first OpenStreetMap Conference, The State of the Map: 14th-15th July 2007, Manchester, UK. -
+ <%= yield :left_menu %>
- <%= yield :optionals %>