expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2025-12-12 17:09:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

[svn r8061] Wiki_markup imporved to include paragraphs

Browse Source 
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
This commit is contained in:
julian
2008-11-07 00:24:20 +01:00
parent 91f24887ab
commit d639a53f20
5 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
troggle/templates/cave.html
View File

@@ -8,20 +8,20 @@
<tr>
<th id="kat_no">
{% if cave.kataster_number %}
{{ cave.kataster_number|wiki_to_html }}
{{ cave.kataster_number|wiki_to_html_short }}
{% if cave.entrancelist %}
- {{ cave.entrancelist|wiki_to_html }}
- {{ cave.entrancelist|wiki_to_html_short }}
{% endif %}
{% if cave.unofficial_number %}
<br />({{ cave.unofficial_number|wiki_to_html }})
<br />({{ cave.unofficial_number|wiki_to_html_short }})
{% endif %}
{% endif %}
</th>
<th id="name">
{{ cave.official_name|wiki_to_html }}
{{ cave.official_name|wiki_to_html_short }}
</th>
<th id="status">
{{ cave.kataster_code|wiki_to_html }}
{{ cave.kataster_code|wiki_to_html_short }}
</th>
</tr>
</table>
@@ -29,9 +29,9 @@
{% if cave.entrances %}
<h2>Entrances</h2>
{% for ent in cave.entrances %}
<a href = "./{{ ent.entrance_letter|wiki_to_html }}">{{ ent.entrance_letter|wiki_to_html }}</a>
<a href = "./{{ ent.entrance_letter|wiki_to_html_short }}">{{ ent.entrance_letter|wiki_to_html_short }}</a>
{% if ent.entrance.marking %}
Marking: {{ ent.entrance.marking_val|wiki_to_html }}
Marking: {{ ent.entrance.marking_val|wiki_to_html_short }}
{% endif %}
<br>
{% endfor %}

2
troggle/templates/caveindex.html
View File

@@ -5,6 +5,6 @@
{% block content %}
{% for cave in caves %}
<p>{{ cave }} <a href="./{{ cave.kataster_number }}/">{{ cave.official_name|wiki_to_html }}</a> </p>
<p>{{ cave }} <a href="./{{ cave.kataster_number }}/">{{ cave.official_name|wiki_to_html_short }}</a> </p>
{% endfor %}
{% endblock %}

1
troggle/templates/logbookentry.html
View File

@@ -20,7 +20,6 @@
</li>
{% endfor %}
</ul>
<em>[wiki_to_html doesn't do paragraphs. don't know where it is located]</em>
<div>{{logbookentry.text|wiki_to_html}}</div>
</div>
{% endblock %}

8
troggle/templates/person.html
View File

@@ -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>