Merge branch 'master' into openid

[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..cbcfe74702079bf968b1512f1e699928ad9754f7 100644 (file)
--- a/app/views/changeset/_changeset.html.erb
+++ b/app/views/changeset/_changeset.html.erb
@@ -28,7 +28,7 @@
     
   <td class="<%= cl %> comment">
     <% if changeset.tags['comment'] %>
     
   <td class="<%= cl %> comment">
     <% if changeset.tags['comment'] %>

-      <%= auto_link(h(changeset.tags['comment'])) %>
+      <%= linkify(h(changeset.tags['comment'])) %>

     <% else %>
       <%= t'changeset.changeset.no_comment' %>
     <% end %>
     <% 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' %>
   <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%>-->
       <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>
   </td>

-

 </tr>
 </tr>