X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d9054cfe29efeb615237a143ca620c53af37288f..95e1aff23493b3725d5259bcca7bcc79d7d3bc26:/app/views/layouts/site.html.erb?ds=inline diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb index 5a9360875..7c921658d 100644 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@ -1,150 +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 %> - <%= 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 %> - - <% end %> - - <% if STATUS == :database_offline or STATUS == :api_offline %> - - <% elsif STATUS == :database_readonly or STATUS == :api_readonly %> - - <% end %> - - <% if false %> - - <% end %> - -
- -
- -
- <%= link_to image_tag("sotm.png", :alt => t('layouts.sotm2012'), :title => t('layouts.sotm2012'), :border => "0"), "http://stateofthemap.org/register-now/" %> -
- - - -
- - <% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) -%> - <%= render :partial => "layouts/piwik" %> + + <%= render :partial => "layouts/header" %> + <%= render :partial => "layouts/content" %> + <% if defined?(Settings.matomo) -%> + <% end -%>