X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/49a45b1c52b9cc8bbfcd6f4e6c93adac912d95a1..5564bcabbfc5db4b790a340e49155b864ec9c8cd:/app/views/layouts/site.html.erb diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb index 4f56a674c..f43d3b395 100644 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@ -1,7 +1,7 @@ <%= 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' %>

@@ -18,7 +18,7 @@ <%= 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'), :method => :post, :href => url_for(:controller => 'user', :action => 'logout', :referer => request.fullpath)}%> + <%= 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')} %> @@ -63,13 +63,10 @@
- <%= yield :optionals %> @@ -104,7 +101,7 @@ <% if false %> <% end %> @@ -125,6 +122,15 @@
+ + + <% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) -%> <%= render :partial => "layouts/piwik" %> <% end -%>