X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/bfcc3235c58aa65e92e8e069e94a38f07e57c276..eeadb9e20222eade2f1db0bb599bef50eea15f93:/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 383941685..be19d01cc 100644 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@ -1,35 +1,116 @@ - + <%= 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' %>

-
- <%= render :partial => "layouts/flash", :locals => { :flash => flash } %> - <%= yield %> +
+ + <%= yield :optionals %> + <% unless @user %> +
+

<%= t 'layouts.intro_1' %>

+

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

+
+ <% elsif STATUS == :database_readonly or STATUS == :api_readonly %> +
+

<%= t 'layouts.osm_read_only' %>

+
+ <% end %> + +
+
+ <%= ad = [{:image => 'sotm-birmingham-ad.png', + :title => 'State of the Map Birmingham', + :href =>'http://stateofthemap.org/'}, + {:image => 'sotm-us-ad.png', + :title => 'State of the Map USA', + :href =>'http://stateofthemap.us/'}].sample + + link_to ad[:href], :title => ad[:title] do + image_tag ad[:image], :class => :ad + end + %> +
+
+ +
+

<%= 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 %> - <%= 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')}%> +
  • <%=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')} %> +
  • <%= 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, { +
  • <%= 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 }, @@ -65,78 +146,15 @@ -
    - - <%= yield :optionals %> - <% unless @user %> -
    -

    <%= t 'layouts.intro_1' %>

    -

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

    -
    - <% elsif STATUS == :database_readonly or STATUS == :api_readonly %> -
    -

    <%= t 'layouts.osm_read_only' %>

    -
    - <% end %> - <% if false %> -
    -

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

    +
    + <%= render :partial => "layouts/flash", :locals => { :flash => flash } %> + <% if content_for? :heading %> +
    + <%= yield :heading %>
    <% 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 %> -
    -
    - -
    -

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

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