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

[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 3748f2f6587409b0c21166b1c24df2cb077cbd67..bf6c270cffa62d4e3d5c8d6217da8fc64283e688 100644 (file)
--- a/app/views/browse/_common_details.html.erb
+++ b/app/views/browse/_common_details.html.erb
@@ -1,34 +1,40 @@
-<h4 class="details">
-  <%= t "browse.version" %>
-  #<%= common_details.version %>
+<h4>
+  <%= if common_details.redacted?
+        t "browse.redacted_version"
+      else
+        t "browse.version"
+      end %>
+  #<%= link_to_unless_current common_details.version, :controller => "old_#{@type.pluralize}", :action => :show, :version => common_details.version %>

 </h4>
 
 </h4>
 

-<p class="font-italic">
-  <% if common_details.changeset.tags['comment'].present? %>
+<p class="fs-6 overflow-x-auto">
+  <% if common_details.changeset.tags["comment"].present? %>

     <%= linkify(common_details.changeset.tags["comment"]) %>
   <% else %>
     <%= t "browse.no_comment" %>
   <% end %>
 </p>
 
     <%= linkify(common_details.changeset.tags["comment"]) %>
   <% else %>
     <%= t "browse.no_comment" %>
   <% end %>
 </p>
 

-<div class="details">
-  <%= 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) %>
-  &middot;
-  <%= t "browse.in_changeset" %>
-  #<%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %>
-</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>

 
 

-<% if @type == "node" and common_details.visible? %>
-<div class="details geo">
-  <%= 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}")) %>
-</div>
-<% end %>
+  <% 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 %>