X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/001ff5764bcf15aaa179dc5c7844038676536622..6659fb9b33503ee6519f89131a8a4b5fef515bcd:/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 2fe92de5b..cf74fc0e0 100644
--- a/app/views/user/view.html.erb
+++ b/app/views/user/view.html.erb
@@ -1,125 +1,226 @@
-<%= user_image @this_user, :style => "float: right" %>
+<% content_for :heading do %>
+  <div id='userinformation'>
+    <%= user_image @this_user %>
+    <div class='userinformation-inner'>
+      <h2><%= @this_user.display_name %><%= role_icons(@this_user) %></h2>
+      <% if @user and @this_user.id == @user.id %>
+        <!-- Displaying user's own profile page -->
+        <ul class='secondary-actions clearfix'>
+          <li>
+            <%= 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>
+          </li>
+          <li>
+            <%= link_to t('user.view.my notes'), :controller => 'notes', :action=> 'mine' %>
+          </li>
+          <li>
+            <%= link_to t('user.view.my traces'), :controller => 'trace', :action=>'mine' %>
+            <span class='count-number'><%= number_with_delimiter(@user.traces.size) %></span>
+          </li>
+          <li>
+            <%= 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>
+          </li>
+          <li>
+            <%= link_to t('user.view.my comments' ), :controller => 'diary_entry', :action => 'comments', :display_name => @user.display_name %>
+          </li>
+          <li>
+            <%= link_to t('user.view.my settings'), :controller => 'user', :action => 'account', :display_name => @user.display_name %>
+          </li>
 
-<h2><%= h(@this_user.display_name) %>
+          <% if @user.blocks.exists? %>
+            <li>
+              <%= 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>
+            </li>
+          <% end %>
 
-<% 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 %></h2>
+          <% if @user and @user.moderator? and @user.blocks_created.exists? %>
+            <li>
+              <%= 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>
+            </li>
+          <% end %>
 
-<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 %>
-    |
-    <%= link_to t('user.view.oauth settings'), :controller => 'oauth_clients', :action => 'index' %>
-    |
-    <%= 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 %>
-    <!-- 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 %>
-  <% if @user and @user.administrator? %>
-    <br/>
-    <% if ["active", "confirmed"].include? @this_user.status %>
-      <%= link_to t('user.view.deactivate_user'), {:controller => 'user', :action => 'set_status', :status => 'pending', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %> |
-    <% elsif ["pending"].include? @this_user.status %>
-      <%= link_to t('user.view.activate_user'), {:controller => 'user', :action => 'set_status', :status => 'active', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %> |
-    <% end %>
-    <% if ["active", "suspended"].include? @this_user.status %>
-      <%= link_to t('user.view.confirm_user'), {:controller => 'user', :action => 'set_status', :status => 'confirmed', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %> |
-    <% end %>
-    <% if ["pending", "active", "confirmed", "suspended"].include? @this_user.status %>
-      <%= link_to t('user.view.hide_user'), {:controller => 'user', :action => 'set_status', :status => 'deleted', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %> |
-    <% else %>
-      <%= link_to t('user.view.unhide_user'), {:controller => 'user', :action => 'set_status', :status => 'active', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %> |
-    <% end %>
-    <%= link_to t('user.view.delete_user'), {:controller => 'user', :action => 'delete', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %>
-  <% end %>
-</div>
+        </ul>
 
-<p><b><%= t 'user.view.mapper since' %></b> <%= l @this_user.creation_time, :format => :friendly %> <%= t 'user.view.ago', :time_in_words_ago => time_ago_in_words(@this_user.creation_time) %></p>
+        <% else %>
 
-<% if @user and @user.administrator? %>
-  <p><b><%= t 'user.view.email address' %></b> <%= @this_user.email %></p>  
-  <p><b><%= t 'user.view.created from' %></b> <%= @this_user.creation_ip %></p>
-  <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 %>
+        <ul class='secondary-actions clearfix'>
 
-<h3><%= t 'user.view.description' %></h3>
+          <li>
+            <%= 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>
+          </li>
+          <li>
+            <%= link_to t('user.view.notes'), :controller => 'notes', :action=> 'mine' %>
+          </li>
+          <li>
+            <%= 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>
+          </li>
 
-<div id="description"><%= htmlize(@this_user.description) %></div>
+          <!-- Displaying another user's profile page -->
 
-<% if @user and @this_user.id == @user.id %>
-  <div id="map" class="user_map" style="border: 1px solid black; position: relative; width: 400px; height: 400px; float: right;">
-    <% if @this_user.home_lat.nil? or @this_user.home_lon.nil? %>
-      <p style="position: absolute; top: 0; bottom: 0; width: 90%; height: 30%; margin: auto 5%">
-        <%= 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) %>
+          <li>
+            <%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => @this_user.display_name %>
+          </li>
+          <li>
+            <%= 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>
+          </li>
+          <li>
+            <%= link_to t('user.view.comments'), :controller => 'diary_entry', :action => 'comments', :display_name => @this_user.display_name %>
+          </li>
+          <li>
+            <% 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 %>
+          </li>
+
+          <% if @this_user.blocks.exists? %>
+            <li>
+              <%= 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>
+            </li>
+          <% end %>
+
+          <% if @this_user.moderator? and @this_user.blocks_created.exists? %>
+            <li>
+              <%= 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>
+            </li>
+          <% end %>
+
+          <% if @user and @user.moderator? %>
+            <li>
+            <%= link_to t('user.view.create_block'), :controller => 'user_blocks', :action => 'new', :display_name => @this_user.display_name %>
+            </li>
+          <% end %>
+
+        </ul>
+
+      <% end %>
+
+      <% if @user and @user.administrator? %>
+
+        <ul class='secondary-actions clearfix'>
+          <% if ["active", "confirmed"].include? @this_user.status %>
+            <li>
+              <%= 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') } %>
+            </li>
+          <% elsif ["pending"].include? @this_user.status %>
+            <li>
+              <%= 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') } %>
+            </li>
+          <% end %>
+
+          <% if ["active", "suspended"].include? @this_user.status %>
+            <li>
+              <%= 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') } %>
+            </li>
+          <% end %>
+            <li>
+              <% 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') } %>
+            </li>
+          <% end %>
+          <li>
+            <%= link_to t('user.view.delete_user'), delete_user_path(:display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %>
+          </li>
+        </ul>
+
+        <% end %>
+
+      <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>
+    </div>
+
+    <div class="user-description richtext"><%= @this_user.description.to_html %></div>
+
+  </div>
+
+  <% if @user and @user.administrator? -%>
+    <div class='admin-user-info deemphasize'>
+      <small><b><%= t 'user.view.email address' %></b> <%= @this_user.email %></small>
+      <% unless @this_user.creation_ip.nil? -%>
+        <small><b><%= t 'user.view.created from' %></b> <%= @this_user.creation_ip %></small>
+      <% end -%>
+      <small><b><%= t 'user.view.status' %></b> <%= @this_user.status.capitalize %></small>
+      <small><b><%= t 'user.view.spam score' %></b> <%= @this_user.spam_score %></small>
+    </div>
+  <% end -%>
+
+<% end %>
+
+  <% if @user and @this_user.id == @user.id %>
+    <% if @this_user.home_lat.nil? or @this_user.home_lon.nil? %>
+      <div id="map" class="content_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 %>
-      <%= render :partial => 'map', :locals => { :setting_location => false, :show_other_users => true } %>
+      <% 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 %>
-  </div>
 
-  <% friends = @this_user.friends.collect { |f| f.befriendee } %>
-  <% nearby = @this_user.nearby - friends %>
+    <% friends = @this_user.friends.collect { |f| f.befriendee } %>
+    <% nearby = @this_user.nearby - friends %>
 
-  <h3 style="margin-top: 0"><%= t 'user.view.your friends' %></h3>
+  <div class="activity-block column-1">
+    <h3><%= t 'user.view.your friends' %></h3>
 
-  <% if friends.empty? %>
-    <%= t 'user.view.no friends' %>
-  <% else %>
-    <table id="friends">
-      <%= render :partial => "contact", :collection => friends %>
-    </table>
-  <% end %>
+    <% if friends.empty? %>
+      <%= t 'user.view.no friends' %>
+    <% else %>
+      <ul class='secondary-actions clearfix'>
+        <li><%= link_to t('user.view.friends_changesets'), friend_changesets_path %></li>
+        <li><%= link_to t('user.view.friends_diaries'), friend_diaries_path %></li>
+      </ul>
+      <div id="friends-container">
+        <%= render :partial => "contact", :collection => friends, :locals => {:type => "friend"} %>
+      </div>
+    <% end %>
+  </div>
 
-  <h3><%= t 'user.view.nearby users' %></h3>
+  <div class="activity-block column-1">
+    <h3><%= t 'user.view.nearby users' %></h3>
 
-  <% if nearby.empty? %>
-    <%= t 'user.view.no nearby users' %>
-  <% else %>
-    <table id="nearbyusers">
-      <%= render :partial => "contact", :collection => nearby %>
-    </table>
-  <% end %>
+    <% if nearby.empty? %>
+      <%= t 'user.view.no nearby users' %>
+    <% else %>
+      <ul class='secondary-actions clearfix'>
+        <li><%= link_to t('user.view.nearby_changesets'), nearby_changesets_path %></li>
+        <li><%= link_to t('user.view.nearby_diaries'), nearby_diaries_path %></li>
+      </ul>
+      <div id="nearbyusers">
+        <%= render :partial => "contact", :collection => nearby, :locals => {:type => "nearby mapper"} %>
+      </div>
+    <% end %>
+  </div>
 <% end %>