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

Fix quote answer and unread messages display

Browse Source
This commit is contained in:
Skia 2017-02-24 01:49:48 +01:00
parent 254126fd79
commit 6764224856
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -203,7 +203,11 @@ ul, ol {
code { code {
font-family: monospace; font-family: monospace;
} }
blockquote {
margin: 10px;
padding: 5px;
border: solid 1px black;
}
.edit-bar { .edit-bar {
display: block; display: block;
margin: 4px; margin: 4px;

2
core/templatetags/renderer.py
View File

@ -10,7 +10,7 @@ register = template.Library()
@register.filter(is_safe=False) @register.filter(is_safe=False)
@stringfilter @stringfilter
def markdown(text): def markdown(text):
return mark_safe(md(escape(text))) return mark_safe(md(text))
@register.filter() @register.filter()
@stringfilter @stringfilter

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

@ -36,18 +36,18 @@
<h3>{{ topic.title }}</h3> <h3>{{ topic.title }}</h3>
<p>{{ topic.description }}</p> <p>{{ topic.description }}</p>
<p><a href="{{ url('forum:new_message', topic_id=topic.id) }}">Reply</a></p> <p><a href="{{ url('forum:new_message', topic_id=topic.id) }}">Reply</a></p>
{% set unread = False %}
{% set vars = {'unread': False} %} {# ugly hack to counter Jinja scopes #}
{% for m in topic.messages.all() %} {% for m in topic.messages.all() %}
{% if m.id == first_unread_message_id %} {% if m.id == first_unread_message_id and vars.update({'unread': True}) %} {# idem #}
<div class="message unread" id="first_unread"> <div class="message unread" id="first_unread">
{% set unread = True %} {% elif vars.unread %}
{% elif unread %} <div class="message unread">
<div class="message unread">
{% else %} {% else %}
<div class="message"> <div class="message">
{% endif %} {% endif %}
<div class="msg_author"> <div class="msg_author">
{% if m.author.profile_pict %} {% if m.author.profile_pict %}
<img src="{{ m.author.profile_pict.get_download_url() }}" alt="{% trans %}Profile{% endtrans %}" id="picture" /> <img src="{{ m.author.profile_pict.get_download_url() }}" alt="{% trans %}Profile{% endtrans %}" id="picture" />
{% else %} {% else %}
<img src="{{ static('core/img/unknown.jpg') }}" alt="{% trans %}Profile{% endtrans %}" id="picture" /> <img src="{{ static('core/img/unknown.jpg') }}" alt="{% trans %}Profile{% endtrans %}" id="picture" />

2
forum/views.py
View File

@ -148,7 +148,7 @@ class ForumMessageCreateView(CanCreateMixin, CreateView):
init = super(ForumMessageCreateView, self).get_initial() init = super(ForumMessageCreateView, self).get_initial()
try: try:
init['message'] = "\n".join([ init['message'] = "\n".join([
" > " + line for line in ForumMessage.objects.filter(id=self.request.GET['quote_id']).first().message.split('\n') "> " + line for line in ForumMessage.objects.filter(id=self.request.GET['quote_id']).first().message.split('\n')
]) ])
except: pass except: pass
return init return init