X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8758685a86c3032a412183a53399e3e77dae75a1..d640ae3b9309e4f3e90a8a6c5bf56e3ae185dc44:/app/views/layouts/site.rhtml diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml index c2e4c9bfc..b524b4167 100644 --- a/app/views/layouts/site.rhtml +++ b/app/views/layouts/site.rhtml @@ -1,49 +1,63 @@ - + + - <%= 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" }) %> + <%= tag("meta", { :name => "description", :content => "OpenStreetMap is the free wiki world map." }) %> + <%= yield :head %> + 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'}, {:id => 'loginanchor'}%> - <% else %> - <%= link_to 'log in', {:controller => 'user', :action => 'login'}, {:id => 'loginanchor'}%> | - <%= link_to 'sign up', {:controller => 'user', :action => 'new'}, {:id => 'registeranchor'} %> + <% if @user and @user.id %> + <%= t 'layouts.welcome_user', :user_link => (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 t('layouts.inbox', :size => @user.new_messages.size), {:controller => 'message', :action => 'inbox', :display_name => @user.display_name}, {:style => "font-weight: #{@inbox_weight};" } %> | + <%= link_to t('layouts.logout'), {:controller => 'user', :action => 'logout', :referer => request.request_uri}, {:id => 'logoutanchor'}%> + <% else %> + <%= link_to t('layouts.log_in'), {:controller => 'user', :action => 'login', :referer => request.request_uri}, {:id => 'loginanchor'}%> | + <%= link_to t('layouts.sign_up'), {:controller => 'user', :action => 'new'}, {:id => 'registeranchor'} %> <% end %>
@@ -52,42 +66,64 @@ + <% 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. +

+ <%= t 'layouts.intro_1' %> +

+

+ <%= t 'layouts.intro_2' %>. +

+

+ <%= t 'layouts.intro_3', + :ucl => 'UCL VR Centre', + :bytemark => '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 %> +
+ <%= t 'layouts.offline' %>
- <%= yield :optionals %> -