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

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

diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb
index 8c6b246d80b145f8fd3cd31102fa3219cc3fb346..fc79addb80a6aa0c7223b566b3a6871c5a08dba3 100644 (file)
--- a/app/views/layouts/_head.html.erb
+++ b/app/views/layouts/_head.html.erb
@@ -18,18 +18,18 @@
   <%= 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") %>
   <%= canonical_tag %>
-  <% if defined?(PUBLISHER_URL) -%>
-  <%= tag("link", { :rel => "publisher", :href => PUBLISHER_URL }) %>
+  <% 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." }) %>
+  <%= 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]) %>