From: Tom Hughes <tom@compton.nu>
Date: Wed, 22 Jul 2020 14:02:51 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2723'
X-Git-Tag: live~3131
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/c47ae999428a0135d2febf470a0b1422c8774eb5?hp=6719d269e387e3be578460a2e4f3242d9d4082c8

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 2828142dc..0843b96a0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -74,8 +74,8 @@ GEM
     autoprefixer-rails (9.8.5)
       execjs
     aws-eventstream (1.1.0)
-    aws-partitions (1.340.0)
-    aws-sdk-core (3.103.0)
+    aws-partitions (1.343.0)
+    aws-sdk-core (3.104.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
@@ -83,8 +83,8 @@ GEM
     aws-sdk-kms (1.36.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.74.0)
-      aws-sdk-core (~> 3, >= 3.102.1)
+    aws-sdk-s3 (1.75.0)
+      aws-sdk-core (~> 3, >= 3.104.1)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.2.1)
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? } -%>