X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9db4f4e13c3a329dd9736c3d8db18c893f064ea2..231bdf66cdc8239c37e1536be4fb52ce275219e3:/app/views/layouts/site.rhtml diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml index 9290ea892..cc8f7192d 100644 --- a/app/views/layouts/site.rhtml +++ b/app/views/layouts/site.rhtml @@ -1,51 +1,60 @@ - - + + - <%= 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" }) %> + <%= 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', :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 %>

<%= link_to 'View', {:controller => 'site', :action => 'index'}, {:id => 'viewanchor', :title => 'view maps', :class => viewclass } %>
<%= link_to 'Edit', {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => 'edit maps', :class => editclass } %>
<%= link_to 'GPS traces', {:controller => 'trace', :action => 'list'}, {:id => 'traceanchor', :title => 'manage traces', :class => traceclass } %>
<%= link_to 'View', {:controller => 'site', :action => 'index'}, {:id => 'viewanchor', :title => 'view maps', :class => viewclass} %>
<%= link_to 'Edit', {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => 'edit maps', :class => editclass} %>
<%= link_to_remote 'Export', {:url => {:controller => 'export', :action => 'start'}}, {:id => 'exportanchor', :title => 'export map data', :class => exportclass, :href => url_for(:controller => 'site', :action => 'export')} %>
<%= link_to 'Export', {:controller => 'site', :action => 'export'}, {:id => 'exportanchor', :title => 'export map data', :class => exportclass} %>
<%= link_to 'GPS Traces', {:controller => 'trace', :action => 'list'}, {:id => 'traceanchor', :title => 'manage traces', :class => traceclass} %>
<%= link_to 'User Diaries', {:controller => 'diary_entry', :action => 'list', :display_name => nil}, {:id => 'diaryanchor', :title => 'view user diaries', :class => diaryclass} %>

@@ -55,50 +64,66 @@

OpenStreetMap

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

The Free Wiki World Map

+ <% 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 to the first OpenStreetMap Conference, The State of the Map: 14th-15th July 2007, Manchester, UK. -

+ <% if false %> +

+ Support OpenStreetMap by + donating + to the Hardware Upgrade Fund.

+ <% end %> +

+ Help & Wiki
+ News blog
+ Shop
+ <%= yield :left_menu %> +

<%= yield :optionals %> -

- - - -

- - -

+ +

+ <%= link_to image_tag("cc_button.png", :alt => "CC by-sa 2.0", :border => "0"), "http://creativecommons.org/licenses/by-sa/2.0/" %> +