X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/31e247c1e223145a6ac8ce9012fe5eb586f1aaea..2e1f6428e7d03a109db57b0d0614ecd2c0e5d5c1:/app/views/users/show.html.erb diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 5aaeabb23..d479b1d56 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -1,7 +1,7 @@ <% content_for :heading do %> -
+
- <%= user_image @user, :class => "user_image_no_margins" %> + <%= user_image @user %>

<%= @user.display_name %> <%= role_icons(@user) %>

@@ -11,37 +11,39 @@
  • <%= link_to t(".my edits"), :controller => "changesets", :action => "index", :display_name => current_user.display_name %> - <%= number_with_delimiter(current_user.changesets.size) %> + <%= 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" %> - <%= number_with_delimiter(current_user.traces.size) %> + <%= number_with_delimiter(current_user.traces.size) %>
  • <%= link_to t(".my diary"), :controller => "diary_entries", :action => "index", :display_name => current_user.display_name %> - <%= number_with_delimiter(current_user.diary_entries.size) %> + <%= number_with_delimiter(current_user.diary_entries.size) %>
  • <%= link_to t(".my comments"), diary_comments_path(current_user) %> + <%= number_with_delimiter(current_user.diary_comments.size) %>
  • - <%= link_to t(".my settings"), user_account_path(current_user) %> + <%= link_to t(".my settings"), edit_account_path %>
    • <% if current_user.blocks.exists? %>
  • <%= link_to t(".blocks on me"), user_blocks_on_path(current_user) %> - <%= number_with_delimiter(current_user.blocks.active.size) %> + <%= number_with_delimiter(current_user.blocks.active.size) %>
    • <% end %> <% if can?(:create, UserBlock) and current_user.blocks_created.exists? %>
  • <%= link_to t(".blocks by me"), user_blocks_by_path(current_user) %> - <%= number_with_delimiter(current_user.blocks_created.active.size) %> + <%= number_with_delimiter(current_user.blocks_created.active.size) %>
    • <% end %> @@ -55,14 +57,15 @@
  • <%= link_to t(".edits"), :controller => "changesets", :action => "index", :display_name => @user.display_name %> - <%= number_with_delimiter(@user.changesets.size) %> + <%= number_with_delimiter(@user.changesets.size) %>
  • <%= 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 %> - <%= number_with_delimiter(@user.traces.size) %> + <%= number_with_delimiter(@user.traces.size) %>
    • @@ -72,32 +75,39 @@
  • <%= link_to t(".diary"), :controller => "diary_entries", :action => "index", :display_name => @user.display_name %> - <%= number_with_delimiter(@user.diary_entries.size) %> + <%= number_with_delimiter(@user.diary_entries.size) %>
  • <%= link_to t(".comments"), diary_comments_path(@user) %> + <%= number_with_delimiter(@user.diary_comments.size) %>
    • -
  • - <% if current_user and current_user.is_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 %> -
    • + <% if current_user %> +
  • + <% 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 %> +
    • + <% end %> <% if @user.blocks.exists? %>
  • <%= link_to t(".block_history"), user_blocks_on_path(@user) %> - <%= number_with_delimiter(@user.blocks.active.size) %> + <%= number_with_delimiter(@user.blocks.active.size) %>
    • <% end %> <% if @user.moderator? and @user.blocks_created.exists? %>
  • <%= link_to t(".moderator_history"), user_blocks_by_path(@user) %> - <%= number_with_delimiter(@user.blocks_created.active.size) %> + <%= number_with_delimiter(@user.blocks_created.active.size) %> +
    • + <% end %> + + <% if can?(:revoke_all, UserBlock) and @user.blocks.active.exists? %> +
  • + <%= link_to t(".revoke_all_blocks"), revoke_all_user_blocks_path(@user) %>
    • <% end %> @@ -112,18 +122,30 @@ <%= 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.creation_time.to_date, :format => :long %>
+
+
<%= 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" %>
-
+
<%= t ".ct status" %>
+
<% if @user.terms_seen? -%> <%= t ".ct declined" %> <% else -%> @@ -131,6 +153,10 @@ <% end -%>
<% end -%> + <% if current_user&.moderator? || current_user&.administrator? %> +
<%= t ".uid" %>
+
<%= link_to @user.id, api_user_path(:id => @user.id) %>
+ <% end -%>
@@ -139,30 +165,44 @@