From c8759d84f05801291f5f6c48a65098a999adfaeb Mon Sep 17 00:00:00 2001
From: Anton Khorev <tony29@yandex.ru>
Date: Tue, 1 Jul 2025 18:44:10 +0300
Subject: [PATCH] Add user profile sidebar section template

---
 app/views/users/_sidebar_section.html.erb |  7 ++++
 app/views/users/show.html.erb             | 49 ++++++++++-------------
 config/locales/en.yml                     |  7 ++--
 3 files changed, 33 insertions(+), 30 deletions(-)
 create mode 100644 app/views/users/_sidebar_section.html.erb

diff --git a/app/views/users/_sidebar_section.html.erb b/app/views/users/_sidebar_section.html.erb
new file mode 100644
index 000000000..a0a4c354f
--- /dev/null
+++ b/app/views/users/_sidebar_section.html.erb
@@ -0,0 +1,7 @@
+<% if present %>
+  <div class="border-bottom text-body-secondary">
+    <div class="my-2">
+      <%= yield %>
+    </div>
+  </div>
+<% end %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index edc744f83..51d256fc6 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -238,37 +238,32 @@
 <% if @user.home_location_name&.strip.present? || @user.company&.strip.present? || !@user.social_links.empty? || owned %>
   <div class="row">
     <div class="col-sm-3">
-      <% 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>
+      <%= render "sidebar_section", :present => @user.home_location_name&.strip.present? do %>
+        <div class="icon-link mw-100">
+          <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>
       <% 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>
+
+      <%= render "sidebar_section", :present => @user.company&.strip.present? do %>
+        <div class="icon-link mw-100">
+          <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>
+          <%= tag.span :class => "text-truncate", :title => t(".company_tooltip") do %>
+            <%= @user.company %>
+          <% end %>
         </div>
       <% end %>
-      <% unless @user.social_links.empty? %>
-        <div class="border-bottom mb-2">
-          <%= render "social_links/show",
-                     :social_links => @user.social_links %>
-        </div>
+
+      <%= render "sidebar_section", :present => !@user.social_links.empty? do %>
+        <%= render "social_links/show", :social_links => @user.social_links %>
       <% end %>
     </div>
     <div class="col-sm-9">
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 95e109dc3..d48f31fda 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -3038,9 +3038,6 @@ en:
       follow: Follow
       mapper since: "Mapper since:"
       last map edit: "Last map edit:"
-      home location: "Home location"
-      company: "Company"
-      company tooltip: "The company affiliation is self-reported and not verified"
       no activity yet: "No activity yet"
       uid: "User id:"
       ct status: "Contributor terms:"
@@ -3080,6 +3077,10 @@ en:
       contributions:
         one: "%{count} contribution in the last year"
         other: "%{count} contributions in the last year"
+    sidebar_section:
+      home_location: "Home location"
+      company: "Company"
+      company_tooltip: "The company affiliation is self-reported and not verified"
     go_public:
       flash success: "All your edits are now public, and you are now allowed to edit."
     issued_blocks:
-- 
2.39.5