X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/bb490aca81d8063a9ad8dd8f1a023c709c096792..2d8feb6d79af2e96d83cf67ca0771116c9c0f11a:/app/views/layouts/site.html.erb diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb index 7346802a9..7c921658d 100644 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@ -1,135 +1,11 @@ - - + + <%= 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') %> -

<%= 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 %> - - -
- -
- -
- -
- - - -
- - - - <%= yield :optionals %> - - <% unless @user %> -
-

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

-
- <% 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 %> - - <% end %> - -
- -
- -
- <%= link_to image_tag("sotm.png", :alt => t('layouts.sotm2011'), :title => t('layouts.sotm2011'), :border => "0"), "http://stateofthemap.org/register-now/" %> -
- -
- -
-
+ + <%= render :partial => "layouts/header" %> + <%= render :partial => "layouts/content" %> + <% if defined?(Settings.matomo) -%> + + <% end -%>