Commit 2c18e169 authored by chris's avatar chris

Remove linebreaks. Striptags when overviewing.

parent 33533592
......@@ -17,7 +17,7 @@
</div>
<div class="pagetitle">{{ object.title }}</div>
{% if object.text %}
<div class="pagetext">{{ object.text|safe|urlize|linebreaks }}</div>
<div class="pagetext">{{ object.text|safe|urlize }}</div>
{% endif %}
</div>
......@@ -30,7 +30,7 @@
{% endthumbnail %}
</a>
<div class="pagetitle" style=";"><a href="/{{ page.slug }}/">{{ page|title }}</a></div>
{{ page.text|safe|urlize|truncatewords:32 }}
{{ page.text|striptags|urlize|truncatewords:32 }}
<div style="clear:both;"></div>
{% endfor %}
......@@ -41,7 +41,7 @@
<div class="page">
<div id="agenda" class="pagetitle">Agenda {{ object.title }}</div>
{% for a in object.agenda_set.all %}
{{ a.text|safe|urlize|linebreaks }}
{{ a.text|safe|urlize }}
{% endfor %}
</div>
</div>
......@@ -80,7 +80,7 @@
<div class="page">
<div id="press" class="pagetitle">{{ object.title }} Press Reviews</div>
{% for image in object.press_set.all %}
{{ image.text|safe|urlize|linebreaks }}
{{ image.text|safe|urlize }}
{% thumbnail image.image "120x120" crop="center" as im %}
<a href="/static/{{ image.image }}" rel="lightbox[{{ image.page }}]">
<img class="thumb" src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }} rel="lightbox" title="{{ image.title }}">
......@@ -96,7 +96,7 @@
<div class="page">
<div id="references" class="pagetitle">{{ object.title }} References</div>
{% for o in object.reference_set.all %}
{{ o.text|safe|urlize|linebreaks }}
{{ o.text|safe|urlize }}
{% endfor %}
</div>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment