X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d797de431716252ac03ad390b3233c91fa3c50b2..2f3c2cdb44def797f1b3107ae166c77e3eee26d2:/app/views/users/show.html.erb?ds=sidebyside

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 61a775c51..4dcc9ab05 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -1,245 +1,216 @@
 <% content_for :heading do %>
-  <div id='userinformation'>
-    <%= user_image @user %>
-    <div class='userinformation-inner'>
+  <div class="row">
+    <div class="col-sm-auto">
+      <%= user_image @user %>
+    </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"), :controller => "diary_entries", :action => "comments", :display_name => current_user.display_name %>
-          </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"), :controller => "user_blocks", :action => "blocks_on", :display_name => current_user.display_name %>
-              <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>
+            <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>
-          <% end %>
-
-          <% if can?(:create, UserBlock) and current_user.blocks_created.exists? %>
             <li>
-              <%= link_to t(".blocks by me"), :controller => "user_blocks", :action => "blocks_by", :display_name => current_user.display_name %>
-              <span class='count-number'><%= number_with_delimiter(current_user.blocks_created.active.size) %></span>
+              <%= link_to t(".my settings"), edit_account_path %>
             </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'>
-
-          <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 -->
-
-          <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"), :controller => "diary_entries", :action => "comments", :display_name => @user.display_name %>
-          </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>
+        <nav class='secondary-actions'>
+          <ul class='clearfix'>
 
-          <% if @user.blocks.exists? %>
             <li>
-              <%= link_to t(".block_history"), :controller => "user_blocks", :action => "blocks_on", :display_name => @user.display_name %>
-              <span class='count-number'><%= number_with_delimiter(@user.blocks.active.size) %></span>
+              <%= 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>
-          <% end %>
-
-          <% if @user.moderator? and @user.blocks_created.exists? %>
             <li>
-              <%= link_to t(".moderator_history"), :controller => "user_blocks", :action => "blocks_by", :display_name => @user.display_name %>
-              <span class='count-number'><%= number_with_delimiter(@user.blocks_created.active.size) %></span>
+              <%= link_to t(".notes"), user_notes_path(@user) %>
             </li>
-          <% end %>
-
-          <% if can?(:create, UserBlock) %>
             <li>
-            <%= link_to t(".create_block"), :controller => "user_blocks", :action => "new", :display_name => @user.display_name %>
+              <%= 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>
-          <% end %>
 
-          <% if current_user and @user.id != current_user.id %>
+            <!-- Displaying another user's profile page -->
+
             <li>
-              <%= report_link(t(".report"), @user) %>
+              <%= 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.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>
-          <% end %>
-        </ul>
-
-      <% end %>
-
-      <% if can?(:set_status, User) || can?(:destroy, User) %>
 
-        <ul class='secondary-actions clearfix'>
-          <% if can? :set_status, User %>
-            <% if ["active", "confirmed"].include? @user.status %>
+            <% if @user.blocks.exists? %>
               <li>
-                <%= link_to t(".deactivate_user"), set_status_user_path(:status => "pending", :display_name => @user.display_name), :method => :post, :data => { :confirm => t(".confirm") } %>
+                <%= link_to t(".block_history"), user_blocks_on_path(@user) %>
+                <span class='count-number'><%= number_with_delimiter(@user.blocks.active.size) %></span>
               </li>
-            <% elsif ["pending"].include? @user.status %>
+            <% end %>
+
+            <% if @user.moderator? and @user.blocks_created.exists? %>
               <li>
-                <%= link_to t(".activate_user"), set_status_user_path(:status => "active", :display_name => @user.display_name), :method => :post, :data => { :confirm => t(".confirm") } %>
+                <%= 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 ["active", "suspended"].include? @user.status %>
+            <% if can?(:create, UserBlock) %>
               <li>
-                <%= link_to t(".confirm_user"), set_status_user_path(:status => "confirmed", :display_name => @user.display_name), :method => :post, :data => { :confirm => t(".confirm") } %>
+                <%= link_to t(".create_block"), new_user_block_path(@user) %>
               </li>
             <% end %>
+
+            <% if current_user and @user.id != current_user.id %>
               <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") } %>
+                <%= report_link(t(".report"), @user) %>
               </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>
-
-        <% end %>
+          </ul>
+        </nav>
+      <% end %>
 
-      <p class='text-muted'>
+      <div 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" %>
+          <dl class="dl-inline">
+            <dt><%= t ".mapper since" %></dt>
+            <dd><%= l @user.created_at.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 -%>
-          <% end -%>
+          </dl>
         </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>
-      <% end -%>
-      <small><b><%= t ".status" %></b> <%= @user.status.capitalize %></small>
-      <small><b><%= t ".spam score" %></b> <%= @user.spam_score %></small>
-    </div>
-  <% end -%>
-
-<% end %>
+      <% if can?(:set_status, User) || can?(:destroy, User) %>
+        <nav class='secondary-actions'>
+          <ul class='clearfix'>
+            <% if can? :set_status, User %>
+              <% if @user.may_activate? %>
+                <li>
+                  <%= link_to t(".activate_user"), set_status_user_path(:event => "activate", :display_name => @user.display_name), :method => :post, :data => { :confirm => t(".confirm") } %>
+                </li>
+              <% end %>
+
+              <% if @user.may_unsuspend? %>
+                <li>
+                  <%= link_to t(".unsuspend_user"), set_status_user_path(:event => "unsuspend", :display_name => @user.display_name), :method => :post, :data => { :confirm => t(".confirm") } %>
+                </li>
+              <% end %>
+
+              <% if @user.may_confirm? %>
+                <li>
+                  <%= link_to t(".confirm_user"), set_status_user_path(:event => "confirm", :display_name => @user.display_name), :method => :post, :data => { :confirm => t(".confirm") } %>
+                </li>
+              <% end %>
+
+              <% if @user.may_unconfirm? %>
+                <li>
+                  <%= link_to t(".unconfirm_user"), set_status_user_path(:event => "unconfirm", :display_name => @user.display_name), :method => :post, :data => { :confirm => t(".confirm") } %>
+                </li>
+              <% end %>
+
+              <% if @user.may_hide? %>
+                <li>
+                  <%= link_to t(".hide_user"), set_status_user_path(:event => "hide", :display_name => @user.display_name), :method => :post, :data => { :confirm => t(".confirm") } %>
+                </li>
+              <% end %>
+
+              <% if @user.may_unhide? %>
+                <li>
+                  <%= link_to t(".unhide_user"), set_status_user_path(:event => "unhide", :display_name => @user.display_name), :method => :post, :data => { :confirm => t(".confirm") } %>
+                </li>
+              <% end %>
+            <% 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(".set_location_html", :edit_profile_url => 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 } %>
+            <% if can?(:destroy, User) && @user.may_soft_destroy? %>
+              <li>
+                <%= link_to t(".delete_user"), user_path(:display_name => @user.display_name), :method => :delete, :data => { :confirm => t(".confirm") } %>
+              </li>
+            <% end %>
+          </ul>
+        </nav>
       <% end %>
 
-      <% 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" } %>
+      <% 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 %>
-
-      <hr>
+      <% end -%>
+    </div>
+  </div>
+<% end %>
 
-      <h3><%= t ".nearby users" %></h3>
+<div class="richtext text-break clearfix"><%= @user.description.to_html %></div>
 
-      <% 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 %>