X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ebcb038c1c27695790f81900204d4c8589b2dfbb..bdc536d126d884b0795bf82784fc81d4a5e47dcc:/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 064fbed0a..f1ae440e7 100644 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@ -1,5 +1,5 @@ - + <%= render :partial => "layouts/head" %>
@@ -13,8 +13,8 @@
<% 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) %> | + <%= 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')}%> @@ -32,7 +32,7 @@
  • <%= link_to h(t('layouts.edit')) + content_tag(:span, "▾", :class => "menuicon"), edit_path, { :id => 'editanchor', :title => t('javascripts.site.edit_tooltip'), - :data => { :minzoom => 13 }, + :data => { :minzoom => 13, :editor => preferred_editor }, :class => 'geolink llz object disabled' } %>
  • <%= link_to t('layouts.history'), browse_changesets_path, { @@ -44,17 +44,18 @@
  • <%= 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' } %>
    • @@ -101,40 +102,36 @@

    <%= raw t 'layouts.donate', :link => "#{t('layouts.donate_link_text')}" %>

    <% end %> -
    -
    -
    - <%= link_to image_tag("sotmpdx.png", - :alt => t('layouts.sotm2012'), - :title => t('layouts.sotm2012'), - :border => "0"), "http://stateofthemap.us/" %> -
    - + } %> + + <%= yield :left_menu %> + +

    <%= t 'layouts.partners_html', :ucl => link_to(t('layouts.partners_ucl'), "http://www.vr.ucl.ac.uk"),