X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3fb931f9a86955faa39bec1fa4f2a731cbc74780..ba9a00b10cc8a075a5a4090a1601e3d3b72b2ec1:/app/views/layouts/site.html.erb diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb index 383941685..1e1e23ebb 100644 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@ -1,146 +1,11 @@ - + <%= 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 %> - - <% end %> - <% if STATUS == :database_offline or STATUS == :api_offline %> - - <% elsif STATUS == :database_readonly or STATUS == :api_readonly %> - - <% end %> - <% if false %> - - <% end %> -
- -
- - -
- <% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) -%> - + + <%= render :partial => "layouts/header" %> + <%= render :partial => "layouts/content" %> + <% if defined?(PIWIK) -%> + <% end -%>