X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c426e8d160101faaa414330a0ccd641d03bef65a..68044c60545093f813ab46611973f052b4584e9a:/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 f1ae440e7..1d23aba0d 100644 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@ -6,66 +6,7 @@ <%= 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 %> - - -
- - -
+
+
+ + +
+ + +
+ <%= render :partial => "layouts/flash", :locals => { :flash => flash } %> + <% if content_for? :heading %> +
+ <%= yield :heading %> +
+ <% end %> +
+ <%= yield %> +
+
<% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) -%> <% end -%>