Fix double escaping of date markup in note feed

[rails.git] / app / views / browse / _changeset_details.html.erb

diff --git a/app/views/browse/_changeset_details.html.erb b/app/views/browse/_changeset_details.html.erb
index 9fb9cb860b1f0bc0e3e5a3ebda62c97884b85aa6..47e38973db5849ef3d01f7e45c706b76e521deb0 100644 (file)
--- a/app/views/browse/_changeset_details.html.erb
+++ b/app/views/browse/_changeset_details.html.erb
@@ -1,95 +1,78 @@
-<table>
+<div class='column-1'>
+
+  <div class='browse-section common'>
+    <div>
+      <h4><%= t 'browse.changeset_details.created_at' %></h4>
+      <p><%= l changeset_details.created_at %></p>
+    </div>
+
+    <div>
+      <h4><%= t 'browse.changeset_details.closed_at' %></h4>
+      <p><%= l changeset_details.closed_at %></p>
+    </div>
+
+    <% if changeset_details.user.data_public? %>
+      <div>
+        <h4><%= t 'browse.changeset_details.belongs_to' %></h4>
+        <p><%= link_to h(changeset_details.user.display_name), :controller => "user", :action => "view", :display_name => changeset_details.user.display_name %></p>
+      </div>
+    <% end %>
+  </div>

 
 

-  <tr>
-    <th><%= t 'browse.changeset_details.created_at' %></th>
-    <td><%= l changeset_details.created_at %></td>
-  </tr>
-  
-  <tr>
-    <th><%= t 'browse.changeset_details.closed_at' %></th>
-    <td><%= l changeset_details.closed_at %></td>
-  </tr>
-  
-  <% if changeset_details.user.data_public? %>
-    <tr>
-      <th><%= t 'browse.changeset_details.belongs_to' %></th>
-      <td><%= link_to h(changeset_details.user.display_name), :controller => "user", :action => "view", :display_name => changeset_details.user.display_name %></td>
-    </tr>
-  <% end %>
-  

   <%= render :partial => "tag_details", :object => changeset_details %>
 
   <%= render :partial => "tag_details", :object => changeset_details %>
 

-  <tr>
-    <th><%= t 'browse.changeset_details.bounding_box' %></th>
+  <div class='browse-section clearfix'>
+    <h4><%= t 'browse.changeset_details.bounding_box' %></h4>

     <% unless changeset_details.has_valid_bbox? %>
     <% unless changeset_details.has_valid_bbox? %>

-      <td><%= t 'browse.changeset_details.no_bounding_box' %></td>
-    <% else
-          minlon = changeset_details.min_lon/GeoRecord::SCALE.to_f
-          minlat = changeset_details.min_lat/GeoRecord::SCALE.to_f
-          maxlon = changeset_details.max_lon/GeoRecord::SCALE.to_f
-          maxlat = changeset_details.max_lat/GeoRecord::SCALE.to_f
-    %>
-      <td>
-        <table>
-          <tr>
-            <td colspan="3" style="text-align:center"><%=maxlat -%></td>
-          </tr>
-          <tr>
-            <td><%=minlon -%></td>
-            <td>(<a href='/?minlon=<%= minlon %>&minlat=<%= minlat %>&maxlon=<%= maxlon %>&maxlat=<%= maxlat %>&box=yes' title='<%= t 'browse.changeset_details.show_area_box' %>'><%= t 'browse.changeset_details.box' %></a>)</td>
-            <td><%=maxlon -%></td>
-          </tr>
-          <tr>
-            <td colspan="3" style="text-align:center"><%= minlat -%></td>
-          </tr>
-        </table>
-      </td>
+    <p><%= t 'browse.changeset_details.no_bounding_box' %></p>
+    <% else bbox = changeset_details.bbox.to_unscaled %>
+        <div class='bbox'>
+            <div class='max_lat'><%=bbox.max_lat -%></div>
+            <div class='min_lon'><%=bbox.min_lon -%></div>
+            <div class='box'>(<%= link_to t('browse.changeset_details.box'), root_path(:minlon => bbox.min_lon, :minlat => bbox.min_lat, :maxlon => bbox.max_lon, :maxlat => bbox.max_lat, :box => 'yes'), :title => t('browse.changeset_details.show_area_box') %>)</div>
+            <div class='max_lon'><%=bbox.max_lon -%></div>
+            <div class='min_lat'><%= bbox.min_lat -%></div>
+        </div>

     <% end %>
     <% end %>

-  </tr>
+  </div>

 
   <% unless @nodes.empty? %>
 
   <% unless @nodes.empty? %>

-    <tr valign="top">
-      <th><%= t 'browse.changeset_details.has_nodes', :count => @node_pages.item_count %></th>
-      <td>
-        <table cellpadding="0">
+    <div class='browse-section'>
+      <h4><%= t 'browse.changeset_details.has_nodes', :count => @node_pages.item_count %></h4>
+      <ul>

           <% @nodes.each do |node| %>
           <% @nodes.each do |node| %>

-            <tr><td><%= link_to h(printable_name(node, true)), { :action => "node", :id => node.id.to_s }, :class => link_class('node', node), :title => link_title(node) %></td></tr>
+            <li><%= link_to h(printable_name(node, true)), { :action => "node", :id => node.node_id.to_s }, :class => link_class('node', node), :title => link_title(node) %></li>

           <% end %>
           <% end %>

-        </table>
-      </td>
-    </tr>
+      </ul>
+    </div>

     <%= render :partial => 'paging_nav', :locals => { :pages => @node_pages, :page_param => "node_page"} %>
   <% end %>
     <%= render :partial => 'paging_nav', :locals => { :pages => @node_pages, :page_param => "node_page"} %>
   <% end %>

-  
+

   <% unless @ways.empty? %>
   <% unless @ways.empty? %>

-    <tr valign="top">
-      <th><%= t 'browse.changeset_details.has_ways', :count => @way_pages.item_count %></th>
-      <td>
-        <table cellpadding="0">
+    <div class='browse-section'>
+      <h4><%= t 'browse.changeset_details.has_ways', :count => @way_pages.item_count %></h4>
+      <ul>

           <% @ways.each do |way| %>
           <% @ways.each do |way| %>

-          <tr><td><%= link_to h(printable_name(way, true)), { :action => "way", :id => way.id.to_s }, :class => link_class('way', way), :title => link_title(way) %></td></tr>
+          <li><%= link_to h(printable_name(way, true)), { :action => "way", :id => way.way_id.to_s }, :class => link_class('way', way), :title => link_title(way) %></li>

           <% end %>
           <%=
           <% end %>
           <%=

-          #render :partial => "containing_relation", :collection => changeset_details.containing_relation_members 
+          #render :partial => "containing_relation", :collection => changeset_details.containing_relation_members

           %>
           %>

-        </table>
-      </td>
-    </tr>
+      </ul>
+    </div>

     <%= render :partial => 'paging_nav', :locals => { :pages => @way_pages, :page_param => "way_page" } %>
   <% end %>
     <%= render :partial => 'paging_nav', :locals => { :pages => @way_pages, :page_param => "way_page" } %>
   <% end %>

-  
+

   <% unless @relations.empty? %>
   <% unless @relations.empty? %>

-    <tr valign="top">
-      <th><%= t 'browse.changeset_details.has_relations', :count => @relation_pages.item_count %></th>
-      <td>
-        <table cellpadding="0">
+    <div class='browse-section'>
+      <h4><%= t 'browse.changeset_details.has_relations', :count => @relation_pages.item_count %></h4>
+        <ul>

           <% @relations.each do |relation| %>
           <% @relations.each do |relation| %>

-          <tr><td><%= link_to h(printable_name(relation, true)), { :action => "relation", :id => relation.id.to_s }, :class => link_class('relation', relation), :title => link_title(relation) %></td></tr>
+          <li><%= link_to h(printable_name(relation, true)), { :action => "relation", :id => relation.relation_id.to_s }, :class => link_class('relation', relation), :title => link_title(relation) %></li>

           <% end %>
           <% end %>

-        </table>
-      </td>
-    </tr>
+        </ul>
+    </div>

     <%= render :partial => 'paging_nav', :locals => { :pages => @relation_pages, :page_param => "relation_page" } %>
   <% end %>
 
     <%= render :partial => 'paging_nav', :locals => { :pages => @relation_pages, :page_param => "relation_page" } %>
   <% end %>
 

-</table>
+</div>
\ No newline at end of file