X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/da950bbfb43e634abdd512255e1c6440ffa52fa4..e5018d8f08c98d00356a13d4e107f718191c331c:/app/views/layouts/site.rhtml diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml index 601e7b0bd..f3cdc9787 100644 --- a/app/views/layouts/site.rhtml +++ b/app/views/layouts/site.rhtml @@ -1,19 +1,14 @@ - <%= javascript_include_tag 'site.js' %> - - <%= 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" }) %> + <%= javascript_include_tag 'prototype' %> + <%= javascript_include_tag 'site' %> + + <%= stylesheet_link_tag 'site' %> + <%= tag("link", { :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Search", :href => "/opensearch/osm.xml" }) %> OpenStreetMap<%= ' | '+@title if @title %> - - <% if params[:controller] == 'site' and params[:action] == 'index' %> -
- <% end %> -
<% if flash[:notice] %>
<%= flash[:notice] %>
@@ -25,11 +20,9 @@ <% 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 %> - <% if !@user.home_lon.nil? and !@user.home_lat.nil? %> - <%= link_to 'home', {:controller => 'site', :action => 'index', :lon => @user.home_lon, :lat => @user.home_lat, :zoom => '10'} %> | - <% end %> - <%= link_to "inbox (#{@user.get_new_messages.length})", {:controller => 'message', :action => 'inbox', :display_name => @user.display_name}, {:style => "font-weight: #{@inbox_weight};" } %> | + <% @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'}%> | @@ -74,7 +67,12 @@
<% end %> - <% if API_READONLY %> + <% 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. @@ -86,6 +84,7 @@ <%= link_to "Users' diaries", {:controller => 'diary_entry', :action => 'list', :display_name => nil} %>
News blog
Shop
+ <%= yield :left_menu %>
<%= yield :optionals %>