X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a570f59187efa0a298d31bae2b224de9762bb42f..3e88348b27bd432bd7cfcc2e01f7b77a01011e68:/app/views/users/show.html.erb?ds=inline diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 011226109..2a195ca60 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -1,235 +1,202 @@ <% content_for :heading do %> -
- <%= user_image @user %> -
-

<%= @user.display_name %><%= role_icons(@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"), :controller => "notes", :action => "mine" %> -
  • -
  • - <%= 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"), :controller => "notes", :action => "mine" %> -
  • -
  • - <%= 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.creation_time.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 -%> +
-

-
- -
<%= @user.description.to_html %>
+
-
+ <% if can?(:set_status, User) || can?(:destroy, User) %> + + <% end %> - <% if current_user and current_user.administrator? -%> - - <% end -%> - +
<% end %> - <% if current_user and @user.id == current_user.id %> - <% if @user.home_lat.nil? or @user.home_lon.nil? %> -
-

<%= t(".if_set_location_html", :settings_link => (link_to t(".settings_link_text"), :controller => "users", :action => "account", :display_name => current_user.display_name)) %>

-
- <% else %> - <% content_for :head do %> - <%= javascript_include_tag "user" %> - <% end %> - <% user_data = { - :lon => current_user.home_lon, - :lat => current_user.home_lat, - :icon => image_path("marker-red.png"), - :description => render(:partial => "popup", :object => current_user, :locals => { :type => "your location" }) - } %> - <%= content_tag "div", "", :id => "map", :class => "content_map", :data => { :user => user_data } %> - <% end %> - - <% friends = @user.friends %> - <% nearby = @user.nearby - friends %> - -
-

<%= t ".my friends" %>

- - <% if friends.empty? %> - <%= t ".no friends" %> - <% else %> - -
- <%= render :partial => "contact", :collection => friends, :locals => { :type => "friend" } %> -
- <% end %> -
+
<%= @user.description.to_html %>
-
-

<%= t ".nearby users" %>

- - <% if nearby.empty? %> - <%= t ".no nearby users" %> - <% else %> - -
- <%= render :partial => "contact", :collection => nearby, :locals => { :type => "nearby mapper" } %> -
- <% end %> +<% if current_user and @user.id == current_user.id %> +
+ <%= link_to t(".edit_profile"), edit_profile_path, :class => "btn btn-outline-primary" %>
<% end %>