Merge remote-tracking branch 'upstream/pull/4936'

[rails.git] / app / views / users / show.html.erb

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 9da3f8f046884b37279fb2a579852006b277e41a..c73581b25a8493d4d6edcbbc43dbfd4cf4afdf71 100644 (file)
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -14,7 +14,8 @@
               <span class='badge count-number'><%= number_with_delimiter(current_user.changesets.size) %></span>
             </li>
             <li>
               <span class='badge count-number'><%= number_with_delimiter(current_user.changesets.size) %></span>
             </li>
             <li>

-              <%= link_to t(".my notes"), user_notes_path(@user) %>
+              <%= link_to t(".my notes"), user_notes_path(current_user) %>
+              <span class='badge count-number'><%= number_with_delimiter(current_user.note_comments.size) %></span>

             </li>
             <li>
               <%= link_to t(".my traces"), :controller => "traces", :action => "mine" %>
             </li>
             <li>
               <%= link_to t(".my traces"), :controller => "traces", :action => "mine" %>


@@ -26,6 +27,7 @@
             </li>
             <li>
               <%= link_to t(".my comments"), diary_comments_path(current_user) %>
             </li>
             <li>
               <%= link_to t(".my comments"), diary_comments_path(current_user) %>

+              <span class='badge count-number'><%= number_with_delimiter(current_user.diary_comments.size) %></span>

             </li>
             <li>
               <%= link_to t(".my settings"), edit_account_path %>
             </li>
             <li>
               <%= link_to t(".my settings"), edit_account_path %>


@@ -59,6 +61,7 @@
             </li>
             <li>
               <%= link_to t(".notes"), user_notes_path(@user) %>
             </li>
             <li>
               <%= link_to t(".notes"), user_notes_path(@user) %>

+              <span class='badge count-number'><%= number_with_delimiter(@user.note_comments.size) %></span>

             </li>
             <li>
               <%= link_to t(".traces"), :controller => "traces", :action => "index", :display_name => @user.display_name %>
             </li>
             <li>
               <%= link_to t(".traces"), :controller => "traces", :action => "index", :display_name => @user.display_name %>


@@ -76,6 +79,7 @@
             </li>
             <li>
               <%= link_to t(".comments"), diary_comments_path(@user) %>
             </li>
             <li>
               <%= link_to t(".comments"), diary_comments_path(@user) %>

+              <span class='badge count-number'><%= number_with_delimiter(@user.diary_comments.size) %></span>

             </li>
             <li>
               <% if current_user and current_user.friends_with?(@user) %>
             </li>
             <li>
               <% if current_user and current_user.friends_with?(@user) %>


@@ -132,11 +136,13 @@
         </nav>
       <% end %>
 
         </nav>
       <% end %>
 

-      <div class='text-muted'>
+      <div class='text-body-secondary'>

         <small>
           <dl class="list-inline">
             <dt class="list-inline-item m-0"><%= t ".mapper since" %></dt>
             <dd class="list-inline-item"><%= l @user.created_at.to_date, :format => :long %></dd>
         <small>
           <dl class="list-inline">
             <dt class="list-inline-item m-0"><%= t ".mapper since" %></dt>
             <dd class="list-inline-item"><%= l @user.created_at.to_date, :format => :long %></dd>

+            <dt class="list-inline-item m-0"><%= t ".last map edit" %></dt>
+            <dd class="list-inline-item"><%= l @user.changesets.first&.created_at&.to_date, :format => :long, :default => t(".no activity yet") %></dd>

             <% unless @user.terms_agreed %>
               <dt class="list-inline-item m-0"><%= t ".ct status" %></dt>
               <dd class="list-inline-item">
             <% unless @user.terms_agreed %>
               <dt class="list-inline-item m-0"><%= t ".ct status" %></dt>
               <dd class="list-inline-item">


@@ -206,7 +212,7 @@
       <% end %>
 
       <% if current_user and current_user.administrator? -%>
       <% end %>
 
       <% if current_user and current_user.administrator? -%>

-        <div class='text-muted'>
+        <div class='text-body-secondary'>

           <small>
             <dl class="list-inline">
               <dt class="list-inline-item m-0"><%= t ".email address" %></dt>
           <small>
             <dl class="list-inline">
               <dt class="list-inline-item m-0"><%= t ".email address" %></dt>