X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/86061a881662bba3ba889878c5b51c37275f5f45..58ea30c724c9990a51c13da40eb5fe515c026888:/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 1c5d3dc64..4dcc9ab05 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 @user %>

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

@@ -28,7 +28,7 @@ <%= link_to t(".my comments"), diary_comments_path(current_user) %>
  • - <%= link_to t(".my settings"), user_account_path(current_user) %> + <%= link_to t(".my settings"), edit_account_path %>
  • <% if current_user.blocks.exists? %> @@ -78,7 +78,7 @@ <%= link_to t(".comments"), diary_comments_path(@user) %>
  • - <% if current_user and current_user.is_friends_with?(@user) %> + <% 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 %> @@ -116,69 +116,95 @@ <% 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 %>
    + <% unless @user.terms_agreed %> +
    <%= t ".ct status" %>
    +
    + <% if @user.terms_seen? -%> + <%= t ".ct declined" %> + <% else -%> + <%= t ".ct undecided" %> + <% end -%> +
    <% end -%> - <% end -%> +
    -

    -
    -
  • +
    - <% if can?(:set_status, User) || can?(:destroy, User) %> - + <% end %> + + <% if current_user and current_user.administrator? -%> +
    + +
    +
    <%= t ".email address" %>
    +
    <%= @user.email %>
    + <% unless @user.creation_ip.nil? -%> +
    <%= t ".created from" %>
    +
    <%= @user.creation_ip %>
    + <% end -%> +
    <%= t ".status" %>
    +
    <%= @user.status.capitalize %>
    +
    <%= t ".spam score" %>
    +
    <%= @user.spam_score %>
    +
    +
    +
    <% end -%> - <%= t ".status" %> <%= @user.status.capitalize %> - <%= t ".spam score" %> <%= @user.spam_score %>
    - <% end -%> + <% end %>
    <%= @user.description.to_html %>