Skip to content

Commit 4a4f687

Browse files
ColdHeatColdHeat
authored
Display bracket names for teams & users (#96)
* Theme related PR for CTFd/CTFd#2612 * Displays brackets on public and private pages for users/teams
1 parent 2e64dda commit 4a4f687

File tree

6 files changed

+70
-13
lines changed

6 files changed

+70
-13
lines changed

‎templates/teams/private.html

+13
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,16 @@ <h3 class="d-inline-block">
234234
</h3>
235235
{% endif %}
236236

237+
{% if team.bracket_id %}
238+
<div class="pt-2">
239+
<h2>
240+
<span class="badge text-bg-light">
241+
{{ team.bracket.name }}
242+
</span>
243+
</h2>
244+
</div>
245+
{% endif %}
246+
237247
{% for field in team.fields %}
238248
<h3 class="d-block">
239249
{{ field.name }}: {{ field.value }}
@@ -328,6 +338,9 @@ <h3>{% trans %}Members{% endtrans %}</h3>
328338
<a href="{{ url_for('users.public', user_id=member.id) }}">
329339
{{ member.name }}
330340
</a>
341+
{% if member.bracket_id %}
342+
<span class="badge bg-secondary ms-2">{{ member.bracket.name }}</span>
343+
{% endif %}
331344
{% if team.captain_id == member.id %}
332345
<span class="badge bg-primary ms-2">{% trans %}Captain{% endtrans %}</span>
333346
{% endif %}

‎templates/teams/public.html

+21-5
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,23 @@ <h3 class="d-inline-block mx-1">
1919

2020
{% if team.country %}
2121
<h3 class="d-inline-block mx-1">
22-
<span class="badge bg-primary rounded-pill">
23-
<i class="flag-{{ team.country.lower() }}"></i>
24-
{{ lookup_country_code(team.country) }}
25-
</span>
22+
<span class="badge bg-primary rounded-pill">
23+
<i class="flag-{{ team.country.lower() }}"></i>
24+
{{ lookup_country_code(team.country) }}
25+
</span>
2626
</h3>
2727
{% endif %}
2828

29+
{% if team.bracket_id %}
30+
<div class="pt-2">
31+
<h2>
32+
<span class="badge text-bg-light">
33+
{{ team.bracket.name }}
34+
</span>
35+
</h2>
36+
</div>
37+
{% endif %}
38+
2939
<div class="pt-2">
3040
{% for field in team.fields %}
3141
<h3 class="d-block">
@@ -51,7 +61,7 @@ <h3 class="d-block">
5161

5262
<h2 id="team-place" class="text-center">
5363
{# This intentionally hides the team's place when scores are hidden because this can be
54-
their internal profile and we don't want to leak their place in the CTF. #}
64+
their internal profile and we don't want to leak their place in the CTF. #}
5565

5666
{# Public page hiding is done at the route level #}
5767
{% if scores_visible() %}
@@ -93,6 +103,12 @@ <h3>{% trans %}Members{% endtrans %}</h3>
93103
<a href="{{ url_for('users.public', user_id=member.id) }}">
94104
{{ member.name }}
95105
</a>
106+
{% if member.bracket_id %}
107+
<span class="badge bg-secondary ms-2">{{ member.bracket.name }}</span>
108+
{% endif %}
109+
{% if team.captain_id == member.id %}
110+
<span class="badge bg-primary ms-2">{% trans %}Captain{% endtrans %}</span>
111+
{% endif %}
96112
</td>
97113
<td>{{ member.score }}</td>
98114
</tr>

‎templates/teams/teams.html

+4
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@ <h6 class="text-muted text-center pb-3">
6363
<span>{{ team.name | truncate(50) }}</span>
6464
{% endif %}
6565

66+
{% if team.bracket_id %}
67+
<span class="badge bg-secondary ms-2">{{ team.bracket.name }}</span>
68+
{% endif %}
69+
6670
{% if team.oauth_id %}
6771
<a href="https://majorleaguecyber.org/t/{{ team.name }}">
6872
<span class="badge bg-primary ms-2">Official</span>

‎templates/users/private.html

+10
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,16 @@ <h3 class="d-inline-block mx-1">
3838
{% endif %}
3939
</div>
4040

41+
{% if user.bracket_id %}
42+
<div class="pt-2">
43+
<h2>
44+
<span class="badge text-bg-light">
45+
{{ user.bracket.name }}
46+
</span>
47+
</h2>
48+
</div>
49+
{% endif %}
50+
4151
<div class="pt-2">
4252
{% for field in user.fields %}
4353
<h3 class="d-block">

‎templates/users/public.html

+18-8
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ <h1>{{ user.name }}</h1>
88
{% if user.team_id %}
99
<h2>
1010
<a href="{{ url_for('teams.public', team_id=user.team_id) }}">
11-
<span class="badge bg-secondary">
12-
{{ user.team.name }}
13-
</span>
11+
<span class="badge bg-secondary">
12+
{{ user.team.name }}
13+
</span>
1414
</a>
1515
</h2>
1616
{% endif %}
@@ -38,6 +38,16 @@ <h3 class="d-inline-block mx-1">
3838
{% endif %}
3939
</div>
4040

41+
{% if user.bracket_id %}
42+
<div class="pt-2">
43+
<h2>
44+
<span class="badge text-bg-light">
45+
{{ user.bracket.name }}
46+
</span>
47+
</h2>
48+
</div>
49+
{% endif %}
50+
4151
<div class="pt-2">
4252
{% for field in user.fields %}
4353
<h3 class="d-block">
@@ -211,11 +221,11 @@ <h3 class="opacity-50 text-center w-100 justify-content-center align-self-center
211221
{% block scripts %}
212222
<script>
213223
window.USER = {{ {
214-
'type': 'user',
215-
'id': user.id,
216-
'name': user.name,
217-
'account_id': user.id,
218-
} | tojson }};
224+
'type': 'user',
225+
'id': user.id,
226+
'name': user.name,
227+
'account_id': user.id,
228+
} | tojson }};
219229
</script>
220230

221231
{{ Assets.js("assets/js/users/public.js") }}

‎templates/users/users.html

+4
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@ <h6 class="text-muted text-center pb-3">
6161
<span>{{ user.name | truncate(50) }}</span>
6262
{% endif %}
6363

64+
{% if user.bracket_id %}
65+
<span class="badge bg-secondary ms-2">{{ user.bracket.name }}</span>
66+
{% endif %}
67+
6468
{% if user.oauth_id %}
6569
<a href="https://majorleaguecyber.org/u/{{ user.name }}">
6670
<span class="badge bg-primary ms-2">{% trans %}Official{% endtrans %}</span>

0 commit comments

Comments
 (0)