X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/596ab82461c6662cbfbe027c16e332d75a1e3c2e..db9420ba57478114090806f8b92c48f528eae31f:/app/views/layouts/site.html.erb diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb index 1e4e56e6a..368e3fc20 100644 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@ -1,37 +1,24 @@ - - <%= javascript_strings %> - <%= 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 %> - <%= t 'layouts.project_name.title' %><%= ' | '+ h(@title) if @title %> - + <%= render :partial => "layouts/head" %> +
+ <%= link_to(image_tag("osm_logo.png", :size => "16x16", :border => 0, :alt => t('layouts.logo.alt_text')), :controller => 'site', :action => 'index') %> +

<%= t 'layouts.project_name.h1' %>

+
- <% if @notice || flash[:notice] %> -
<%= @notice || flash[:notice] %>
- <% end %> + <%= render :partial => "layouts/flash", :locals => { :flash => flash } %> <%= yield %>
<% 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}, :title => t('layouts.welcome_user_link_tooltip')) %> | + <%= t 'layouts.welcome_user', :user_link => (link_to h(@user.display_name), {:controller => 'user', :action => 'view', :display_name => @user.display_name}, :title => t('layouts.welcome_user_link_tooltip')) %> + <%= link_to t('layouts.welcome_user_link_tooltip'), {:controller => 'user', :action => 'view', :display_name => @user.display_name} %> | <%= yield :greeting %> - <% - inbox_attributes = {} - inbox_attributes[:class] = 'greeting-bar-unread' if @user.new_messages.size > 0 - inbox_attributes[:title] = t 'layouts.inbox_tooltip', :count => @user.new_messages.size - %> - <%= link_to t('layouts.inbox', :count => @user.new_messages.size), {:controller => 'message', :action => 'inbox', :display_name => @user.display_name}, inbox_attributes %> | - <%= link_to t('layouts.logout'), {:controller => 'user', :action => 'logout', :referer => request.request_uri}, {:id => 'logoutanchor', :title => t('layouts.logout_tooltip')}%> + <%= render :partial => "layouts/inbox" %> | + <%= link_to t('layouts.logout'), {:controller => 'user', :action => 'logout', :session => request.session_options[:id], :referer => request.request_uri}, {:id => 'logoutanchor', :title => t('layouts.logout_tooltip'), :method => :post, :href => url_for(:controller => 'user', :action => 'logout', :referer => request.request_uri)}%> <% else %> <%= link_to t('layouts.log_in'), {:controller => 'user', :action => 'login', :referer => request.request_uri}, {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %> | <%= link_to t('layouts.sign_up'), {:controller => 'user', :action => 'new'}, {:id => 'registeranchor', :title => t('layouts.sign_up_tooltip')} %> @@ -54,18 +41,30 @@ diaryclass = 'active' if params['controller'] == 'diary_entry' %>
  • <%= link_to t('layouts.view'), {:controller => 'site', :action => 'index'}, {:id => 'viewanchor', :title => t('layouts.view_tooltip'), :class => viewclass} %>
    • -
  • <%= link_to t('layouts.edit'), {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => t('layouts.edit_tooltip'), :class => editclass} %>
    • -
  • <%= link_to t('layouts.history'), {:controller => 'changeset', :action => 'list' }, {:id => 'historyanchor', :title => t('layouts.history_tooltip'), :class => historyclass} %>
    • +
  • <%= link_to t('layouts.edit') + ' ▾', {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => t('javascripts.site.edit_tooltip'), :class => editclass} %>
    • +
  • <%= link_to t('layouts.history'), {:controller => 'changeset', :action => 'list' }, {:id => 'historyanchor', :title => t('javascripts.site.history_tooltip'), :class => historyclass} %>
    • <% if params['controller'] == 'site' and (params['action'] == 'index' or params['action'] == 'export') %>
  • <%= link_to_remote t('layouts.export'), {:url => {:controller => 'export', :action => 'start'}}, {:id => 'exportanchor', :title => t('layouts.export_tooltip'), :class => exportclass, :href => url_for(:controller => 'site', :action => 'export')} %>
    • <% else %>
  • <%= link_to t('layouts.export'), {:controller => 'site', :action => 'export'}, {:id => 'exportanchor', :title => t('layouts.export_tooltip'), :class => exportclass} %>
    • <% end %> -
  • <%= link_to t('layouts.gps_traces'), {:controller => 'trace', :action => 'list'}, {:id => 'traceanchor', :title => t('layouts.gps_traces_tooltip'), :class => traceclass} %>
    • +
  • <%= link_to t('layouts.gps_traces'), {:controller => 'trace', :action => 'list', :display_name => nil, :tag => nil, :page => nil}, {:id => 'traceanchor', :title => t('layouts.gps_traces_tooltip'), :class => traceclass} %>
  • <%= link_to t('layouts.user_diaries'), {:controller => 'diary_entry', :action => 'list', :display_name => nil}, {:id => 'diaryanchor', :title => t('layouts.user_diaries_tooltip'), :class => diaryclass} %>
    • +
    + +
    + + +
    <% end %> - <% if OSM_STATUS == :database_offline or OSM_STATUS == :api_offline %> + <% if STATUS == :database_offline or STATUS == :api_offline %>
    <%= t 'layouts.osm_offline' %>
    - <% elsif OSM_STATUS == :database_readonly or OSM_STATUS == :api_readonly %> + <% elsif STATUS == :database_readonly or STATUS == :api_readonly %>
    <%= t 'layouts.osm_read_only' %>
    @@ -109,10 +109,18 @@ <% end %>
    - <%= t 'layouts.help_wiki' %>
    - <%= t 'layouts.news_blog' %>
    - <%= t 'layouts.shop' %>
    - <%= yield :left_menu %> +
      +
    • <%= link_to(t('layouts.help_centre'), t('layouts.help_url'), :title => t('layouts.help_title')) %>
      • +
    • <%= link_to(t('layouts.documentation'), t('layouts.wiki_url'), :title => t('layouts.documentation_title')) %>
      • +
    • <%= link_to t('layouts.copyright'), {:controller => 'site', :action => 'copyright'} %>
      • +
    • <%= t 'layouts.community_blogs' %>
      • +
    • <%= t 'layouts.foundation' %>
      • + <%= yield :left_menu %> +
    +
    + +
    + <%= link_to image_tag("sotm.png", :alt => t('layouts.sotm2011'), :title => t('layouts.sotm2011'), :border => "0"), "http://stateofthemap.org/register-now/" %>
    <%= yield :optionals %> @@ -121,18 +129,6 @@ - -