Merge branch 'master' into notes

[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..9b9266a05a6694fd25809a619cd8c829c7de263e 100644 (file)
--- a/app/assets/javascripts/templates/notes/show.jst.ejs
+++ b/app/assets/javascripts/templates/notes/show.jst.ejs
@@ -1,19 +1,25 @@
 <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="#">
-    <textarea name="text" cols="40" rows="5"></textarea>
+    <textarea class="comment" name="text" cols="40" rows="5"></textarea>
     <br/>
     <div class="buttons">
       <input type="submit" name="close" value="<%- I18n.t('javascripts.notes.show.close') %>" data-url="<%- note.close_url %>">