X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/eb0f9ff63d5ad5d91ea941420e094dd2980df094..1f7dd79daf44de5f8f8b6c246a269e44bb258175:/app/views/user/view.html.erb
diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb
index f05b26220..67619a536 100644
--- a/app/views/user/view.html.erb
+++ b/app/views/user/view.html.erb
@@ -1,164 +1,220 @@
-
<%= 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 %>
-<% if @user and @user.administrator? %>
-
-<% if @this_user.active? %>
-<%= link_to t('user.view.deactivate_user'), {:controller => 'user', :action => 'deactivate', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %>
-<% else %>
-<%= link_to t('user.view.activate_user'), {:controller => 'user', :action => 'activate', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %>
-<% end %>
-<% if @this_user.visible? %>
-| <%= link_to t('user.view.hide_user'), {:controller => 'user', :action => 'hide', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %>
-| <%= link_to t('user.view.delete_user'), {:controller => 'user', :action => 'delete', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %>
-<% else %>
-| <%= link_to t('user.view.unhide_user'), {:controller => 'user', :action => 'unhide', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %>
-<% end %>
-<% end %>
-
+<% content_for :heading do %>
+
+
+ <% 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| %>
-
- <%= 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 %>) |
-
+ <% content_for :head do %>
+ <%= javascript_include_tag "user" %>
<% end %>
-
+ <%
+ 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 %>
+
+ - <%= 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, :locals => {:type => "friend"} %>
+
+ <% end %>
+
+
+
+
<%= 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, :locals => {:type => "nearby mapper"} %>
+
+ <% end %>
+
<% end %>