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

[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 dc08424f36a69432bd1c7d6993dcfc4711102896..790d13fc380b03161f8ee59c0ed679559a68b31d 100644 (file)
--- a/app/views/layouts/_meta.html.erb
+++ b/app/views/layouts/_meta.html.erb
@@ -7,19 +7,21 @@
 <%= favicon_link_tag "favicon-96x96.png", :rel => "icon", :sizes => "96x96", :type => "image/png" %>
 <%= favicon_link_tag "android-chrome-192x192.png", :rel => "icon", :sizes => "192x192", :type => "image/png" %>
 <%= favicon_link_tag "favicon-16x16.png", :rel => "icon", :sizes => "16x16", :type => "image/png" %>
-<%= tag("link", :rel => "mask-icon", :href => asset_path("tab-icon.svg"), :color => "#7ebc6f") %>
-<%= tag("link", :rel => "manifest", :href => asset_path("manifest.json")) %>
-<%= tag("meta", :name => "msapplication-config", :content => asset_path("browserconfig.xml")) %>
-<%= 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.link :rel => "mask-icon", :href => asset_path("tab-icon.svg"), :color => "#7ebc6f" %>
+<%= tag.link :rel => "manifest", :href => asset_path("manifest.json") %>
+<%= tag.meta :name => "msapplication-config", :content => asset_path("browserconfig.xml") %>
+<%= 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) %>
+<%= 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]) %>
+<%= 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, @opengraph_properties || {}) %>
+<% if flash[:matomo_goal] -%>
+<%= tag.meta :name => "matomo-goal", :content => flash[:matomo_goal] %>
 <% end -%>