X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/4c0a5ee7d9a81582c15e1a69b2e48c684950436c..0425aeebbcf511b6b3627c5a3ba8f5066c80660b:/app/views/browse/_common_details.html.erb?ds=sidebyside diff --git a/app/views/browse/_common_details.html.erb b/app/views/browse/_common_details.html.erb index ede9e14c5..bf6c270cf 100644 --- a/app/views/browse/_common_details.html.erb +++ b/app/views/browse/_common_details.html.erb @@ -1,33 +1,40 @@ <h4> - <% if common_details.changeset.tags['comment'].present? %> - <%= linkify(h(common_details.changeset.tags['comment'])) %> - <% else %> - <%= t 'browse.no_comment' %> - <% end %> + <%= 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> -<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> +<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> -<div class="details"> - <%= t 'browse.version' %> - #<%= h(common_details.version) %> - · - <%= 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" %> -<div class="details geo"> - Location: - <%= link_to(content_tag(:span, number_with_delimiter(common_details.lat), :class => "latitude") + ", " + content_tag(:span, number_with_delimiter(common_details.lon), :class => "longitude"), {:controller => 'site', :action => 'index', :lat => h(common_details.lat), :lon => h(common_details.lon), :zoom => "18"}) %> -</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 %>