X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0aec1c5fa062feacf2ea7f6c8330ac7c7e2258bd..b9a19ab23a8dc63bc7c7f867e2ece6924319f0f2:/app/views/layouts/site.html.erb?ds=sidebyside diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb index 01dd5aee5..0ba203fde 100644 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@ -1,154 +1,165 @@ - - - - - <%= javascript_strings %> - <%= javascript_include_tag 'prototype' %> - <%= javascript_include_tag 'site' %> - <%= javascript_include_tag 'menu' %> - - <%= 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." }) %> - <%= style_rules %> - <%= yield :head %> - <%= t 'layouts.project_name.title' %><%= ' | '+ h(@title) if @title %> - - -
- <% if flash[:error] %> -
<%= flash[:error] %>
- <% end %> - <% if flash[:warning] %> -
<%= flash[:warning] %>
- <% end %> - <% if flash[:notice] %> -
<%= flash[:notice] %>
- <% end %> - - <%= 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 %> - - -
- -
- -
- + + + <%= 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' %>

- - - -
- +
- + <%= 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 STATUS == :database_offline or STATUS == :api_offline %> -
- <%= t 'layouts.osm_offline' %> +
+

<%= t 'layouts.osm_offline' %>

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

<%= t 'layouts.osm_read_only' %>

<% end %> +
    +
  • +

    <%= 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' %>

    + +
    • +
  • +

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

    +
    • + <%= yield :left_menu %> +
+
+
+ <%= ad = [{:image => 'sotm-birmingham-ad.png', + :title => 'State of the Map Birmingham', + :href =>'http://stateofthemap.org/'}, + {:image => 'donate-ad.png', + :title => 'Server Donation Drive', + :href =>'http://donate.openstreetmap.org/'}].sample - <% if false %> - +
+ +
+

<%= t 'layouts.partners_html', + :ucl => link_to(t('layouts.partners_ucl'), "http://www.vr.ucl.ac.uk"), + :ic => link_to(t('layouts.partners_ic'), "http://www.imperial.ac.uk/"), + :bytemark => link_to(t('layouts.partners_bytemark'), "http://www.bytemark.co.uk"), + :partners => link_to(t('layouts.partners_partners'), t('layouts.partners_url')) %> +

+
+
+
+
    + <% if @user and @user.id %> +
  • <%=link_to h(@user.display_name), user_path(:display_name => @user.display_name), :title => t('layouts.welcome_user_link_tooltip') %>
    • +
  • <%= 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'), 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' + } %>
    • +
+
+ + +
+ <%= render :partial => "layouts/flash", :locals => { :flash => flash } %> + <% if content_for? :heading %> +
+ <%= yield :heading %>
<% end %> - -
-
    -
  • <%= t 'layouts.help_and_wiki', - :help => link_to(t('layouts.help'), t('layouts.help_url'), :title => t('layouts.help_title')), - :wiki => link_to(t('layouts.wiki'), t('layouts.wiki_url'), :title => t('layouts.wiki_title')) - %>
    • -
  • <%= link_to t('layouts.copyright'), {:controller => 'site', :action => 'copyright'} %>
    • -
  • <%= t 'layouts.news_blog' %>
    • -
  • <%= t 'layouts.shop' %>
    • - <%= yield :left_menu %> -
+
+ <%= yield %>
- - <%= yield :optionals %> - -
- -
+ <% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) -%> + + <% end -%>