Fix quote answer and unread messages display

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

View File

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

View File

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

View File

@ -36,12 +36,12 @@
<h3>{{ topic.title }}</h3>
<p>{{ topic.description }}</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() %}
{% 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">
{% set unread = True %}
{% elif unread %}
{% elif vars.unread %}
<div class="message unread">
{% else %}
<div class="message">

View File

@ -148,7 +148,7 @@ class ForumMessageCreateView(CanCreateMixin, CreateView):
init = super(ForumMessageCreateView, self).get_initial()
try:
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
return init