X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7f3cb3c6246e6e271761e714cceb081e85a4d245..8551db4c82df7458632d4aa30e9344d60e0774dc:/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 c73581b25..d479b1d56 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -81,15 +81,15 @@ <%= 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? %>
  • @@ -217,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) %>