X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f138055849e5b09cd94797c3e1705c6357d6b93b..5944feb008005f67a09240d4b9ad1e2513f7633b:/app/views/users/show.html.erb?ds=inline diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 81fda926b..c73581b25 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -14,7 +14,8 @@ <%= number_with_delimiter(current_user.changesets.size) %>
  • - <%= link_to t(".my notes"), user_notes_path(@user) %> + <%= link_to t(".my notes"), user_notes_path(current_user) %> + <%= number_with_delimiter(current_user.note_comments.size) %>
  • <%= link_to t(".my traces"), :controller => "traces", :action => "mine" %> @@ -26,6 +27,7 @@
  • <%= link_to t(".my comments"), diary_comments_path(current_user) %> + <%= number_with_delimiter(current_user.diary_comments.size) %>
  • <%= link_to t(".my settings"), edit_account_path %> @@ -59,6 +61,7 @@
  • <%= link_to t(".notes"), user_notes_path(@user) %> + <%= number_with_delimiter(@user.note_comments.size) %>
  • <%= link_to t(".traces"), :controller => "traces", :action => "index", :display_name => @user.display_name %> @@ -76,6 +79,7 @@
  • <%= link_to t(".comments"), diary_comments_path(@user) %> + <%= number_with_delimiter(@user.diary_comments.size) %>
  • <% if current_user and current_user.friends_with?(@user) %> @@ -101,6 +105,12 @@
    • <% end %> + <% if can?(:revoke_all, UserBlock) and @user.blocks.active.exists? %> +
  • + <%= link_to t(".revoke_all_blocks"), revoke_all_user_blocks_path(@user) %> +
    • + <% end %> + <% if can?(:create, UserBlock) %>
  • <%= link_to t(".create_block"), new_user_block_path(@user) %> @@ -112,15 +122,27 @@ <%= report_link(t(".report"), @user) %>
    • <% end %> + + <% if current_user and UserMute.exists?(owner: current_user, subject: @user) %> +
  • + <%= link_to t(".destroy_mute"), user_mute_path(@user), :method => :delete %> +
    • + <% elsif current_user %> +
  • + <%= link_to t(".create_mute"), user_mute_path(@user), :method => :post, :title => t("user_mutes.index.user_mute_explainer") %> +
    • + <% end %> <% end %> -
    +
    <%= t ".mapper since" %>
    <%= l @user.created_at.to_date, :format => :long %>
    +
    <%= t ".last map edit" %>
    +
    <%= l @user.changesets.first&.created_at&.to_date, :format => :long, :default => t(".no activity yet") %>
    <% unless @user.terms_agreed %>
    <%= t ".ct status" %>
    @@ -190,17 +212,17 @@ <% end %> <% if current_user and current_user.administrator? -%> -
    +
    <%= t ".email address" %>
    <%= @user.email %>
    <% unless @user.creation_ip.nil? -%>
    <%= t ".created from" %>
    -
    <%= @user.creation_ip %>
    +
    <%= link_to @user.creation_ip, users_path(:ip => @user.creation_ip) %>
    <% end -%>
    <%= t ".status" %>
    -
    <%= @user.status.capitalize %>
    +
    <%= link_to @user.status.capitalize, users_path(:status => @user.status) %>
    <%= t ".spam score" %>
    <%= @user.spam_score %>