Simplified common details

[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 f8f00addb35cdffd43c020f47506dca3d23f4c1f..a63792968ec8873484d190b27808ed1b999c1cd0 100644 (file)
--- a/app/views/changeset/_changeset.html.erb
+++ b/app/views/changeset/_changeset.html.erb
@@ -1,55 +1,43 @@
-<tr>
-  <% cl = cycle('table0', 'table1') %>
+<%
+   changeset_data = {:id => changeset.id}
 
-  <td class="<%= cl %>">
-    #<%= changeset.id %>
-  </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 %><%= changeset.closed_at.strftime("%d %b %Y %H:%M") %><% end %>
-  </td>
+<%= content_tag "li", :id => "changeset_#{changeset.id}", :data => {:changeset => changeset_data} do %>
+  <%= link_to(changeset.id, changeset_path(changeset.id), :class => :changeset_id) %>
 
-    
-  <%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 %>
+  <span class='date'>
+    <% if changeset.closed_at > DateTime.now %>
+      <%= t 'changeset.changeset.still_editing' %>
     <% else %>
-      <i><%= t'changeset.changeset.anonymous' %></i>
+      <%= l changeset.closed_at, :format => :long %>
     <% end %>
-    </td>
+  </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 %>
-    
-  <td class="<%= cl %> comment">
-    <% if changeset.tags['comment'] %>
-      <%= h(changeset.tags['comment']) %>
+
+  <p class="comment deemphasize">
+    <% if changeset.tags['comment'].to_s != '' %>
+      <%= linkify(h(changeset.tags['comment'])) %>
     <% else %>
-      <%= t'changeset.changeset.no_comment' %>
+      <%= 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>
-
-  <td class="<%= cl %>">
-    <%= link_to t('changeset.changeset.more'), {:controller => 'browse', :action => 'changeset', :id => changeset.id}, {:title => t('changeset.changeset.view_changeset_details')} %> 
-  </td>
-
-</tr>
+  </p>
+<% end %>