klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-11-22 14:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

forum: reply page, CSS, and first_unread fix

Browse Source
This commit is contained in:
Skia 2017-02-25 14:37:45 +01:00
parent 777fdd7bd5
commit 7d99f02a4d
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -247,10 +247,16 @@ tbody>tr:hover {
background: darkgrey; background: darkgrey;
width: 100%; width: 100%;
} }
em {
font-style: italic;
}
.highlight { .highlight {
background: orange; background: orange;
font-weight: bold; font-weight: bold;
} }
.underline {
text-decoration: underline;
}
.tool-bar { .tool-bar {
overflow: auto; overflow: auto;
padding: 4px; padding: 4px;

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

@ -39,6 +39,9 @@
<p><a href="{{ url('forum:new_message', topic_id=topic.id) }}">{% trans %}Reply{% endtrans %}</a></p> <p><a href="{{ url('forum:new_message', topic_id=topic.id) }}">{% trans %}Reply{% endtrans %}</a></p>
{% for m in topic.messages.select_related('author__avatar_pict').all() %} {% for m in topic.messages.select_related('author__avatar_pict').all() %}
{% if m.id == first_unread_message_id %}
<span id="first_unread"></span>
{% endif %}
{% if m.id >= first_unread_message_id %} {% if m.id >= first_unread_message_id %}
{{ display_message(m, user, True) }} {{ display_message(m, user, True) }}
{% else %} {% else %}

7
forum/views.py
View File

@ -144,13 +144,18 @@ class ForumTopicDetailView(CanViewMixin, DetailView):
class ForumMessageEditView(CanEditMixin, UpdateView): class ForumMessageEditView(CanEditMixin, UpdateView):
model = ForumMessage model = ForumMessage
fields = ['title', 'message'] fields = ['title', 'message']
template_name = "core/edit.jinja" template_name = "forum/reply.jinja"
pk_url_kwarg = "message_id" pk_url_kwarg = "message_id"
def form_valid(self, form): def form_valid(self, form):
ForumMessageMeta(message=self.object, user=self.request.user, action="EDIT").save() ForumMessageMeta(message=self.object, user=self.request.user, action="EDIT").save()
return super(ForumMessageEditView, self).form_valid(form) return super(ForumMessageEditView, self).form_valid(form)
def get_context_data(self, **kwargs):
kwargs = super(ForumMessageEditView, self).get_context_data(**kwargs)
kwargs['topic'] = self.object.topic
return kwargs
class ForumMessageDeleteView(SingleObjectMixin, RedirectView): class ForumMessageDeleteView(SingleObjectMixin, RedirectView):
model = ForumMessage model = ForumMessage
pk_url_kwarg = "message_id" pk_url_kwarg = "message_id"