From: Tom Hughes Date: Wed, 30 Sep 2020 10:57:18 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/2838' X-Git-Tag: live~2525 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/3b56c005ebac1e5aaef8890057767e1955bb4948?hp=ddac660f3b7cc09a7718f20d1b857b0794d5a4ef Merge remote-tracking branch 'upstream/pull/2838' --- diff --git a/app/views/browse/_common_details.html.erb b/app/views/browse/_common_details.html.erb index 351ec4c6a..3748f2f65 100644 --- a/app/views/browse/_common_details.html.erb +++ b/app/views/browse/_common_details.html.erb @@ -1,21 +1,21 @@ -

+

+ <%= t "browse.version" %> + #<%= common_details.version %> +

+ +

<% if common_details.changeset.tags['comment'].present? %> <%= linkify(common_details.changeset.tags["comment"]) %> <% else %> <%= t "browse.no_comment" %> <% end %> - +

<%= 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) %> -
- -
- <%= t "browse.version" %> - #<%= common_details.version %> · <%= t "browse.in_changeset" %> #<%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %> diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb index c15e1f8c6..1217c03be 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -6,7 +6,9 @@
-
<%= linkify(@changeset.tags["comment"].to_s.presence || t("browse.no_comment")) %>
+

+ <%= linkify(@changeset.tags["comment"].to_s.presence || t("browse.no_comment")) %> +

<%= changeset_details(@changeset) %>
<%= render :partial => "tag_details", :object => @changeset.tags.except("comment") %> diff --git a/app/views/changesets/_changeset.html.erb b/app/views/changesets/_changeset.html.erb index e3febb1c5..267bdb555 100644 --- a/app/views/changesets/_changeset.html.erb +++ b/app/views/changesets/_changeset.html.erb @@ -11,11 +11,11 @@ end %> <%= tag.li :id => "changeset_#{changeset.id}", :data => { :changeset => changeset_data }, :class => "list-group-item" do %> -
+

<%= changeset.tags["comment"].to_s.presence || t("browse.no_comment") %> -

+

<%= changeset.comments.length %> diff --git a/app/views/users/_contact.html.erb b/app/views/users/_contact.html.erb index 4446c519d..d46a61984 100644 --- a/app/views/users/_contact.html.erb +++ b/app/views/users/_contact.html.erb @@ -23,9 +23,9 @@ <% if changeset %> <%= t("users.show.latest edit", :ago => time_ago_in_words(changeset.created_at, :scope => :'datetime.distance_in_words_ago')) %> <% comment = changeset.tags["comment"].to_s != "" ? changeset.tags["comment"] : t("browse.no_comment") %> - "<%= link_to(comment, - { :controller => "browse", :action => "changeset", :id => changeset.id }, - { :title => t("changesets.changeset.view_changeset_details") }) %>" + <%= link_to(comment, + { :controller => "browse", :action => "changeset", :id => changeset.id }, + { :title => t("changesets.changeset.view_changeset_details") }) %> <% else %> <%= t "changesets.changeset.no_edits" %> <% end %>