From c1022642a2ebe9dce996ea118f2f274c28763779 Mon Sep 17 00:00:00 2001 From: Julien Constant <49886317+Juknum@users.noreply.github.com> Date: Sat, 8 Apr 2023 20:58:55 +0200 Subject: [PATCH] =?UTF-8?q?[FIX]=20Fixes=20suppl=C3=A9mentaires=20pour=20l?= =?UTF-8?q?a=20m=C3=A0j=20de=20mars=20(#622)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Les photos de l'onglet de la page utilisateur utilise désormais leur version thumbnail au lieu de leur version HD - Une des classes du CSS du SAS a été renommée car elle empiétait sur une class de la navbar - Le profil utilisateur a été revu pour ajouter plus d'espacement entre le tableau des cotisations et le numéro de cotisants - Les images de forum & blouse sont de nouveau cliquable pour les afficher en grands - Sur mobile, lorsqu'on cliquait sur le premier élément de la navbar, ce dernier avait un overlay avec des angles arrondis - Sur mobile, les utilisateurs avec des images de profils non carrées dépassait dans l'onglet Famille --- core/static/core/navbar.scss | 4 - core/static/sas/album.scss | 2 +- core/static/user/user_detail.scss | 1 + core/static/user/user_godfathers.scss | 2 +- core/templates/core/user_detail.jinja | 185 ++++++++++++------------ core/templates/core/user_pictures.jinja | 2 +- sas/templates/sas/album.jinja | 2 +- 7 files changed, 97 insertions(+), 101 deletions(-) diff --git a/core/static/core/navbar.scss b/core/static/core/navbar.scss index 7b0caa06..311825d9 100644 --- a/core/static/core/navbar.scss +++ b/core/static/core/navbar.scss @@ -59,10 +59,6 @@ nav.navbar { height: auto; justify-content: flex-start; - &:first-child { - border-radius: .6em .6em 0 0; - } - &:last-child { border-radius: 0 0 .6em .6em; diff --git a/core/static/sas/album.scss b/core/static/sas/album.scss index b84d0dd3..7b744183 100644 --- a/core/static/sas/album.scss +++ b/core/static/sas/album.scss @@ -3,7 +3,7 @@ main { padding: 10px; } -.navbar { +.album-navbar { margin-top: 10px; display: flex; flex-direction: row; diff --git a/core/static/user/user_detail.scss b/core/static/user/user_detail.scss index 4f67c6f6..3b32a327 100644 --- a/core/static/user/user_detail.scss +++ b/core/static/user/user_detail.scss @@ -180,6 +180,7 @@ main { max-height: calc(100% / 3); width: 100%; object-fit: contain; + cursor: pointer; @media (max-width: 960px) { max-height: 100%; diff --git a/core/static/user/user_godfathers.scss b/core/static/user/user_godfathers.scss index e600ec1b..e49e63c9 100644 --- a/core/static/user/user_godfathers.scss +++ b/core/static/user/user_godfathers.scss @@ -69,7 +69,7 @@ @media (max-width: 375px) { max-width: 100%; - max-height: 80px; + max-height: 65px; } } } diff --git a/core/templates/core/user_detail.jinja b/core/templates/core/user_detail.jinja index 5a2300d1..5cc24de0 100644 --- a/core/templates/core/user_detail.jinja +++ b/core/templates/core/user_detail.jinja @@ -99,7 +99,7 @@
-
+ - - {% if user.memberships.filter(end_date=None).exists() or user.is_in_group(settings.SITH_MAIN_BOARD_GROUP) or user == - profile or user.is_in_group(settings.SITH_BAR_MANAGER_BOARD_GROUP) %} - {# if the user is member of a club, he can view the subscription state #} -
- {% if profile.is_subscribed %} - {% if user == profile or user.is_root or user.is_board_member %} -
- {{ user_subscription(profile) }} -
- {% endif %} - {% if user == profile or user.is_root or user.is_board_member or user.is_launderette_manager %} -
- {# Shows tokens bought by the user #} - {{ show_tokens(profile) }} - {# Shows slots took by the user #} - {{ show_slots(profile) }} -
- {% endif %} - {% else %} -
- {% trans %}Not subscribed{% endtrans %} - {% if user.is_board_member %} - {% trans %}New subscription{% endtrans - %} - {% endif %} - {% endif %} -
- {% endif %} - {% if profile.was_subscribed and (user == profile or user.can_read_subscription_history)%} -
-
- - {% trans %}Subscription history{% endtrans %} - - - - + {% if user.memberships.filter(end_date=None).exists() or user.is_in_group(settings.SITH_MAIN_BOARD_GROUP) or user == profile or user.is_in_group(settings.SITH_BAR_MANAGER_BOARD_GROUP) %} + {# if the user is member of a club, he can view the subscription state #} +
+ {% if profile.is_subscribed %} + {% if user == profile or user.is_root or user.is_board_member %} +
+ {{ user_subscription(profile) }} +
+ {% endif %} + {% if user == profile or user.is_root or user.is_board_member or user.is_launderette_manager %} +
+ {# Shows tokens bought by the user #} + {{ show_tokens(profile) }} + {# Shows slots took by the user #} + {{ show_slots(profile) }} +
+ {% endif %} + {% else %} +
+ {% trans %}Not subscribed{% endtrans %} + {% if user.is_board_member %} + {% trans %}New subscription{% endtrans + %} + {% endif %} + {% endif %}
-
- - - - - - - - - - {% for sub in profile.subscriptions.all() %} - - - - - - - {% endfor %} -
{% trans %}Subscription start{% endtrans %}{% trans %}Subscription end{% endtrans %}{% trans %}Subscription type{% endtrans %}{% trans %}Payment method{% endtrans %}
{{ sub.subscription_start }}{{ sub.subscription_end }}{{ sub.subscription_type }}{{ sub.get_payment_method_display() }}
-
-
- {% endif %} - - {% if user.is_root or user.is_board_member %} -
-
-
- {% csrf_token %} - {{ gift_form.label }} - {{ gift_form.user }} - -
- {% if profile.gifts.exists() %} - {% set gifts = profile.gifts.order_by("-date")|list %} -
+ {% endif %} +
+ {% if profile.was_subscribed and (user == profile or user.can_read_subscription_history)%}
- {% trans %}Last given gift :{% endtrans %} {{ gifts[0] }} + {% trans %}Subscription history{% endtrans %}
-
    - {% for gift in gifts %} -
  • {{ gift }} - - - -
    • - {% endfor %} -
+ + + + + + + + + + {% for sub in profile.subscriptions.all() %} + + + + + + + {% endfor %} +
{% trans %}Subscription start{% endtrans %}{% trans %}Subscription end{% endtrans %}{% trans %}Subscription type{% endtrans %}{% trans %}Payment method{% endtrans %}
{{ sub.subscription_start }}{{ sub.subscription_end }}{{ sub.subscription_type }}{{ sub.get_payment_method_display() }}
+
-
- {% else %} - {% trans %}No gift given yet{% endtrans %} {% endif %} -
+ +
+
+ {% if user.is_root or user.is_board_member %} +
+ {% csrf_token %} + {{ gift_form.label }} + {{ gift_form.user }} + +
+ {% if profile.gifts.exists() %} + {% set gifts = profile.gifts.order_by("-date")|list %} +
+
+
+ + {% trans %}Last given gift :{% endtrans %} {{ gifts[0] }} + + + + +
+
+
    + {% for gift in gifts %} +
  • {{ gift }} + + + +
    • + {% endfor %} +
+
+ {% else %} + {% trans %}No gift given yet{% endtrans %} + {% endif %} +
{% endif %}
@@ -250,7 +249,7 @@ keys.push(e.keyCode); if (keys.toString() == pattern) { keys = []; - $("#user_profile_pictures_bigone img").attr("src", "{{ static('core/img/yug.jpg') }}"); + $("#big_picture img").attr("src", "{{ static('core/img/yug.jpg') }}"); } if (keys.length == 6) { keys.shift(); @@ -258,10 +257,10 @@ }); }); $(function () { - $("#user_profile_pictures_thumbnails img").click(function () { - $("#user_profile_pictures_bigone img").attr("src", $(this)[0].src); - $("#user_profile_pictures_bigone img").attr("alt", $(this)[0].alt); - $("#user_profile_pictures_bigone img").attr("title", $(this)[0].title); + $("#small_pictures img").click(function () { + $("#big_picture img").attr("src", $(this)[0].src); + $("#big_picture img").attr("alt", $(this)[0].alt); + $("#big_picture img").attr("title", $(this)[0].title); }) }); $(function () { diff --git a/core/templates/core/user_pictures.jinja b/core/templates/core/user_pictures.jinja index ba98fc95..471aecda 100644 --- a/core/templates/core/user_pictures.jinja +++ b/core/templates/core/user_pictures.jinja @@ -21,7 +21,7 @@
{% if not p.is_moderated %}
 
diff --git a/sas/templates/sas/album.jinja b/sas/templates/sas/album.jinja index ca3f7804..0d3be6dd 100644 --- a/sas/templates/sas/album.jinja +++ b/sas/templates/sas/album.jinja @@ -29,7 +29,7 @@
{% csrf_token %} -
+

{{ album.get_display_name() }}