Merge remote-tracking branch 'osmlab/map-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 cf8ea0a40ce2121fffb82f590efef120d01c905e..63177012c87c1616d9de5b3419519b91909d0ebb 100644 (file)
--- a/app/assets/javascripts/templates/notes/show.jst.ejs
+++ b/app/assets/javascripts/templates/notes/show.jst.ejs
@@ -1,23 +1,40 @@
 <div class="note">
 <div class="note">

-  <h2><%- I18n.t('javascripts.notes.show.title', { id: note.id }) %></h2>
+  <a class="permalink deemphasize" href="/?note=<%- note.id %>"><span><%- I18n.t('javascripts.notes.show.permalink', { id: note.id }) %></span></a>
+  <% if (note.comments.some(function (comment) { return !comment.user })) { %>
+  <small class="warning"><%- I18n.t('javascripts.notes.show.anonymous_warning') %></small>
+  <% } %>

   <% note.comments.forEach(function (comment) { %>
   <% note.comments.forEach(function (comment) { %>

-  <p>
+  <div>

     <small class="deemphasize">
     <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.' + comment.action + '_by', {
+           user: comment.user, user_url: comment.user_url,
+           time: I18n.l("time.formats.long", comment.date)
+        }) %>
+      <% } else { %>
+        <%- I18n.t('javascripts.notes.show.' + comment.action + '_by_anonymous', {
+           time: I18n.l("time.formats.long", comment.date)
+        }) %>
+      <% } %>

     </small>
     </small>

-    <br/>
-    <%- comment.text %>
-  </p>
+    <div class="comment_body"><%= comment.html %></div>
+  </div>

   <% }) %>
   <% if (note.status == "open") { %>
   <form action="#">
   <% }) %>
   <% if (note.status == "open") { %>
   <form action="#">

-    <textarea name="text" cols="40" rows="5"></textarea>
-    <br/>
-    <div class="buttons">
-      <input type="submit" name="close" value="<%- I18n.t('javascripts.notes.show.close') %>" id="note-close">
-      <input type="submit" name="comment" value="<%- I18n.t('javascripts.notes.show.comment') %>" id="note-comment">
+    <textarea class="comment" name="text" cols="40" rows="5"></textarea>
+    <div class="buttons clearfix">
+      <input type="submit" name="hide" value="<%- I18n.t('javascripts.notes.show.hide') %>" class="hide_unless_moderator deemphasize" data-method="DELETE" data-url="<%- note.url %>">
+      <input type="submit" name="close" value="<%- I18n.t('javascripts.notes.show.resolve') %>" class="hide_unless_logged_in" data-method="POST" data-url="<%- note.close_url %>">
+      <input type="submit" name="comment" value="<%- I18n.t('javascripts.notes.show.comment') %>" data-method="POST" data-url="<%- note.comment_url %>" disabled="1">
+    </div>
+  </form>
+  <% } else { %>
+  <form action="#">
+    <input type="hidden" name="text" value="">
+    <div class="buttons clearfix">
+      <input type="submit" name="hide" value="<%- I18n.t('javascripts.notes.show.hide') %>" class="hide_unless_moderator deemphasize" data-method="DELETE" data-url="<%- note.url %>">
+      <input type="submit" name="reopen" value="<%- I18n.t('javascripts.notes.show.reactivate') %>" class="hide_unless_logged_in" data-method="POST" data-url="<%- note.reopen_url %>">

     </div>
   </form>
   <% } %>
     </div>
   </form>
   <% } %>