From bb51fbe0590001e494f25807b556e64c56769c87 Mon Sep 17 00:00:00 2001
From: Robert Sparks <rjsparks@nostrum.com>
Date: Fri, 16 Oct 2015 19:15:44 +0000
Subject: [PATCH] Preserve linefeeds (using class pasted) when viewing nomcom
 feedback messages. Commit ready for merge.  - Legacy-Id: 10220

---
 ietf/settings_sqlitetest.py                        | 8 ++++----
 ietf/templates/nomcom/view_feedback_nominee.html   | 2 +-
 ietf/templates/nomcom/view_feedback_unrelated.html | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ietf/settings_sqlitetest.py b/ietf/settings_sqlitetest.py
index 0d7f5ae59..e0b23881e 100644
--- a/ietf/settings_sqlitetest.py
+++ b/ietf/settings_sqlitetest.py
@@ -36,7 +36,7 @@ DATABASES = {
         },
     }
 
-DRAFT_ALIASES_PATH = "/tmp/draft-aliases"
-DRAFT_VIRTUAL_PATH = "/tmp/draft-virtual"
-GROUP_ALIASES_PATH = "/tmp/group-aliases"
-GROUP_VIRTUAL_PATH = "/tmp/group-virtual"
+DRAFT_ALIASES_PATH = "./draft-aliases"
+DRAFT_VIRTUAL_PATH = "/Users/rjsparks/tmp/draft-virtual"
+GROUP_ALIASES_PATH = "./group-aliases"
+GROUP_VIRTUAL_PATH = "/Users/rjsparks/tmp/group-virtual"
diff --git a/ietf/templates/nomcom/view_feedback_nominee.html b/ietf/templates/nomcom/view_feedback_nominee.html
index 44bd03701..c19b3477e 100644
--- a/ietf/templates/nomcom/view_feedback_nominee.html
+++ b/ietf/templates/nomcom/view_feedback_nominee.html
@@ -52,7 +52,7 @@
                 <dd>{{ feedback.subject }}</dd>
               {% endif %}
               <dt>Body</dt>
-              <dd>{% decrypt feedback.comments request year 1 %}</dd>
+              <dd class="pasted">{% decrypt feedback.comments request year 1 %}</dd>
             </dl>
           {% endif %}
         {% endfor %}
diff --git a/ietf/templates/nomcom/view_feedback_unrelated.html b/ietf/templates/nomcom/view_feedback_unrelated.html
index b915ab1a2..1bb0a3608 100644
--- a/ietf/templates/nomcom/view_feedback_unrelated.html
+++ b/ietf/templates/nomcom/view_feedback_unrelated.html
@@ -43,7 +43,7 @@
             <dt>Positions</dt>
             <dd>{{ feedback.positions.all|join:"," }}</dd>
             <dt>Body</dt>
-            <dd>{% decrypt feedback.comments request year 1 %}</dd>
+            <dd class="pasted">{% decrypt feedback.comments request year 1 %}</dd>
           </dl>
         {% endfor %}
       </div>