3 files changed, 11 insertions, 31 deletions
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
index 0856a0f..e220beb 100644
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -7,19 +7,18 @@
    <%= csrf_meta_tags %>
  
    <title><%= "#{params[:controller]} | #{params[:action]}" %></title>
-    <%= javascript_tag "var AUTH_TOKEN = #{form_authenticity_token.inspect};" if protect_against_forgery? %>
    <%= javascript_include_tag 'admin_bundle' %>
    <%= tinymce_assets %>
    <link rel="stylesheet" href="<%= mtime_busted_path('/stylesheets/admin.css') %>">
    <script src="<%= mtime_busted_path('/javascripts/admin_search.js') %>"></script>
    <script src="<%= mtime_busted_path('/javascripts/admin_interface.js') %>"></script>
    <script src="<%= mtime_busted_path('/javascripts/related_assets.js') %>"></script>
-    <script>
+    <%= javascript_tag nonce: true do %>
      var ADMIN_SEARCH_URL = "<%= admin_search_path %>";
      var ADMIN_MENU_SEARCH_URL = "<%= admin_menu_search_path %>";
      var PARAMETERIZE_PREVIEW_URL = "<%= parameterize_preview_nodes_path %>";
      var DASHBOARD_SEARCH_URL = "<%= admin_dashboard_search_path %>";
-    </script>
+    <% end %>
  </head>
  
  <body>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 57d12e6..f981fc1 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -10,20 +10,20 @@
    <meta property="og:description" content="Der Chaos Computer Club ist eine galaktische Gemeinschaft von Lebewesen für Informationsfreiheit und Technikfolgenabschätzung." />
    <title><%= page_title %></title>
-    <link rel="stylesheet" href="/stylesheets/ccc.css">
+    <link rel="stylesheet" href="<%= mtime_busted_path('/stylesheets/ccc.css') %>">
-    <link rel="stylesheet" href="/stylesheets/glightbox.min.css">
+    <link rel="stylesheet" href="<%= mtime_busted_path('/stylesheets/glightbox.min.css') %>">
-    <script src="/javascripts/glightbox.min.js"></script>
+    <script src="<%= mtime_busted_path('/javascripts/glightbox.min.js') %>"></script>
-    <script src="/javascripts/public.js"></script>
+    <script src="<%= mtime_busted_path('/javascripts/public.js') %>"></script>
    <%= auto_discovery_link_tag(:atom, '/rss/updates.xml', title: "ATOM") %>
    <%= auto_discovery_link_tag(:rss,  '/rss/updates.rdf', title: "RSS") %>
-    <script>
+    <%= javascript_tag nonce: true do %>
-      (function() { document.addEventListener("DOMContentLoaded", function() {
+      document.addEventListener("DOMContentLoaded", function() {
-        if (localStorage.getItem('override-prefers-color-scheme', false))
+        if (localStorage.getItem('override-prefers-color-scheme'))
          document.getElementById("light-mode").checked = true;
-      }); })();
+      });
-    </script>
+    <% end %>
  </head>
@@ -62,12 +62,10 @@
      <div id="center_column">
        <%= yield :layout %>
        <div id="footer">
-          <br />
          <p style="text-align: center">
            <%= link_to "Impressum", content_path("imprint") %>
            <%= link_to "Datenschutz", content_path("datenschutz") %>
            <%= language_selector %>
-            <!-- %= link_to t(:sponsors), content_path("sponsors") % -->
          </p>
        </div>
      </div>
diff --git a/app/views/layouts/events.html.erb b/app/views/layouts/events.html.erb
deleted file mode 100644
index 93a6c0c..0000000
--- a/app/views/layouts/events.html.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
-  <title>Events: <%= controller.action_name %></title>
-  <%= stylesheet_link_tag 'scaffold' %>
-</head>
-<body>
-<p style="color: green"><%= flash[:notice] %></p>
-<%= yield %>
-</body>
-</html>