X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5c39e5870d5b31262644ef8e7d1b73dbe6f4e0b7..732e1ab03a3b0f003dd8dc10e505d8d952fa18b9:/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 31e9d7585..41d7b0064 100644
--- a/app/views/user/view.html.erb
+++ b/app/views/user/view.html.erb
@@ -1,141 +1,230 @@
-<%= user_image @this_user %>
+<% content_for :heading do %>
+
<% if @user and @this_user.id == @user.id %>
-
- <%= 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 %>
+ <% 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 %>
- <%= 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 %>
- <% 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') } %> |
+ <% 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 %>
- <% 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') } %> |
+
+ <% 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.unhide_user'), set_status_user_path(:status => 'active', :display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %> |
+
+ - <%= 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 %>
- <%= link_to t('user.view.delete_user'), delete_user_path(:display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %>
- <% end %>
-
-
-
<%= @this_user.description.to_html %>
-
-
-<%= 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 -%>
-
-
-
-<% 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 -%>
+
-<% 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)) %>
+
+
<%= t 'user.view.nearby users' %>
+
+ <% if nearby.empty? %>
+ <%= t 'user.view.no nearby users' %>
<% else %>
- <%= render :partial => 'map', :locals => { :setting_location => false, :show_other_users => true } %>
+
+ - <%= 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 %>
-
- <% 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 %>
-
- <% 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 %>
-
- <% end %>
<% end %>