[svn] Wiki_markup imporved to include paragraphs

wiki_to_html should be used when the field will include paragraphs
wiki_to_html_short should be used when the field will not include paragraphs
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8061 by julian @ 11/6/2008 11:24 PM

1 files changed, 5 insertions, 3 deletions

diff --git a/templates/person.html b/templates/person.html
index 9d79141..ff1fe62 100644
--- a/templates/person.html
+++ b/templates/person.html
@@ -1,10 +1,10 @@
 {% extends "base.html" %}

 {% load wiki_markup %}

 

-{% block title %}Person {{person.id}}{% endblock %}

+{% block title %}Person {{person|wiki_to_html_short}}{% endblock %}

 

 {% block content %}

-    <div class="personblock"><a href="/person/{{person.id}}">{{person}}</a>

+    <div class="personblock"><a href="/person/{{person.id}}">{{person|wiki_to_html_short}}</a>

     <ul>

     {% for personexpedition in person.personexpedition_set.all %}

         <li>

@@ -14,7 +14,9 @@
         <div>

         <ul>

         {% for persontrip in personexpedition.persontrip_set.all %}

-            <li><a href="/logbookentry/{{persontrip.logbookentry.id}}">{{persontrip.date}}</a> ({{persontrip.logbookentry.place}}) - {{persontrip.logbookentry.title}}</li>

+            <li><a href="/logbookentry/{{persontrip.logbookentry.id}}">{{persontrip.date}}</a>

+            ({{persontrip.logbookentry.place|wiki_to_html_short}}) - 

+             {{persontrip.logbookentry.title|wiki_to_html_short}}</li>

         {% endfor %}

         <ul>

         </div>