X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/2f9a4d03375e09279b33ff2530421b4cc69cd817..cea0cccc6d73d7543d80d659b0f221f0d3196c0e:/app/views/layouts/site.html.erb diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb index 813fd50fe..a89db5078 100644 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@ -1,12 +1,12 @@ <%= 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' %>

-
-
+ +

+ <%= image_tag "osm_logo.png", :size => "16x16", :alt => t('layouts.logo.alt_text') %> + <%= t 'layouts.project_name.h1' %> +

+
-
    - <% 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 %> -
+ <% if @user and @user.id %> + <%= render :partial => "layouts/user_menu" %> + <% 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 %>