X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/26698d6d267ab410d082a9b774b3ad5f9dc86b05..475a3fd83615fec2a1b79d04f3323ae45c917ccd:/app/views/users/show.html.erb?ds=sidebyside diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 1dd84edea..8ef7b5644 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -1,245 +1,240 @@ <% content_for :heading do %> -
- <%= user_image @user %> -
+
+
+ <%= user_image @user %> +
+

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

<% if current_user and @user.id == current_user.id %> -
    -
  • - <%= link_to t(".my edits"), :controller => "changesets", :action => "index", :display_name => current_user.display_name %> - <%= number_with_delimiter(current_user.changesets.size) %> -
    • -
  • - <%= link_to t(".my notes"), user_notes_path(@user) %> -
    • -
  • - <%= link_to t(".my traces"), :controller => "traces", :action => "mine" %> - <%= 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) %> -
    • -
  • - <%= link_to t(".my comments"), :controller => "diary_entries", :action => "comments", :display_name => current_user.display_name %> -
    • -
  • - <%= link_to t(".my settings"), :controller => "users", :action => "account", :display_name => current_user.display_name %> -
    • - - <% if current_user.blocks.exists? %> +
+ <% else %> -
    - -
  • - <%= link_to t(".edits"), :controller => "changesets", :action => "index", :display_name => @user.display_name %> - <%= number_with_delimiter(@user.changesets.size) %> -
    • -
  • - <%= link_to t(".notes"), user_notes_path(@user) %> -
    • -
  • - <%= link_to t(".traces"), :controller => "traces", :action => "index", :display_name => @user.display_name %> - <%= number_with_delimiter(@user.traces.size) %> -
    • - - - -
  • - <%= link_to t(".send message"), new_message_path(@user) %> -
    • -
  • - <%= link_to t(".diary"), :controller => "diary_entries", :action => "index", :display_name => @user.display_name %> - <%= number_with_delimiter(@user.diary_entries.size) %> -
    • -
  • - <%= link_to t(".comments"), :controller => "diary_entries", :action => "comments", :display_name => @user.display_name %> -
    • -
  • - <% 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 %> -
    • +
+ + <% end %> -

+

- <%= t ".mapper since" %> <%= l @user.creation_time.to_date, :format => :long %> - <% unless @user.terms_agreed %> - | - <%= t ".ct status" %> - <% if @user.terms_seen? -%> - <%= t ".ct declined" %> - <% else -%> - <%= t ".ct undecided" %> +
+
<%= 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" %>
+
+ <% if @user.terms_seen? -%> + <%= t ".ct declined" %> + <% else -%> + <%= t ".ct undecided" %> + <% end -%> +
+ <% end -%> + <% if current_user&.moderator? || current_user&.administrator? %> +
<%= t ".uid" %>
+
<%= link_to @user.id, api_user_path(:id => @user.id) %>
<% end -%> - <% end -%> +
-

-
- -
<%= @user.description.to_html %>
- - <% if current_user and @user.id == current_user.id %> -
- <%= link_to t(".edit_profile"), edit_profile_path, :class => "btn btn-outline-primary" %>
- <% end %> - -
- <% if current_user and current_user.administrator? -%> - - <% end -%> + <% if can?(:update, :user_status) %> + + <% end %> - <% if nearby.empty? %> - <%= t ".no nearby users" %> - <% else %> -
    -
  • <%= link_to t(".nearby_changesets"), nearby_changesets_path %>
    • -
  • <%= link_to t(".nearby_diaries"), nearby_diary_entries_path %>
    • -
-
- <%= render :partial => "contact", :collection => nearby, :locals => { :type => "nearby mapper" } %> + <% if current_user and current_user.administrator? -%> +
+ +
+
<%= t ".email address" %>
+
<%= @user.email %>
+ <% unless @user.creation_address.nil? -%> +
<%= t ".created from" %>
+
<%= link_to @user.creation_address, users_list_path(:ip => @user.creation_address) %>
+ <% end -%> +
<%= t ".status" %>
+
<%= link_to @user.status.capitalize, users_list_path(:status => @user.status) %>
+
<%= t ".spam score" %>
+
<%= @user.spam_score %>
+
+
- <% end %> + <% end -%>
- <% end %> -
+
+<% end %> + +
<%= @user.description.to_html %>
+ +<% if current_user and @user.id == current_user.id %> +
+ <%= link_to t(".edit_profile"), edit_profile_path, :class => "btn btn-outline-primary" %> +
+<% end %>