X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6e71f16bbbdf3da35fc064c354c4078ea48edcbf..5bb23f6f5f8fed81f1166a15344e44afa7fbb480:/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 b6c5c6053..d479b1d56 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,16 +79,17 @@
  • <%= link_to t(".comments"), diary_comments_path(@user) %> + <%= number_with_delimiter(@user.diary_comments.size) %>
    • -
  • - <% 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 %> -
    • + <% 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? %>
  • @@ -137,6 +141,8 @@
    <%= 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" %>
    @@ -211,9 +217,9 @@
    <%= t ".email address" %>
    <%= @user.email %>
    - <% unless @user.creation_ip.nil? -%> + <% unless @user.creation_address.nil? -%>
    <%= t ".created from" %>
    -
    <%= link_to @user.creation_ip, users_path(:ip => @user.creation_ip) %>
    +
    <%= link_to @user.creation_address, users_path(:ip => @user.creation_address) %>
    <% end -%>
    <%= t ".status" %>
    <%= link_to @user.status.capitalize, users_path(:status => @user.status) %>