X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/a66c34991acfff398fbc83c921dfce18a835ee26..4300c7b142cb00d4f51e097d53332d3e8ed3caa6:/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 1c8f1c5da..195332b09 100644 --- a/app/views/browse/_common_details.html.erb +++ b/app/views/browse/_common_details.html.erb @@ -1,31 +1,40 @@ <h4> - <% if common_details.changeset.tags['comment'].present? %> - <%= linkify(h(common_details.changeset.tags["comment"])) %> + <%= 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> + +<p class="fst-italic"> + <% if common_details.changeset.tags["comment"].present? %> + <%= linkify(common_details.changeset.tags["comment"]) %> <% else %> <%= t "browse.no_comment" %> <% end %> -</h4> +</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) %> -</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 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> - -<% if @type == "node" and common_details.visible? %> -<div class="details geo"> - <%= t "browse.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", :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 %>