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

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

diff --git a/app/views/changesets/_changeset.html.erb b/app/views/changesets/_changeset.html.erb
index 03ba013a32df307f31ac7b4cb4bab182661f5168..a4357a3f5ae677e1a7a22f822d32f8574e0dd469 100644 (file)
--- a/app/views/changesets/_changeset.html.erb
+++ b/app/views/changesets/_changeset.html.erb
@@ -1,7 +1,6 @@
-<%
-   changeset_data = {:id => changeset.id}
+<% changeset_data = { :id => changeset.id }
 
-   if changeset.has_valid_bbox?
+   if changeset.bbox_valid?
      bbox = changeset.bbox.to_unscaled
      changeset_data[:bbox] = {
        :minlon => bbox.min_lon,
@@ -9,22 +8,25 @@
        :maxlon => bbox.max_lon,
        :maxlat => bbox.max_lat
      }
-   end
-%>
+   end %>
 
-<%= content_tag "li", :id => "changeset_#{changeset.id}", :data => {:changeset => changeset_data} do %>
-  <h4>
-    <a class="changeset_id" href="<%= changeset_path(changeset) %>">
-      <%= changeset.tags['comment'].to_s.presence || t('browse.no_comment') %>
+<%= tag.li :id => "changeset_#{changeset.id}", :data => { :changeset => changeset_data }, :class => "list-group-item" do %>
+  <p class="fst-italic">
+    <a class="changeset_id text-dark stretched-link" href="<%= changeset_path(changeset) %>">
+      <span><%= changeset.tags["comment"].to_s.presence || t("browse.no_comment") %></span>
     </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 %>
+  </p>
+  <div class="row">
+    <div class="col">
+      <%= changeset_details(changeset) %>
+      &middot;
+      <a class="changeset_id text-dark" href="<%= changeset_path(changeset) %>">
+        #<%= changeset.id %>
+      </a>
+    </div>
+    <div class="col-auto text-secondary<%= " opacity-50" if changeset.comments.empty? %>">
+      <%= changeset.comments.length %>
+      <span class="icon note grey"></span>
+    </div>
   </div>
 <% end %>