bterkuile/fizzy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Place highlights after the "timelined day"

Browse Source
This commit is contained in:
Jorge Manrubia
2025-09-02 10:57:40 +02:00
parent 4bcc1627e8
commit 7a02f8fcda
2 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/events/_day.html.erb
+2 -13
View File
@@ -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 %>
app/views/events/_weekly_highlights.html.erb
+17 -3
View File
@@ -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 %>