From 7e4a2a30d9ae07a8de794adce2ccdbb3265d5b31 Mon Sep 17 00:00:00 2001 From: Danhia Date: Sun, 23 Jan 2022 18:45:10 +0100 Subject: [PATCH] changed color in top 10 + updated resources --- src/accounts/templates/accounts/profile.html | 2 +- src/home/templates/home/home.html | 8 ++++++-- src/resources/locale/de/LC_MESSAGES/django.po | 2 +- src/resources/locale/en/LC_MESSAGES/django.po | 2 +- src/resources/locale/es/LC_MESSAGES/django.po | 2 +- src/resources/locale/fr/LC_MESSAGES/django.po | 4 ++-- src/resources/locale/it/LC_MESSAGES/django.po | 2 +- src/resources/locale/ru/LC_MESSAGES/django.po | 2 +- src/resources/templates/resources/donate.html | 2 +- src/statics/css/style.css | 2 +- 10 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/accounts/templates/accounts/profile.html b/src/accounts/templates/accounts/profile.html index ba19560..66b8f9b 100644 --- a/src/accounts/templates/accounts/profile.html +++ b/src/accounts/templates/accounts/profile.html @@ -53,7 +53,7 @@ {% endif %} {% if member %} -
  • {% trans "Status: Member" %}
    • +
  • {% trans "Status: Member" %}
    • {% else %}
  • {% trans "Status: Visitor" %}
    • {% endif %} diff --git a/src/home/templates/home/home.html b/src/home/templates/home/home.html index bcc5ee3..3e83e8b 100644 --- a/src/home/templates/home/home.html +++ b/src/home/templates/home/home.html @@ -2,6 +2,7 @@ {% block content %} {% load i18n %} {% get_current_language as lang %} +{% load is_member %}
    {% if news %} @@ -44,9 +45,12 @@ {% endif %}
      -
    • Top 10
      • +
    • Top 10
      • {% for t in top %} -
    • # {{ forloop.counter }} {{ t.user.username }} {{ t.score }}
      • + {% ismember t.user.userprofileinfo as is_member %} +
    • # {{ forloop.counter }} + {{ t.user.username }} + {{ t.score }}
      • {% endfor %}
      diff --git a/src/resources/locale/de/LC_MESSAGES/django.po b/src/resources/locale/de/LC_MESSAGES/django.po index 891fa93..7f14a31 100644 --- a/src/resources/locale/de/LC_MESSAGES/django.po +++ b/src/resources/locale/de/LC_MESSAGES/django.po @@ -149,7 +149,7 @@ msgstr "" #: resources/templates/resources/donate.html:18 msgid "" "A different color for your pseudo in the scoreboard, to let everyone know " -"you're a member. (not yet implemented but coming soon)" +"you're a member." msgstr "" #: resources/templates/resources/donate.html:19 diff --git a/src/resources/locale/en/LC_MESSAGES/django.po b/src/resources/locale/en/LC_MESSAGES/django.po index 891fa93..7f14a31 100644 --- a/src/resources/locale/en/LC_MESSAGES/django.po +++ b/src/resources/locale/en/LC_MESSAGES/django.po @@ -149,7 +149,7 @@ msgstr "" #: resources/templates/resources/donate.html:18 msgid "" "A different color for your pseudo in the scoreboard, to let everyone know " -"you're a member. (not yet implemented but coming soon)" +"you're a member." msgstr "" #: resources/templates/resources/donate.html:19 diff --git a/src/resources/locale/es/LC_MESSAGES/django.po b/src/resources/locale/es/LC_MESSAGES/django.po index 891fa93..7f14a31 100644 --- a/src/resources/locale/es/LC_MESSAGES/django.po +++ b/src/resources/locale/es/LC_MESSAGES/django.po @@ -149,7 +149,7 @@ msgstr "" #: resources/templates/resources/donate.html:18 msgid "" "A different color for your pseudo in the scoreboard, to let everyone know " -"you're a member. (not yet implemented but coming soon)" +"you're a member." msgstr "" #: resources/templates/resources/donate.html:19 diff --git a/src/resources/locale/fr/LC_MESSAGES/django.po b/src/resources/locale/fr/LC_MESSAGES/django.po index facc533..ee0d281 100644 --- a/src/resources/locale/fr/LC_MESSAGES/django.po +++ b/src/resources/locale/fr/LC_MESSAGES/django.po @@ -151,10 +151,10 @@ msgstr "Lorsque vous adherez à 42CTF, vous obtenez les avantages suivants :" #: resources/templates/resources/donate.html:18 msgid "" "A different color for your pseudo in the scoreboard, to let everyone know " -"you're a member. (not yet implemented but coming soon)" +"you're a member." msgstr "" "Une couleur différente pour votre pseudo sur le scoreboard, pour que tout le " -"monde sache que vous êtes membre (en cours de développement)." +"monde sache que vous êtes membre." #: resources/templates/resources/donate.html:19 msgid "" diff --git a/src/resources/locale/it/LC_MESSAGES/django.po b/src/resources/locale/it/LC_MESSAGES/django.po index 891fa93..7f14a31 100644 --- a/src/resources/locale/it/LC_MESSAGES/django.po +++ b/src/resources/locale/it/LC_MESSAGES/django.po @@ -149,7 +149,7 @@ msgstr "" #: resources/templates/resources/donate.html:18 msgid "" "A different color for your pseudo in the scoreboard, to let everyone know " -"you're a member. (not yet implemented but coming soon)" +"you're a member." msgstr "" #: resources/templates/resources/donate.html:19 diff --git a/src/resources/locale/ru/LC_MESSAGES/django.po b/src/resources/locale/ru/LC_MESSAGES/django.po index 6705fef..a7c8e1c 100644 --- a/src/resources/locale/ru/LC_MESSAGES/django.po +++ b/src/resources/locale/ru/LC_MESSAGES/django.po @@ -151,7 +151,7 @@ msgstr "" #: resources/templates/resources/donate.html:18 msgid "" "A different color for your pseudo in the scoreboard, to let everyone know " -"you're a member. (not yet implemented but coming soon)" +"you're a member." msgstr "" #: resources/templates/resources/donate.html:19 diff --git a/src/resources/templates/resources/donate.html b/src/resources/templates/resources/donate.html index fa0c2a6..0b3cb83 100644 --- a/src/resources/templates/resources/donate.html +++ b/src/resources/templates/resources/donate.html @@ -15,7 +15,7 @@ {% trans "Membership is then granted for 1 year." %}

      {% trans "When you become a member, you gain the following advantages:" %}
      - - {% trans "A different color for your pseudo in the scoreboard, to let everyone know you're a member. (not yet implemented but coming soon)" %}
      + - {% trans "A different color for your pseudo in the scoreboard, to let everyone know you're a member." %}
      - {% trans "The possibility to play again past CTF, with challenges no longer available, in the form of private events with the people of your choice." %}
      {% trans "Ex: you played Welcome CTF 2021, and want to play it again with your friends during one weekend." %} {% trans "Or you didn't play Welcome CTF 2021 because you were not eligible." %} diff --git a/src/statics/css/style.css b/src/statics/css/style.css index 4819fa7..f8df0ab 100644 --- a/src/statics/css/style.css +++ b/src/statics/css/style.css @@ -79,7 +79,7 @@ pre { } .list-group a { text-decoration: none; - color: #4375aa; + /* color: #4375aa; */ } .list-group a:hover { text-decoration: none;