diff --git a/templates/teams/private.html b/templates/teams/private.html index 7c0fda7..70fb865 100644 --- a/templates/teams/private.html +++ b/templates/teams/private.html @@ -234,6 +234,16 @@

{% endif %} + {% if team.bracket_id %} +
+

+ + {{ team.bracket.name }} + +

+
+ {% endif %} + {% for field in team.fields %}

{{ field.name }}: {{ field.value }} @@ -328,6 +338,9 @@

{% trans %}Members{% endtrans %}

{{ member.name }} + {% if member.bracket_id %} + {{ member.bracket.name }} + {% endif %} {% if team.captain_id == member.id %} {% trans %}Captain{% endtrans %} {% endif %} diff --git a/templates/teams/public.html b/templates/teams/public.html index 103739d..5f57431 100644 --- a/templates/teams/public.html +++ b/templates/teams/public.html @@ -19,13 +19,23 @@

{% if team.country %}

- - - {{ lookup_country_code(team.country) }} - + + + {{ lookup_country_code(team.country) }} +

{% endif %} + {% if team.bracket_id %} +
+

+ + {{ team.bracket.name }} + +

+
+ {% endif %} +
{% for field in team.fields %}

@@ -51,7 +61,7 @@

{# This intentionally hides the team's place when scores are hidden because this can be - their internal profile and we don't want to leak their place in the CTF. #} + their internal profile and we don't want to leak their place in the CTF. #} {# Public page hiding is done at the route level #} {% if scores_visible() %} @@ -93,6 +103,12 @@

{% trans %}Members{% endtrans %}

{{ member.name }} + {% if member.bracket_id %} + {{ member.bracket.name }} + {% endif %} + {% if team.captain_id == member.id %} + {% trans %}Captain{% endtrans %} + {% endif %} {{ member.score }} diff --git a/templates/teams/teams.html b/templates/teams/teams.html index dd887e2..960f77c 100644 --- a/templates/teams/teams.html +++ b/templates/teams/teams.html @@ -63,6 +63,10 @@
{{ team.name | truncate(50) }} {% endif %} + {% if team.bracket_id %} + {{ team.bracket.name }} + {% endif %} + {% if team.oauth_id %} Official diff --git a/templates/users/private.html b/templates/users/private.html index 59c7547..ff6eda6 100644 --- a/templates/users/private.html +++ b/templates/users/private.html @@ -38,6 +38,16 @@

{% endif %}

+ {% if user.bracket_id %} +
+

+ + {{ user.bracket.name }} + +

+
+ {% endif %} +
{% for field in user.fields %}

diff --git a/templates/users/public.html b/templates/users/public.html index 4bd6ed6..c43abdc 100644 --- a/templates/users/public.html +++ b/templates/users/public.html @@ -8,9 +8,9 @@

{{ user.name }}

{% if user.team_id %}

- - {{ user.team.name }} - + + {{ user.team.name }} +

{% endif %} @@ -38,6 +38,16 @@

{% endif %}

+ {% if user.bracket_id %} +
+

+ + {{ user.bracket.name }} + +

+
+ {% endif %} +
{% for field in user.fields %}

@@ -211,11 +221,11 @@

{{ user.name | truncate(50) }} {% endif %} + {% if user.bracket_id %} + {{ user.bracket.name }} + {% endif %} + {% if user.oauth_id %} {% trans %}Official{% endtrans %}