Display formatted notes in the web UI

[rails.git] / app / assets / javascripts / templates / notes / show.jst.ejs

diff --git a/app/assets/javascripts/templates/notes/show.jst.ejs b/app/assets/javascripts/templates/notes/show.jst.ejs
index 8b95fea2e3bdd75c578b83016e0ba74e667b5760..028f4d084dd5bd5bdc1e164754c82328718fce57 100644 (file)
--- a/app/assets/javascripts/templates/notes/show.jst.ejs
+++ b/app/assets/javascripts/templates/notes/show.jst.ejs
@@ -1,15 +1,21 @@
 <div class="note">
   <h2><%- I18n.t('javascripts.notes.show.title', { id: note.id }) %></h2>
   <% note.comments.forEach(function (comment) { %>
-  <p>
+  <div>
     <small class="deemphasize">
-      <%- I18n.t('javascripts.notes.show.event', {
-         action: comment.action, user: comment.user, time: comment.date
-      }) %>
+      <% if (comment.user) { %>
+        <%= I18n.t('javascripts.notes.show.event', {
+           action: comment.action, user: comment.user,
+           user_url: comment.user_url, time: comment.date
+        }) %>
+      <% } else { %>
+        <%- I18n.t('javascripts.notes.show.anonymous_event', {
+           action: comment.action, time: comment.date
+        }) %>
+      <% } %>
     </small>
-    <br/>
-    <%- comment.text %>
-  </p>
+    <div class="comment_body"><%= comment.html %></div>
+  </div>
   <% }) %>
   <% if (note.status == "open") { %>
   <form action="#">