X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/00375024263970a43ea7d39e3c65dfd0f32e8869..18409c05ab43a2f818f6db911ae383eb0ebfb07d:/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 a8201b912..f02f024a5 100644 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@ -1,152 +1,14 @@ - +<%= tag.html :lang => I18n.locale, + :dir => dir, + :data => { :bs_theme => (preferred_color_scheme(:site) if preferred_color_scheme(:site) != "auto") } do %> <%= 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 %> -
-
- - <% 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 %> - - -
- - -
- - <%= 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')}" %>

-
- <% end %> -
- -
-
- <%= link_to image_tag("sotmpdx.png", - :alt => t('layouts.sotm2012'), - :title => t('layouts.sotm2012'), - :border => "0"), "http://stateofthemap.us/" %> -
- -
-

<%= 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 defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) -%> - + <%= tag.body :class => body_class, + :data => { :map_theme => (preferred_color_scheme(:map) if preferred_color_scheme(:map) != "auto") } do %> + <%= render :partial => "layouts/header" %> + <%= render :partial => "layouts/content" %> + <% if defined?(Settings.matomo) -%> + <% end -%> - - + <% end %> +<% end %>