From 69c6e140c29eb759fb36f4ba4564ed7022ba6e8b Mon Sep 17 00:00:00 2001 From: Colin Farquhar Date: Thu, 11 Dec 2025 15:15:53 +0000 Subject: [PATCH 1/6] separate backlog into sections --- common-theme/layouts/_default/backlog.html | 69 +++++++++++++++++++ .../partials/block/issues-list-as-blocks.html | 2 +- 2 files changed, 70 insertions(+), 1 deletion(-) diff --git a/common-theme/layouts/_default/backlog.html b/common-theme/layouts/_default/backlog.html index 6d6d5b24f..adfbcda8d 100644 --- a/common-theme/layouts/_default/backlog.html +++ b/common-theme/layouts/_default/backlog.html @@ -14,9 +14,26 @@ for each repo, grab the issues that match the filter */}} {{ range $repos }} + {{ $recurringTasks := slice }} + {{ $mandatoryTasks := slice }} + {{ $optionalTasks := slice }} {{ $issueBlocks := partial "block/issues-list-as-blocks.html" (dict "backlog" . "backlog_filter" $backlog_filter "path" $currentPath) }} {{ $repo := . }} {{ range $issueBlocks }} + {{ $issue := . }} + {{ range .labels.nodes }} + {{if in .name "Recurring"}} + {{ $recurringTasks = $recurringTasks | append $issue }} + {{else if in .name "Core"}} + {{ $mandatoryTasks = $mandatoryTasks | append $issue }} + {{else if in .name "Optional"}} + {{ $optionalTasks = $optionalTasks | append $issue }} + {{ end }} + {{ end }} + {{ end }} +

Recurring Tasks

+

These tasks need to be completed in every sprint.

+ {{range $recurringTasks}} {{ end }} +

Mandatory Tasks

+

These tasks will help consolidate your learning for this sprint. You should complete as many of these as possible before class on Saturday.

+ {{range $mandatoryTasks}} + +
+ + {{ .name }} + 🔗 + + Clone + + +
+ {{ partial "block/block.html" (dict "block" . "Page" + $.Page "Site" site ) + }} +
+
+ {{ end }} +

Optional Tasks

+

These are optional "stretch goals" to attempt when you have finished the mandatory tasks. They may be more challenging or require some additional research.

+ {{range $optionalTasks}} + +
+ + {{ .name }} + 🔗 + + Clone + + +
+ {{ partial "block/block.html" (dict "block" . "Page" + $.Page "Site" site ) + }} +
+
+ {{ end }} {{ end }} {{ end }} diff --git a/common-theme/layouts/partials/block/issues-list-as-blocks.html b/common-theme/layouts/partials/block/issues-list-as-blocks.html index 741654026..6f13bb4f1 100644 --- a/common-theme/layouts/partials/block/issues-list-as-blocks.html +++ b/common-theme/layouts/partials/block/issues-list-as-blocks.html @@ -30,7 +30,7 @@ url number labels( - first: 25 + first: 50 orderBy: { direction: DESC field: NAME From bfcf059a2c560e20802ae24d640e8a14adc0887f Mon Sep 17 00:00:00 2001 From: Colin Farquhar Date: Fri, 12 Dec 2025 15:21:01 +0000 Subject: [PATCH 2/6] remove invisible button --- common-theme/layouts/_default/backlog.html | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/common-theme/layouts/_default/backlog.html b/common-theme/layouts/_default/backlog.html index adfbcda8d..5a7041059 100644 --- a/common-theme/layouts/_default/backlog.html +++ b/common-theme/layouts/_default/backlog.html @@ -34,12 +34,6 @@

Recurring Tasks

These tasks need to be completed in every sprint.

{{range $recurringTasks}} -
{{ .name }} @@ -61,12 +55,6 @@

Recurring Tasks

Mandatory Tasks

These tasks will help consolidate your learning for this sprint. You should complete as many of these as possible before class on Saturday.

{{range $mandatoryTasks}} -
{{ .name }} @@ -87,12 +75,6 @@

Mandatory Tasks

Optional Tasks

These are optional "stretch goals" to attempt when you have finished the mandatory tasks. They may be more challenging or require some additional research.

{{range $optionalTasks}} -
{{ .name }} From 49120fd8ef36de412dbb966af6e5e0c7670094a6 Mon Sep 17 00:00:00 2001 From: Colin Farquhar Date: Fri, 12 Dec 2025 16:25:42 +0000 Subject: [PATCH 3/6] add new partial for backlog issues --- common-theme/layouts/_default/backlog.html | 73 ++++++------------- .../layouts/partials/block/backlog-issue.html | 18 +++++ 2 files changed, 42 insertions(+), 49 deletions(-) create mode 100644 common-theme/layouts/partials/block/backlog-issue.html diff --git a/common-theme/layouts/_default/backlog.html b/common-theme/layouts/_default/backlog.html index 5a7041059..0c536b129 100644 --- a/common-theme/layouts/_default/backlog.html +++ b/common-theme/layouts/_default/backlog.html @@ -34,63 +34,38 @@

Recurring Tasks

These tasks need to be completed in every sprint.

{{range $recurringTasks}} -
- - {{ .name }} - 🔗 - - Clone - - -
- {{ partial "block/block.html" (dict "block" . "Page" - $.Page "Site" site ) - }} -
-
+ {{ partial "block/backlog-issue.html" (dict + "block" . + "Page" $.Page + "Site" site + "repo" $repo + "sprint" $backlog_filter + "path" $currentPath + ) }} {{ end }}

Mandatory Tasks

These tasks will help consolidate your learning for this sprint. You should complete as many of these as possible before class on Saturday.

{{range $mandatoryTasks}} -
- - {{ .name }} - 🔗 - - Clone - - -
- {{ partial "block/block.html" (dict "block" . "Page" - $.Page "Site" site ) - }} -
-
+ {{ partial "block/backlog-issue.html" (dict + "block" . + "Page" $.Page + "Site" site + "repo" $repo + "sprint" $backlog_filter + "path" $currentPath + ) }} {{ end }}

Optional Tasks

These are optional "stretch goals" to attempt when you have finished the mandatory tasks. They may be more challenging or require some additional research.

{{range $optionalTasks}} -
- - {{ .name }} - 🔗 - - Clone - - -
- {{ partial "block/block.html" (dict "block" . "Page" - $.Page "Site" site ) - }} -
-
+ {{ partial "block/backlog-issue.html" (dict + "block" . + "Page" $.Page + "Site" site + "repo" $repo + "sprint" $backlog_filter + "path" $currentPath + ) }} {{ end }} {{ end }} diff --git a/common-theme/layouts/partials/block/backlog-issue.html b/common-theme/layouts/partials/block/backlog-issue.html new file mode 100644 index 000000000..b18c9a3f4 --- /dev/null +++ b/common-theme/layouts/partials/block/backlog-issue.html @@ -0,0 +1,18 @@ +
+ + {{ .block.name }} + 🔗 + + Clone + + +
+ {{ partial "block/block.html" (dict + "block" .block + "Page" $.Page + "Site" site + ) }} +
+
\ No newline at end of file From bf4dd310c5c29e9b14c4818e3fceb355b8fbd109 Mon Sep 17 00:00:00 2001 From: Colin Farquhar Date: Thu, 18 Dec 2025 15:13:29 +0000 Subject: [PATCH 4/6] add check to avoid rendering empty blocks --- common-theme/layouts/_default/backlog.html | 70 ++++++++++++---------- 1 file changed, 38 insertions(+), 32 deletions(-) diff --git a/common-theme/layouts/_default/backlog.html b/common-theme/layouts/_default/backlog.html index 0c536b129..c58cd2b66 100644 --- a/common-theme/layouts/_default/backlog.html +++ b/common-theme/layouts/_default/backlog.html @@ -31,41 +31,47 @@ {{ end }} {{ end }} {{ end }} -

Recurring Tasks

-

These tasks need to be completed in every sprint.

- {{range $recurringTasks}} - {{ partial "block/backlog-issue.html" (dict - "block" . - "Page" $.Page - "Site" site - "repo" $repo - "sprint" $backlog_filter - "path" $currentPath + {{ if lt 0 ($recurringTasks | len) }} +

Recurring Tasks

+

These tasks need to be completed in every sprint.

+ {{range $recurringTasks}} + {{ partial "block/backlog-issue.html" (dict + "block" . + "Page" $.Page + "Site" site + "repo" $repo + "sprint" $backlog_filter + "path" $currentPath ) }} + {{ end }} {{ end }} -

Mandatory Tasks

-

These tasks will help consolidate your learning for this sprint. You should complete as many of these as possible before class on Saturday.

- {{range $mandatoryTasks}} - {{ partial "block/backlog-issue.html" (dict - "block" . - "Page" $.Page - "Site" site - "repo" $repo - "sprint" $backlog_filter - "path" $currentPath - ) }} + {{ if lt 0 ($mandatoryTasks | len) }} +

Mandatory Tasks

+

These tasks will help consolidate your learning for this sprint. You should complete as many of these as possible before class on Saturday.

+ {{range $mandatoryTasks}} + {{ partial "block/backlog-issue.html" (dict + "block" . + "Page" $.Page + "Site" site + "repo" $repo + "sprint" $backlog_filter + "path" $currentPath + ) }} + {{ end }} {{ end }} -

Optional Tasks

-

These are optional "stretch goals" to attempt when you have finished the mandatory tasks. They may be more challenging or require some additional research.

- {{range $optionalTasks}} - {{ partial "block/backlog-issue.html" (dict - "block" . - "Page" $.Page - "Site" site - "repo" $repo - "sprint" $backlog_filter - "path" $currentPath - ) }} + {{ if lt 0 ($optionalTasks | len) }} +

Optional Tasks

+

These are optional "stretch goals" to attempt when you have finished the mandatory tasks. They may be more challenging or require some additional research.

+ {{range $optionalTasks}} + {{ partial "block/backlog-issue.html" (dict + "block" . + "Page" $.Page + "Site" site + "repo" $repo + "sprint" $backlog_filter + "path" $currentPath + ) }} + {{ end }} {{ end }} {{ end }} From 0c5a7051b482cc6aa8ffa510eacc7cd455686fed Mon Sep 17 00:00:00 2001 From: Colin Farquhar Date: Thu, 18 Dec 2025 15:13:53 +0000 Subject: [PATCH 5/6] remove rendered labels from issues --- common-theme/layouts/partials/block/issue.html | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/common-theme/layouts/partials/block/issue.html b/common-theme/layouts/partials/block/issue.html index 23e22ca6c..5a68e950b 100644 --- a/common-theme/layouts/partials/block/issue.html +++ b/common-theme/layouts/partials/block/issue.html @@ -40,18 +40,5 @@

Learning Objectives

{{ $response.body | page.RenderString }}
- {{ with $response.labels }} -
    - {{ range . }} -
  • - - {{ .name }} - -
    • - {{ end }} -
- {{ end }} {{ end }} From 90b8801bd7124d9a469ab8cbd4a509e60c545662 Mon Sep 17 00:00:00 2001 From: Colin Farquhar Date: Fri, 19 Dec 2025 15:16:30 +0000 Subject: [PATCH 6/6] adds section for high-priority tasks --- common-theme/layouts/_default/backlog.html | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/common-theme/layouts/_default/backlog.html b/common-theme/layouts/_default/backlog.html index c58cd2b66..3cca49fd7 100644 --- a/common-theme/layouts/_default/backlog.html +++ b/common-theme/layouts/_default/backlog.html @@ -14,6 +14,7 @@ for each repo, grab the issues that match the filter */}} {{ range $repos }} + {{ $setupTasks := slice }} {{ $recurringTasks := slice }} {{ $mandatoryTasks := slice }} {{ $optionalTasks := slice }} @@ -24,6 +25,8 @@ {{ range .labels.nodes }} {{if in .name "Recurring"}} {{ $recurringTasks = $recurringTasks | append $issue }} + {{else if in .name "Setup"}} + {{ $setupTasks = $setupTasks | append $issue }} {{else if in .name "Core"}} {{ $mandatoryTasks = $mandatoryTasks | append $issue }} {{else if in .name "Optional"}} @@ -31,6 +34,20 @@ {{ end }} {{ end }} {{ end }} + {{ if lt 0 ($setupTasks | len) }} +

Start Here

+

These tasks should be completed before attempting anything else.

+ {{range $setupTasks}} + {{ partial "block/backlog-issue.html" (dict + "block" . + "Page" $.Page + "Site" site + "repo" $repo + "sprint" $backlog_filter + "path" $currentPath + ) }} + {{ end }} + {{ end }} {{ if lt 0 ($recurringTasks | len) }}

Recurring Tasks

These tasks need to be completed in every sprint.