Add option to include marker in permalinks

[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 8c37118f189cdf04246ca27c364d2fd2e1e40a97..bea60ed4a5983cc9c00806b55ca71487a8767cca 100644 (file)
--- a/app/assets/javascripts/templates/notes/show.jst.ejs
+++ b/app/assets/javascripts/templates/notes/show.jst.ejs
@@ -1,5 +1,5 @@
 <div class="note">
 <div class="note">

-  <h2><%- I18n.t('javascripts.notes.show.title', { id: note.id }) %></h2>
+  <a class="icon link 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>
   <% } %>
   <% if (note.comments.some(function (comment) { return !comment.user })) { %>
   <small class="warning"><%- I18n.t('javascripts.notes.show.anonymous_warning') %></small>
   <% } %>


@@ -23,10 +23,18 @@
   <% if (note.status == "open") { %>
   <form action="#">
     <textarea class="comment" name="text" cols="40" rows="5"></textarea>
   <% if (note.status == "open") { %>
   <form action="#">
     <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 %>">
-      <input type="submit" name="comment" value="<%- I18n.t('javascripts.notes.show.comment') %>" data-url="<%- note.comment_url %>" disabled="1">
+    <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>
   <% } %>