Add a MarkdownInput widget, and make use of it

Signed-off-by: Skia <skia@libskia.so>

forum/templates/forum/reply.jinja

@@ -22,18 +22,16 @@
 <div id="forum">
     <h3>{{ topic.title }}</h3>
     <h4>{% trans %}Reply{% endtrans %}</h4>
-    {% else %}
+{% else %}
+<div id="forum">
     <h4>{% trans %}New topic{% endtrans %}</h4>
-    {% endif %}
+{% endif %}
     <form action="" method="post" enctype="multipart/form-data">
         {% csrf_token %}
         <p>{{ form.title.errors }}<label for="{{ form.title.name }}">{{ form.title.label }}</label> {{ form.title }}</p>
         <p>{{ form.message.errors }}<label for="{{ form.message.name }}">{{ form.message.label }}</label> </p>
         <p><a href="{{ syntax_help_page.get_absolute_url() }}">{% trans %}Help on the syntax{% endtrans %}</a>
-        <div class="markdown_editor">
         {{ form.message }}
-        </div>
-        </p>
         <p><input type="button" value="{% trans %}Preview{% endtrans %}" onclick="javascript:make_preview();" /></p>
         <p><input type="submit" value="{% trans %}Save{% endtrans %}" /></p>
     </form>

forum/views.py

@@ -38,6 +38,7 @@ from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
 from ajax_select import make_ajax_form, make_ajax_field
 
 from core.views import CanViewMixin, CanEditMixin, CanEditPropMixin, CanCreateMixin, TabedViewMixin
+from core.views.forms import MarkdownInput
 from core.models import Page
 from forum.models import Forum, ForumMessage, ForumTopic, ForumMessageMeta
 
@@ -142,6 +143,9 @@ class TopicForm(forms.ModelForm):
     class Meta:
         model = ForumMessage
         fields = ['title', 'message']
+        widgets = {
+            'message': MarkdownInput,
+            }
     title = forms.CharField(required=True, label=_("Title"))
 
 class ForumTopicCreateView(CanCreateMixin, CreateView):
@@ -162,6 +166,11 @@ class ForumTopicCreateView(CanCreateMixin, CreateView):
         form.instance.author = self.request.user
         return super(ForumTopicCreateView, self).form_valid(form)
 
+    def get_context_data(self, **kwargs):
+        kwargs = super(ForumTopicCreateView, self).get_context_data(**kwargs)
+        kwargs['syntax_help_page'] = Page.get_page_by_full_name(settings.SITH_CORE_PAGE_SYNTAX)
+        return kwargs
+
 class ForumTopicEditView(CanEditMixin, UpdateView):
     model = ForumTopic
     fields = ['forum']
@@ -205,7 +214,7 @@ class ForumMessageView(SingleObjectMixin, RedirectView):
 
 class ForumMessageEditView(CanEditMixin, UpdateView):
     model = ForumMessage
-    fields = ['title', 'message']
+    form_class = forms.modelform_factory(model=ForumMessage, fields=['title', 'message',], widgets={'message': MarkdownInput})
     template_name = "forum/reply.jinja"
     pk_url_kwarg = "message_id"
 
@@ -243,7 +252,7 @@ class ForumMessageUndeleteView(SingleObjectMixin, RedirectView):
 
 class ForumMessageCreateView(CanCreateMixin, CreateView):
     model = ForumMessage
-    fields = ['title', 'message']
+    form_class = forms.modelform_factory(model=ForumMessage, fields=['title', 'message',], widgets={'message': MarkdownInput})
     template_name = "forum/reply.jinja"
 
     def dispatch(self, request, *args, **kwargs):