X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e82c758ceac7c0894b08dd5840af687318234578..68044c60545093f813ab46611973f052b4584e9a:/app/views/layouts/site.html.erb diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb index e5c7e1bdd..1d23aba0d 100644 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@ -1,88 +1,34 @@ - + <%= 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') %> + <%= 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 %> -
- -
- - <% if @user and @user.id %> - <%= raw(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.fullpath}, {:id => 'logoutanchor', :title => t('layouts.logout_tooltip')}%> - <% else %> - <%= link_to t('layouts.log_in'), {:controller => 'user', :action => 'login', :referer => request.fullpath}, {: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 %> - - -
- - - - - -
+
- <%= yield :optionals %> - <% unless @user %>
-

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

+

<%= 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'), - url_for({:controller => 'site', :action => 'copyright'})), - :create_account => link_to(t('layouts.intro_2_create_account'), - url_for({:controller => 'user', :action => 'new'})) + :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' %>

@@ -92,59 +38,117 @@

<%= t 'layouts.osm_read_only' %>

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

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

<% 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'), {:controller => 'site', :action => 'copyright'} %>
      • -
    -
    • -
  • <%= t'layouts.community' %> - -
    • -
  • <%= 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') } %>
    • - <%= yield :left_menu %> -
-
- -
- <%= link_to image_tag("sotm.png", :alt => t('layouts.sotm2012'), :title => t('layouts.sotm2012'), :border => "0"), "http://stateofthemap.org/register-now/" %> +
    +
  • +

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

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

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

+ <% end %> +
+ <%= yield %>
- <% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) -%> - <%= render :partial => "layouts/piwik" %> + <% end -%>