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

[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 bea1fbbe0179409eda121e7c708060cb40ae98f9..8aa5b64c7b91245f43621598a01262d8e1557650 100644 (file)
--- a/app/views/browse/_common_details.html.erb
+++ b/app/views/browse/_common_details.html.erb
@@ -1,39 +1,37 @@
-<div class='browse-section common'>
-  <div class='browse-field'>
-    <% if common_details.visible? %>
-      <h4><%= t 'browse.common_details.edited_at' %></h4>
-    <% else %>
-      <h4><%= t 'browse.common_details.deleted_at' %></h4>
-    <% end %>
-    <p><%= l common_details.timestamp %></p>
-  </div>
+<h4>
+  <%= t "browse.version" %>
+  #<%= common_details.version %>
+</h4>
 
-  <% if common_details.changeset.user.data_public? %>
-    <div class='browse-field'>
-      <% if common_details.visible? %>
-        <h4><%= t 'browse.common_details.edited_by' %></h4>
-      <% else %>
-        <h4><%= t 'browse.common_details.deleted_by' %></h4>
-      <% end %>
-      <p><%= link_to h(common_details.changeset.user.display_name), :controller => "user", :action => "view", :display_name => common_details.changeset.user.display_name %></p>
-    </div>
+<p class="fst-italic">
+  <% if common_details.changeset.tags["comment"].present? %>
+    <%= linkify(common_details.changeset.tags["comment"]) %>
+  <% else %>
+    <%= t "browse.no_comment" %>
   <% end %>
+</p>
 
-  <div class='browse-field'>
-    <h4><%= t 'browse.common_details.version' %></h4>
-    <p><%= h(common_details.version) %></p>
-  </div>
+<ul class="list-unstyled">
+  <li>
+    <%= t "browse.#{common_details.visible? ? :edited : :deleted}_by_html",
+          :time => time_ago_in_words(common_details.timestamp, :scope => :"datetime.distance_in_words_ago"),
+          :user => changeset_user_link(common_details.changeset),
+          :title => l(common_details.timestamp) %>
+  </li>
+  <li>
+    <%= t "browse.in_changeset" %>
+    #<%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %>
+  </li>
 
-  <div class='browse-field'>
-    <h4><%= t 'browse.common_details.in_changeset' %></h4>
-    <p><%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %></p>
-  </div>
-
-  <% if common_details.changeset.tags['comment'].present? %>
-    <div class='browse-field'>
-      <h4><%= t 'browse.common_details.changeset_comment' %></h4>
-      <p><%= linkify(h(common_details.changeset.tags['comment'])) %></p>
-    </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 %>
-</div>
-<%= render :partial => "tag_details", :object => common_details %>
+</ul>
+
+<%= render :partial => "tag_details", :object => common_details.tags %>