X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/b61e4f77e86fd2535a88b0d3e5aec97809c8ec5e..68360190d52272d4709904c5f6d63122ef3580cb:/app/views/layouts/site.rhtml?ds=sidebyside diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml index 2a1c8ac0b..534003031 100644 --- a/app/views/layouts/site.rhtml +++ b/app/views/layouts/site.rhtml @@ -1,17 +1,20 @@ - + <%= 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<%= ' | '+@title if @title %> + <%= tag("meta", { :name => "description", :content => "OpenStreetMap is the free wiki world map." }) %> + <%= yield :head %> + OpenStreetMap<%= ' | '+ h(@title) if @title %>
- <% if flash[:notice] %> -
<%= flash[:notice] %>
+ <% if @notice || flash[:notice] %> +
<%= @notice || flash[:notice] %>
<% end %> <%= yield %> @@ -19,11 +22,9 @@ <% if @user and @user.id %> - Welcome, <%= link_to @user.display_name, {:controller => 'user', :action => 'view', :display_name => @user.display_name}%> | + 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 %> - <% 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 %> + <%= 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 %> @@ -37,15 +38,26 @@ <% viewclass = '' editclass = '' + historyclass = '' + exportclass = '' traceclass = '' viewclass = 'active' if params['controller'] == 'site' and params['action'] == 'index' editclass = 'active' if params['controller'] == 'site' and params['action'] == 'edit' - editclass = 'active' if params['controller'] == 'campaign' + historyclass = 'active' if params['controller'] == 'changeset' and params['action'] == 'list_bbox' + exportclass = 'active' if params['controller'] == 'site' and params['action'] == 'export' traceclass = 'active' if params['controller'] == 'trace' + diaryclass = 'active' if params['controller'] == 'diary_entry' %> -
  • <%= 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 'History', {:controller => 'history' }, {:id => 'historyanchor', :title => 'changeset history', :class => historyclass} %>
    • + <% if params['controller'] == 'site' and (params['action'] == 'index' or params['action'] == 'export') %> +
  • <%= link_to_remote 'Export', {:url => {:controller => 'export', :action => 'start'}}, {:id => 'exportanchor', :title => 'export map data', :class => exportclass, :href => url_for(:controller => 'site', :action => 'export')} %>
    • + <% else %> +
  • <%= link_to 'Export', {:controller => 'site', :action => 'export'}, {:id => 'exportanchor', :title => 'export map data', :class => exportclass} %>
    • + <% end %> +
  • <%= 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} %>
    • @@ -61,45 +73,66 @@ <% 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 %> - <% if API_READONLY %> + <% 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 == :database_readonly or OSM_STATUS == :api_readonly %>
    The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out.
    <% end %> + <% if false %> + + <% end %> +
    Help & Wiki
    - <%= link_to "Users' diaries", {:controller => 'diary_entry', :action => 'list', :display_name => nil} %>
    News blog
    Shop
    <%= yield :left_menu %>
    - <%= yield :optionals %> - +
    +
    + Make a Donation +
    + +