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

[rails.git] / app / views / layouts / site.html.erb
diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb

index 69ac7aa023a193cc40fad42a2c9a7393b0cb5cad..f02f024a57a69e84905c76122f1b16ff053e8f20 100644 (file)
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -1,11 +1,14 @@
  <!DOCTYPE html>
  <!DOCTYPE html>
-<html lang="<%= I18n.locale %>" dir="<%= dir %>">
+<%= tag.html :lang => I18n.locale,
+             :dir => dir,
+             :data => { :bs_theme => (preferred_color_scheme(:site) if preferred_color_scheme(:site) != "auto") } do %>
    <%= render :partial => "layouts/head" %>
    <%= render :partial => "layouts/head" %>
-  <body class="<%= body_class %>">
+  <%= tag.body :class => body_class,
+               :data => { :map_theme => (preferred_color_scheme(:map) if preferred_color_scheme(:map) != "auto") } do %>
      <%= render :partial => "layouts/header" %>
      <%= render :partial => "layouts/content" %>
      <%= render :partial => "layouts/header" %>
      <%= render :partial => "layouts/content" %>
-    <% if defined?(PIWIK) -%>
-    <noscript><p><img src="<%= request.protocol %><%= PIWIK['location'] %>/piwik.php?idsite=<%= PIWIK['site'] %>" style="border:0" alt="" /></p></noscript>
+    <% if defined?(Settings.matomo) -%>
+    <noscript><p><img src="<%= request.protocol %><%= Settings.matomo["location"] %>/matomo.php?idsite=<%= Settings.matomo["site"] %>" class="matomo" alt="" /></p></noscript>
      <% end -%>
      <% end -%>
-  </body>
-</html>
+  <% end %>
+<% end %>