Merge remote-tracking branch 'upstream/pull/3986'

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

diff --git a/app/views/browse/_common_details.html.erb b/app/views/browse/_common_details.html.erb
index 959820bfd4ea32a0d2ba107948ce95d91d300f34..9eb6b5bfe55988f76d99e1487012cb9c3b619158 100644 (file)
--- a/app/views/browse/_common_details.html.erb
+++ b/app/views/browse/_common_details.html.erb
@@ -1,26 +1,37 @@
 <h4>
 <h4>

-  <% if common_details.changeset.tags['comment'].present? %>
-    <%= linkify(h(common_details.changeset.tags['comment'])) %>
+  <%= t "browse.version" %>
+  #<%= common_details.version %>
+</h4>
+
+<p class="fst-italic">
+  <% if common_details.changeset.tags["comment"].present? %>
+    <%= linkify(common_details.changeset.tags["comment"]) %>

   <% else %>
   <% else %>

-    <%= t 'browse.no_comment' %>
+    <%= t "browse.no_comment" %>

   <% end %>
   <% end %>

-</h4>
+</p>

 
 

-<div class="details">
-  <%=
-      t "browse.#{common_details.visible? ? :edited : :deleted}_by_html",
-        :time => distance_of_time_in_words_to_now(common_details.timestamp),
-        :user => changeset_user_link(common_details.changeset),
-        :title => l(common_details.timestamp)
-  %>
-</div>
+<ul class="list-unstyled">
+  <li>
+    <%= t "browse.#{common_details.visible? ? :edited : :deleted}_ago_by_html",
+          :time_ago => tag.abbr(time_ago_in_words(common_details.timestamp, :scope => :"datetime.distance_in_words_ago"),
+                                :title => l(common_details.timestamp)),
+          :user => changeset_user_link(common_details.changeset) %>
+  </li>
+  <li>
+    <%= t "browse.in_changeset" %>
+    #<%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %>
+  </li>

 
 

-<div class="details">
-  <%= t 'browse.version' %>
-  #<%= h(common_details.version) %>
-  &middot;
-  <%= t 'browse.in_changeset' %>
-  #<%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %>
-</div>
+  <% if @type == "node" and common_details.visible? %>
+    <li>
+      <%= t "browse.location" %>
+      <%= link_to(t(".coordinates_html",
+                    :latitude => tag.span(number_with_delimiter(common_details.lat), :class => "latitude"),
+                    :longitude => tag.span(number_with_delimiter(common_details.lon), :class => "longitude")),
+                  root_path(:anchor => "map=18/#{common_details.lat}/#{common_details.lon}")) %>
+    </li>
+  <% end %>
+</ul>

 
 <%= render :partial => "tag_details", :object => common_details.tags %>
 
 <%= render :partial => "tag_details", :object => common_details.tags %>