From 7a02f8fcda8372b32ea01f55ab4b22d293f943cf Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Tue, 2 Sep 2025 10:57:40 +0200
Subject: [PATCH] Place highlights after the "timelined day"

---
 app/views/events/_day.html.erb               | 15 ++-------------
 app/views/events/_weekly_highlights.html.erb | 20 +++++++++++++++++---
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/app/views/events/_day.html.erb b/app/views/events/_day.html.erb
index bb84ff713..29507f4c8 100644
--- a/app/views/events/_day.html.erb
+++ b/app/views/events/_day.html.erb
@@ -1,25 +1,14 @@
 <section class="events__day" data-controller="related-element"
   data-related-element-highlight-class="event--related">
   <% if day_timeline.has_activity? %>
-
-    <% if day_timeline.has_weekly_highlights? %>
-      <h2 class="events__day-header">
-        <span class="events__day-time min-width max-width">
-          <span class="overflow-ellipsis">
-            <span>Highlights for this week</span>
-          </span>
-        </span>
-      </h2>
-    <% end %>
-
-    <%= render "events/weekly_highlights", day_timeline: day_timeline if day_timeline.has_weekly_highlights? %>
-
     <div class="events__columns">
       <%= render "events/day_timeline_column", event_type: "added", day_timeline: day_timeline %>
       <%= render "events/day_timeline_column", event_type: "updated", day_timeline: day_timeline %>
       <%= render "events/day_timeline_column", event_type: "closed", day_timeline: day_timeline %>
     </div>
 
+    <%= render "events/weekly_highlights", day_timeline: day_timeline if day_timeline.has_weekly_highlights? %>
+
     <%= render "events/empty_days", day_timeline: day_timeline %>
   <% else %>
     <%= render "events/empty_days", day_timeline: day_timeline %>
diff --git a/app/views/events/_weekly_highlights.html.erb b/app/views/events/_weekly_highlights.html.erb
index 51666e4b7..8c4566fd4 100644
--- a/app/views/events/_weekly_highlights.html.erb
+++ b/app/views/events/_weekly_highlights.html.erb
@@ -1,3 +1,17 @@
-<div class="events__activity-summary txt-small">
-  <%= day_timeline.weekly_highlights.to_html %>
-</div>
+<% if day_timeline.has_weekly_highlights? %>
+  <h2 class="events__day-header">
+        <span class="events__day-time min-width max-width">
+          <span class="overflow-ellipsis">
+            <span>Highlights for</span>
+            **<%= local_datetime_tag day_timeline.day, style: :agoorweekday %>**
+            <%= local_datetime_tag day_timeline.weekly_highlights.starts_at, style: :agoorweekday %>
+            -
+            <%= local_datetime_tag day_timeline.weekly_highlights.ends_at, style: :agoorweekday %>
+          </span>
+        </span>
+  </h2>
+
+  <div class="events__activity-summary txt-small">
+    <%= day_timeline.weekly_highlights.to_html %>
+  </div>
+<% end %>