From fa90e632ba3ce3806fce808a29a8b0241da35ab5 Mon Sep 17 00:00:00 2001
From: Julian Rother <julianr@fsmpi.rwth-aachen.de>
Date: Thu, 8 Sep 2016 01:10:41 +0200
Subject: [PATCH] Replace newlines with <br>-tags in most fields (esp.
description/comment)
---
server.py | 5 +++++
templates/macros.html | 12 ++++++------
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/server.py b/server.py
index 29a44dd..ea711cc 100755
--- a/server.py
+++ b/server.py
@@ -123,6 +123,11 @@ def rfc3339(d):
def get_announcements(minlevel=0):
return query('SELECT * FROM announcements WHERE NOT deleted AND (? OR visible) AND level >= ? ORDER BY level DESC', ismod(), minlevel)
+@app.template_filter()
+def fixnl(s):
+ # To be remove, as soon as db schema is cleaned-up
+ return str(s).replace('\n', '<br>')
+
@app.route('/')
@register_navbar('Home', icon='home')
def index():
diff --git a/templates/macros.html b/templates/macros.html
index 1e95d1f..128f68b 100644
--- a/templates/macros.html
+++ b/templates/macros.html
@@ -11,8 +11,8 @@
{% endif %}
</div>
<div class="col-xs-4">
- <div>{{ lecture['title'] }}</div>
- <p style="font-style: italic; color: #777;">{{ lecture['comment'] }}</p>
+ <div>{{ lecture['title']|fixnl|safe }}</div>
+ <p style="font-style: italic; color: #777;">{{ lecture['comment']|fixnl|safe }}</p>
</div>
</div>
</a>
@@ -26,14 +26,14 @@
</li>
{% if lecture['speaker'] %}
<li>
- <span class="small">Gehalten von {{ lecture['speaker'] }} </span>
+ <span class="small">Gehalten von {{ lecture['speaker']|safe }} </span>
</li>
{% endif %}
<li>
- {{ lecture['title'] }}
+ {{ lecture['title']|fixnl|safe }}
</li>
<li>
- <p style="font-style: italic; color: #777;">{{ lecture['comment'] }}</p>
+ <p style="font-style: italic; color: #777;">{{ lecture['comment']|fixnl|safe }}</p>
</li>
</ul>
</a>
@@ -169,7 +169,7 @@ $('#embedcodebtn').popover(
{% if ismod() %}
<span class="modeditable" data-path="{{path|join('.')}}" ><a class="modeditablesign btn btn-default" tabindex="0" style="padding: 3px; margin-right: 5px;"><span class="glyphicon glyphicon-pencil"></span></a><span class="modeditablevalue">{{ value|safe }}</span></span>
{% else %}
- {{value|safe}}
+ {{value|fixnl|safe}}
{% endif %}
{% endmacro %}
--
GitLab