From eb3bea734f52c1b658b18029ff0279a8bea540e4 Mon Sep 17 00:00:00 2001 From: Wanderer65 Date: Thu, 23 Oct 2025 13:43:59 +0530 Subject: [PATCH 1/5] Highlight weekends in the calendar --- dojo/templates/dojo/calendar.html | 58 +++++++++++++++++++++---------- 1 file changed, 39 insertions(+), 19 deletions(-) diff --git a/dojo/templates/dojo/calendar.html b/dojo/templates/dojo/calendar.html index f7d96cd058e..2423a0fb619 100644 --- a/dojo/templates/dojo/calendar.html +++ b/dojo/templates/dojo/calendar.html @@ -1,7 +1,12 @@ -{% extends 'base.html' %} {% load static %} {% load i18n %} +{% block head_extra %} + {{ block.super }} + + +{% endblock %} + {% block content %} {{ block.super }}
@@ -32,18 +37,28 @@


{% endblock %} + {% block postscript %} {{ block.super }} + + + + + From 1bb09cee303804cdab5d4dcb5f489473c9c64e04 Mon Sep 17 00:00:00 2001 From: Wanderer65 Date: Thu, 23 Oct 2025 21:15:52 +0530 Subject: [PATCH 2/5] Fix: use local FullCalendar libs and restore comment per review feedback --- dojo/templates/dojo/calendar.html | 48 ++++++------------------------- 1 file changed, 8 insertions(+), 40 deletions(-) diff --git a/dojo/templates/dojo/calendar.html b/dojo/templates/dojo/calendar.html index 2423a0fb619..1a28eb48ce9 100644 --- a/dojo/templates/dojo/calendar.html +++ b/dojo/templates/dojo/calendar.html @@ -3,51 +3,19 @@ {% block head_extra %} {{ block.super }} - - -{% endblock %} - -{% block content %} - {{ block.super }} - -
-
-
- -
-
- -
-
- -
-
-
- -

-
-

+ + {% endblock %} {% block postscript %} {{ block.super }} - - - - + + + + -{% endblock %} + $('.fc-basicDay-button').attr('aria-label', '{% trans "Day preview" % From 73980368c8c0f69079b99fa35322b333b8c1243f Mon Sep 17 00:00:00 2001 From: Wanderer65 Date: Thu, 23 Oct 2025 22:33:51 +0530 Subject: [PATCH 4/5] Restore form, retain weekend highlight, use local FullCalendar JS/CSS as per reviewer --- dojo/templates/dojo/calendar.html | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dojo/templates/dojo/calendar.html b/dojo/templates/dojo/calendar.html index b6d625ba848..efa31212761 100644 --- a/dojo/templates/dojo/calendar.html +++ b/dojo/templates/dojo/calendar.html @@ -69,7 +69,7 @@ editable: false, eventLimit: true, // allow "more" link when too many events - // Render events for tests or engagements + // Render events events: [ {% if caltype == 'tests' %} {% for t in tests %} @@ -102,4 +102,18 @@ $('.fc-next-button').attr('aria-label', '{% trans "Next month" %}'); $('.fc-month-button').attr('aria-label', '{% trans "Month preview" %}'); $('.fc-basicWeek-button').attr('aria-label', '{% trans "Week preview" %}'); - $('.fc-basicDay-button').attr('aria-label', '{% trans "Day preview" % + $('.fc-basicDay-button').attr('aria-label', '{% trans "Day preview" %}'); + }, + + // Highlight weekends + dayRender: function(date, cell) { + // Highlight Saturdays (6) and Sundays (0) + if (date.day() === 0 || date.day() === 6) { + cell.css("background-color", "#fff8dc"); // light yellow + } + } + }); + }); + +{% endblock %} + From 433366fa03e1c6408ec64905962d4629dd631c02 Mon Sep 17 00:00:00 2001 From: Wanderer65 Date: Thu, 23 Oct 2025 22:58:10 +0530 Subject: [PATCH 5/5] Fix calendar.html: restore form, retain weekend highlight, use local JS/CSS, add accessible labels --- dojo/templates/dojo/calendar.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dojo/templates/dojo/calendar.html b/dojo/templates/dojo/calendar.html index efa31212761..c6143e01b0d 100644 --- a/dojo/templates/dojo/calendar.html +++ b/dojo/templates/dojo/calendar.html @@ -13,12 +13,14 @@
+
+