From d8a6002ac66a22f5a6d724a76e92d765018a7f66 Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Sun, 23 Aug 2026 13:23:01 +0000 Subject: [PATCH 1/2] BMT 2025 archive: reorder rounds, split tiebreakers into own table Co-Authored-By: golden --- content/archives/bmt-2025/index.md | 46 +++++++++++++++++------------- templates/resources/page.html | 28 ++++++++++++++---- 2 files changed, 49 insertions(+), 25 deletions(-) diff --git a/content/archives/bmt-2025/index.md b/content/archives/bmt-2025/index.md index 10dc6e8c..81e3058a 100644 --- a/content/archives/bmt-2025/index.md +++ b/content/archives/bmt-2025/index.md @@ -11,63 +11,69 @@ key = "problems" label = "Solutions" key = "solutions" -[[extra.archive.tests]] +[[extra.archive.groups]] +label = "Round/Test" + +[[extra.archive.groups.tests]] +title = "Power" +problems = "power-problems.pdf" +#solutions = "power-solutions.pdf" + +[[extra.archive.groups.tests]] title = "General" problems = "general-problems.pdf" #solutions = "general-solutions.pdf" -[[extra.archive.tests]] +[[extra.archive.groups.tests]] title = "Algebra" problems = "algebra-problems.pdf" #solutions = "algebra-solutions.pdf" -[[extra.archive.tests]] +[[extra.archive.groups.tests]] title = "Calculus" problems = "calculus-problems.pdf" #solutions = "calculus-solutions.pdf" -[[extra.archive.tests]] +[[extra.archive.groups.tests]] title = "Discrete" problems = "discrete-problems.pdf" #solutions = "discrete-solutions.pdf" -[[extra.archive.tests]] +[[extra.archive.groups.tests]] title = "Geometry" problems = "geometry-problems.pdf" #solutions = "geometry-solutions.pdf" -[[extra.archive.tests]] +[[extra.archive.groups.tests]] title = "Guts" problems = "guts-problems.pdf" #solutions = "guts-solutions.pdf" -[[extra.archive.tests]] -title = "Power" -problems = "power-problems.pdf" -#solutions = "power-solutions.pdf" +[[extra.archive.groups]] +label = "Tiebreaker" -[[extra.archive.tests]] -title = "General Tiebreaker" +[[extra.archive.groups.tests]] +title = "General" problems = "general-tiebreaker-problems.pdf" #solutions = "general-tiebreaker-solutions.pdf" -[[extra.archive.tests]] -title = "Algebra Tiebreaker" +[[extra.archive.groups.tests]] +title = "Algebra" problems = "algebra-tiebreaker-problems.pdf" #solutions = "algebra-tiebreaker-solutions.pdf" -[[extra.archive.tests]] -title = "Calculus Tiebreaker" +[[extra.archive.groups.tests]] +title = "Calculus" problems = "calculus-tiebreaker-problems.pdf" #solutions = "calculus-tiebreaker-solutions.pdf" -[[extra.archive.tests]] -title = "Discrete Tiebreaker" +[[extra.archive.groups.tests]] +title = "Discrete" problems = "discrete-tiebreaker-problems.pdf" #solutions = "discrete-tiebreaker-solutions.pdf" -[[extra.archive.tests]] -title = "Geometry Tiebreaker" +[[extra.archive.groups.tests]] +title = "Geometry" problems = "geometry-tiebreaker-problems.pdf" #solutions = "geometry-tiebreaker-solutions.pdf" +++ diff --git a/templates/resources/page.html b/templates/resources/page.html index 63b1a456..8b514dd7 100644 --- a/templates/resources/page.html +++ b/templates/resources/page.html @@ -1,18 +1,18 @@ {% extends "page.html" %} -{% block before_page_content %} +{% macro archive_table(label, tests, columns) %} - - {% for column in page.extra.archive.columns %} + + {% for column in columns %} {% endfor %} - {% for test in page.extra.archive.tests %} + {% for test in tests %} - {% for column in page.extra.archive.columns %} + {% for column in columns %}
Round{{ label }}{{ column.label }}
{{ test.title }} {% set href = test | get(key=column.key, default="") %} {% if href %} @@ -24,4 +24,22 @@ {% endfor %}
+{% endmacro %} + +{% block before_page_content %} +{% if page.extra.archive.groups is defined %} +{% for group in page.extra.archive.groups %} +{{ self::archive_table( + label=group.label | default(value="Round/Test"), + tests=group.tests, + columns=page.extra.archive.columns, +) }} +{% endfor %} +{% else %} +{{ self::archive_table( + label="Round/Test", + tests=page.extra.archive.tests, + columns=page.extra.archive.columns, +) }} +{% endif %} {% endblock %} From bbce47fc8e1dc23a423d13f5f0a9a9206db92e6b Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Sun, 23 Aug 2026 13:24:39 +0000 Subject: [PATCH 2/2] Keep Tiebreaker in row labels Co-Authored-By: golden --- content/archives/bmt-2025/index.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/content/archives/bmt-2025/index.md b/content/archives/bmt-2025/index.md index 81e3058a..aff8b296 100644 --- a/content/archives/bmt-2025/index.md +++ b/content/archives/bmt-2025/index.md @@ -53,27 +53,27 @@ problems = "guts-problems.pdf" label = "Tiebreaker" [[extra.archive.groups.tests]] -title = "General" +title = "General Tiebreaker" problems = "general-tiebreaker-problems.pdf" #solutions = "general-tiebreaker-solutions.pdf" [[extra.archive.groups.tests]] -title = "Algebra" +title = "Algebra Tiebreaker" problems = "algebra-tiebreaker-problems.pdf" #solutions = "algebra-tiebreaker-solutions.pdf" [[extra.archive.groups.tests]] -title = "Calculus" +title = "Calculus Tiebreaker" problems = "calculus-tiebreaker-problems.pdf" #solutions = "calculus-tiebreaker-solutions.pdf" [[extra.archive.groups.tests]] -title = "Discrete" +title = "Discrete Tiebreaker" problems = "discrete-tiebreaker-problems.pdf" #solutions = "discrete-tiebreaker-solutions.pdf" [[extra.archive.groups.tests]] -title = "Geometry" +title = "Geometry Tiebreaker" problems = "geometry-tiebreaker-problems.pdf" #solutions = "geometry-tiebreaker-solutions.pdf" +++