From c794de680b9584061bfb08b886a4824662f67b7b Mon Sep 17 00:00:00 2001 From: rubenwardy Date: Mon, 26 Jul 2021 00:02:55 +0100 Subject: [PATCH] Profile medals: top package type icons, equal height --- app/blueprints/users/profile.py | 18 ++++++++++++------ app/templates/users/profile.html | 6 +++--- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/app/blueprints/users/profile.py b/app/blueprints/users/profile.py index 4d07fc2..9259b8a 100644 --- a/app/blueprints/users/profile.py +++ b/app/blueprints/users/profile.py @@ -105,7 +105,7 @@ def get_user_medals(user: User) -> Tuple[List[Medal], List[Medal]]: except ValueError: pass - if review_percent and review_percent < 25: + if review_percent is not None and review_percent < 25: if review_idx == 0: title = gettext(u"Most reviews") description = gettext( @@ -154,16 +154,22 @@ def get_user_medals(user: User) -> Tuple[List[Medal], List[Medal]]: None) if user_package_ranks: top_rank = user_package_ranks[2] - top_type = PackageType.coerce(user_package_ranks[0]).value + top_type = PackageType.coerce(user_package_ranks[0]) if top_rank == 1: - title = gettext(u"Top %(type)s", type=top_type.lower()) + title = gettext(u"Top %(type)s", type=top_type.value.lower()) else: - title = gettext(u"Top %(group)d %(type)s", group=top_rank, type=top_type.lower()) + title = gettext(u"Top %(group)d %(type)s", group=top_rank, type=top_type.value.lower()) + if top_type == PackageType.MOD: + icon = "fa-box" + elif top_type == PackageType.GAME: + icon = "fa-gamepad" + else: + icon = "fa-paint-brush" description = gettext(u"%(display_name)s has a %(type)s placed at #%(place)d.", - display_name=user.display_name, type=top_type.lower(), place=top_rank) + display_name=user.display_name, type=top_type.value.lower(), place=top_rank) unlocked.append( - Medal.make_unlocked(place_to_color(top_rank), "fa-trophy", title, description)) + Medal.make_unlocked(place_to_color(top_rank), icon, title, description)) # # DOWNLOADS diff --git a/app/templates/users/profile.html b/app/templates/users/profile.html index 594590f..d556869 100644 --- a/app/templates/users/profile.html +++ b/app/templates/users/profile.html @@ -125,7 +125,7 @@
{% for medal in medals_unlocked %}
-
+
@@ -141,10 +141,10 @@
{% endfor %} - {% if current_user == user %} + {% if current_user == user or (current_user.is_authenticated and current_user.rank.atLeast(current_user.rank.ADMIN)) %} {% for medal in medals_locked %}
-
+

{{ medal.description }}