Tidy up code for adding a map to the changeset list page

[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 650030688eb82d431faf084cc47f5e1063a94243..b06dd05a396f965abb0baf2fcb445654128c4df5 100644 (file)
--- a/app/views/changeset/_changeset.html.erb
+++ b/app/views/changeset/_changeset.html.erb
@@ -1,7 +1,7 @@
-<tr>
-  <% cl = cycle('table0', 'table1') %>
+<% cl = cycle('table0', 'table1') %>
 
-  <td class="<%= cl %>">
+<tr class="<%= cl %>" id="tr-changeset-<%= changeset.id%>">
+  <td>
     <%=
       id_link = link_to(changeset.id,
                         {:controller => 'browse', :action => 'changeset', :id => changeset.id},
@@ -10,14 +10,14 @@
     %>
   </td>
 
-  <td class="<%= cl %> date">
+  <td class="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">
+    <td 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 %>
@@ -26,31 +26,39 @@
     </td>
   <% end %>
     
-  <td class="<%= cl %> comment">
-    <% if changeset.tags['comment'] %>
-      <%= auto_link(h(changeset.tags['comment'])) %>
+  <td class="comment">
+    <% if changeset.tags['comment'].to_s != '' %>
+      <%= linkify(h(changeset.tags['comment'])) %>
     <% else %>
       <%= t'changeset.changeset.no_comment' %>
     <% end %>
   </td>
 
-  <td class="<%= cl %> area">
+  <td class="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
-    %>
+    <% 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
-    %>
+      <% if changeset.area > 1500000000000 %>
+        <%= t'changeset.changeset.big_area' %>
+      <% end %>
+    <% end %>
   </td>
-
 </tr>
+
+<script type="text/javascript">
+$("tr-changeset-<%= changeset.id%>").observe("mouseover", function() {
+  highlightChangeset("<%= changeset.id %>");
+});
+
+$("tr-changeset-<%= changeset.id%>").observe("mouseout", function() {
+  unHighlightChangeset("<%= changeset.id %>");
+});
+</script>