summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAurélien Bompard <aurelien@bompard.org>2012-12-12 12:15:01 +0100
committerAurélien Bompard <aurelien@bompard.org>2012-12-12 12:18:45 +0100
commite8ff971ed0089e343c5653672707307b89ad6e63 (patch)
tree39f5f94eec75e0017f0de66d7f1f09bd867b94c3
parent5cb4e8512157e1153821a5c6085361234ca7ef41 (diff)
downloadhyperkitty-e8ff971ed0089e343c5653672707307b89ad6e63.tar.gz
hyperkitty-e8ff971ed0089e343c5653672707307b89ad6e63.tar.xz
hyperkitty-e8ff971ed0089e343c5653672707307b89ad6e63.zip
Wrap email text in the other templates too
See rev 317.
-rw-r--r--hyperkitty/templates/month_view.html4
-rw-r--r--hyperkitty/templates/search.html4
2 files changed, 6 insertions, 2 deletions
diff --git a/hyperkitty/templates/month_view.html b/hyperkitty/templates/month_view.html
index 41c8275..cfdaf8a 100644
--- a/hyperkitty/templates/month_view.html
+++ b/hyperkitty/templates/month_view.html
@@ -55,7 +55,9 @@
{{ thread.starting_email.sender_name|escapeemail }}
</div>
<div class="thread_email">
- <span class="expander">{{ thread.starting_email.content }}</span>
+ <span class="expander">
+ {{ thread.starting_email.content|wordwrap:90|urlizetrunc:76|escapeemail }}
+ </span>
</div>
</div>
<div class="thread_info">
diff --git a/hyperkitty/templates/search.html b/hyperkitty/templates/search.html
index 844bc60..df29615 100644
--- a/hyperkitty/templates/search.html
+++ b/hyperkitty/templates/search.html
@@ -36,7 +36,9 @@
{{email.sender_name}}
</div>
<div class="inline-block thread_email">
- <span class="expander"> {{email.content}} </span>
+ <span class="expander">
+ {{email.content|wordwrap:90|urlizetrunc:76|escapeemail}}
+ </span>
</div>
</div>
<div class="thread_info">