Merge branch 'pull/5218'

[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 253945b9b6d2529d1cbc344453c257f924dcdd7f..d479b1d56dad13e0ab1e94e5188f8b6331ccf2cd 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,16 +79,17 @@
             </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>

-            <li>
-              <% if current_user and current_user.friends_with?(@user) %>
-                <%= link_to t(".remove as friend"), remove_friend_path(:display_name => @user.display_name), :method => :post %>
-              <% elsif current_user %>
-                <%= link_to t(".add as friend"), make_friend_path(:display_name => @user.display_name), :method => :post %>
-              <% else %>
-                <%= link_to t(".add as friend"), make_friend_path(:display_name => @user.display_name) %>
-              <% end %>
-            </li>
+            <% if current_user %>
+              <li>
+                <% if current_user.friends_with?(@user) %>
+                  <%= link_to t(".remove as friend"), remove_friend_path(:display_name => @user.display_name), :method => :post %>
+                <% else %>
+                  <%= link_to t(".add as friend"), make_friend_path(:display_name => @user.display_name), :method => :post %>
+                <% end %>
+              </li>
+            <% end %>

 
             <% if @user.blocks.exists? %>
               <li>
 
             <% if @user.blocks.exists? %>
               <li>


@@ -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,17 +212,17 @@
       <% 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>
               <dd class="list-inline-item"><%= @user.email %></dd>
           <small>
             <dl class="list-inline">
               <dt class="list-inline-item m-0"><%= t ".email address" %></dt>
               <dd class="list-inline-item"><%= @user.email %></dd>

-              <% unless @user.creation_ip.nil? -%>
+              <% unless @user.creation_address.nil? -%>

                 <dt class="list-inline-item m-0"><%= t ".created from" %></dt>
                 <dt class="list-inline-item m-0"><%= t ".created from" %></dt>

-                <dd class="list-inline-item"><%= @user.creation_ip %></dd>
+                <dd class="list-inline-item"><%= link_to @user.creation_address, users_path(:ip => @user.creation_address) %></dd>

               <% end -%>
               <dt class="list-inline-item m-0"><%= t ".status" %></dt>
               <% end -%>
               <dt class="list-inline-item m-0"><%= t ".status" %></dt>

-              <dd class="list-inline-item"><%= @user.status.capitalize %></dd>
+              <dd class="list-inline-item"><%= link_to @user.status.capitalize, users_path(:status => @user.status) %></dd>

               <dt class="list-inline-item m-0"><%= t ".spam score" %></dt>
               <dd class="list-inline-item"><%= @user.spam_score %></dd>
             </dl>
               <dt class="list-inline-item m-0"><%= t ".spam score" %></dt>
               <dd class="list-inline-item"><%= @user.spam_score %></dd>
             </dl>