X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/7de5220090d01722d8ea06679493355eefd4636c..2d22ab10f759828e27876f138b419ff4c0913b87:/app/views/user/view.html.erb diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb index 4a8fde862..f39bafec7 100644 --- a/app/views/user/view.html.erb +++ b/app/views/user/view.html.erb @@ -1,149 +1,228 @@ -

<%= h(@this_user.display_name) %> -<% UserRole::ALL_ROLES.each do |role| %> -<% if @user and @user.administrator? %> -<% if @this_user.has_role? role %> -<%= link_to(image_tag("roles/#{role}.png", :size => "20x20", :border => 0, :alt => t("user.view.role.revoke.#{role}"), :title => t("user.view.role.revoke.#{role}")), :controller => 'user_roles', :action => 'revoke', :display_name => @this_user.display_name, :role => role) %> -<% else %> -<%= link_to(image_tag("roles/blank_#{role}.png", :size => "20x20", :border => 0, :alt => t("user.view.role.grant.#{role}"), :title => t("user.view.role.grant.#{role}")), :controller => 'user_roles', :action => 'grant', :display_name => @this_user.display_name, :role => role) %> -<% end %> -<% elsif @this_user.has_role? role %> -<%= image_tag("roles/#{role}.png", :size => "20x20", :border => 0, :alt => t("user.view.role.#{role}"), :title => t("user.view.role.#{role}")) %> -<% end %> -<% end %>

-
-<% 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 %> -| <%= link_to t('user.view.blocks on me'), :controller => 'user_blocks', :action => 'blocks_on', :display_name => @user.display_name %> -<% if @user and @user.moderator? %> -| <%= link_to t('user.view.blocks by me'), :controller => 'user_blocks', :action => 'blocks_by', :display_name => @user.display_name %> -<% end %> -<% 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 %> -| <%= link_to t('user.view.block_history'), :controller => 'user_blocks', :action => 'blocks_on', :display_name => @this_user.display_name %> -<% if @this_user.moderator? %> -| <%= link_to t('user.view.moderator_history'), :controller => 'user_blocks', :action => 'blocks_by', :display_name => @this_user.display_name %> -<% 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 %> -
+<% content_for :heading do %> +
+ <%= user_image @this_user %> +
+

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

+ <% if @user and @this_user.id == @user.id %> + + - <%= 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 %> + <% else %> + + - <% if @user and @this_user.id == @user.id %> -

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

- <% if @this_user.friends.empty? %> - <%= t 'user.view.no friends' %> - <% 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 %> + + <% 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 %> - 		(<%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => @friend.display_name %>)
- <%end%> -
- <%end%> +

+ + <%= t 'user.view.mapper since' %> <%= l @this_user.creation_time.to_date, :format => :long %> + | + <%= 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 -%> + +

+
+ +
<%= @this_user.description.to_html %>
+ +
+ + <% 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 -%> + +<% end %> <% if @user and @this_user.id == @user.id %> -

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

- <% if @this_user.nearby.empty? %> - <%= t 'user.view.no nearby users' %> + <% 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 %> - -
- <%= render :partial => 'friend_map' %> - - <% @this_user.nearby.each do |nearby| %> - - - - - + <% content_for :head do %> + <%= javascript_include_tag "user" %> <% 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 %>)
+ <% + user_data = { + :lon => @user.home_lon, + :lat => @user.home_lat, + :icon => image_path("marker-red.png"), + :description => render(:partial => "popup", :object => @user, :locals => {:type => "your location"}) + } + %> + <%= content_tag "div", "", :id => "map", :class => "content_map", :data => {:user => user_data} %> <% end %> - <% 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' %> + <% friends = @this_user.friends.collect { |f| f.befriendee } %> + <% nearby = @this_user.nearby - friends %> + +
+

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

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

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

+ + <% if nearby.empty? %> + <%= t 'user.view.no nearby users' %> + <% else %> + +
+ <%= render :partial => "contact", :collection => nearby, :locals => {:type => "nearby mapper"} %> +
+ <% end %> +
<% end %>