X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/59102ea017825ceafdfe603cc43f9dd45e5c0ab6..9477d7a65e03b895a8d30a4586449e76c1ea4758:/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 b0faeaf64..04fc4cb3b 100644
--- a/app/views/user/view.html.erb
+++ b/app/views/user/view.html.erb
@@ -1,145 +1,158 @@
-<h2><%= 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.#{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.#{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}")) %>
-<% end %>
-<% end %></h2>
-<div id="userinformation">
-<% if @user and @this_user.id == @user.id %>
-<!-- Displaying user's own profile page -->
-<%= 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 %>
-<!-- Displaying another user's profile page -->
-<%= 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 %>
-</div>
+<%= user_image @this_user %>
 
-<% if @this_user != nil %>
-<P>
-<b><%= t 'user.view.mapper since' %></b> <%= l @this_user.creation_time %> <%= t 'user.view.ago', :time_in_words_ago => time_ago_in_words(@this_user.creation_time) %>
-</P>
-<% end %>
-  
-<h3><%= t 'user.view.user image heading' %></h3>
-<% if @this_user.image %>
-  <%= image_tag url_for_file_column(@this_user, "image") %>
+<h2><%= @this_user.display_name %><%= role_icons(@this_user) %></h2>
+
+<div id="userinformation">
   <% if @user and @this_user.id == @user.id %>
-    <%= button_to t('user.view.delete image'), :action => 'delete_image' %>
+    <!-- Displaying user's own profile page -->
+    <%= link_to t('user.view.my edits'), :controller => 'changeset', :action => 'list', :display_name => @user.display_name %>
+    <span class='count-number'><%= number_with_delimiter(@user.changesets.size) %></span>
+    |
+    <%= link_to t('user.view.my traces'), :controller => 'trace', :action=>'mine' %>
+    <span class='count-number'><%= number_with_delimiter(@user.traces.size) %></span>
+    |
+    <%= link_to t('user.view.my notes'), :controller => 'notes', :action=> 'mine' %>
+    |
+    <%= link_to t('user.view.my diary'), :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %>
+    <span class='count-number'><%= number_with_delimiter(@user.diary_entries.size) %></span>
+    |
+    <%= 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 %>
+      <span class='count-number'><%= number_with_delimiter(@user.blocks.active.size) %></span>
+    <% 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 %>
+      <span class='count-number'><%= number_with_delimiter(@user.blocks_created.active.size) %></span>
+    <% end %>
+  <% else %>
+    <%= link_to t('user.view.edits'), :controller => 'changeset', :action => 'list', :display_name => @this_user.display_name %>
+    <span class='count-number'><%= number_with_delimiter(@this_user.changesets.size) %></span>
+    |
+    <%= link_to t('user.view.traces'), :controller => 'trace', :action => 'list', :display_name => @this_user.display_name %>
+    <span class='count-number'><%= number_with_delimiter(@this_user.traces.size) %></span>
+    |
+    <%= link_to t('user.view.notes'), :controller => 'notes', :action=> 'mine' %>
+    |
+    <!-- Displaying another user's profile page -->
+    <%= 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 %>
+    <span class='count-number'><%= number_with_delimiter(@this_user.diary_entries.size) %></span>
+    |
+    <%= 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 %>
+      <span class='count-number'><%= number_with_delimiter(@this_user.blocks.active.size) %></span>
+    <% 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 %>
+      <span class='count-number'><%= number_with_delimiter(@this_user.blocks_created.active.size) %></span>
+    <% 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 %>
-<br />
+  <% if @user and @user.administrator? %>
+    <br/>
+    <% 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 %>
+</div>
 
-<% if @user and @this_user.id == @user.id %>
-  <%= t 'user.view.upload an image' %><br />
-  <%= form_tag({:action=>'upload_image'}, :multipart => true)%>
-    <%= file_column_field 'user', 'image' %>
-    <%= submit_tag t('user.view.add image') %>
-  </form>
-<% end %>
+<div id="description"><%= @this_user.description.to_html %></div>
 
-<h3><%= t 'user.view.description' %></h3>
-<div id="description"><%= htmlize(@this_user.description) %></div>
+<p class='deemphasize'><small>
+<%= 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 -%>
+</small>
+</p>
 
-<% if @this_user.home_lat.nil? or @this_user.home_lon.nil? %>
-<h3><%= t 'user.view.user location' %></h3>
+<% if @user and @user.administrator? -%>
+  <p><b><%= t 'user.view.email address' %></b> <%= @this_user.email %></p>
+  <% unless @this_user.creation_ip.nil? -%>
+  <p><b><%= t 'user.view.created from' %></b> <%= @this_user.creation_ip %></p>
+  <% end -%>
+  <p><b><%= t 'user.view.status' %></b> <%= @this_user.status.capitalize %></p>
+  <p><b><%= t 'user.view.spam score' %></b> <%= @this_user.spam_score %></p>
+<% 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) %>
+<% if @user and @this_user.id == @user.id %>
+  <% if @this_user.home_lat.nil? or @this_user.home_lon.nil? %>
+    <div id="map" class="user_map">
+      <p id="no_home_location"><%= 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)) %></p>
+    </div>
+  <% else %>
+    <% 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 => "user_map", :data => {:user => user_data} %>
   <% end %>
-<% else %>
-
-  <% if @user and @this_user.id == @user.id %>
-    <h3><%= t 'user.view.your friends' %></h3>
-    <% if @this_user.friends.empty? %>
-      <%= t 'user.view.no friends' %>
-    <% else %>
-      <table id="friends">
-      <% @this_user.friends.each do |friend| %>
-      <% @friend = User.find_by_id(friend.friend_user_id) %>
-      <tr>
-      <td class="image">
-      <% if @friend.image %>
-        <%= image_tag url_for_file_column(@friend, "image") %>
-      <% end %>
-      </td>
-      <td class="username"><%= link_to h(@friend.display_name), :controller => 'user', :action => 'view',  :display_name => @friend.display_name %></td>
-      <td>
-        <% 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 %>
-      </td>
-      <td class="message">(<%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => @friend.display_name %>)</td>
-      </tr>
-      <%end%>
-      </table>
-    <%end%>
-    <br/>
-  <%end%>
 
+  <% friends = @this_user.friends.collect { |f| f.befriendee } %>
+  <% nearby = @this_user.nearby - friends %>
 
-  <% if @user and @this_user.id == @user.id %>
-    <h3><%= t 'user.view.nearby users' %></h3>
-    <% if @this_user.nearby.empty? %>
-      <%= t 'user.view.no nearby users' %>
-    <% else %>
+  <h3 style="margin-top: 0"><%= t 'user.view.your friends' %></h3>
 
-    <div id="map" style="border: 1px solid black; position: relative; width : 90%; height : 400px;"></div>
-    <%= render :partial => 'friend_map' %>
-      <table id="nearbyusers">
-      <% @this_user.nearby.each do |nearby| %>
-      <tr>
-      <td class="username"><%= link_to h(nearby.display_name), :controller => 'user', :action => 'view',  :display_name => nearby.display_name %></td>
-      <td>
-        <% 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 %>
-      </td>
-      <td class="message">(<%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => nearby.display_name %>)</td>
-      </tr>
-      <% end %>
-      </table>
-    <% end %>
+  <% if friends.empty? %>
+    <%= t 'user.view.no friends' %>
+  <% else %>
+    <%= link_to t('user.view.friends_changesets'), friend_changesets_path %><br/>
+    <%= link_to t('user.view.friends_diaries'), friend_diaries_path %><br/><br/>
+    <table id="friends">
+      <%= render :partial => "contact", :collection => friends, :locals => {:type => "friend"} %>
+    </table>
   <% end %>
-<% end %>
 
-<br/>
-<br/>
-<% 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 %>
-<br/><br/>
-<%= link_to t('user.view.my_oauth_details'), :controller => 'oauth_clients', :action => 'index' %>
+  <h3><%= t 'user.view.nearby users' %></h3>
+
+  <% if nearby.empty? %>
+    <%= t 'user.view.no nearby users' %>
+  <% else %>
+    <%= link_to t('user.view.nearby_changesets'), nearby_changesets_path %><br/>
+    <%= link_to t('user.view.nearby_diaries'), nearby_diaries_path %><br/><br/>
+    <table id="nearbyusers">
+      <%= render :partial => "contact", :collection => nearby, :locals => {:type => "nearby mapper"} %>
+    </table>
+  <% end %>
 <% end %>