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

[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 a63792968ec8873484d190b27808ed1b999c1cd0..03ba013a32df307f31ac7b4cb4bab182661f5168 100644 (file)
--- a/app/views/changeset/_changeset.html.erb
+++ b/app/views/changeset/_changeset.html.erb
@@ -13,31 +13,18 @@
 %>
 
 <%= content_tag "li", :id => "changeset_#{changeset.id}", :data => {:changeset => changeset_data} do %>
-  <%= link_to(changeset.id, changeset_path(changeset.id), :class => :changeset_id) %>
-
-  <span class='date'>
-    <% if changeset.closed_at > DateTime.now %>
-      <%= t 'changeset.changeset.still_editing' %>
-    <% else %>
-      <%= l changeset.closed_at, :format => :long %>
-    <% end %>
-  </span>
-
-  <% unless params.key?(:display_name) %>
-    <span class="user">
-      <% if changeset.user.data_public? %>
-        <%= link_to changeset.user.display_name, user_path(changeset.user.display_name) %>
-      <% else %>
-        <i><%= t 'changeset.changeset.anonymous' %></i>
-      <% end %>
-    </span>
-  <% end %>
-
-  <p class="comment deemphasize">
-    <% if changeset.tags['comment'].to_s != '' %>
-      <%= linkify(h(changeset.tags['comment'])) %>
-    <% else %>
-      <%= t 'changeset.changeset.no_comment' %>
-    <% end %>
-  </p>
+  <h4>
+    <a class="changeset_id" href="<%= changeset_path(changeset) %>">
+      <%= changeset.tags['comment'].to_s.presence || t('browse.no_comment') %>
+    </a>
+  </h4>
+  <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 %>