From 2f8153978bf6b68653d9d74669169ae977eea05d Mon Sep 17 00:00:00 2001 From: Michael Vasseur <14887731+vmcj@users.noreply.github.com> Date: Sun, 6 Jul 2025 20:02:56 +0200 Subject: [PATCH 1/5] Demo using bootstrap in team page --- .../team/partials/index_content.html.twig | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/webapp/templates/team/partials/index_content.html.twig b/webapp/templates/team/partials/index_content.html.twig index 34c7ca453c..b334cbc09e 100644 --- a/webapp/templates/team/partials/index_content.html.twig +++ b/webapp/templates/team/partials/index_content.html.twig @@ -20,6 +20,50 @@ {% endif %} +
+
+
+
+ Submissions +
+
+ {% include 'team/partials/submission_list.html.twig' %} +
+
+
+
+
+
+ Clarifications +
+
+ {% if clarifications is empty %} +

No clarifications.

+ {% else %} + {% include 'team/partials/clarification_list.html.twig' with {clarifications: clarifications} %} + {% endif %} +
+
+
+
+ Clarification Requests +
+
+ {% if clarificationRequests is empty %} +

No clarification request.

+ {% else %} + {% include 'team/partials/clarification_list.html.twig' with {clarifications: clarificationRequests} %} + {% endif %} +
+
+ + Request clarification + +
+
+
+
+

Submissions

From f75608980f2a1387dd85b41614bdf3f5979b2174 Mon Sep 17 00:00:00 2001 From: Michael Vasseur <14887731+vmcj@users.noreply.github.com> Date: Sun, 6 Jul 2025 20:16:51 +0200 Subject: [PATCH 2/5] Demonstrate my own suggestion --- .../team/partials/index_content.html.twig | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/webapp/templates/team/partials/index_content.html.twig b/webapp/templates/team/partials/index_content.html.twig index b334cbc09e..3ae1ca4e4a 100644 --- a/webapp/templates/team/partials/index_content.html.twig +++ b/webapp/templates/team/partials/index_content.html.twig @@ -61,6 +61,21 @@
+
+
+ Clarification Requests + + Request clarification + +
+
+ {% if clarificationRequests is empty %} +

No clarification request.

+ {% else %} + {% include 'team/partials/clarification_list.html.twig' with {clarifications: clarificationRequests} %} + {% endif %} +
+
From 0d11a16fd2f073f89e9569ba3d9c09995980b736 Mon Sep 17 00:00:00 2001 From: Michael Vasseur <14887731+vmcj@users.noreply.github.com> Date: Mon, 7 Jul 2025 20:54:07 +0200 Subject: [PATCH 3/5] Disable refreshing for easier debugging --- webapp/public/js/domjudge.js | 2 +- webapp/templates/base.html.twig | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/webapp/public/js/domjudge.js b/webapp/public/js/domjudge.js index e3b9250c3b..3af30149c0 100644 --- a/webapp/public/js/domjudge.js +++ b/webapp/public/js/domjudge.js @@ -617,7 +617,7 @@ function enableRefresh($url, $after, usingAjax) { } }; refreshHandler = setTimeout(refresh, $after * 1000); - refreshEnabled = true; + refreshEnabled = false; setCookie('domjudge_refresh', 1); if(window.location.href == localStorage.getItem('lastUrl')) { diff --git a/webapp/templates/base.html.twig b/webapp/templates/base.html.twig index 9b54ed453b..610d81d6f3 100644 --- a/webapp/templates/base.html.twig +++ b/webapp/templates/base.html.twig @@ -48,17 +48,6 @@ {% endif %} var markdownPreviewUrl = "{{ path('markdown_preview') }}"; $(function () { - /* toggle refresh if set */ - {% if refresh is defined and refresh %} - $('#refresh-navitem').on('click', function () { - toggleRefresh('{{ refresh.url | raw }}', {{ refresh.after }}, {{ refresh.ajax | default(0) }}); - }); - {% endif %} - /* Enable page refresh if set if wanted by the page, and wanted by the user */ - {% if refresh is defined and refresh and refresh_flag %} - enableRefresh('{{ refresh.url | raw }}', {{ refresh.after }}, {{ refresh.ajax | default(0) }}); - {% endif %} - initializeAjaxModals(); }); From ca6295a5620b7017c8431e818529a84360f23891 Mon Sep 17 00:00:00 2001 From: Michael Vasseur <14887731+vmcj@users.noreply.github.com> Date: Mon, 7 Jul 2025 20:54:31 +0200 Subject: [PATCH 4/5] Show possible new layout --- .../team/partials/index_content.html.twig | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/webapp/templates/team/partials/index_content.html.twig b/webapp/templates/team/partials/index_content.html.twig index 3ae1ca4e4a..b466ddeb1b 100644 --- a/webapp/templates/team/partials/index_content.html.twig +++ b/webapp/templates/team/partials/index_content.html.twig @@ -8,18 +8,6 @@ {% else %} -
- {% set displayRank = not contest.freezeData.showFrozen %} - {% include 'partials/scoreboard_table.html.twig' with {displayRank: displayRank, jury: false, public: false} %} -
- -
- {% include 'partials/messages.html.twig' %} - {% if not contest.allowSubmit %} - {% include 'partials/alert.html.twig' with {'type': 'danger', 'message': 'Submissions (temporarily) disabled.'} %} - {% endif %} -
-
@@ -30,8 +18,6 @@ {% include 'team/partials/submission_list.html.twig' %}
-
-
Clarifications @@ -61,18 +47,32 @@
-
+
+
+
+
+ Clarifications +
+
+ {% if clarifications is empty %} +

No clarifications.

+ {% else %} + {% include 'team/partials/clarification_list_suggested.html.twig' with {clarifications: clarifications} %} + {% endif %} +
+
+
Clarification Requests Request clarification
-
+
{% if clarificationRequests is empty %}

No clarification request.

{% else %} - {% include 'team/partials/clarification_list.html.twig' with {clarifications: clarificationRequests} %} + {% include 'team/partials/clarification_list_suggested.html.twig' with {clarifications: clarificationRequests} %} {% endif %}
From 21cb9937ad349e071644d3c0e2b2756f4355cf26 Mon Sep 17 00:00:00 2001 From: Michael Vasseur <14887731+vmcj@users.noreply.github.com> Date: Mon, 7 Jul 2025 21:35:50 +0200 Subject: [PATCH 5/5] Fix the header to be in the same style. --- webapp/templates/team/partials/index_content.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/templates/team/partials/index_content.html.twig b/webapp/templates/team/partials/index_content.html.twig index b466ddeb1b..a7cb2c7262 100644 --- a/webapp/templates/team/partials/index_content.html.twig +++ b/webapp/templates/team/partials/index_content.html.twig @@ -50,7 +50,7 @@
-
+
Clarifications