Merge branch 'master' into openstreetbugs2

[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 b682f1b4bd68a95a29d1e5b1e252cb48a662c194..33d8cf129d80f51c7387e8f175cbe2fa961b79e1 100644 (file)
--- a/app/views/changeset/_changeset.html.erb
+++ b/app/views/changeset/_changeset.html.erb
@@ -12,7 +12,7 @@
 
   <td class="<%= cl %> date">
     <% if changeset.closed_at > DateTime.now %> <%= t'changeset.changeset.still_editing' %>
-    <% else %><%= l changeset.closed_at, :format => :short %><% end %>
+    <% else %><%= l changeset.closed_at, :format => :long %><% end %>
   </td>
 
     
@@ -27,8 +27,8 @@
   <% end %>
     
   <td class="<%= cl %> comment">
-    <% if changeset.tags['comment'] %>
-      <%= h(changeset.tags['comment']) %>
+    <% if changeset.tags['comment'].to_s != '' %>
+      <%= linkify(h(changeset.tags['comment'])) %>
     <% else %>
       <%= t'changeset.changeset.no_comment' %>
     <% end %>
@@ -37,20 +37,18 @@
   <td class="<%= cl %> 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>