cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Send meta information with error pages

Browse source
This commit is contained in:
Tom Hughes 2020-04-22 12:21:42 +01:00
parent 62247da244
commit 1cb92c9d2a
3 changed files with 27 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

26
app/views/layouts/_head.html.erb
View file

@ -9,31 +9,7 @@
<%= stylesheet_link_tag "screen-#{dir}", :media => "screen" %>
<%= stylesheet_link_tag "print-#{dir}", :media => "print" %>
<%= stylesheet_link_tag "leaflet-all", :media => "screen, print" %>
<%= favicon_link_tag "favicon.ico" if browser.ie? %>
<% [57, 60, 72, 76, 114, 120, 144, 152, 180].each do |size| -%>
<%= favicon_link_tag "apple-touch-icon-#{size}x#{size}.png", :rel => "apple-touch-icon", :sizes => "#{size}x#{size}", :type => "image/png" %>
<% end -%>
<%= favicon_link_tag "favicon-32x32.png", :rel => "icon", :sizes => "32x32", :type => "image/png" %>
<%= favicon_link_tag "favicon-194x194.png", :rel => "icon", :sizes => "194x194", :type => "image/png" %>
<%= 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") %>
<%= 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]) %>
<% end -%>
<%= render :partial => "layouts/meta" %>
<%= yield :head %>
<%= yield :auto_discovery_link_tag %>
<%= csrf_meta_tag %>

25
app/views/layouts/_meta.html.erb Normal file
View file

@ -0,0 +1,25 @@
<%= favicon_link_tag "favicon.ico" if browser.ie? %>
<% [57, 60, 72, 76, 114, 120, 144, 152, 180].each do |size| -%>
<%= favicon_link_tag "apple-touch-icon-#{size}x#{size}.png", :rel => "apple-touch-icon", :sizes => "#{size}x#{size}", :type => "image/png" %>
<% end -%>
<%= favicon_link_tag "favicon-32x32.png", :rel => "icon", :sizes => "32x32", :type => "image/png" %>
<%= favicon_link_tag "favicon-194x194.png", :rel => "icon", :sizes => "194x194", :type => "image/png" %>
<%= 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") %>
<%= 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]) %>
<% end -%>

1
app/views/layouts/error.html.erb
View file

@ -4,6 +4,7 @@
<meta charset="utf-8">
<title>OpenStreetMap</title>
<%= stylesheet_link_tag "errors", :media => "screen" %>
<%= render :partial => "layouts/meta" %>
</head>
<body>
<a href="<%= root_path %>">