Skip to content

Commit

Permalink
[scoreboard] Reword scoreboard to be clearer (#583)
Browse files Browse the repository at this point in the history
Co-authored-by: Samuel Zhu <[email protected]>
  • Loading branch information
sjzhu and Samuel Zhu authored Oct 3, 2024
1 parent 407f99a commit 191eb83
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 8 deletions.
15 changes: 12 additions & 3 deletions dojo_theme/static/js/dojo/scoreboard.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,18 @@ function loadScoreboard(duration, page) {
$("#scoreboard-control-week").removeClass("scoreboard-page-selected");
$("#scoreboard-control-month").removeClass("scoreboard-page-selected");
$("#scoreboard-control-all").removeClass("scoreboard-page-selected");
if (duration == 7) $("#scoreboard-control-week").addClass("scoreboard-page-selected");
if (duration == 30) $("#scoreboard-control-month").addClass("scoreboard-page-selected");
if (duration == 0) $("#scoreboard-control-all").addClass("scoreboard-page-selected");
if (duration == 7) {
$("#scoreboard-control-week").addClass("scoreboard-page-selected");
$("#scoreboard-heading").text("7-Day Scoreboard:");
}
if (duration == 30) {
$("#scoreboard-control-month").addClass("scoreboard-page-selected");
$("#scoreboard-heading").text("30-Day Scoreboard:");
}
if (duration == 0) {
$("#scoreboard-control-all").addClass("scoreboard-page-selected");
$("#scoreboard-heading").text("All-Time Scoreboard:");
}

CTFd.fetch(endpoint, {
method: "GET",
Expand Down
2 changes: 1 addition & 1 deletion dojo_theme/templates/dojo.html
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ <h2 class="row">Modules</h2>

<br>

<h2 class="row">Rankings:</h2>
<h2 class="row" id="scoreboard-heading">30-Day Scoreboard:</h2>
<br>
{% from "macros/scoreboard.html" import scoreboard %}
{{ scoreboard() }}
Expand Down
6 changes: 3 additions & 3 deletions dojo_theme/templates/macros/scoreboard.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{% macro scoreboard() -%}
<div class="scoreboard-controls row">
<p>
<span id="scoreboard-control-week"><a href="javascript:loadScoreboard(7, 1)">Week</a></span> |
<span id="scoreboard-control-month"><a href="javascript:loadScoreboard(30, 1)">Month</a></span> |
<span id="scoreboard-control-all"><a href="javascript:loadScoreboard(0, 1)">All Time</a></span>
<span id="scoreboard-control-week"><a href="javascript:loadScoreboard(7, 1)">7-Day</a></span> |
<span id="scoreboard-control-month"><a href="javascript:loadScoreboard(30, 1)">30-Day</a></span> |
<span id="scoreboard-control-all"><a href="javascript:loadScoreboard(0, 1)">All-Time</a></span>
</p>
</div>
<div class="scoreboard row">
Expand Down
2 changes: 1 addition & 1 deletion dojo_theme/templates/module.html
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ <h4 class="accordion-item-name challenge-name {{ active }}">

<br>

<h2>Ranking</h2>
<h2 class="row" id="scoreboard-heading">30-Day Scoreboard:</h2>
<p>This scoreboard reflects solves for challenges in this module after the module launched in this dojo.</p>
{% from "macros/scoreboard.html" import scoreboard %}
{{ scoreboard() }}
Expand Down

0 comments on commit 191eb83

Please sign in to comment.