+ + {{ type_label }} +
+{{ ('badges.description.' ~ type.value)|trans }}
+{{ 'badges.detail.newest_earners'|trans }}
+
+ {% for earner in newest_earners %}
+
+ {% if earner.tier is not null %}
+ {{ earner.tier.romanNumeral() }}
+ {% endif %}
+ {{ earner.playerName ?? ('#' ~ earner.playerCode|upper) }}
+ {% if earner.countryCode is not null %}
+
+ {% endif %}
+
+ {% endfor %}
+
+
+
+
+
+
+ {% if section.holders|length > 0 %}
+
+ {{ section.tier.romanNumeral() }}
+
+
+
+
+ {{ 'badges.detail.holders_count'|trans({'%count%': section.totalCount}) }}
+
+ {{ (section.tier.translationKey())|trans }} · +{{ section.tier.points }} AP
+ {{ ('badges.requirement.' ~ type.value ~ '_' ~ section.tier.value)|trans }} +
+ {% for holder in section.holders %}
+
+ {% if loop.first %}
+ 🏆
+ {% endif %}
+ {% if holder.avatar is not null %}
+  }})
+ {% endif %}
+ {{ holder.playerName ?? ('#' ~ holder.playerCode|upper) }}
+ {% if holder.countryCode is not null %}
+
+ {% endif %}
+ {{ holder.earnedAt|format_date('short') }}
+
+ {% endfor %}
+
+ {% if section.hiddenCount > 0 %}
+
+ {{ 'badges.detail.more_puzzlers'|trans({'%count%': section.hiddenCount}) }}
+
+ {% endif %}
+
+ {% elseif section.totalCount > 0 %}
+ + {{ 'badges.detail.only_hidden_holders'|trans({'%count%': section.totalCount}) }} +
+ {% else %} ++ {{ 'badges.detail.nobody_yet'|trans }} +
+ {% endif %} ++ + {{ 'badges.detail.listing_note'|trans }} +
+{% endblock %} diff --git a/templates/added_time_recap.html.twig b/templates/added_time_recap.html.twig index 6b2a09895..844b6504f 100644 --- a/templates/added_time_recap.html.twig +++ b/templates/added_time_recap.html.twig @@ -21,6 +21,8 @@
+
{{ 'added_tracking_recap.add_another'|trans }}
diff --git a/templates/badge_reveals.html.twig b/templates/badge_reveals.html.twig
new file mode 100644
index 000000000..6613cf3d5
--- /dev/null
+++ b/templates/badge_reveals.html.twig
@@ -0,0 +1,59 @@
+{% extends 'base.html.twig' %}
+
+{% block title %}{{ 'badges.reveals.meta_title'|trans }}{% endblock %}
+
+{% block content %}
+
+
+
+
{{ 'badges.reveals.title'|trans }}
+ + {% if badges|length > 0 %} +{{ 'badges.reveals.intro'|trans({'%count%': badges|length}) }}
+ +
+ {% for badge in badges %}
+ {% set tier = badge.tier %}
+ {% set tier_class = tier ? tier.cssClass() : 'badge-tier-supporter' %}
+ {% set label = (badge.type.translationKey())|trans %}
+
+
+
+
+
+
+
+ {% endfor %}
+
+ {{ label }}
+
+ {% if tier %}
+ {{ (tier.translationKey())|trans }}
+ {% endif %}
+ {{ 'badges.reveals.hint'|trans }}
+ {% else %} + + {% endif %} + + + {{ 'badges.reveals.back_to_profile'|trans }} + +{% endblock %} diff --git a/templates/badges_overview.html.twig b/templates/badges_overview.html.twig new file mode 100644 index 000000000..8d5559b83 --- /dev/null +++ b/templates/badges_overview.html.twig @@ -0,0 +1,123 @@ +{% extends 'base.html.twig' %} + +{% block title %}{{ 'badges.overview_title'|trans }}{% endblock %} + +{% block meta_description %}{{ 'badges.overview_subtitle'|trans }}{% endblock %} + +{% block content %} ++ + {{ 'badges.overview_title'|trans }} +
+{{ 'badges.overview_subtitle'|trans }}
+ + {% if ap_total is not null %} ++ + + {{ 'badges.ap_total'|trans({'%points%': ap_total}) }} + +
+ {% endif %} + + {% if logged_in == false %} ++ + {{ 'badges.login_to_track'|trans }} +
+ {% elseif not is_member %} ++ + {{ 'badges.free_user_hint'|trans }} + {{ 'badges.unlock_with_membership'|trans }} +
+ {% endif %} +
+ {% for group in catalog %}
+
+
+
+
+ {% endfor %}
+
+
+
+
+
+
+
+
+
+
+ {% set earned_count = group.earnedCount() %}
+
+ {{ earned_count }} / {{ group.tiers|length }}
+
+ + + {{ (group.type.translationKey())|trans }} + +
++ {{ ('badges.description.' ~ group.type.value)|trans }} +
+
+ {% for entry in group.tiers %}
+ {% set earned_but_locked = entry.earned and logged_in and not is_member %}
+
+
+ {% if logged_in and group.progressToNext is not null %}
+ {% set progress = group.progressToNext %}
+
+
+ {% endfor %}
+
+
+
+ {{ entry.tier.romanNumeral() }}
+
+ {% if earned_but_locked %}
+ ✓
+ {% endif %}
+
+ {{ (entry.tier.translationKey())|trans }}
+
+ +{{ entry.tier.points }} AP
+
+
+ {% elseif logged_in and group.progressToNext is null and group.hasAnyEarned() %}
+
+ {{ ('badges.requirement.' ~ group.type.value ~ '_' ~ progress.nextTier.value)|trans }}
+ {{ progress.percent }}%
+
+
+
+
+ + + {{ 'badges.highest_earned'|trans }} +
+ {% elseif logged_in %} ++ + {{ 'badges.not_earned_yet'|trans }} — {{ 'badges.keep_going'|trans }} +
+ {% endif %} + + + {{ 'badges.view_holders'|trans }} + ++ + {{ 'badges.how_it_works_hint'|trans }} + {{ 'badges.how_it_works_link'|trans }} +
+{% endblock %} diff --git a/templates/base.html.twig b/templates/base.html.twig index 3c28f7668..2b3f7979e 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -353,9 +353,11 @@ {% else %} diff --git a/templates/components/XpRevealInvite.html.twig b/templates/components/XpRevealInvite.html.twig new file mode 100644 index 000000000..bb5d31170 --- /dev/null +++ b/templates/components/XpRevealInvite.html.twig @@ -0,0 +1,11 @@ +{% if unrevealedCount > 0 %} +
+
+
+{% endif %}
diff --git a/templates/components/XpRing.html.twig b/templates/components/XpRing.html.twig
new file mode 100644
index 000000000..55df586aa
--- /dev/null
+++ b/templates/components/XpRing.html.twig
@@ -0,0 +1,33 @@
+{% set inner %}{% block content %}{% endblock %}{% endset %}
+
+{% if this.visible %}
+ {% if ambient %}
+ {{ inner }}
+ {% else %}
+
+ {{ 'badges.reveals.invite'|trans({'%count%': unrevealedCount}) }}
+
+
+ {{ 'badges.reveals.invite_button'|trans }}
+
+
+ {{ inner }}
+
+
+ {% endif %}
+{% else %}
+ {{ inner }}
+{% endif %}
diff --git a/templates/components/XpSolveReceipt.html.twig b/templates/components/XpSolveReceipt.html.twig
new file mode 100644
index 000000000..d82e8dab9
--- /dev/null
+++ b/templates/components/XpSolveReceipt.html.twig
@@ -0,0 +1,106 @@
+{% set mode = this.mode %}
+
+{% if mode != 'hidden' %}
+
+
+
+
+ {{ 'xp.level_chip'|trans({'%level%': this.profile.level}) }}
+
+ {{ 'xp.total'|trans({'%xp%': this.profile.xpTotal}) }}
+
+
+ {% if showProgress %}
+ {% if this.profile.isMaxLevel %}
+ {{ 'xp.max_level_reached'|trans }}
+ {% else %}
+
+ {{ 'xp.progress_label'|trans({'%xp%': this.profile.xpToNextLevel, '%level%': this.profile.level + 1}) }}
+ {% endif %}
+ {% endif %}
+
+
+{% endif %}
diff --git a/templates/edit-profile.html.twig b/templates/edit-profile.html.twig
index 31742cdcd..3c0d30cf7 100644
--- a/templates/edit-profile.html.twig
+++ b/templates/edit-profile.html.twig
@@ -29,6 +29,9 @@
{{ form_row(features_options_form.streakOptedOut) }}
{{ form_row(features_options_form.rankingOptedOut) }}
{{ form_row(features_options_form.timePredictionsOptedOut) }}
+ {% if features_options_form.experienceSystemOptedOut is defined %}
+ {{ form_row(features_options_form.experienceSystemOptedOut) }}
+ {% endif %}
+ {% if mode == 'receipt' %}
+
++ + {{ 'xp.receipt.title'|trans }} +
+ +
+ {% for line in lines %}
+
+
+
+ {{ this.lineLabelKey(line)|trans }}
+ +{{ line.amount }} XP
+
+ {% endfor %}
+
+ {% if this.showDifficultyPending %}
+
+ {{ 'xp.line.difficulty_pending'|trans }}
+ …
+
+ {% endif %}
+
+ {% if this.showSpeedPending %}
+
+ {{ 'xp.line.speed_pending'|trans }}
+ …
+
+ {% endif %}
+
+
+ {{ 'xp.receipt.total'|trans }}
+ +{{ this.total }} XP
+
+
+
+
+ {% if not viewerIsMember and waitingCount > 0 %}
+
+ {% endif %}
+ {% elseif mode == 'max_level' %}
+
+ {{ 'xp.level_chip'|trans({'%level%': profile.level}) }}
+ {{ 'xp.progress_label'|trans({'%xp%': profile.xpToNextLevel, '%level%': profile.level + 1}) }}
+
+
+ + {{ 'xp.level_chip'|trans({'%level%': profile.level}) }} + {{ 'xp.receipt.max_level_title'|trans }} +
+ + {% if viewerIsMember %} + {% if this.nearestAchievements|length > 0 %} +{{ 'xp.receipt.nearest_achievements'|trans }}
+ {% for candidate in this.nearestAchievements %} +
+
+ {% endfor %}
+
+
+ {{ 'badges.browse_all'|trans }}
+
+ {% else %}
+
+ {{ candidate.type.translationKey()|trans }} — {{ candidate.progress.nextTier.translationKey()|trans }}
+ {{ candidate.progress.percent }}%
+
+
+ {{ 'xp.receipt.max_level_all_done'|trans }}
+ {% endif %} + {% else %} + + + + {{ 'badges.unlock_with_membership'|trans }} + + {% endif %} + {% elseif mode == 'relax_repeat' %} ++ + {{ 'xp.receipt.relax_repeat'|trans }} +
+ {% else %} +
+
+ {{ 'xp.receipt.counting'|trans }}
+
@@ -50,6 +53,9 @@
diff --git a/templates/edit-time.html.twig b/templates/edit-time.html.twig index a45ff36f6..c55e2d76c 100644 --- a/templates/edit-time.html.twig +++ b/templates/edit-time.html.twig @@ -59,6 +59,12 @@
{{ 'edit_time.delete_modal_confirm'|trans }}
+ {% if xp_delete_warning|default(0) > 0 %} ++ + {{ 'edit_time.delete_xp_warning'|trans({'%xp%': xp_delete_warning}) }} +
+ {% endif %}