klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith3.git synced 2024-06-29 09:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

forum: use short names

Browse Source 
Signed-off-by: Skia <skia@libskia.so>
This commit is contained in:
Skia 2017-05-31 23:56:47 +02:00
parent 11d20f43e5
commit f3c1ab4ae4
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,10 @@
<a href="{{ url("core:user_profile", user_id=user.id) }}">{{ user.get_display_name() }}</a> <a href="{{ url("core:user_profile", user_id=user.id) }}">{{ user.get_display_name() }}</a>
{%- endmacro %} {%- endmacro %}
{% macro user_profile_link_short_name(user) -%}
<a href="{{ url("core:user_profile", user_id=user.id) }}">{{ user.get_short_name() }}</a>
{%- endmacro %}
{% macro user_link_with_pict(user) -%} {% macro user_link_with_pict(user) -%}
<a href="{{ url("core:user_profile", user_id=user.id) }}" class="mini_profile_link" > <a href="{{ url("core:user_profile", user_id=user.id) }}" class="mini_profile_link" >
{{ user.get_mini_item()|safe }} {{ user.get_mini_item()|safe }}

10
forum/templates/forum/macros.jinja
View File

@ -1,4 +1,4 @@
{% from 'core/macros.jinja' import user_profile_link %} {% from 'core/macros.jinja' import user_profile_link_short_name %}
{% macro display_forum(forum, user, is_root=False) %} {% macro display_forum(forum, user, is_root=False) %}
<div class="forum {% if is_root %}category{% endif %}"> <div class="forum {% if is_root %}category{% endif %}">
@ -29,7 +29,7 @@
</p> </p>
<div class="ib w_medium last_message" style="font-size: x-small; text-align: center"> <div class="ib w_medium last_message" style="font-size: x-small; text-align: center">
{% if forum.last_message %} {% if forum.last_message %}
{{ forum.last_message.author }} <br/> {{ user_profile_link_short_name(forum.last_message.author) }} <br/>
<a href="{{ forum.last_message.get_absolute_url() }}"> <a href="{{ forum.last_message.get_absolute_url() }}">
<date> <date>
{{ forum.last_message.date|localtime|date(DATETIME_FORMAT) }} {{ forum.last_message.date|localtime|date(DATETIME_FORMAT) }}
@ -66,7 +66,7 @@
<div class="ib w_medium last_message"> <div class="ib w_medium last_message">
<div class="ib w_medium"> <div class="ib w_medium">
<p class="ib w_medium" style="text-align: center;"> <p class="ib w_medium" style="text-align: center;">
{{ user_profile_link(topic.author) }} {{ user_profile_link_short_name(topic.author) }}
</p> </p>
<p class="ib w_medium" style="text-align: center;"> <p class="ib w_medium" style="text-align: center;">
{{ topic._message_number }} {{ topic._message_number }}
@ -75,7 +75,7 @@
<p class="ib w_medium" style="text-align: center;"> <p class="ib w_medium" style="text-align: center;">
{% set last_msg = topic.last_message %} {% set last_msg = topic.last_message %}
{% if last_msg %} {% if last_msg %}
{{ user_profile_link(last_msg.author) }} <br/> {{ user_profile_link_short_name(last_msg.author) }} <br/>
<a href="{{ last_msg.get_absolute_url() }}"> <a href="{{ last_msg.get_absolute_url() }}">
<date>{{ last_msg.date|date(DATETIME_FORMAT) }} {{ last_msg.date|time(DATETIME_FORMAT) }}</date> <date>{{ last_msg.date|date(DATETIME_FORMAT) }} {{ last_msg.date|time(DATETIME_FORMAT) }}</date>
</a> </a>
@ -133,7 +133,7 @@
<ul class="msg_meta"> <ul class="msg_meta">
{% for meta in m.metas.select_related('user').order_by('id') %} {% for meta in m.metas.select_related('user').order_by('id') %}
<li style="background: {% if m.author == meta.user %}#bfffbf{% else %}#ffffbf{% endif %}"> <li style="background: {% if m.author == meta.user %}#bfffbf{% else %}#ffffbf{% endif %}">
{{ meta.get_action_display() }} {{ meta.user.get_display_name() }} {{ meta.get_action_display() }} {{ meta.user.get_short_name() }}
{% trans %} at {% endtrans %}{{ meta.date|localtime|time(DATETIME_FORMAT) }} {% trans %} at {% endtrans %}{{ meta.date|localtime|time(DATETIME_FORMAT) }}
{% trans %} the {% endtrans %}{{ meta.date|localtime|date(DATETIME_FORMAT)}}</li> {% trans %} the {% endtrans %}{{ meta.date|localtime|date(DATETIME_FORMAT)}}</li>
{% endfor %} {% endfor %}