From: Tom Hughes <tom@compton.nu>
Date: Sun, 2 Dec 2012 17:06:59 +0000 (+0000)
Subject: Display formatted notes in the web UI
X-Git-Tag: live~5117^2~55
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/c533fb4b7430c5c9e194bde7a047b7479c758130

Display formatted notes in the web UI
---

diff --git a/app/assets/javascripts/templates/notes/show.jst.ejs b/app/assets/javascripts/templates/notes/show.jst.ejs
index eb3a1474b..028f4d084 100644
--- a/app/assets/javascripts/templates/notes/show.jst.ejs
+++ b/app/assets/javascripts/templates/notes/show.jst.ejs
@@ -1,7 +1,7 @@
 <div class="note">
   <h2><%- I18n.t('javascripts.notes.show.title', { id: note.id }) %></h2>
   <% note.comments.forEach(function (comment) { %>
-  <p>
+  <div>
     <small class="deemphasize">
       <% if (comment.user) { %>
         <%= I18n.t('javascripts.notes.show.event', {
@@ -14,9 +14,8 @@
         }) %>
       <% } %>
     </small>
-    <br/>
-    <%- comment.text %>
-  </p>
+    <div class="comment_body"><%= comment.html %></div>
+  </div>
   <% }) %>
   <% if (note.status == "open") { %>
   <form action="#">
diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 53fa9ccf3..5174e475d 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -1428,7 +1428,19 @@ abbr.geo {
 
 /* Rules for the notes interface */
 
-.note .buttons {
-  margin-top: 5px;
-  text-align: right;
+.note {
+  .comment_body {
+    margin-top: 4px;
+    margin-bottom: 4px;
+
+    p {
+      margin-top: 0px;
+      margin-bottom: 0px;
+    }
+  }
+
+  .buttons {
+    margin-top: 5px;
+    text-align: right;
+  }
 }