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

[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 f336671f3e1d051f6acfd84d2bc6bada7b60ae44..7d3f8e829c672d3bc0c05ebc1acaf178cfda4e73 100644 (file)
--- a/app/views/browse/_common_details.html.erb
+++ b/app/views/browse/_common_details.html.erb
@@ -1,32 +1,36 @@
-<div class='browse-section common'>
-  <% if common_details.changeset.tags['comment'].present? %>
-    <div style="font-weight: bold; margin-bottom: 5px;">
-      <%= linkify(h(common_details.changeset.tags['comment'])) %>
-    </div>
+<h4>
+  <%= t "browse.version" %>
+  #<%= link_to_unless_current common_details.version, :controller => "old_#{@type.pluralize}", :action => :show, :version => common_details.version %>
+</h4>
+
+<p class="fst-italic">
+  <% if common_details.changeset.tags["comment"].present? %>
+    <%= linkify(common_details.changeset.tags["comment"]) %>

   <% else %>
   <% else %>

-    <div style="font-weight: bold; margin-bottom: 5px;">(no comment)</div>
+    <%= t "browse.no_comment" %>

   <% end %>
   <% end %>

-  <div>
-    <% if common_details.visible? %>
-      <%= t 'browse.common_details.edited' %> 
-    <% else %>
-      <%= t 'browse.common_details.deleted' %> 
-    <% end %>
-      <abbr><%= distance_of_time_in_words_to_now(common_details.timestamp) %> ago</abbr>
+</p>

 
 

-    <% if common_details.changeset.user.data_public? %>
-      <%= t 'browse.common_details.by' %>
-      <%= link_to h(common_details.changeset.user.display_name), :controller => "user", :action => "view", :display_name => common_details.changeset.user.display_name %>
-    <% end %>
-  </div>
+<ul class="list-unstyled">
+  <li>
+    <%= t "browse.#{common_details.visible? ? :edited : :deleted}_ago_by_html",
+          :time_ago => friendly_date_ago(common_details.timestamp),
+          :user => changeset_user_link(common_details.changeset) %>
+  </li>
+  <li>
+    <%= t "browse.in_changeset" %>
+    #<%= link_to common_details.changeset_id, changeset_path(common_details.changeset) %>
+  </li>

 
 

-  <div>
-    <%= t 'browse.common_details.version' %> 
-    #<%= h(common_details.version) %>
-    &middot;
-    <%= t 'browse.common_details.in_changeset' %> 
-    #<%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %>
-  </div>
-</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 => "browse/tag_details", :object => common_details.tags %>