klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2025-07-10 03:49:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some various forum fixes and improvements

Browse Source
This commit is contained in:
Skia
2017-02-24 04:37:01 +01:00
parent d6b5db4a4b
commit f262014f9b
5 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forum/templates/forum/forum.jinja
View File

@ -7,7 +7,7 @@
{% block content %}
<div>
<a href="{{ url('forum:main') }}">Forum</a>
<a href="{{ url('forum:main') }}">{% trans %}Forum{% endtrans %}</a>
{% for f in forum.get_parent_list() %}
> <a href="{{ f.get_absolute_url() }}">{{ f }}</a>
{% endfor %}
@ -16,9 +16,9 @@
<h3>{{ forum.name }}</h3>
<p>
{% if user.is_in_group(settings.SITH_GROUP_FORUM_ADMIN_ID) or user.is_in_group(settings.SITH_GROUP_COM_ADMIN_ID) %}
<a href="{{ url('forum:new_forum') }}?parent={{ forum.id }}">New forum</a> <br/>
<a href="{{ url('forum:new_forum') }}?parent={{ forum.id }}">{% trans %}New forum{% endtrans %}</a> <br/>
{% endif %}
<a href="{{ url('forum:new_topic', forum_id=forum.id) }}">New topic</a>
<a href="{{ url('forum:new_topic', forum_id=forum.id) }}">{% trans %}New topic{% endtrans %}</a>
</p>
{% for f in forum.children.all() %}
{{ display_forum(f, user) }}

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

@ -16,8 +16,8 @@
</div>
{% endif %}
{% if user.is_owner(forum) %}
<a class="ib" href="{{ url('forum:edit_forum', forum_id=forum.id) }}">Edit</a>
<a class="ib" href="{{ url('forum:delete_forum', forum_id=forum.id) }}">Delete</a>
<a class="ib" href="{{ url('forum:edit_forum', forum_id=forum.id) }}">{% trans %}Edit{% endtrans %}</a>
<a class="ib" href="{{ url('forum:delete_forum', forum_id=forum.id) }}">{% trans %}Delete{% endtrans %}</a>
{% endif %}
</div>
{% if not forum.is_category %}

2
forum/templates/forum/main.jinja
View File

@ -8,7 +8,7 @@
{% block content %}
<p>
<a href="{{ url('forum:main') }}">Forum</a> >
<a href="{{ url('forum:main') }}">{% trans %}Forum{% endtrans %}</a> >
</p>
<h3>{% trans %}Forum{% endtrans %}</h3>
<p>

5
forum/templates/forum/topic.jinja
View File

@ -26,7 +26,7 @@
{% block content %}
<p>
<a href="{{ url('forum:main') }}">Forum</a>
<a href="{{ url('forum:main') }}">{% trans %}Forum{% endtrans %}</a>
{% for f in topic.forum.get_parent_list() %}
> <a href="{{ f.get_absolute_url() }}">{{ f }}</a>
{% endfor %}
@ -52,7 +52,8 @@
<br/>
<strong>{{ user_profile_link(m.author) }}</strong>
</div>
<div {% if m.id == first_unread_message_id %}id="first_unread"{% endif %} style="display: inline-block; width: 80%; vertical-align: top;">
<div {% if m.id == first_unread_message_id %}id="first_unread"{% endif %} style="display: inline-block; width:
80%; vertical-align: top; {% if m.deleted %}background: #FFAAAA;{% endif %}">
<div style="display: inline-block; width: 74%;">
{% if m.title %}
<h5>{{ m.title }}</h5>