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

[rails.git] / app / views / changeset / _changeset.html.erb

diff --git a/app/views/changeset/_changeset.html.erb b/app/views/changeset/_changeset.html.erb
index 52bc3be0d95930a0d363093de3df7590777ffe97..f27b0bc911be60723a8788d7efc304c4f2d32bab 100644 (file)
--- a/app/views/changeset/_changeset.html.erb
+++ b/app/views/changeset/_changeset.html.erb
@@ -15,12 +15,16 @@
 <%= content_tag "li", :id => "changeset_#{changeset.id}", :data => {:changeset => changeset_data} do %>
   <h4>
     <a class="changeset_id" href="<%= changeset_path(changeset.id) %>">
 <%= content_tag "li", :id => "changeset_#{changeset.id}", :data => {:changeset => changeset_data} do %>
   <h4>
     <a class="changeset_id" href="<%= changeset_path(changeset.id) %>">

-      <% if changeset.tags['comment'].to_s != '' %>
-        <%= linkify(h(changeset.tags['comment'])) %>
-      <% else %>
-        <%= t 'changeset.changeset.no_comment' %>
-      <% end %>
+      <%= changeset.tags['comment'].to_s.presence || t('browse.no_comment') %>

     </a>
   </h4>
     </a>
   </h4>

-  <div class="details"><%= changeset_details(changeset) %></div>
+  <div class="comments comments-<%= changeset.comments.length %>">
+    <%= changeset.comments.length %>
+    <span class="icon note grey"></span>
+  </div>
+  <div class="details">
+    <%= changeset_details(changeset) %>
+    &middot;
+    #<%= changeset.id %>
+  </div>

 <% end %>
 <% end %>