Merge remote-tracking branch 'upstream/pull/3297'
This commit is contained in:
Tom Hughes
commit
e91c02f2ce
18 changed files with 459 additions and 386 deletions
|
|
@ -1,45 +0,0 @@
|
|||
<% user_data = {
|
||||
:lon => contact.home_lon,
|
||||
:lat => contact.home_lat,
|
||||
:icon => image_path(type == "friend" ? "marker-blue.png" : "marker-green.png"),
|
||||
:description => render(:partial => "popup", :object => contact, :locals => { :type => type })
|
||||
} %>
|
||||
<%= tag.div :class => "contact-activity clearfix", :data => { :user => user_data } do %>
|
||||
<%= user_thumbnail contact %>
|
||||
<div class='activity-details'>
|
||||
<p class='text-muted'>
|
||||
<%= link_to contact.display_name, user_path(contact) %>
|
||||
<% if @user.home_lon and @user.home_lat and contact.home_lon and contact.home_lat %>
|
||||
<% distance = @user.distance(contact) %>
|
||||
<% if distance < 1 %>
|
||||
(<%= t "users.show.m away", :count => (distance * 1000).round %>)
|
||||
<% else %>
|
||||
(<%= t "users.show.km away", :count => distance.round %>)
|
||||
<% end %>
|
||||
<% end %>
|
||||
</p>
|
||||
<p>
|
||||
<% changeset = contact.changesets.first %>
|
||||
<% if changeset %>
|
||||
<%= t("users.show.latest edit", :ago => time_ago_in_words(changeset.created_at, :scope => :"datetime.distance_in_words_ago")) %>
|
||||
<% comment = changeset.tags["comment"].to_s == "" ? t("browse.no_comment") : changeset.tags["comment"] %>
|
||||
<q><%= link_to(comment,
|
||||
{ :controller => "browse", :action => "changeset", :id => changeset.id },
|
||||
{ :title => t("changesets.changeset.view_changeset_details") }) %></q>
|
||||
<% else %>
|
||||
<%= t "changesets.changeset.no_edits" %>
|
||||
<% end %>
|
||||
</p>
|
||||
|
||||
<ul class='secondary-actions clearfix text-muted'>
|
||||
<li><%= link_to t("users.show.send message"), new_message_path(contact) %></li>
|
||||
<li>
|
||||
<% if current_user.is_friends_with?(contact) %>
|
||||
<%= link_to t("users.show.remove as friend"), remove_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %>
|
||||
<% else %>
|
||||
<%= link_to t("users.show.add as friend"), make_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %>
|
||||
<% end %>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<% end %>
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
<div class="user_popup">
|
||||
<%= user_thumbnail popup %>
|
||||
<p><%= t(".#{type}") %></p>
|
||||
<p><%= link_to popup.display_name, user_path(popup) %></p>
|
||||
</div>
|
||||
|
|
@ -1,245 +1,202 @@
|
|||
<% content_for :heading do %>
|
||||
<div id='userinformation'>
|
||||
<%= user_image @user %>
|
||||
<div class='userinformation-inner'>
|
||||
<div id="userinformation" class="row">
|
||||
<div class="col-sm-auto">
|
||||
<%= user_image @user, :class => "user_image_no_margins" %>
|
||||
</div>
|
||||
<div class="col">
|
||||
<h1><%= @user.display_name %> <%= role_icons(@user) %></h1>
|
||||
<% if current_user and @user.id == current_user.id %>
|
||||
<!-- Displaying user's own profile page -->
|
||||
<ul class='secondary-actions clearfix'>
|
||||
<li>
|
||||
<%= link_to t(".my edits"), :controller => "changesets", :action => "index", :display_name => current_user.display_name %>
|
||||
<span class='count-number'><%= number_with_delimiter(current_user.changesets.size) %></span>
|
||||
</li>
|
||||
<li>
|
||||
<%= link_to t(".my notes"), user_notes_path(@user) %>
|
||||
</li>
|
||||
<li>
|
||||
<%= link_to t(".my traces"), :controller => "traces", :action => "mine" %>
|
||||
<span class='count-number'><%= number_with_delimiter(current_user.traces.size) %></span>
|
||||
</li>
|
||||
<li>
|
||||
<%= link_to t(".my diary"), :controller => "diary_entries", :action => "index", :display_name => current_user.display_name %>
|
||||
<span class='count-number'><%= number_with_delimiter(current_user.diary_entries.size) %></span>
|
||||
</li>
|
||||
<li>
|
||||
<%= link_to t(".my comments"), diary_comments_path(current_user) %>
|
||||
</li>
|
||||
<li>
|
||||
<%= link_to t(".my settings"), user_account_path(current_user) %>
|
||||
</li>
|
||||
|
||||
<% if current_user.blocks.exists? %>
|
||||
<nav class='secondary-actions'>
|
||||
<ul class='clearfix'>
|
||||
<li>
|
||||
<%= link_to t(".blocks on me"), user_blocks_on_path(current_user) %>
|
||||
<span class='count-number'><%= number_with_delimiter(current_user.blocks.active.size) %></span>
|
||||
<%= link_to t(".my edits"), :controller => "changesets", :action => "index", :display_name => current_user.display_name %>
|
||||
<span class='count-number'><%= number_with_delimiter(current_user.changesets.size) %></span>
|
||||
</li>
|
||||
<% end %>
|
||||
|
||||
<% if can?(:create, UserBlock) and current_user.blocks_created.exists? %>
|
||||
<li>
|
||||
<%= link_to t(".blocks by me"), user_blocks_by_path(current_user) %>
|
||||
<span class='count-number'><%= number_with_delimiter(current_user.blocks_created.active.size) %></span>
|
||||
<%= link_to t(".my notes"), user_notes_path(@user) %>
|
||||
</li>
|
||||
<li>
|
||||
<%= link_to t(".my traces"), :controller => "traces", :action => "mine" %>
|
||||
<span class='count-number'><%= number_with_delimiter(current_user.traces.size) %></span>
|
||||
</li>
|
||||
<li>
|
||||
<%= link_to t(".my diary"), :controller => "diary_entries", :action => "index", :display_name => current_user.display_name %>
|
||||
<span class='count-number'><%= number_with_delimiter(current_user.diary_entries.size) %></span>
|
||||
</li>
|
||||
<li>
|
||||
<%= link_to t(".my comments"), diary_comments_path(current_user) %>
|
||||
</li>
|
||||
<li>
|
||||
<%= link_to t(".my settings"), user_account_path(current_user) %>
|
||||
</li>
|
||||
<% end %>
|
||||
|
||||
</ul>
|
||||
<% if current_user.blocks.exists? %>
|
||||
<li>
|
||||
<%= link_to t(".blocks on me"), user_blocks_on_path(current_user) %>
|
||||
<span class='count-number'><%= number_with_delimiter(current_user.blocks.active.size) %></span>
|
||||
</li>
|
||||
<% end %>
|
||||
|
||||
<% if can?(:create, UserBlock) and current_user.blocks_created.exists? %>
|
||||
<li>
|
||||
<%= link_to t(".blocks by me"), user_blocks_by_path(current_user) %>
|
||||
<span class='count-number'><%= number_with_delimiter(current_user.blocks_created.active.size) %></span>
|
||||
</li>
|
||||
<% end %>
|
||||
|
||||
</ul>
|
||||
</nav>
|
||||
|
||||
<% else %>
|
||||
<!-- Displaying user profile page to the public -->
|
||||
<ul class='secondary-actions clearfix'>
|
||||
<nav class='secondary-actions'>
|
||||
<ul class='clearfix'>
|
||||
|
||||
<li>
|
||||
<%= link_to t(".edits"), :controller => "changesets", :action => "index", :display_name => @user.display_name %>
|
||||
<span class='count-number'><%= number_with_delimiter(@user.changesets.size) %></span>
|
||||
</li>
|
||||
<li>
|
||||
<%= link_to t(".notes"), user_notes_path(@user) %>
|
||||
</li>
|
||||
<li>
|
||||
<%= link_to t(".traces"), :controller => "traces", :action => "index", :display_name => @user.display_name %>
|
||||
<span class='count-number'><%= number_with_delimiter(@user.traces.size) %></span>
|
||||
</li>
|
||||
<li>
|
||||
<%= link_to t(".edits"), :controller => "changesets", :action => "index", :display_name => @user.display_name %>
|
||||
<span class='count-number'><%= number_with_delimiter(@user.changesets.size) %></span>
|
||||
</li>
|
||||
<li>
|
||||
<%= link_to t(".notes"), user_notes_path(@user) %>
|
||||
</li>
|
||||
<li>
|
||||
<%= link_to t(".traces"), :controller => "traces", :action => "index", :display_name => @user.display_name %>
|
||||
<span class='count-number'><%= number_with_delimiter(@user.traces.size) %></span>
|
||||
</li>
|
||||
|
||||
<!-- Displaying another user's profile page -->
|
||||
<!-- Displaying another user's profile page -->
|
||||
|
||||
<li>
|
||||
<%= link_to t(".send message"), new_message_path(@user) %>
|
||||
</li>
|
||||
<li>
|
||||
<%= link_to t(".diary"), :controller => "diary_entries", :action => "index", :display_name => @user.display_name %>
|
||||
<span class='count-number'><%= number_with_delimiter(@user.diary_entries.size) %></span>
|
||||
</li>
|
||||
<li>
|
||||
<%= link_to t(".comments"), diary_comments_path(@user) %>
|
||||
</li>
|
||||
<li>
|
||||
<% if current_user and current_user.is_friends_with?(@user) %>
|
||||
<%= link_to t(".remove as friend"), remove_friend_path(:display_name => @user.display_name), :method => :post %>
|
||||
<% elsif current_user %>
|
||||
<%= link_to t(".add as friend"), make_friend_path(:display_name => @user.display_name), :method => :post %>
|
||||
<% else %>
|
||||
<%= link_to t(".add as friend"), make_friend_path(:display_name => @user.display_name) %>
|
||||
<li>
|
||||
<%= link_to t(".send message"), new_message_path(@user) %>
|
||||
</li>
|
||||
<li>
|
||||
<%= link_to t(".diary"), :controller => "diary_entries", :action => "index", :display_name => @user.display_name %>
|
||||
<span class='count-number'><%= number_with_delimiter(@user.diary_entries.size) %></span>
|
||||
</li>
|
||||
<li>
|
||||
<%= link_to t(".comments"), diary_comments_path(@user) %>
|
||||
</li>
|
||||
<li>
|
||||
<% if current_user and current_user.is_friends_with?(@user) %>
|
||||
<%= link_to t(".remove as friend"), remove_friend_path(:display_name => @user.display_name), :method => :post %>
|
||||
<% elsif current_user %>
|
||||
<%= link_to t(".add as friend"), make_friend_path(:display_name => @user.display_name), :method => :post %>
|
||||
<% else %>
|
||||
<%= link_to t(".add as friend"), make_friend_path(:display_name => @user.display_name) %>
|
||||
<% end %>
|
||||
</li>
|
||||
|
||||
<% if @user.blocks.exists? %>
|
||||
<li>
|
||||
<%= link_to t(".block_history"), user_blocks_on_path(@user) %>
|
||||
<span class='count-number'><%= number_with_delimiter(@user.blocks.active.size) %></span>
|
||||
</li>
|
||||
<% end %>
|
||||
</li>
|
||||
|
||||
<% if @user.blocks.exists? %>
|
||||
<li>
|
||||
<%= link_to t(".block_history"), user_blocks_on_path(@user) %>
|
||||
<span class='count-number'><%= number_with_delimiter(@user.blocks.active.size) %></span>
|
||||
</li>
|
||||
<% end %>
|
||||
<% if @user.moderator? and @user.blocks_created.exists? %>
|
||||
<li>
|
||||
<%= link_to t(".moderator_history"), user_blocks_by_path(@user) %>
|
||||
<span class='count-number'><%= number_with_delimiter(@user.blocks_created.active.size) %></span>
|
||||
</li>
|
||||
<% end %>
|
||||
|
||||
<% if @user.moderator? and @user.blocks_created.exists? %>
|
||||
<li>
|
||||
<%= link_to t(".moderator_history"), user_blocks_by_path(@user) %>
|
||||
<span class='count-number'><%= number_with_delimiter(@user.blocks_created.active.size) %></span>
|
||||
</li>
|
||||
<% end %>
|
||||
|
||||
<% if can?(:create, UserBlock) %>
|
||||
<li>
|
||||
<%= link_to t(".create_block"), new_user_block_path(@user) %>
|
||||
</li>
|
||||
<% end %>
|
||||
|
||||
<% if current_user and @user.id != current_user.id %>
|
||||
<li>
|
||||
<%= report_link(t(".report"), @user) %>
|
||||
</li>
|
||||
<% end %>
|
||||
</ul>
|
||||
<% if can?(:create, UserBlock) %>
|
||||
<li>
|
||||
<%= link_to t(".create_block"), new_user_block_path(@user) %>
|
||||
</li>
|
||||
<% end %>
|
||||
|
||||
<% if current_user and @user.id != current_user.id %>
|
||||
<li>
|
||||
<%= report_link(t(".report"), @user) %>
|
||||
</li>
|
||||
<% end %>
|
||||
</ul>
|
||||
</nav>
|
||||
<% end %>
|
||||
|
||||
<div class='text-muted'>
|
||||
<small>
|
||||
<dl class="dl-inline">
|
||||
<dt><%= t ".mapper since" %></dt>
|
||||
<dd><%= l @user.creation_time.to_date, :format => :long %></dd>
|
||||
<% unless @user.terms_agreed %>
|
||||
<dt><%= t ".ct status" %></dt>
|
||||
<dd>
|
||||
<% if @user.terms_seen? -%>
|
||||
<%= t ".ct declined" %>
|
||||
<% else -%>
|
||||
<%= t ".ct undecided" %>
|
||||
<% end -%>
|
||||
</dd>
|
||||
<% end -%>
|
||||
</dl>
|
||||
</small>
|
||||
</div>
|
||||
|
||||
<% if can?(:set_status, User) || can?(:destroy, User) %>
|
||||
<nav class='secondary-actions'>
|
||||
<ul class='clearfix'>
|
||||
<% if can? :set_status, User %>
|
||||
<% if ["active", "confirmed"].include? @user.status %>
|
||||
<li>
|
||||
<%= link_to t(".deactivate_user"), set_status_user_path(:status => "pending", :display_name => @user.display_name), :method => :post, :data => { :confirm => t(".confirm") } %>
|
||||
</li>
|
||||
<% elsif ["pending"].include? @user.status %>
|
||||
<li>
|
||||
<%= link_to t(".activate_user"), set_status_user_path(:status => "active", :display_name => @user.display_name), :method => :post, :data => { :confirm => t(".confirm") } %>
|
||||
</li>
|
||||
<% end %>
|
||||
|
||||
<ul class='secondary-actions clearfix'>
|
||||
<% if can? :set_status, User %>
|
||||
<% if ["active", "confirmed"].include? @user.status %>
|
||||
<li>
|
||||
<%= link_to t(".deactivate_user"), set_status_user_path(:status => "pending", :display_name => @user.display_name), :method => :post, :data => { :confirm => t(".confirm") } %>
|
||||
</li>
|
||||
<% elsif ["pending"].include? @user.status %>
|
||||
<li>
|
||||
<%= link_to t(".activate_user"), set_status_user_path(:status => "active", :display_name => @user.display_name), :method => :post, :data => { :confirm => t(".confirm") } %>
|
||||
</li>
|
||||
<% end %>
|
||||
|
||||
<% if ["active", "suspended"].include? @user.status %>
|
||||
<li>
|
||||
<%= link_to t(".confirm_user"), set_status_user_path(:status => "confirmed", :display_name => @user.display_name), :method => :post, :data => { :confirm => t(".confirm") } %>
|
||||
</li>
|
||||
<% end %>
|
||||
<% if ["active", "suspended"].include? @user.status %>
|
||||
<li>
|
||||
<%= link_to t(".confirm_user"), set_status_user_path(:status => "confirmed", :display_name => @user.display_name), :method => :post, :data => { :confirm => t(".confirm") } %>
|
||||
</li>
|
||||
<% end %>
|
||||
<li>
|
||||
<% if ["pending", "active", "confirmed", "suspended"].include? @user.status %>
|
||||
<%= link_to t(".hide_user"), set_status_user_path(:status => "deleted", :display_name => @user.display_name), :method => :post, :data => { :confirm => t(".confirm") } %>
|
||||
<% else %>
|
||||
<%= link_to t(".unhide_user"), set_status_user_path(:status => "active", :display_name => @user.display_name), :method => :post, :data => { :confirm => t(".confirm") } %>
|
||||
<% else %>
|
||||
<%= link_to t(".unhide_user"), set_status_user_path(:status => "active", :display_name => @user.display_name), :method => :post, :data => { :confirm => t(".confirm") } %>
|
||||
<% end %>
|
||||
</li>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<% if can? :destroy, User %>
|
||||
<li>
|
||||
<%= link_to t(".delete_user"), user_path(:display_name => @user.display_name), :method => :delete, :data => { :confirm => t(".confirm") } %>
|
||||
</li>
|
||||
<% end %>
|
||||
</ul>
|
||||
<% if can? :destroy, User %>
|
||||
<li>
|
||||
<%= link_to t(".delete_user"), user_path(:display_name => @user.display_name), :method => :delete, :data => { :confirm => t(".confirm") } %>
|
||||
</li>
|
||||
<% end %>
|
||||
</ul>
|
||||
</nav>
|
||||
<% end %>
|
||||
|
||||
<% end %>
|
||||
|
||||
<p class='text-muted'>
|
||||
<small>
|
||||
<%= t ".mapper since" %> <%= l @user.creation_time.to_date, :format => :long %>
|
||||
<% unless @user.terms_agreed %>
|
||||
|
|
||||
<%= t ".ct status" %>
|
||||
<% if @user.terms_seen? -%>
|
||||
<%= t ".ct declined" %>
|
||||
<% else -%>
|
||||
<%= t ".ct undecided" %>
|
||||
<% end -%>
|
||||
<% end -%>
|
||||
</small>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div class="user-description richtext text-break"><%= @user.description.to_html %></div>
|
||||
|
||||
<% if current_user and @user.id == current_user.id %>
|
||||
<div class="my-3">
|
||||
<%= link_to t(".edit_profile"), edit_profile_path, :class => "btn btn-outline-primary" %>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
</div>
|
||||
|
||||
<% if current_user and current_user.administrator? -%>
|
||||
<div class='admin-user-info text-muted'>
|
||||
<small><b><%= t ".email address" %></b> <%= @user.email %></small>
|
||||
<% unless @user.creation_ip.nil? -%>
|
||||
<small><b><%= t ".created from" %></b> <%= @user.creation_ip %></small>
|
||||
<% if current_user and current_user.administrator? -%>
|
||||
<div class='text-muted'>
|
||||
<small>
|
||||
<dl class='dl-inline'>
|
||||
<dt><%= t ".email address" %></dt>
|
||||
<dd><%= @user.email %></dd>
|
||||
<% unless @user.creation_ip.nil? -%>
|
||||
<dt><%= t ".created from" %></dt>
|
||||
<dd><%= @user.creation_ip %></dd>
|
||||
<% end -%>
|
||||
<dt><%= t ".status" %></dt>
|
||||
<dd><%= @user.status.capitalize %></dd>
|
||||
<dt><%= t ".spam score" %></dt>
|
||||
<dd><%= @user.spam_score %></dd>
|
||||
</dl>
|
||||
</small>
|
||||
</div>
|
||||
<% end -%>
|
||||
<small><b><%= t ".status" %></b> <%= @user.status.capitalize %></small>
|
||||
<small><b><%= t ".spam score" %></b> <%= @user.spam_score %></small>
|
||||
</div>
|
||||
<% end -%>
|
||||
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
<div class="row">
|
||||
<% if current_user and @user.id == current_user.id %>
|
||||
<div class="col-md order-md-last">
|
||||
<% if @user.home_lat.nil? or @user.home_lon.nil? %>
|
||||
<div id="map" class="content_map">
|
||||
<p id="no_home_location"><%= t(".no_home_location_html", :edit_profile_link => link_to(t(".edit_your_profile"), edit_profile_path)) %></p>
|
||||
</div>
|
||||
<% else %>
|
||||
<% content_for :head do %>
|
||||
<%= javascript_include_tag "user" %>
|
||||
<% end %>
|
||||
<% user_data = {
|
||||
:lon => current_user.home_lon,
|
||||
:lat => current_user.home_lat,
|
||||
:icon => image_path("marker-red.png"),
|
||||
:description => render(:partial => "popup", :object => current_user, :locals => { :type => "your location" })
|
||||
} %>
|
||||
<%= tag.div "", :id => "map", :class => "content_map", :data => { :user => user_data } %>
|
||||
<% end %>
|
||||
<div class="richtext text-break clearfix"><%= @user.description.to_html %></div>
|
||||
|
||||
<% friends = @user.friends %>
|
||||
<% nearby = @user.nearby - friends %>
|
||||
</div>
|
||||
|
||||
<div class="col-md">
|
||||
<h3><%= t ".my friends" %></h3>
|
||||
|
||||
<% if friends.empty? %>
|
||||
<%= t ".no friends" %>
|
||||
<% else %>
|
||||
<ul class='secondary-actions clearfix'>
|
||||
<li><%= link_to t(".friends_changesets"), friend_changesets_path %></li>
|
||||
<li><%= link_to t(".friends_diaries"), friends_diary_entries_path %></li>
|
||||
</ul>
|
||||
<div id="friends-container">
|
||||
<%= render :partial => "contact", :collection => friends, :locals => { :type => "friend" } %>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
<hr>
|
||||
|
||||
<h3><%= t ".nearby users" %></h3>
|
||||
|
||||
<% if nearby.empty? %>
|
||||
<%= t ".no nearby users" %>
|
||||
<% else %>
|
||||
<ul class='secondary-actions clearfix'>
|
||||
<li><%= link_to t(".nearby_changesets"), nearby_changesets_path %></li>
|
||||
<li><%= link_to t(".nearby_diaries"), nearby_diary_entries_path %></li>
|
||||
</ul>
|
||||
<div id="nearbyusers">
|
||||
<%= render :partial => "contact", :collection => nearby, :locals => { :type => "nearby mapper" } %>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
<% if current_user and @user.id == current_user.id %>
|
||||
<div class="my-3">
|
||||
<%= link_to t(".edit_profile"), edit_profile_path, :class => "btn btn-outline-primary" %>
|
||||
</div>
|
||||
<% end %>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue