From: Tom Hughes <tom@compton.nu>
Date: Wed, 22 Jul 2020 12:44:37 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2724'
X-Git-Tag: live~3289
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/bc3a5adc794765ce3646cc308834b9947c8b0aaf?hp=606d2e51c55b6c1931f9bb336893bb9976dd83fd

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

diff --git a/app/views/browse/_common_details.html.erb b/app/views/browse/_common_details.html.erb
index 1100fe97b..683cf6d70 100644
--- a/app/views/browse/_common_details.html.erb
+++ b/app/views/browse/_common_details.html.erb
@@ -24,7 +24,7 @@
 <% if @type == "node" and common_details.visible? %>
 <div class="details geo">
   <%= t "browse.location" %>
-  <%= link_to(tag.span(number_with_delimiter(common_details.lat), :class => "latitude") + ", " + tag.span(number_with_delimiter(common_details.lon), :class => "longitude"), :controller => "site", :action => "index", :anchor => "map=18/#{common_details.lat}/#{common_details.lon}") %>
+  <%= link_to(tag.span(number_with_delimiter(common_details.lat), :class => "latitude") + ", " + tag.span(number_with_delimiter(common_details.lon), :class => "longitude"), root_path(:anchor => "map=18/#{common_details.lat}/#{common_details.lon}")) %>
 </div>
 <% end %>
 
diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb
index 74d1223c7..c72730a76 100644
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -12,10 +12,16 @@
   </div>
 
   <div class="details" data-coordinates="<%= @note.lat %>,<%= @note.lon %>" data-status="<%= @note.status %>">
-    <p><%= note_event("opened", @note.created_at, @note.author) %></p>
-    <% if @note.status == "closed" %>
-      <p><%= note_event(@note.status, @note.closed_at, @note.all_comments.last.author) %></p>
-    <% end %>
+    <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(tag.span(number_with_delimiter(@note.lat), :class => "latitude") + ", " + tag.span(number_with_delimiter(@note.lon), :class => "longitude"), root_path(:anchor => "map=18/#{@note.lat}/#{@note.lon}")) %>
+      </li>
+    </ul>
   </div>
 
   <% if @note_comments.find { |comment| comment.author.nil? } -%>