use markdown all the way

camp/settings.py

@@ -144,6 +144,7 @@ STATIC_ROOT = os.path.join(BASE_DIR, 'static')
 
 MARKDOWNX_MEDIA_PATH = 'images/markdown'
 MARKDOWNX_EDITOR_RESIZABLE = True
+MARKDOWNX_MARKDOWNIFY_FUNCTION = 'content.utils.markdownify'
 
 MEDIA_URL = '/static/images/'
 MEDIA_ROOT = os.path.join(BASE_DIR, 'data/images')

content/models.py

@@ -138,6 +138,14 @@ class Content(models.Model):
     def formatted_schedule(self):
         return mark_safe(markdownify(self.schedule))
 
+    @property
+    def formatted_opttext2(self):
+        return mark_safe(markdownify(self.opttext2))
+
+    @property
+    def formatted_opttext3(self):
+        return mark_safe(markdownify(self.opttext3))
+
     @property
     def typefilter(self):
         return self.type

content/templates/content.html

@@ -19,8 +19,12 @@
                 {% if content.place %}<br/>{{content.place}}{% endif%}
                 </h6>
             {% endif %}
-            <p> {{content.formatted_header|safe}} </p>
+            <p>
-            <p> {{content.formatted_body|safe}} </p>
+                {{content.formatted_header}}
+            </p>
+            <p>
+                {{content.formatted_body}}
+            </p>
             {% include "opt.html" %}
             {% include "links.html" %}
             {% include "gallery.html" with gallery=content.gallery %}

content/templates/events.html

@@ -8,8 +8,12 @@
         {% endif %}
         <div class="index-text">
             <h4><a href="{{ events.get_absolute_url }}/" class="big-title">{{events.title}} </a></h4>
-            <p> {{events.formatted_header|safe}} </p>
+            <p>
-            <p> {{events.formatted_body|safe}} </p>
+                {{events.formatted_header}}
+            </p>
+            <p>
+                {{events.formatted_body}}
+            </p>
             {% include "opt.html" with content=events %}
             {% include "links.html" with content=events %}
             {% include "gallery.html" with gallery=gallery %}

content/templates/index.html

@@ -7,8 +7,12 @@
 	<div class="large-8 medium-8 columns special-column">
 	<div class="index-text">
 	<h4 class="big-title">{{content.title}} </a></h4>
-	<p> {{content.formatted_header}} </p>
+	<p>
-	<p> {{content.formatted_body}} </p>
+        {{content.formatted_header}}
+    </p>
+	<p>
+        {{content.formatted_body}}
+    </p>
 	</div>
 	{% endfor %}
 

content/templates/opt.html

@@ -3,7 +3,9 @@
     {% if content.optbtn2 %}
     <h4>{{ content.optbtn2|safe }} </h4>
     {% endif %}
-    <p>{{ content.opttext2|safe|linebreaks }}</p>
+    <p>
+        {{ content.formatted_opttext2 }}
+    </p>
 </div>
 {% endif %}
 {% if content.opttext3 %}
@@ -11,7 +13,9 @@
     {% if content.optbtn3 %}
     <h4>{{ content.optbtn3|safe }} </h4>
     {% endif %}
-    <p>{{ content.opttext3|safe|linebreaks }}</p>
+    <p>
+        {{ content.formatted_opttext3 }}
+    </p>
 </div>
 {% endif %}
 {% if content.schedule %}

content/templates/works.html

@@ -8,8 +8,12 @@
         {% endif %}
         <div class="index-text">
             <h4><a href="{{ works.get_absolute_url }}" class="big-title">{{works.title}} </a></h4>
-            <p> {{works.formatted_header|safe}} </p>
+            <p>
-            <p> {{works.formatted_body|safe}} </p>
+                {{works.formatted_header}}
+            </p>
+            <p>
+                {{works.formatted_body}}
+            </p>
             {% include "opt.html" with content=works %}
             {% include "links.html" with content=projects %}
             {% include "gallery.html" with gallery=gallery %}

content/utils.py

@@ -0,0 +1,5 @@
+import markdownx.utils
+
+def markdownify(string):
+    string = markdownx.utils.markdownify(string)
+    return string