From: Andy Allan <git@gravitystorm.co.uk>
Date: Thu, 12 Aug 2021 14:59:07 +0000 (+0100)
Subject: Refactor the profile page to move the profile information out of the header
X-Git-Tag: live~1933^2~7
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/3f8cf322723750aa4c8d062d4a727f9107ceccb4

Refactor the profile page to move the profile information out of the header

This makes it look like other normal pages, along with removing the unusual full-width class.
---

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 42090e733..16624dda1 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1096,17 +1096,6 @@ tr.turn:hover {
 
 /* Rules for the user profile page */
 
-#userinformation {
-  min-height: 100px;
-  .userinformation-inner {
-    float: left;
-  }
-  .user-description {
-    width: 100%;
-    clear: both;
-  }
-}
-
 .admin-user-info small {
   margin-bottom: $lineheight/2;
   display: inline;
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 95abbdc3c..0ea411811 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -1,7 +1,9 @@
 <% 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 => "" %>
+    </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 -->
@@ -108,45 +110,8 @@
             </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 %>
-              <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 %>
-              <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") } %>
-              </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 %>
-
       <p class='text-muted'>
         <small>
           <%= t ".mapper since" %> <%= l @user.creation_time.to_date, :format => :long %>
@@ -162,16 +127,41 @@
         </small>
       </p>
     </div>
+  </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 %>
+  <% if can?(:set_status, User) || can?(:destroy, User) %>
+    <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 %>
 
-  </div>
+        <% 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") } %>
+          </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 %>
 
   <% if current_user and current_user.administrator? -%>
     <div class='admin-user-info text-muted'>
@@ -183,5 +173,12 @@
       <small><b><%= t ".spam score" %></b> <%= @user.spam_score %></small>
     </div>
   <% end -%>
+<% end %>
 
+<div class="richtext text-break clearfix"><%= @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 %>