Rename showData to updateData in start.js.erb to resolve name clash

[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 2ba88b756ad16a1c1a4e357bcac79aa888aa2dbc..88447dde6957718a77d085a23c058ce8b0c2d5d7 100644 (file)
--- a/app/views/changeset/_changeset.html.erb
+++ b/app/views/changeset/_changeset.html.erb
@@ -1,30 +1,32 @@
 <% cl = cycle('table0', 'table1') %>
 <% cl = cycle('table0', 'table1') %>

-<tr class="<%= cl %>" id="tr-changeset-<%= changeset.id%>" onMouseOver="highlightChangesetMap('changeset-<%= changeset.id %>');this.style.backgroundColor='#ffff55';" onMouseOut="unHighlightChangesetMap('changeset-<%= changeset.id %>');this.style.backgroundColor='';">

 
 

+<tr class="<%= cl %>" id="tr-changeset-<%= changeset.id%>">

   <td>
     <%=
       id_link = link_to(changeset.id,
                         {:controller => 'browse', :action => 'changeset', :id => changeset.id},
                         {:title => t('changeset.changeset.view_changeset_details')})
   <td>
     <%=
       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
+      raw t 'changeset.changeset.id', :id => id_link

     %>
   </td>
 
   <td class="date">
     %>
   </td>
 
   <td class="date">

-    <% if changeset.closed_at > DateTime.now %> <%= t'changeset.changeset.still_editing' %>
-    <% else %><%= l changeset.closed_at, :format => :long %><% end %>
-  </td>
-
+    <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 %>  
-    <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 %>
-      <i><%= t'changeset.changeset.anonymous' %></i>
+    <%if showusername %>
+      <br />
+      <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 %>
     <% end %>

-    </td>
-  <% end %>
+  </td>

     
   <td class="comment">
     <% if changeset.tags['comment'].to_s != '' %>
     
   <td class="comment">
     <% if changeset.tags['comment'].to_s != '' %>


@@ -33,22 +35,14 @@
       <%= t'changeset.changeset.no_comment' %>
     <% end %>
   </td>
       <%= t'changeset.changeset.no_comment' %>
     <% end %>
   </td>

-
-  <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
-      %>
-      <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>
 </tr>

+
+<script type="text/javascript">
+$("#tr-changeset-<%= changeset.id%>").mouseover(function() {
+  highlightChangeset("<%= changeset.id %>");
+});
+
+$("#tr-changeset-<%= changeset.id%>").mouseout(function() {
+  unHighlightChangeset("<%= changeset.id %>");
+});
+</script>