<td> tags must be closed, move browse index test over to changeset, lazy fix for...

[rails.git] / app / views / changeset / _changeset.rhtml

diff --git a/app/views/changeset/_changeset.rhtml b/app/views/changeset/_changeset.rhtml
index e9c07f94f44d0bcaeb07b93ec7e4dd8f3d1f61a5..049be5d33ebcb225f183f0f591b0dfc8fe151c53 100644 (file)
--- a/app/views/changeset/_changeset.rhtml
+++ b/app/views/changeset/_changeset.rhtml
@@ -3,17 +3,31 @@
 
   <td class="<%= cl %>">
     #<%= changeset.id %>
+  </td>
 
   <td class="<%= cl %>">
-    <% if changeset.closed_at > Time.now %> (still editing)
+    <% if changeset.closed_at > DateTime.now %> (still editing)
     <% else %><%= changeset.closed_at.strftime("%d %b %Y %H:%M") %><% end %>
+  </td>
 
+    
+  <%if showusername %>  
+    <td class="<%= cl %>">
+    <% if changeset.user.data_public? %>
+      <%= link_to h(changeset.user.display_name), :controller => "user", :action => "view", :display_name => changeset.user.display_name %>
+    <% else %>
+      <i>Anonymous</i>
+    <% end %>
+    </td>
+  <% end %>
+    
   <td class="<%= cl %>">
     <% if changeset.tags['comment'] %>
-      <%= changeset.tags['comment'] %>
+      <%= h(changeset.tags['comment']) %>
     <% else %>
       (none)
     <% end %>
+  </td>
 
   <td class="<%= cl %>">
     <% if changeset.min_lat.nil? %>
@@ -22,13 +36,15 @@
       lat1 = changeset.min_lat/GeoRecord::SCALE.to_f
       lat2 = changeset.max_lat/GeoRecord::SCALE.to_f
       lon1 = changeset.min_lon/GeoRecord::SCALE.to_f
-      lon2 = changeset.min_lon/GeoRecord::SCALE.to_f
+      lon2 = changeset.max_lon/GeoRecord::SCALE.to_f
     %>
       (<a href='/?lat=<%= lat1 %>&lon=<%= lon1 %>&zoom=14'><%= format("%0.3f",lat1) -%>,<%= format("%0.3f",lon1) -%></a>) to 
       (<a href='/?lat=<%= lat2 %>&lon=<%= lon2 %>&zoom=14'><%= format("%0.3f",lat2) -%>,<%= format("%0.3f",lon2) -%></a>) 
   <% end %>
+  </td>
 
   <td class="<%= cl %>">
     <%= link_to 'more', {:controller => 'browse', :action => 'changeset', :id => changeset.id}, {:title => 'View changeset details'} %> 
+  </td>
 
 </tr>