mirror of
https://github.com/ae-utbm/sith.git
synced 2025-07-01 15:45:17 +00:00
Fix CSS
This commit is contained in:
parent
1ffa65b3a4
commit
f9d5585525
@ -15,12 +15,13 @@
|
|||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
justify-content: space-around;
|
justify-content: center;
|
||||||
|
gap: 40px;
|
||||||
align-items: stretch;
|
align-items: stretch;
|
||||||
|
|
||||||
@media (max-width: 750px) {
|
@media (max-width: 750px) {
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
gap: 20px;
|
gap: 10px
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1,6 +1,11 @@
|
|||||||
{% extends "core/base.jinja" %}
|
{% extends "core/base.jinja" %}
|
||||||
{% from "core/macros.jinja" import show_slots, show_tokens, user_subscription %}
|
{% from "core/macros.jinja" import show_slots, show_tokens, user_subscription %}
|
||||||
|
|
||||||
|
{%- block additional_css -%}
|
||||||
|
<link rel="stylesheet" href="{{ scss('core/override.scss') }}">
|
||||||
|
<link rel="stylesheet" href="{{ scss('user/user_detail.scss') }}">
|
||||||
|
{%- endblock -%}
|
||||||
|
|
||||||
{% block title %}
|
{% block title %}
|
||||||
{% trans user_name=profile.get_display_name() %}{{ user_name }}'s profile{% endtrans %}
|
{% trans user_name=profile.get_display_name() %}{{ user_name }}'s profile{% endtrans %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
@ -41,7 +46,8 @@
|
|||||||
{% if profile.department != "NA" %}
|
{% if profile.department != "NA" %}
|
||||||
<div>
|
<div>
|
||||||
<span class="user_profile_infos_item">{% trans %}Department: {% endtrans %}</span>
|
<span class="user_profile_infos_item">{% trans %}Department: {% endtrans %}</span>
|
||||||
<span class="user_profile_infos_item_value">{{ profile.department }}{{ profile.semester }}</span>
|
<span class="user_profile_infos_item_value">{{ profile.department }}{{ profile.semester
|
||||||
|
}}</span>
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
@ -77,11 +83,8 @@
|
|||||||
{% if profile.promo %}
|
{% if profile.promo %}
|
||||||
<div id="user_profile_infos_promo">
|
<div id="user_profile_infos_promo">
|
||||||
{% trans %}Promo: {% endtrans %}{{ profile.promo }}
|
{% trans %}Promo: {% endtrans %}{{ profile.promo }}
|
||||||
<img src="{{ static('core/img/promo_%02d.png' % profile.promo) }}" alt="Promo {{ profile.promo }}" />
|
<img src="{{ static('core/img/promo_%02d.png' % profile.promo) }}"
|
||||||
<img src="{{ static('core/img/promo_%02d.png' % profile.promo) }}" alt="Promo {{ profile.promo }}" />
|
alt="Promo {{ profile.promo }}" />
|
||||||
{% trans %}Promo: {% endtrans %}{{ profile.promo }}
|
|
||||||
<img src="{{ static('core/img/promo_%02d.png' % profile.promo) }}" alt="Promo {{ profile.promo }}" />
|
|
||||||
{% trans %}Promo: {% endtrans %}{{ profile.promo }}
|
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
@ -124,7 +127,8 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% 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 #}
|
{# if the user is member of a club, he can view the subscription state #}
|
||||||
<hr>
|
<hr>
|
||||||
{% if profile.is_subscribed %}
|
{% if profile.is_subscribed %}
|
||||||
@ -145,7 +149,8 @@
|
|||||||
<div>
|
<div>
|
||||||
{% trans %}Not subscribed{% endtrans %}
|
{% trans %}Not subscribed{% endtrans %}
|
||||||
{% if user.is_board_member %}
|
{% if user.is_board_member %}
|
||||||
<a href="{{ url('subscription:subscription') }}?member={{ profile.id }}">{% trans %}New subscription{% endtrans %}</a>
|
<a href="{{ url('subscription:subscription') }}?member={{ profile.id }}">{% trans %}New subscription{% endtrans
|
||||||
|
%}</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
@ -188,7 +193,8 @@
|
|||||||
<div>
|
<div>
|
||||||
<ul>
|
<ul>
|
||||||
{% for gift in profile.gifts.all().order_by('-date') %}
|
{% for gift in profile.gifts.all().order_by('-date') %}
|
||||||
<li>{{ gift }} <a href="{{ url('core:user_gift_delete', user_id=profile.id, gift_id=gift.id) }}">{% trans %}Delete{% endtrans %}</a></li>
|
<li>{{ gift }} <a href="{{ url('core:user_gift_delete', user_id=profile.id, gift_id=gift.id) }}">{%
|
||||||
|
trans %}Delete{% endtrans %}</a></li>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
@ -206,40 +212,40 @@
|
|||||||
{% block script %}
|
{% block script %}
|
||||||
{{ super() }}
|
{{ super() }}
|
||||||
<script>
|
<script>
|
||||||
$( function() {
|
$(function () {
|
||||||
var keys = [];
|
var keys = [];
|
||||||
var pattern = "71,85,89,71,85,89";
|
var pattern = "71,85,89,71,85,89";
|
||||||
$(document).keydown(function (e) {
|
$(document).keydown(function (e) {
|
||||||
keys.push(e.keyCode);
|
keys.push(e.keyCode);
|
||||||
if (keys.toString()==pattern) {
|
if (keys.toString() == pattern) {
|
||||||
keys = [];
|
keys = [];
|
||||||
$("#user_profile_pictures_bigone img").attr("src", "{{ static('core/img/yug.jpg') }}");
|
$("#user_profile_pictures_bigone img").attr("src", "{{ static('core/img/yug.jpg') }}");
|
||||||
}
|
}
|
||||||
if (keys.length==6) {
|
if (keys.length == 6) {
|
||||||
keys.shift();
|
keys.shift();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
} );
|
});
|
||||||
$(function(){
|
$(function () {
|
||||||
$("#user_profile_pictures_thumbnails img").click(function () {
|
$("#user_profile_pictures_thumbnails img").click(function () {
|
||||||
$("#user_profile_pictures_bigone img").attr("src", $(this)[0].src);
|
$("#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("alt", $(this)[0].alt);
|
||||||
$("#user_profile_pictures_bigone img").attr("title", $(this)[0].title);
|
$("#user_profile_pictures_bigone img").attr("title", $(this)[0].title);
|
||||||
})
|
})
|
||||||
});
|
});
|
||||||
$(function(){
|
$(function () {
|
||||||
$("#drop_gifts").accordion({
|
$("#drop_gifts").accordion({
|
||||||
heightStyle: "content",
|
heightStyle: "content",
|
||||||
collapsible: true,
|
collapsible: true,
|
||||||
active: false
|
active: false
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
$(function(){
|
$(function () {
|
||||||
$("#drop_subscriptions").accordion({
|
$("#drop_subscriptions").accordion({
|
||||||
heightStyle: "content",
|
heightStyle: "content",
|
||||||
collapsible: true,
|
collapsible: true,
|
||||||
active: false
|
active: false
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
{% endblock %}
|
{% endblock %}
|
@ -6,16 +6,12 @@
|
|||||||
{%- endblock -%}
|
{%- endblock -%}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<h2>{% trans user_name=profile.get_full_name() %}Edit user groups for {{ user_name }}{% endtrans %}</h2>
|
<main>
|
||||||
<form action="" method="post">
|
|
||||||
<main>
|
|
||||||
<h2>{% trans user_name=profile.get_full_name() %}Edit user groups for {{ user_name }}{% endtrans %}</h2>
|
<h2>{% trans user_name=profile.get_full_name() %}Edit user groups for {{ user_name }}{% endtrans %}</h2>
|
||||||
<form action="" method="post">
|
<form action="" method="post">
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
{{ form.as_p() }}
|
{{ form.as_p() }}
|
||||||
<p><input type="submit" value="{% trans %}Update{% endtrans %}" /></p>
|
<p><input type="submit" value="{% trans %}Update{% endtrans %}" /></p>
|
||||||
</form>
|
</form>
|
||||||
<input type="submit" value="{% trans %}Update{% endtrans %}" />
|
|
||||||
</form>
|
|
||||||
</main>
|
</main>
|
||||||
{%- endblock -%}
|
{%- endblock -%}
|
Loading…
x
Reference in New Issue
Block a user