cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Tom Hughes 2024-12-05 18:41:10 +00:00
commit fe81ac334c
3 changed files with 43 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/helpers/note_helper.rb
View file

@ -18,7 +18,8 @@ module NoteHelper
elsif author.status == "deleted"
t("users.no_such_user.deleted")
else
link_to h(author.display_name), link_options.merge(:controller => "/users", :action => "show", :display_name => author.display_name)
link_to h(author.display_name), link_options.merge(:controller => "/users", :action => "show", :display_name => author.display_name),
:class => "mw-100 d-inline-block align-bottom text-truncate text-wrap", :dir => "auto"
end
end
end

24
app/views/notes/show.html.erb
View file

@ -9,19 +9,17 @@
</div>
<div class="details" data-coordinates="<%= @note.lat %>,<%= @note.lon %>" data-status="<%= @note.status %>">
<ul class="list-unstyled">
<li><%= note_event("opened", @note.created_at, @note.author) %></li>
<% if @note.status == "closed" %>
<li><%= note_event(@note.status, @note.closed_at, @note.all_comments.last.author) %></li>
<% end %>
<li>
<%= t "browse.location" %>
<%= link_to(t(".coordinates_html",
:latitude => tag.span(number_with_delimiter(@note.lat), :class => "latitude"),
:longitude => tag.span(number_with_delimiter(@note.lon), :class => "longitude")),
root_path(:anchor => "map=18/#{@note.lat}/#{@note.lon}")) %>
</li>
</ul>
<p class="mb-2"><%= note_event("opened", @note.created_at, @note.author) %></p>
<% if @note.status == "closed" %>
<p class="mb-2"><%= note_event(@note.status, @note.closed_at, @note.all_comments.last.author) %></p>
<% end %>
<p>
<%= t "browse.location" %>
<%= link_to t(".coordinates_html",
:latitude => tag.span(number_with_delimiter(@note.lat), :class => "latitude"),
:longitude => tag.span(number_with_delimiter(@note.lon), :class => "longitude")),
root_path(:anchor => "map=18/#{@note.lat}/#{@note.lon}") %>
</p>
</div>
<% if @note_comments.find { |comment| comment.author.nil? } -%>