klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-11-25 02:24:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

[FIX] Fixes supplémentaires pour la màj de mars (#622)

Browse Source 
- 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
This commit is contained in:
Julien Constant 2023-04-08 20:58:55 +02:00 committed by Julien Constant
parent 06253f029c
commit c1022642a2
7 changed files with 97 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/static/core/navbar.scss
View File

@ -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;

2
core/static/sas/album.scss
View File

@ -3,7 +3,7 @@ main {
padding: 10px;
}
.navbar {
.album-navbar {
margin-top: 10px;
display: flex;
flex-direction: row;

1
core/static/user/user_detail.scss
View File

@ -180,6 +180,7 @@ main {
max-height: calc(100% / 3);
width: 100%;
object-fit: contain;
cursor: pointer;
@media (max-width: 960px) {
max-height: 100%;

2
core/static/user/user_godfathers.scss
View File

@ -69,7 +69,7 @@
@media (max-width: 375px) {
max-width: 100%;
max-height: 80px;
max-height: 65px;
}
}
}

21
core/templates/core/user_detail.jinja
View File

@ -99,7 +99,7 @@
</div>
<!-- Pictures -->
<div class="user_profile_pictures">
<div class="user_profile_pictures_bigone">
<div class="user_profile_pictures_bigone" id="big_picture">
{% if profile.profile_pict %}
<img src="{{ profile.profile_pict.get_download_url() }}" alt="{% trans %}Profile{% endtrans %}"
title="{% trans %}Profile{% endtrans %}" />
@ -108,7 +108,7 @@
title="{% trans %}Profile{% endtrans %}" />
{% endif %}
</div>
<div class="user_profile_pictures_thumbnails">
<div class="user_profile_pictures_thumbnails" id="small_pictures">
{% if profile.profile_pict %}
<img src="{{ profile.profile_pict.get_download_url() }}" alt="{% trans %}Profile{% endtrans %}"
title="{% trans %}Profile{% endtrans %}" />
@ -136,8 +136,7 @@
</div>
</div>
</main>
{% 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 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 #}
<hr>
{% if profile.is_subscribed %}
@ -164,6 +163,7 @@
{% endif %}
</div>
{% endif %}
<br>
{% if profile.was_subscribed and (user == profile or user.can_read_subscription_history)%}
<div class="collapse" :class="{'shadow': collapsed}" x-data="{collapsed: false}" x-cloak>
<div class="collapse-header clickable" @click="collapsed = !collapsed">
@ -197,9 +197,9 @@
</div>
{% endif %}
{% if user.is_root or user.is_board_member %}
<hr>
<div>
{% if user.is_root or user.is_board_member %}
<form class="form-gifts" action="{{ url('core:user_gift_create', user_id=profile.id) }}" method="post">
{% csrf_token %}
{{ gift_form.label }}
@ -229,7 +229,6 @@
{% endfor %}
</ul>
</div>
</div>
{% else %}
<em>{% trans %}No gift given yet{% endtrans %}</em>
{% 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 () {

2
core/templates/core/user_pictures.jinja
View File

@ -21,7 +21,7 @@
<a href="{{ url("sas:picture", picture_id=p.id) }}#pict">
<div
class="photo{% if not p.is_moderated %} not_moderated{% endif %}"
style="background-image: url('{% if p.file %}{{ p.get_download_url() }}{% else %}{{ static('core/img/sas.jpg') }}{% endif %}');"
style="background-image: url('{% if p.file %}{{ p.get_download_thumb_url() }}{% else %}{{ static('core/img/sas.jpg') }}{% endif %}');"
>
{% if not p.is_moderated %}
<div class="overlay">&nbsp;</div>

2
sas/templates/sas/album.jinja
View File

@ -29,7 +29,7 @@
<form action="" method="post" enctype="multipart/form-data">
{% csrf_token %}
<div class="navbar">
<div class="album-navbar">
<h3>{{ album.get_display_name() }}</h3>
<div class="toolbar">