Use textile_en

diff --git a/requirements.txt b/requirements.txt
index 5319e8b..8459572 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ django-piwik
 #TODO: pyScss support, for now just install sass
 
 django_cas>=2.1,<2.2
 #TODO: pyScss support, for now just install sass
 
 django_cas>=2.1,<2.2

-fnpdjango<0.2
+fnpdjango>=0.1.9.1,<0.2

 
 ipython
 
 
 ipython
 

diff --git a/src/copyspeak/templates/flatpages/default.html b/src/copyspeak/templates/flatpages/default.html
index cd805b7..42a92bf 100644 (file)
--- a/src/copyspeak/templates/flatpages/default.html
+++ b/src/copyspeak/templates/flatpages/default.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
 {% extends "base.html" %}

-{% load textile_pl from fnp_markup %}
+{% load textile_en from fnp_markup %}

 
 {% block title %}{{ flatpage.title }}{% endblock %}
 
 
 {% block title %}{{ flatpage.title }}{% endblock %}
 


@@ -7,7 +7,7 @@
 {% block body %}
 <div class="text-page-wrapper">
 <article class="text-page">
 {% block body %}
 <div class="text-page-wrapper">
 <article class="text-page">

-{{ flatpage.content|textile_pl }}
+{{ flatpage.content|textile_en }}

 </article>
 </div>
 {% endblock %}
 </article>
 </div>
 {% endblock %}

diff --git a/src/words/templates/words/word_detail.html b/src/words/templates/words/word_detail.html
index 043bbd5..10e97c1 100755 (executable)
--- a/src/words/templates/words/word_detail.html
+++ b/src/words/templates/words/word_detail.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load static from staticfiles %}
 {% extends "base.html" %}
 {% load static from staticfiles %}

-
+{% load textile_en from fnp_markup %}

 
 {% block title %}{{ object }}{% endblock %}
 
 
 {% block title %}{{ object }}{% endblock %}
 


@@ -14,12 +14,12 @@
 
     <div class="desc-container">
         <section class="examples">
 
     <div class="desc-container">
         <section class="examples">

-            {{ object.examples|safe|linebreaks }}
+            {{ object.examples|textile_en }}

         </section>
 
         <section class="usage">
             <p>/used:/</p>
         </section>
 
         <section class="usage">
             <p>/used:/</p>

-            {{ object.usage|safe|linebreaks }}
+            {{ object.usage|textile_en }}

         </section>
     </div>
 
         </section>
     </div>
 


@@ -42,7 +42,7 @@
     <div class="right-desc-container">
         <section class="recommendations">
             <p>/recommendations:/</p>
     <div class="right-desc-container">
         <section class="recommendations">
             <p>/recommendations:/</p>

-            {{ object.recommendations|safe|linebreaks }}
+            {{ object.recommendations|textile_en }}

         </section>
     </div>
 
         </section>
     </div>