X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/bfcc3235c58aa65e92e8e069e94a38f07e57c276..2fa81de6a95e7f82ac67cda2b6b6cecbfabf694a:/app/views/layouts/site.html.erb
diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index 383941685..1d23aba0d 100644
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -1,76 +1,17 @@
-
+
<%= 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 %>
-
-
- - <%= link_to t('layouts.view'), root_path, {
- :id => 'viewanchor',
- :title => t('layouts.view_tooltip'),
- :class => 'geolink llz layers'
- } %>
- - <%= link_to h(t('layouts.edit')) + content_tag(:span, "â¾", :class => "menuicon"), edit_path, {
- :id => 'editanchor',
- :title => t('javascripts.site.edit_tooltip'),
- :data => { :minzoom => 13, :editor => preferred_editor },
- :class => 'geolink llz object disabled'
- } %>
- - <%= link_to t('layouts.history'), browse_changesets_path, {
- :id => 'historyanchor',
- :data => { :minzoom => 11 },
- :title => t('javascripts.site.history_tooltip'),
- :class => 'geolink bbox'
- } %>
- - <%= link_to t('layouts.export'), export_path, {
- :id => 'exportanchor',
- :title => t('layouts.export_tooltip'),
- :data => { :url => url_for(:controller => :export, :action => :start) },
- :class => 'geolink llz layers'
- } %>
-
-
+
+ <% if @user and @user.id %>
+ - <%=link_to h(@user.display_name), user_path(:display_name => @user.display_name), :title => t('layouts.welcome_user_link_tooltip') %>
+ - <%= 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 %>
+
+
+ - <%= link_to t('layouts.view'), root_path, {
+ :id => 'viewanchor',
+ :title => t('layouts.view_tooltip'),
+ :class => 'geolink llz layers'
+ } %>
+ - <%= link_to h(t('layouts.edit')) + content_tag(:span, "â¼", :class => "menuicon"), edit_path, {
+ :id => 'editanchor',
+ :title => t('javascripts.site.edit_tooltip'),
+ :data => { :minzoom => 13, :editor => preferred_editor },
+ :class => 'geolink llz object disabled'
+ } %>
+ - <%= link_to t('layouts.history'), browse_changesets_path, {
+ :id => 'historyanchor',
+ :data => { :minzoom => 11 },
+ :title => t('javascripts.site.history_tooltip'),
+ :class => 'geolink bbox'
+ } %>
+ - <%= link_to t('layouts.export'), export_path, {
+ :id => 'exportanchor',
+ :title => t('layouts.export_tooltip'),
+ :data => { :url => url_for(:controller => :export, :action => :start) },
+ :class => 'geolink llz layers'
+ } %>
+
+
+ <%= render :partial => "layouts/flash", :locals => { :flash => flash } %>
+ <% if content_for? :heading %>
+
+ <%= yield :heading %>
+
+ <% end %>
+
+ <%= yield %>
+
+
<% end -%>