From 570d4ff66c7f5be8d7aa1d87afeaf69afffbb9ca Mon Sep 17 00:00:00 2001 From: Kevin McConnell Date: Thu, 23 Jan 2025 13:11:04 +0000 Subject: [PATCH] Control the "no activity" label client-side This allows us to take into account the local timezone -- any days where all the events were outside the local 24-hour period are the ones that are empty. --- app/assets/stylesheets/events.css | 12 +++++++++++- app/views/events/_day.html.erb | 21 ++++++++++----------- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/app/assets/stylesheets/events.css b/app/assets/stylesheets/events.css index 3417716ca..e56cb85f6 100644 --- a/app/assets/stylesheets/events.css +++ b/app/assets/stylesheets/events.css @@ -2,7 +2,7 @@ --grid-lines: 3px; border-block-start: 1px solid var(--color-subtle); - display: grid; + display: none; gap: var(--grid-lines); grid-template-columns: repeat(4, 1fr); padding-block-start: var(--block-space); @@ -20,6 +20,16 @@ padding: calc(3 * var(--block-space)); } +.events--day:has(.event:not(.out-of-range)) { + .events { + display: grid; + } + + .events--none { + display: none; + } +} + .event-grid-item { background-color: var(--color-selected); block-size: 100%; diff --git a/app/views/events/_day.html.erb b/app/views/events/_day.html.erb index d421db034..a59347f07 100644 --- a/app/views/events/_day.html.erb +++ b/app/views/events/_day.html.erb @@ -1,13 +1,12 @@ -
+

<%= event_day_title(activity_day) %>

- <% if @events.any? %> -
- <%= render_column_headers %> - <%= render_event_grid_cells(activity_day) %> - <%= render_time_labels(activity_day) %> - <%= render events %> -
- <% else %> -

No activity for this day.

- <% end %> + +
+ <%= render_column_headers %> + <%= render_event_grid_cells(activity_day) %> + <%= render_time_labels(activity_day) %> + <%= render events %> +
+ +

No activity for this day.