Compact user menu

[rails.git] / app / views / layouts / site.html.erb
diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb

index 44edfc6d129aa7f6273192b49dddcbec969975b1..512b95905bac4b8e174fd001ec9adb720199a54c 100644 (file)
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -1,12 +1,12 @@
  <!DOCTYPE html>
  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= I18n.locale %>" lang="<%= I18n.locale %>" dir="<%= dir %>">
    <%= render :partial => "layouts/head" %>
-  <body class="<%= params[:controller] %> <%= params[:controller] %>-<%= params[:action] %>">
-    <div id="small-title">
-      <%= link_to(image_tag("osm_logo.png", :size => "16x16", :alt => t('layouts.logo.alt_text')), root_path) %>
-      <h1><%= t 'layouts.project_name.h1' %></h1>
-    </div>
-        <div id="left">
+  <body class="<%= body_class %>">
+    <h1 id="small-title">
+      <%= image_tag "osm_logo.png", :size => "16x16", :alt => t('layouts.logo.alt_text') %>
+      <%= t 'layouts.project_name.h1' %>
+    </h1>
+    <div id="left">
        <div id="logo">
          <%= link_to(image_tag("osm_logo.png",
            :size => "120x120",
@@ -44,7 +44,6 @@
            <ul>
              <li><%= link_to(t('layouts.help_centre'), t('layouts.help_url'), :title => t('layouts.help_title')) %></li>
              <li><%= link_to(t('layouts.documentation'), t('layouts.wiki_url'), :title => t('layouts.documentation_title')) %></li>
-            <li><%= link_to t('layouts.copyright'), copyright_path %></li>
            </ul>
          </li>
          <li>
@@ -59,6 +58,9 @@
          </li>
          <li>
            <h4><%= t'layouts.data' %></h4>
+          <ul>
+            <li><%= link_to t('layouts.copyright'), copyright_path %></li>
+          </ul>
            <ul>
              <li><%= link_to t('layouts.export_data'), export_path %></li>
            </ul>
@@ -97,17 +99,14 @@
        </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',