not api endpoints, moved to button, fixed notifier message, fixed tests

[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 4bccbe516ad929778959046921577b47b9fdeada..f27b0bc911be60723a8788d7efc304c4f2d32bab 100644 (file)
--- a/app/views/changeset/_changeset.html.erb
+++ b/app/views/changeset/_changeset.html.erb
@@ -13,32 +13,18 @@
 %>
 
 <%= content_tag "li", :id => "changeset_#{changeset.id}", :data => {:changeset => changeset_data} do %>
 %>
 
 <%= content_tag "li", :id => "changeset_#{changeset.id}", :data => {:changeset => changeset_data} do %>

-  <p class="comment">
-      <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 %>
-      </a>
-  </p>
-
-  <span class='date'>
-    <% if changeset.closed_at > DateTime.now %>
-      <%= t 'changeset.changeset.still_editing' %>
-    <% else %>
-      <% closed_at = l changeset.closed_at, :format => :long %>
-      <abbr title='<%= closed_at %>'><%= distance_of_time_in_words_to_now(closed_at) %></abbr>
-    <% end %>
-  </span>
-
-  <% unless params.key?(:display_name) %>
-    <span class="user"> by 
-      <% 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 %>
+  <h4>
+    <a class="changeset_id" href="<%= changeset_path(changeset.id) %>">
+      <%= 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 %>
 <% end %>