X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ebcb038c1c27695790f81900204d4c8589b2dfbb..b9a19ab23a8dc63bc7c7f867e2ece6924319f0f2:/app/views/layouts/site.html.erb diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb index 064fbed0a..0ba203fde 100644 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@ -1,77 +1,19 @@ - + <%= 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 %> @@ -96,45 +38,52 @@

<%= t 'layouts.osm_read_only' %>

<% end %> - <% if false %> - - <% end %> -
-
-
- <%= link_to image_tag("sotmpdx.png", - :alt => t('layouts.sotm2012'), - :title => t('layouts.sotm2012'), - :border => "0"), "http://stateofthemap.us/" %> -
- +
+ + +
+ + +
+ <%= render :partial => "layouts/flash", :locals => { :flash => flash } %> + <% if content_for? :heading %> +
+ <%= yield :heading %> +
+ <% end %> +
+ <%= yield %> +
+
<% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) -%> <% end -%>