Merge branch 'master' into notes

[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 33d8cf129d80f51c7387e8f175cbe2fa961b79e1..3e4871ec069ef8daff3fb0f3655f2d2306d5be34 100644 (file)
--- a/app/views/changeset/_changeset.html.erb
+++ b/app/views/changeset/_changeset.html.erb
@@ -1,54 +1,50 @@
-<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>
+<%= content_tag "ul", :class => 'changeset_item', :id => "changeset_#{changeset.id}", :data => {:changeset => changeset_data} do %>
+  <li>
 
-    
-  <%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>
+    <span class="changeset_id">
+      <%=
+        link_to(changeset.id,
+          {:controller => 'browse', :action => 'changeset', :id => changeset.id},
+          {:title => t('changeset.changeset.view_changeset_details')})
+      %>
+    </span>
+
+    <span class='date'>
+      <% if changeset.closed_at > DateTime.now %> <%= t'changeset.changeset.still_editing' %>
+      <% else %><%= l changeset.closed_at, :format => :long %><% end %>
+    </span>
+
+    <%if showusername %>
+      <span class="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 %>
+      </span>
     <% end %>
-    </td>
-  <% end %>
-    
-  <td class="<%= cl %> comment">
+  </li>
+
+  <li class="comment deemphasize">
     <% if changeset.tags['comment'].to_s != '' %>
       <%= linkify(h(changeset.tags['comment'])) %>
     <% else %>
       <%= t'changeset.changeset.no_comment' %>
     <% end %>
-  </td>
+  </li>
 
-  <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>
+<% end %>