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 6d3a9b3bfccd59271f4ee4ee8a6f9674779841b1..aa98220f4f362c4f6b191674b71b9fe374a1d351 100644 (file)
--- a/app/assets/javascripts/templates/notes/show.jst.ejs
+++ b/app/assets/javascripts/templates/notes/show.jst.ejs
@@ -1,15 +1,19 @@
 <div class="note">
 <div class="note">

-  <h2><%- I18n.t('javascripts.notes.show.title', { id: note.id }) %></h2>
+  <h2><a href="/?note=<%- note.id %>"><%- I18n.t('javascripts.notes.show.title', { id: note.id }) %></a></h2>
+  <% 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) { %>
   <div>
     <small class="deemphasize">
       <% if (comment.user) { %>
         <%= I18n.t('javascripts.notes.show.' + comment.action + '_by', {
   <% note.comments.forEach(function (comment) { %>
   <div>
     <small class="deemphasize">
       <% if (comment.user) { %>
         <%= I18n.t('javascripts.notes.show.' + comment.action + '_by', {

-           user: comment.user, user_url: comment.user_url, time: comment.date
+           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', {
         }) %>
       <% } else { %>
         <%- I18n.t('javascripts.notes.show.' + comment.action + '_by_anonymous', {

-           time: comment.date
+           time: I18n.l("time.formats.long", comment.date)

         }) %>
       <% } %>
     </small>
         }) %>
       <% } %>
     </small>


@@ -21,7 +25,7 @@
     <textarea class="comment" name="text" cols="40" rows="5"></textarea>
     <br/>
     <div class="buttons">
     <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="close" value="<%- I18n.t('javascripts.notes.show.resolve') %>" 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>
   </form>
       <input type="submit" name="comment" value="<%- I18n.t('javascripts.notes.show.comment') %>" data-url="<%- note.comment_url %>" disabled="1">
     </div>
   </form>