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

[rails.git] / app / views / layouts / _meta.html.erb

diff --git a/app/views/layouts/_meta.html.erb b/app/views/layouts/_meta.html.erb
index 2052b1d64135f802f873ca3a2595a666e81837c6..790d13fc380b03161f8ee59c0ed679559a68b31d 100644 (file)
--- a/app/views/layouts/_meta.html.erb
+++ b/app/views/layouts/_meta.html.erb
@@ -13,13 +13,15 @@
 <%= tag.meta :name => "msapplication-TileColor", :content => "#00a300" %>
 <%= tag.meta :name => "msapplication-TileImage", :content => image_path("mstile-144x144.png") %>
 <%= tag.meta :name => "theme-color", :content => "#ffffff" %>
 <%= tag.meta :name => "msapplication-TileColor", :content => "#00a300" %>
 <%= tag.meta :name => "msapplication-TileImage", :content => image_path("mstile-144x144.png") %>
 <%= tag.meta :name => "theme-color", :content => "#ffffff" %>

+<%= turbo_refresh_method_tag :morph %>
+<%= turbo_refresh_scroll_tag :preserve %>

 <%= canonical_tag %>
 <% if Settings.key?(:publisher_url) -%>
 <%= tag.link :rel => "publisher", :href => Settings.publisher_url %>
 <% end -%>
 <%= tag.link :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Search", :href => asset_path("osm.xml") %>
 <%= tag.meta :name => "description", :content => "OpenStreetMap is the free wiki world map." %>
 <%= canonical_tag %>
 <% if Settings.key?(:publisher_url) -%>
 <%= tag.link :rel => "publisher", :href => Settings.publisher_url %>
 <% end -%>
 <%= tag.link :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Search", :href => asset_path("osm.xml") %>
 <%= tag.meta :name => "description", :content => "OpenStreetMap is the free wiki world map." %>

-<%= opengraph_tags(@title) %>
-<% if flash[:piwik_goal] -%>
-<%= tag.meta :name => "piwik-goal", :content => flash[:piwik_goal] %>
+<%= opengraph_tags(@title, @opengraph_properties || {}) %>
+<% if flash[:matomo_goal] -%>
+<%= tag.meta :name => "matomo-goal", :content => flash[:matomo_goal] %>

 <% end -%>
 <% end -%>