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 d76e973262d1d4c6aeca6db51178b8e363914811..03ba013a32df307f31ac7b4cb4bab182661f5168 100644 (file)
--- a/app/views/changeset/_changeset.html.erb
+++ b/app/views/changeset/_changeset.html.erb
@@ -1,56 +1,30 @@
-<tr>
-  <% cl = cycle('table0', 'table1') %>
+<%
+   changeset_data = {:id => changeset.id}

 
 

-  <td class="<%= cl %>">
-    <%=
-      id_link = link_to(changeset.id,
-                        {:controller => 'browse', :action => 'changeset', :id => changeset.id},
-                        {:title => t('changeset.changeset.view_changeset_details')})
-      t'changeset.changeset.id', :id => id_link
-    %>
-  </td>
+   if changeset.has_valid_bbox?
+     bbox = changeset.bbox.to_unscaled
+     changeset_data[:bbox] = {
+       :minlon => bbox.min_lon,
+       :minlat => bbox.min_lat,
+       :maxlon => bbox.max_lon,
+       :maxlat => bbox.max_lat
+     }
+   end
+%>

 
 

-  <td class="<%= cl %> date">
-    <% if changeset.closed_at > DateTime.now %> <%= t'changeset.changeset.still_editing' %>
-    <% else %><%= l changeset.closed_at, :format => :long %><% end %>
-  </td>
-
-    
-  <%if showusername %>  
-    <td class="<%= cl %> user">
-    <% if changeset.user.data_public? %>
-      <%= link_to h(changeset.user.display_name), :controller => "changeset", :action => "list", :display_name => changeset.user.display_name %>
-    <% else %>
-      <i><%= t'changeset.changeset.anonymous' %></i>
-    <% end %>
-    </td>
-  <% end %>
-    
-  <td class="<%= cl %> comment">
-    <% if changeset.tags['comment'] %>
-      <%= h(changeset.tags['comment']) %>
-    <% else %>
-      <%= t'changeset.changeset.no_comment' %>
-    <% end %>
-  </td>
-
-  <td class="<%= cl %> area">
-    <% if changeset.min_lat.nil? %>
-      <%= t'changeset.changeset.no_edits' %>
-    <% else 
-      minlon = changeset.min_lon/GeoRecord::SCALE.to_f
-      minlat = changeset.min_lat/GeoRecord::SCALE.to_f
-      maxlon = changeset.max_lon/GeoRecord::SCALE.to_f
-      maxlat = changeset.max_lat/GeoRecord::SCALE.to_f
-    %>
-      <a href='/?minlon=<%= minlon %>&minlat=<%= minlat %>&maxlon=<%= maxlon %>&maxlat=<%= maxlat %>&box=yes' title='<%= t'changeset.changeset.show_area_box' %>'><%= format("%0.3f",minlon) -%>,<%= format("%0.3f",minlat) -%>,<%= format("%0.3f",maxlon) -%>,<%= format("%0.3f",maxlat) -%></a>
-      <!--<%=changeset.area%>-->
-    <%   if changeset.area > 1500000000000 %>
-      <%= t'changeset.changeset.big_area' %>
-    <%
-         end
-       end
-    %>
-  </td>
-
-</tr>
+<%= 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') %>
+    </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 %>