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

User profile template fix

Browse Source
This commit is contained in:
Skia 2016-08-20 13:57:27 +02:00
parent 84efcd87e7
commit 62745e89fa
3 changed files with 62 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/static/core/style.css
View File

@ -182,11 +182,18 @@ tbody>tr:hover {
overflow: auto; overflow: auto;
} }
#user_profile h4 { border-bottom: 1px solid grey; max-width: 60%; } #user_profile h4 { border-bottom: 1px solid grey; max-width: 60%; }
#user_profile #left_column {
max-width: 59%;
}
#user_profile #right_column {
max-width: 40%;
float: right;
font-style: italic;
}
#user_profile #pictures { #user_profile #pictures {
max-width: 250px; max-width: 250px;
max-height: 300px; max-height: 300px;
float: right; margin: 0px auto;
font-style: italic;
} }
#user_profile #nickname { #user_profile #nickname {
font-style: italic; font-style: italic;

5
core/templates/core/macros.jinja
View File

@ -10,11 +10,15 @@
{% macro user_mini_profile(user) %} {% macro user_mini_profile(user) %}
<div id="user_profile"> <div id="user_profile">
<div id="right_column">
<div id="pictures"> <div id="pictures">
{% if user.profile_pict %} {% if user.profile_pict %}
<img src="{{ user.profile_pict.get_download_url() }}" alt="{% trans %}Profile{% endtrans %}" /> <img src="{{ user.profile_pict.get_download_url() }}" alt="{% trans %}Profile{% endtrans %}" />
{% endif %} {% endif %}
</div> </div>
</div>
<div id="left_column">
<p>{{ user.get_full_name() }}</p> <p>{{ user.get_full_name() }}</p>
{% if user.nick_name %} {% if user.nick_name %}
<p id="nickname">&laquo; {{ user.nick_name }} &raquo;</p> <p id="nickname">&laquo; {{ user.nick_name }} &raquo;</p>
@ -27,4 +31,5 @@
{% trans %}Promo: {% endtrans %}{{ user.promo }}</p> {% trans %}Promo: {% endtrans %}{{ user.promo }}</p>
{% endif %} {% endif %}
</div> </div>
</div>
{%- endmacro %} {%- endmacro %}

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

@ -8,12 +8,15 @@
<div id="user_profile_container"> <div id="user_profile_container">
<div id="user_profile"> <div id="user_profile">
<div id="right_column">
<div id="pictures"> <div id="pictures">
{% if profile.profile_pict %} {% if profile.profile_pict %}
<img src="{{ profile.profile_pict.get_download_url() }}" alt="{% trans %}Profile{% endtrans %}" /> <img src="{{ profile.profile_pict.get_download_url() }}" alt="{% trans %}Profile{% endtrans %}" />
{% endif %} {% endif %}
<p><em>{{ profile.quote }}</em></p>
</div> </div>
<p id="quote"><em>{{ profile.quote }}</em></p>
</div>
<div id="left_column">
<h4>{{ profile.get_full_name() }}</h4> <h4>{{ profile.get_full_name() }}</h4>
{% if profile.nick_name %} {% if profile.nick_name %}
<p id="nickname">&laquo; {{ profile.nick_name }} &raquo;</p> <p id="nickname">&laquo; {{ profile.nick_name }} &raquo;</p>
@ -34,6 +37,7 @@
{% endif %} {% endif %}
</div> </div>
</div> </div>
</div>
{% if user.membership.filter(end_date=None).exists() or user.is_in_group(settings.SITH_MAIN_BOARD_GROUP) %} {% if user.membership.filter(end_date=None).exists() or user.is_in_group(settings.SITH_MAIN_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 #}