X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/f7aeff3dd62c9ddc21e9465f6e734059cd780b0f..6054eea2383438cf0439175a2dd7216476f60971:/app/views/layouts/site.html.erb diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb index c17255709..f1ae440e7 100644 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@ -1,135 +1,148 @@ - - - - - <%= javascript_strings %> - <%= javascript_include_tag 'prototype' %> - <%= javascript_include_tag 'site' %> - - <%= stylesheet_link_tag 'common' %> - - <%= stylesheet_link_tag 'small', :media => "only screen and (max-width: 481px)" %> - <%= stylesheet_link_tag 'large', :media => "screen and (min-width: 482px)" %> - <%= 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", :alt => t('layouts.logo.alt_text')), root_path) %> +

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

- <% if flash[:error] %> -

<%= flash[:error] %>

- <% end %> - <% if flash[:warning] %> -

<%= flash[:warning] %>

- <% end %> - <% if flash[: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')) %> - <%= link_to t('layouts.welcome_user_link_tooltip'), {:controller => 'user', :action => 'view', :display_name => @user.display_name} %> | - <%= yield :greeting %> - <%= 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')} %> - <% end %> - - -

+ + <% if @user and @user.id %> + <%= raw(t 'layouts.welcome_user', :user_link => (link_to h(@user.display_name), user_path(:display_name => @user.display_name), :title => t('layouts.welcome_user_link_tooltip'))) %> + <%= link_to t('layouts.welcome_user_link_tooltip'), user_path(:display_name => @user.display_name) %> | + <%= yield :greeting %> + <%= render :partial => "layouts/inbox" %> | + <%= link_to t('layouts.logout'), logout_path(:session => request.session_options[:id], :referer => request.fullpath), {:id => 'logoutanchor', :title => t('layouts.logout_tooltip')}%> + <% else %> + <%= link_to t('layouts.log_in'), login_path(:referer => request.fullpath), {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %> | + <%= link_to t('layouts.sign_up'), user_new_path, {:id => 'registeranchor', :title => t('layouts.sign_up_tooltip')} %> + <% end %> +

<%= 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('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} %>
<%= 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')} %>
<%= link_to t('layouts.export'), {:controller => 'site', :action => 'export'}, {:id => 'exportanchor', :title => t('layouts.export_tooltip'), :class => exportclass} %>
<%= link_to t('layouts.view'), root_path, { + :id => 'viewanchor', + :title => t('layouts.view_tooltip'), + :class => 'geolink llz layers' + } %>
<%= link_to h(t('layouts.edit')) + content_tag(:span, "â¾", :class => "menuicon"), edit_path, { + :id => 'editanchor', + :title => t('javascripts.site.edit_tooltip'), + :data => { :minzoom => 13, :editor => preferred_editor }, + :class => 'geolink llz object disabled' + } %>
<%= link_to t('layouts.history'), browse_changesets_path, { + :id => 'historyanchor', + :data => { :minzoom => 11 }, + :title => t('javascripts.site.history_tooltip'), + :class => 'geolink bbox' + } %>
<%= link_to t('layouts.export'), export_path, { + :id => 'exportanchor', + :title => t('layouts.export_tooltip'), + :data => { :url => url_for(:controller => :export, :action => :start) }, + :class => 'geolink llz layers' + } %>

<%= link_to t('layouts.edit_with', + :editor => t("editor.#{editor}.description")), + edit_path(:editor => editor), { + :data => { :editor => editor }, + :class => "geolink llz object" + } %>
<%= link_to t('layouts.gps_traces'), {:controller => 'trace', :action => 'list'}, {: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} %>

- +

- -

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

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

<%= t('layouts.tag_line') %>

- + <%= link_to(image_tag("osm_logo.png", + :size => "120x120", + :alt => t('layouts.logo.alt_text')), + root_path) %> +

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

<%= t('layouts.tag_line') %>

- + <%= yield :optionals %> <% unless @user %> -

<%= t 'layouts.intro_1' %>

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

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

- <%= t 'layouts.intro_3', - :ucl => link_to(t('layouts.intro_3_ucl'), "http://www.vr.ucl.ac.uk"), - :bytemark => link_to(t('layouts.intro_3_bytemark'), "http://www.bytemark.co.uk"), - :partners => link_to(t('layouts.intro_3_partners'), t('layouts.intro_3_partners_url')) %> + <%= t 'layouts.intro_2_html', + :download => link_to(t('layouts.intro_2_download'), "http://planet.openstreetmap.org/"), + :use => link_to(t('layouts.intro_2_use'), t('layouts.intro_2_use_url')), + :license => link_to(t('layouts.intro_2_license'), copyright_path), + :create_account => link_to(t('layouts.intro_2_create_account'), user_new_path) + %>

<% end %> - - <% if OSM_STATUS == :database_offline or OSM_STATUS == :api_offline %> -

- <%= t 'layouts.osm_offline' %> + <% if STATUS == :database_offline or STATUS == :api_offline %> + - <% elsif OSM_STATUS == :database_readonly or OSM_STATUS == :api_readonly %> -

- <%= t 'layouts.osm_read_only' %> + <% elsif STATUS == :database_readonly or STATUS == :api_readonly %> + <% end %> - <% if false %> -

- <%= t 'layouts.donate', :link => "#{t('layouts.donate_link_text')}" %> + <% end %> - -

- <%= t 'layouts.help_wiki' %>
- <%= link_to t('layouts.copyright'), {:controller => 'site', :action => 'copyright'} %>
- <%= t 'layouts.news_blog' %>
- <%= t 'layouts.shop' %>
+

+
<%= t'layouts.help' %>
+
- <%= 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'), copyright_path %>
+
+
<%= t'layouts.community' %>
+
- <%= t 'layouts.community_blogs' %>
- <%= t 'layouts.foundation' %>
- <%= link_to(t('layouts.user_diaries'), diary_path, { + :title => t('layouts.user_diaries_tooltip') + }) %>
+
+
<%= link_to t('layouts.gps_traces'), traces_path, { + :id => 'traceanchor', + :title => t('layouts.gps_traces_tooltip') + } %>
+

+ +

<%= h(t('layouts.make_a_donation.text')) %>

+ + - - <%= yield :optionals %> - - -

- <%= h(t('layouts.make_a_donation.text')) %> -

+ <% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) -%> + + <% end -%>

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

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

<%= t('layouts.tag_line') %>

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

<%= t('layouts.tag_line') %>

<%= t'layouts.help' %>

<%= t'layouts.community' %>

<%= link_to t('layouts.gps_traces'), traces_path, { + :id => 'traceanchor', + :title => t('layouts.gps_traces_tooltip') + } %>