From 64e9baf6d990d1f3fa0cdfe80e0c2d77e3e789e6 Mon Sep 17 00:00:00 2001
From: Anton Khorev <tony29@yandex.ru>
Date: Thu, 5 Jun 2025 18:52:57 +0300
Subject: [PATCH] Move profile location and company to sidebar

---
 app/views/social_links/_show.html.erb    |  4 +-
 app/views/users/show.html.erb            | 61 ++++++++++++++----------
 test/system/user_company_test.rb         |  8 ++--
 test/system/user_location_change_test.rb |  8 ++--
 4 files changed, 46 insertions(+), 35 deletions(-)

diff --git a/app/views/social_links/_show.html.erb b/app/views/social_links/_show.html.erb
index 65359a89f..f54ac6377 100644
--- a/app/views/social_links/_show.html.erb
+++ b/app/views/social_links/_show.html.erb
@@ -1,7 +1,7 @@
-<ul class="list-unstyled social_links">
+<ul class="list-unstyled social_links mb-0">
   <% social_links.each do |social_link| %>
     <li>
-      <%= link_to social_link.parsed[:url], :class => "icon-link mw-100 text-body-secondary mb-3", :rel => "nofollow me" do %>
+      <%= link_to social_link.parsed[:url], :class => "icon-link mw-100 text-body-secondary mb-2", :rel => "nofollow me" do %>
         <%= image_tag "social_link_icons/#{social_link.parsed[:platform].nil? ? 'website' : social_link.parsed[:platform]}.svg",
                       :alt => social_link.parsed[:platform].nil? ? t(".website") : social_link.parsed[:platform],
                       :size => "16" %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 8f2681035..9c4af3e4d 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -142,26 +142,6 @@
       <div class='text-body-secondary'>
         <small>
           <dl class="list-inline">
-            <% if @user.home_location_name&.strip.present? %>
-              <dt class="list-inline-item m-0 align-text-bottom">
-                <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-geo-alt-fill" viewBox="0 0 16 16">
-                  <path d="M8 16s6-5.686 6-10A6 6 0 0 0 2 6c0 4.314 6 10 6 10m0-7a3 3 0 1 1 0-6 3 3 0 0 1 0 6">
-                    <title><%= t ".home location" %></title>
-                  </path>
-                </svg>
-              </dt>
-              <dd class="list-inline-item"><%= @user.home_location_name %></dd>
-            <% end %>
-            <% if @user.company&.strip.present? %>
-              <dt class="list-inline-item m-0 align-text-bottom">
-                <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-buildings-fill" viewBox="0 0 16 16">
-                  <path d="M15 .5a.5.5 0 0 0-.724-.447l-8 4A.5.5 0 0 0 6 4.5v3.14L.342 9.526A.5.5 0 0 0 0 10v5.5a.5.5 0 0 0 .5.5h9a.5.5 0 0 0 .5-.5V14h1v1.5a.5.5 0 0 0 .5.5h3a.5.5 0 0 0 .5-.5zM2 11h1v1H2zm2 0h1v1H4zm-1 2v1H2v-1zm1 0h1v1H4zm9-10v1h-1V3zM8 5h1v1H8zm1 2v1H8V7zM8 9h1v1H8zm2 0h1v1h-1zm-1 2v1H8v-1zm1 0h1v1h-1zm3-2v1h-1V9zm-1 2h1v1h-1zm-2-4h1v1h-1zm3 0v1h-1V7zm-2-2v1h-1V5zm1 0h1v1h-1z">
-                    <title><%= t ".company" %></title>
-                  </path>
-                </svg>
-              </dt>
-              <dd class="list-inline-item" title="<%= t ".company tooltip" %>"><%= @user.company %></dd>
-            <% end %>
             <dt class="list-inline-item m-0"><%= t ".mapper since" %></dt>
             <dd class="list-inline-item"><%= l @user.created_at.to_date, :format => :long %></dd>
             <dt class="list-inline-item m-0"><%= t ".last map edit" %></dt>
@@ -253,18 +233,49 @@
     </div>
   </div>
 <% end %>
-<% if @user.social_links.empty? %>
-  <div class="richtext text-break"><%= @user.description.to_html %></div>
-<% else %>
+
+<% if @user.home_location_name&.strip.present? || @user.company&.strip.present? || !@user.social_links.empty? %>
   <div class="row">
     <div class="col-sm-3">
-      <%= render "social_links/show",
-                 :social_links => @user.social_links %>
+      <% if @user.home_location_name&.strip.present? %>
+        <div class="border-bottom text-body-secondary mb-2">
+          <div class="icon-link mw-100 mb-2">
+            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" viewBox="0 0 16 16" class="flex-shrink-0">
+              <title><%= t ".home location" %></title>
+              <path d="M8 16s6-5.686 6-10A6 6 0 0 0 2 6c0 4.314 6 10 6 10m0-7a3 3 0 1 1 0-6 3 3 0 0 1 0 6" />
+            </svg>
+            <span class="text-truncate">
+              <%= @user.home_location_name %>
+            </span>
+          </div>
+        </div>
+      <% end %>
+      <% if @user.company&.strip.present? %>
+        <div class="border-bottom text-body-secondary mb-2">
+          <div class="icon-link mw-100 mb-2">
+            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" viewBox="0 0 16 16" class="flex-shrink-0">
+              <title><%= t ".company" %></title>
+              <path d="M15 .5a.5.5 0 0 0-.724-.447l-8 4A.5.5 0 0 0 6 4.5v3.14L.342 9.526A.5.5 0 0 0 0 10v5.5a.5.5 0 0 0 .5.5h9a.5.5 0 0 0 .5-.5V14h1v1.5a.5.5 0 0 0 .5.5h3a.5.5 0 0 0 .5-.5zM2 11h1v1H2zm2 0h1v1H4zm-1 2v1H2v-1zm1 0h1v1H4zm9-10v1h-1V3zM8 5h1v1H8zm1 2v1H8V7zM8 9h1v1H8zm2 0h1v1h-1zm-1 2v1H8v-1zm1 0h1v1h-1zm3-2v1h-1V9zm-1 2h1v1h-1zm-2-4h1v1h-1zm3 0v1h-1V7zm-2-2v1h-1V5zm1 0h1v1h-1z" />
+            </svg>
+            <span class="text-truncate" title="<%= t ".company tooltip" %>">
+              <%= @user.company %>
+            </span>
+          </div>
+        </div>
+      <% end %>
+      <% unless @user.social_links.empty? %>
+        <div class="border-bottom mb-2">
+          <%= render "social_links/show",
+                     :social_links => @user.social_links %>
+        </div>
+      <% end %>
     </div>
     <div class="col-sm-9">
       <div class="richtext text-break"><%= @user.description.to_html %></div>
     </div>
   </div>
+<% else %>
+  <div class="richtext text-break"><%= @user.description.to_html %></div>
 <% end %>
 
 <% if @heatmap_frame %>
diff --git a/test/system/user_company_test.rb b/test/system/user_company_test.rb
index f730b2127..c1e094cc8 100644
--- a/test/system/user_company_test.rb
+++ b/test/system/user_company_test.rb
@@ -7,8 +7,8 @@ class UserCompanyTest < ApplicationSystemTestCase
 
     visit user_path(user)
 
-    within_content_heading do
-      assert_no_text "Company"
+    within_content_body do
+      assert_no_text :all, "Company"
     end
 
     visit profile_path
@@ -20,8 +20,8 @@ class UserCompanyTest < ApplicationSystemTestCase
 
     assert_text "Profile updated."
 
-    within_content_heading do
-      assert_text "Company Test Co."
+    within_content_body do
+      assert_text :all, "Company Test Co."
     end
   end
 end
diff --git a/test/system/user_location_change_test.rb b/test/system/user_location_change_test.rb
index 62a9013f7..ac032a3d8 100644
--- a/test/system/user_location_change_test.rb
+++ b/test/system/user_location_change_test.rb
@@ -11,8 +11,8 @@ class UserLocationChangeTest < ApplicationSystemTestCase
 
     visit user_path(user)
 
-    within_content_heading do
-      assert_no_text "Home location"
+    within_content_body do
+      assert_no_text :all, "Home location"
     end
 
     visit profile_path
@@ -24,8 +24,8 @@ class UserLocationChangeTest < ApplicationSystemTestCase
 
     assert_text "Profile updated."
 
-    within_content_heading do
-      assert_text "Home location Test Place"
+    within_content_body do
+      assert_text :all, "Home location Test Place"
     end
   end
 end
-- 
2.39.5