From 8a2931021d6db494b53cc5b3cd2f262a413a0a84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20A=2E=20S=C3=A1nchez=20L=C3=B3pez?= Date: Mon, 10 Jun 2013 15:17:54 +0000 Subject: [PATCH] Wrap feedback comments to avoid wide lines. See #975 - Legacy-Id: 5783 --- ietf/nomcom/templatetags/nomcom_tags.py | 3 ++- ietf/templates/nomcom/view_feedback_nominee.html | 2 +- ietf/templates/nomcom/view_feedback_unrelated.html | 4 +--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ietf/nomcom/templatetags/nomcom_tags.py b/ietf/nomcom/templatetags/nomcom_tags.py index 64126bc17..028855787 100644 --- a/ietf/nomcom/templatetags/nomcom_tags.py +++ b/ietf/nomcom/templatetags/nomcom_tags.py @@ -7,6 +7,7 @@ from django.template.defaultfilters import linebreaksbr, force_escape from ietf.utils.pipe import pipe from ietf.ietfauth.decorators import has_role +from ietf.idtracker.templatetags.ietf_filters import wrap_text from ietf.person.models import Person from ietf.nomcom.models import Feedback @@ -81,4 +82,4 @@ def decrypt(string, request, year, plain=False): if not plain: return force_escape(linebreaksbr(out)) - return force_escape(out) + return wrap_text(force_escape(out)) diff --git a/ietf/templates/nomcom/view_feedback_nominee.html b/ietf/templates/nomcom/view_feedback_nominee.html index d88fc8533..dd0d58ec8 100644 --- a/ietf/templates/nomcom/view_feedback_nominee.html +++ b/ietf/templates/nomcom/view_feedback_nominee.html @@ -46,7 +46,7 @@

Subject:

{{ feedback.subject }}
{% endif %}

Body

-
{% decrypt feedback.comments request year %}
+
{% decrypt feedback.comments request year 1 %}
{% endifequal %} {% endfor %} diff --git a/ietf/templates/nomcom/view_feedback_unrelated.html b/ietf/templates/nomcom/view_feedback_unrelated.html index c7c6dbf5d..2b4f44937 100644 --- a/ietf/templates/nomcom/view_feedback_unrelated.html +++ b/ietf/templates/nomcom/view_feedback_unrelated.html @@ -41,9 +41,7 @@ {% endfor %} {% endifequal %} Positions: {{ feedback.positions.all|join:"," }} -

- {% decrypt feedback.comments request year %} -

+
{% decrypt feedback.comments request year 1 %}
{% endfor %}