Skip to content

Commit

Permalink
temporarily remove markup/markdown from django-knowledge templates
Browse files Browse the repository at this point in the history
  • Loading branch information
Félix Sipma committed Jan 30, 2014
1 parent aefae98 commit 4048735
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
4 changes: 2 additions & 2 deletions cartoterra/templates/django_knowledge/emails/message.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{% endblocktrans %}</p>

<div style="background:#f3f3f3;margin:8px 0;padding:12px 18px">
{{ response.body|striptags|markdown }}
{{ response.body|striptags }}
</div>

<p>{% trans "You are receiving these messages because you checked the 'alert' box when you originally posted." %}</p>
Expand All @@ -23,7 +23,7 @@
{% endblocktrans %}</p>

<div style="background:#f3f3f3;margin:8px 0;padding:12px 18px">
{{ question.body|striptags|markdown }}
{{ question.body|striptags }}
</div>

<p>{% trans "You are receiving these messages because you are a staff member." %}</p>
Expand Down
7 changes: 3 additions & 4 deletions cartoterra/templates/django_knowledge/thread.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{% extends 'django_knowledge/inner.html' %}

{% load i18n %}
{% load markup %}
{% load knowledge_tags %}

{% block title %}{{ question.title }}{% endblock title %}
Expand All @@ -22,7 +21,7 @@ <h5>{{ question.get_name }} <span class="quiet">
&nbsp;{{ question.added }}
</span></h5>

{{ question.body|striptags|markdown }}
{{ question.body|striptags }}

{% include "django_knowledge/mod_bar.html" with allowed_mods=allowed_mods.question type="question" node=question %}
</div>
Expand All @@ -47,7 +46,7 @@ <h5>{{ response.get_name }} <span class="quiet">
&nbsp;{{ response.added }}
</span></h5>

{{ response.body|striptags|markdown }}
{{ response.body|striptags }}

{% include "django_knowledge/mod_bar.html" with allowed_mods=allowed_mods.response type="response" node=response %}
</div>
Expand Down Expand Up @@ -75,4 +74,4 @@ <h5>{{ response.get_name }} <span class="quiet">

</div>

{% endblock knowledge_widgets %}
{% endblock knowledge_widgets %}

0 comments on commit 4048735

Please sign in to comment.