X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7b37f4cb62fca5fec3d3d41eacf4601595519c4a..ec4ef1ad2bc2c00895c97794f5e5d0e7820dff8a:/app/views/layouts/site.html.erb diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb index 3a8e1f1c0..9346b5670 100644 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@ -1,132 +1,151 @@ - + <%= 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", :border => 0, :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 %> - <%= 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 %> +
    - <% - viewclass = 'geolink llz layers' - editclass = 'geolink llz object minzoom13 disabled' - historyclass = 'geolink bbox minzoom11' - exportclass = 'geolink llz layers' - traceclass = '' - diaryclass = '' - viewclass += ' active' if params['controller'] == 'site' and params['action'] == 'index' - editclass += ' active' if params['controller'] == 'site' and params['action'] == 'edit' - historyclass += ' active' if params['controller'] == 'changeset' and params['action'] == 'list' - exportclass += ' active' if params['controller'] == 'site' and params['action'] == 'export' - traceclass += ' active' if params['controller'] == 'trace' - 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('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 t('layouts.export'), {:controller => 'site', :action => 'export'}, {:id => 'exportanchor', :title => t('layouts.export_tooltip'), :class => exportclass} %>
    • -
  • <%= 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} %>
    • +
  • <%= 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 }, + :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'), + :class => 'geolink llz layers' + } %>
- - -
- - <%= yield :optionals %> - <% unless @user %> -
-

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

-

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

+
+

<%= t 'layouts.intro_1' %>

- <%= t 'layouts.intro_3', - :ucl => link_to(t('layouts.intro_3_ucl'), "http://www.vr.ucl.ac.uk"), - :ic => link_to(t('layouts.intro_3_ic'), "http://www.imperial.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 %> - <% if false %> - <% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) -%> - <%= render :partial => "layouts/piwik" %> + <% end -%>