X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d227589a6336999c38bffc5e11655100b9a4630a..24453e72308c681c3d4a5c8b4a743bab4c4bc5ce:/app/views/user/view.html.erb?ds=sidebyside diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb index 931037319..da5804304 100644 --- a/app/views/user/view.html.erb +++ b/app/views/user/view.html.erb @@ -1,127 +1,141 @@ -

<%= h(@this_user.display_name) %>

-
-<% if @user and @this_user.id == @user.id %> - -<%= link_to t('user.view.my diary'), :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %> -| <%= link_to t('user.view.new diary entry'), :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %> -| <%= link_to t('user.view.my edits'), :controller => 'changeset', :action => 'list', :display_name => @user.display_name %> -| <%= link_to t('user.view.my traces'), :controller => 'trace', :action=>'mine' %> -| <%= link_to t('user.view.my settings'), :controller => 'user', :action => 'account', :display_name => @user.display_name %> -<% else %> - -<%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => @this_user.display_name %> -| <%= link_to t('user.view.diary'), :controller => 'diary_entry', :action => 'list', :display_name => @this_user.display_name %> -| <%= link_to t('user.view.edits'), :controller => 'changeset', :action => 'list', :display_name => @this_user.display_name %> -| <%= link_to t('user.view.traces'), :controller => 'trace', :action => 'view', :display_name => @this_user.display_name %> -| <% if @user and @user.is_friends_with?(@this_user) %> - <%= link_to t('user.view.remove as friend'), :controller => 'user', :action => 'remove_friend', :display_name => @this_user.display_name %> -<% else %> - <%= link_to t('user.view.add as friend'), :controller => 'user', :action => 'make_friend', :display_name => @this_user.display_name %> -<% end %> -<% end %> -
+<%= user_image @this_user %> -<% if @this_user != nil %> -

-<%= t 'user.view.mapper since' %><%= l @this_user.creation_time %> <%= t 'user.view.ago', :time_in_words_ago => time_ago_in_words(@this_user.creation_time) %> -

-<% end %> - -

<%= t 'user.view.user image heading' %>

-<% if @this_user.image %> - <%= image_tag url_for_file_column(@this_user, "image") %> +

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

+ +
<% if @user and @this_user.id == @user.id %> - <%= button_to t('user.view.delete image'), :action => 'delete_image' %> + + <%= link_to t('user.view.my edits'), :controller => 'changeset', :action => 'list', :display_name => @user.display_name %> + <%= number_with_delimiter(@user.changesets.size) %> + | + <%= link_to t('user.view.my traces'), :controller => 'trace', :action=>'mine' %> + <%= number_with_delimiter(@user.traces.size) %> + | + <%= link_to t('user.view.my diary'), :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %> + | + <%= link_to t('user.view.my comments' ), :controller => 'diary_entry', :action => 'comments', :display_name => @user.display_name %> + | + <%= link_to t('user.view.my settings'), :controller => 'user', :action => 'account', :display_name => @user.display_name %> + <% if @user.blocks.exists? %> + | + <%= link_to t('user.view.blocks on me'), :controller => 'user_blocks', :action => 'blocks_on', :display_name => @user.display_name %> + <%= number_with_delimiter(@user.blocks.active.size) %> + <% end %> + <% if @user and @user.moderator? and @user.blocks_created.exists? %> + | + <%= link_to t('user.view.blocks by me'), :controller => 'user_blocks', :action => 'blocks_by', :display_name => @user.display_name %> + <%= number_with_delimiter(@user.blocks_created.active.size) %> + <% end %> + <% else %> + <%= link_to t('user.view.edits'), :controller => 'changeset', :action => 'list', :display_name => @this_user.display_name %> + <%= number_with_delimiter(@this_user.changesets.size) %> + | + <%= link_to t('user.view.traces'), :controller => 'trace', :action => 'list', :display_name => @this_user.display_name %> + <%= number_with_delimiter(@this_user.traces.size) %> + | + + <%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => @this_user.display_name %> + | + <%= link_to t('user.view.diary'), :controller => 'diary_entry', :action => 'list', :display_name => @this_user.display_name %> + | + <%= link_to t('user.view.comments'), :controller => 'diary_entry', :action => 'comments', :display_name => @this_user.display_name %> + | + <% if @user and @user.is_friends_with?(@this_user) %> + <%= link_to t('user.view.remove as friend'), remove_friend_path(:display_name => @this_user.display_name), :method => :post %> + <% else %> + <%= link_to t('user.view.add as friend'), make_friend_path(:display_name => @this_user.display_name), :method => :post %> + <% end %> + <% if @this_user.blocks.exists? %> + | + <%= link_to t('user.view.block_history'), :controller => 'user_blocks', :action => 'blocks_on', :display_name => @this_user.display_name %> + <%= number_with_delimiter(@this_user.blocks.active.size) %> + <% end %> + <% if @this_user.moderator? and @this_user.blocks_created.exists? %> + | + <%= link_to t('user.view.moderator_history'), :controller => 'user_blocks', :action => 'blocks_by', :display_name => @this_user.display_name %> + <%= number_with_delimiter(@this_user.blocks_created.active.size) %> + <% end %> + <% if @user and @user.moderator? %> + | <%= link_to t('user.view.create_block'), :controller => 'user_blocks', :action => 'new', :display_name => @this_user.display_name %> + <% end %> <% end %> -<% end %> -
+ <% if @user and @user.administrator? %> +
+ <% if ["active", "confirmed"].include? @this_user.status %> + <%= link_to t('user.view.deactivate_user'), set_status_user_path(:status => 'pending', :display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %> | + <% elsif ["pending"].include? @this_user.status %> + <%= link_to t('user.view.activate_user'), set_status_user_path(:status => 'active', :display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %> | + <% end %> + <% if ["active", "suspended"].include? @this_user.status %> + <%= link_to t('user.view.confirm_user'), set_status_user_path(:status => 'confirmed', :display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %> | + <% end %> + <% if ["pending", "active", "confirmed", "suspended"].include? @this_user.status %> + <%= link_to t('user.view.hide_user'), set_status_user_path(:status => 'deleted', :display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %> | + <% else %> + <%= link_to t('user.view.unhide_user'), set_status_user_path(:status => 'active', :display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %> | + <% end %> + <%= link_to t('user.view.delete_user'), delete_user_path(:display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %> + <% end %> +
-<% if @user and @this_user.id == @user.id %> - <%= t 'user.view.upload an image' %>
- <%= form_tag({:action=>'upload_image'}, :multipart => true)%> - <%= file_column_field 'user', 'image' %> - <%= submit_tag t('user.view.add image') %> - -<% end %> +

<%= t 'user.view.mapper since' %> <%= l @this_user.creation_time, :format => :friendly %> <%= t 'user.view.ago', :time_in_words_ago => time_ago_in_words(@this_user.creation_time) %>

-

<%= t 'user.view.description' %>

-
<%= htmlize(@this_user.description) %>
+

<%= t 'user.view.ct status' %> +<% if not @this_user.terms_agreed.nil? -%> +<%= t 'user.view.ct accepted', :ago =>time_ago_in_words(@this_user.terms_agreed) %> +<% elsif not @this_user.terms_seen? -%> +<%= t 'user.view.ct undecided' %> +<% else -%> +<%= t 'user.view.ct declined' %> +<% end -%> +

-<% if @this_user.home_lat.nil? or @this_user.home_lon.nil? %> -

<%= t 'user.view.user location' %>

+<% if @user and @user.administrator? -%> +

<%= t 'user.view.email address' %> <%= @this_user.email %>

+ <% unless @this_user.creation_ip.nil? -%> +

<%= t 'user.view.created from' %> <%= @this_user.creation_ip %>

+ <% end -%> +

<%= t 'user.view.status' %> <%= @this_user.status.capitalize %>

+

<%= t 'user.view.spam score' %> <%= @this_user.spam_score %>

+<% end -%> - <%= t 'user.view.no home location' %> - <% if @user and @this_user.id == @user.id %> - <%= t 'user.view.if set location', :settings_link => (link_to t('user.view.settings_link_text'), :controller => 'user', :action => 'account', :display_name => @user.display_name) %> - <% end %> -<% else %> +

<%= t 'user.view.description' %>

- <% if @user and @this_user.id == @user.id %> -

<%= t 'user.view.your friends' %>

- <% if @this_user.friends.empty? %> - <%= t 'user.view.no friends' %> +
<%= @this_user.description.to_html %>
+ +<% if @user and @this_user.id == @user.id %> +
+ <% if @this_user.home_lat.nil? or @this_user.home_lon.nil? %> +

<%= raw(t 'user.view.if set location', :settings_link => (link_to t('user.view.settings_link_text'), :controller => 'user', :action => 'account', :display_name => @user.display_name)) %>

<% else %> - - <% @this_user.friends.each do |friend| %> - <% @friend = User.find_by_id(friend.friend_user_id) %> - - - - - - - <%end%> -
- <% if @friend.image %> - <%= image_tag url_for_file_column(@friend, "image") %> - <% end %> - <%= link_to h(@friend.display_name), :controller => 'user', :action => 'view', :display_name => @friend.display_name %> - <% if @friend.home_lon and @friend.home_lat %> - <% distance = @this_user.distance(@friend) %> - <% if distance < 1 %> - <%= t 'user.view.m away', :count => (distance * 1000).round %> - <% else %> - <%= t 'user.view.km away', :count => distance.round %> - <% end %> - <% end %> - (<%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => @friend.display_name %>)
- <%end%> -
- <%end%> + <%= render :partial => 'map', :locals => { :setting_location => false, :show_other_users => true } %> + <% end %> +
+ <% friends = @this_user.friends.collect { |f| f.befriendee } %> + <% nearby = @this_user.nearby - friends %> - <% if @user and @this_user.id == @user.id %> -

<%= t 'user.view.nearby users' %>

- <% if @this_user.nearby.empty? %> - <%= t 'user.view.no nearby users' %> - <% else %> +

<%= t 'user.view.your friends' %>

-
- <%= render :partial => 'friend_map' %> - - <% @this_user.nearby.each do |nearby| %> - - - - - - <% end %> -
<%= link_to h(nearby.display_name), :controller => 'user', :action => 'view', :display_name => nearby.display_name %> - <% distance = @this_user.distance(nearby) %> - <% if distance < 1 %> - <%= t 'user.view.m away', :count => (distance * 1000).round %> - <% else %> - <%= t 'user.view.km away', :count => distance.round %> - <% end %> - (<%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => nearby.display_name %>)
- <% end %> + <% if friends.empty? %> + <%= t 'user.view.no friends' %> + <% else %> + <%= link_to t('user.view.friends_changesets'), friend_changesets_path %>
+ <%= link_to t('user.view.friends_diaries'), friend_diaries_path %>

+ + <%= render :partial => "contact", :collection => friends %> +
<% end %> -<% end %> -
-
-<% if @user and @this_user.id == @user.id %> -<%= link_to t('user.view.change your settings'), :controller => 'user', :action => 'account', :display_name => @user.display_name %> -

-<%= link_to t('user.view.my_oauth_details'), :controller => 'oauth_clients', :action => 'index' %> +

<%= t 'user.view.nearby users' %>

+ + <% if nearby.empty? %> + <%= t 'user.view.no nearby users' %> + <% else %> + <%= link_to t('user.view.nearby_changesets'), nearby_changesets_path %>
+ <%= link_to t('user.view.nearby_diaries'), nearby_diaries_path %>

+ + <%= render :partial => "contact", :collection => nearby %> +
+ <% end %> <% end %>