X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b92e1b058421a6bf49f65f2d45060cfdf197fd1d..2c0cd2730c369410a677bcd30e6233534e7fc5ad:/app/views/layouts/site.rhtml?ds=sidebyside diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml index a2b912a97..3c84dc47f 100644 --- a/app/views/layouts/site.rhtml +++ b/app/views/layouts/site.rhtml @@ -1,17 +1,14 @@ - <%= javascript_include_tag 'site.js' %> - - <%= stylesheet_link_tag 'site.css' %> + <%= 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] %>
@@ -23,8 +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 %> - <%= 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'}%> | @@ -69,21 +67,21 @@
<% end %> + <% if API_READONLY %> +
+ The OpenStreetMap database is currently in read-only mode while + essential database maintenance work is carried out. +
+ <% end %> +
Help & Wiki
<%= link_to "Users' diaries", {:controller => 'diary_entry', :action => 'list', :display_name => nil} %>
News blog
Shop
+ <%= yield :left_menu %>
- -
-
- Come to the first OpenStreetMap Conference, The State of the Map: 14th-15th July 2007, Manchester, UK. -
-
- - <%= yield :optionals %>