Merge remote-tracking branch 'upstream/pull/2637'

[rails.git] / app / views / browse / note.html.erb

diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb
index f68dfbe2eae5bfc2a8bd1cbb5778214604075d0f..ffc198b0a52ebf6c05db80184cb3fba30ac84a82 100644 (file)
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -12,10 +12,10 @@
   </div>
 
   <div class="details" data-coordinates="<%= @note.lat %>,<%= @note.lon %>" data-status="<%= @note.status %>">
   </div>
 
   <div class="details" data-coordinates="<%= @note.lat %>,<%= @note.lon %>" data-status="<%= @note.status %>">

-    <%= note_event("open", @note.created_at, @note.author) %>
+    <%= note_event("opened", @note.created_at, @note.author) %>

     <% if @note.status == "closed" %>
       <br />
     <% if @note.status == "closed" %>
       <br />

-      <%= note_event(@note.status, @note.closed_at, @note_comments.last.author) %>
+      <%= note_event(@note.status, @note.closed_at, @note.all_comments.last.author) %>

     <% end %>
   </div>
 
     <% end %>
   </div>
 


@@ -29,7 +29,7 @@
 
   <% if @note_comments.length > 1 %>
     <div class='note-comments'>
 
   <% if @note_comments.length > 1 %>
     <div class='note-comments'>

-      <ul>
+      <ul class="list-unstyled">

         <% @note_comments[1..-1].each do |comment| %>
           <li id="c<%= comment.id %>">
             <small class='deemphasize'><%= note_event(comment.event, comment.created_at, comment.author) %></small>
         <% @note_comments[1..-1].each do |comment| %>
           <li id="c<%= comment.id %>">
             <small class='deemphasize'><%= note_event(comment.event, comment.created_at, comment.author) %></small>