Merge remote-tracking branch 'osmlab/user-display'

diff --combined app/views/layouts/site.html.erb
index 3deffdde2ca73dcee490b6142d3760f34a8025e5,a89db50787d8f6a7aef22df58297cfd7aa3bc803..12b5b82c5c358c9aa123e16c739b53fce0b61019
--- 1/app/views/layouts/site.html.erb
--- 2/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@@ -74,7 -74,10 +74,7 @@@
          <div class='ads'>
            <%= ad = [{:image => 'sotm-birmingham-ad.png',
                       :title => 'State of the Map Birmingham',
 -                     :href =>'http://stateofthemap.org/'},
 -                    {:image => 'donate-ad.png',
 -                     :title => 'Server Donation Drive',
 -                     :href =>'http://donate.openstreetmap.org/'}].sample
 +                     :href =>'http://stateofthemap.org/'}].sample
  
                link_to ad[:href], :title => ad[:title] do
                  image_tag ad[:image], :class => :ad
@@@ -96,53 -99,25 +96,25 @@@
        </div>
      </div>
      <div id='top-bar'>
-       <ul class='secondary-actions' id="greeting">
-          <% if @user and @user.id %>
-            <li id="full-greeting"><%=link_to h(@user.display_name), user_path(:display_name => @user.display_name), :title => t('layouts.welcome_user_link_tooltip') %></li>
-            <li><%= yield :greeting %></li>
-            <li><%= render :partial => "layouts/inbox" %></li>
-            <li><%= link_to t('layouts.logout'), logout_path(:session => request.session_options[:id], :referer => request.fullpath), {:id => 'logoutanchor', :title => t('layouts.logout_tooltip')}%></li>
-          <% else %>
-            <li><%= link_to t('layouts.log_in'), login_path(:referer => request.fullpath), {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %></li>
-            <li><%= link_to t('layouts.sign_up'), user_new_path, {:id => 'registeranchor', :title => t('layouts.sign_up_tooltip')} %></li>
-          <% end %>
-       </ul>
+       <% if @user and @user.id %>
+         <%= render :partial => "layouts/user_menu" %>
+       <% else %>
+         <ul class='secondary-actions' id='greeting'>
+           <li><%= link_to t('layouts.log_in'), login_path(:referer => request.fullpath), {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %></li>
+           <li><%= link_to t('layouts.sign_up'), user_new_path, {:id => 'registeranchor', :title => t('layouts.sign_up_tooltip')} %></li>
+         </ul>
+       <% end %>
        <ul id="tabnav">
-         <li><%= link_to t('layouts.view'), root_path, {
-           :id => 'viewanchor',
-           :title => t('layouts.view_tooltip'),
-           :class => 'geolink llz layers'
-         } %></li>
-         <li><%= 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'
-         } %></li>
-         <li><%= link_to t('layouts.history'), browse_changesets_path, {
-           :id => 'historyanchor',
-           :data => { :minzoom => 11 },
-           :title => t('javascripts.site.history_tooltip'),
-           :class => 'geolink bbox'
-         } %></li>
-       </ul>
-     </div>
-     <div id="editmenu" class="menu">
-       <ul>
-         <% Editors::RECOMMENDED_EDITORS.each do |editor| %>
-           <li><%= link_to t('layouts.edit_with',
-             :editor => t("editor.#{editor}.description")),
-             edit_path(:editor => editor), {
-             :data => { :editor => editor },
-             :class => "geolink llz object"
-           } %></li>
-         <% end %>
-         <%= yield :editmenu %>
+         <li id="view_tab">
+           <%= link_to t('layouts.view'), root_path, :class => 'tab geolink llz layers' %>
+         </li><li id="edit_tab">
+           <%= render :partial => 'layouts/edit_menu',
+                      :locals => { :link_text => t('layouts.edit'), :link_class => 'llz object' }%>
+         </li><li id="history_tab">
+           <%= link_to t('layouts.history'), browse_changesets_path, :class => 'tab geolink bbox' %>
+         </li>
        </ul>
      </div>
-     <script type="text/javascript">
-       createMenu("editanchor", "editmenu", "left");
-     </script>
      <div class="wrapper">
        <%= render :partial => "layouts/flash", :locals => { :flash => flash } %>
        <% if content_for? :heading %>