Remove table from diary edit and refactor using new form styles

[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 e388d65aefc1531abac0e4cf5b9ef8e7574c232a..3e4871ec069ef8daff3fb0f3655f2d2306d5be34 100644 (file)
--- a/app/views/changeset/_changeset.html.erb
+++ b/app/views/changeset/_changeset.html.erb
@@ -1,48 +1,50 @@
-<% cl = cycle('table0', 'table1') %>
+<%
+   changeset_data = {:id => changeset.id}

 
 

-<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')})
-      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="date">
-    <span class="date">
+<%= content_tag "ul", :class => 'changeset_item', :id => "changeset_#{changeset.id}", :data => {:changeset => changeset_data} do %>
+  <li>
+
+    <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 changeset.closed_at > DateTime.now %> <%= t'changeset.changeset.still_editing' %>
       <% else %><%= l changeset.closed_at, :format => :long %><% end %>
     </span>

-    
+

     <%if showusername %>
     <%if showusername %>

-      <br />

       <span class="user">
       <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 %>
+        <% 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 %>
       </span>
     <% end %>

-  </td>
-    
-  <td class="comment">
+  </li>
+
+  <li class="comment deemphasize">

     <% if changeset.tags['comment'].to_s != '' %>
       <%= linkify(h(changeset.tags['comment'])) %>
     <% else %>
       <%= t'changeset.changeset.no_comment' %>
     <% end %>
     <% if changeset.tags['comment'].to_s != '' %>
       <%= linkify(h(changeset.tags['comment'])) %>
     <% else %>
       <%= t'changeset.changeset.no_comment' %>
     <% end %>

-  </td>
-</tr>
-
-<script type="text/javascript">
-$("tr-changeset-<%= changeset.id%>").observe("mouseover", function() {
-  highlightChangeset("<%= changeset.id %>");
-});
+  </li>

 
 

-$("tr-changeset-<%= changeset.id%>").observe("mouseout", function() {
-  unHighlightChangeset("<%= changeset.id %>");
-});
-</script>
+<% end %>