7 files changed, 31 insertions, 31 deletions

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 32c7373..75f92c3 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,10 +1,7 @@
-# Filters added to this controller apply to all controllers in the application.
-# Likewise, all the methods added will be available for all controllers.
-
 class ApplicationController < ActionController::Base
   include AuthenticatedSystem
 
-  protect_from_forgery # See ActionController::RequestForgeryProtection for details
+  protect_from_forgery
 
   before_action :set_locale
 
@@ -14,7 +11,11 @@ class ApplicationController < ActionController::Base
     if params[:locale] && I18n.available_locales.include?(params[:locale].to_sym)
       I18n.locale = params[:locale].to_sym
     else
-      params.delete(:locale)
+      I18n.locale = I18n.default_locale
     end
   end
+
+  def default_url_options
+    { locale: I18n.locale == I18n.default_locale ? nil : I18n.locale }
+  end
 end
diff --git a/app/models/node.rb b/app/models/node.rb
index 59a9d7c..92ecc12 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -4,11 +4,11 @@ class Node < ApplicationRecord
 
   # Associations
   has_many    :pages, -> { order("revision ASC") }, :dependent => :destroy
-  belongs_to  :head,  :class_name => "Page",  :foreign_key => :head_id, :dependent => :destroy
-  belongs_to  :draft, :class_name => "Page",  :foreign_key => :draft_id, :dependent => :destroy
+  belongs_to  :head,  :class_name => "Page",  :foreign_key => :head_id, :dependent => :destroy, optional: true
+  belongs_to  :draft, :class_name => "Page",  :foreign_key => :draft_id, :dependent => :destroy, optional: true
   has_many    :permissions, :dependent => :destroy
   has_one     :event, :dependent => :destroy
-  belongs_to  :lock_owner, :class_name => "User", :foreign_key => :locking_user_id
+  belongs_to  :lock_owner, :class_name => "User", :foreign_key => :locking_user_id, optional: true
 
   # Callbacks
   after_create  :initialize_empty_page
diff --git a/app/models/page.rb b/app/models/page.rb
index ca3a8be..67db50a 100644
--- a/app/models/page.rb
+++ b/app/models/page.rb
@@ -12,9 +12,9 @@ class Page < ApplicationRecord
   translates :title, :abstract, :body # Globalize2
 
   # Associations
-  belongs_to :node
-  belongs_to :user
-  belongs_to :editor, :class_name => "User"
+  belongs_to :node, optional: true
+  belongs_to :user, optional: true
+  belongs_to :editor, :class_name => "User", optional: true
   has_many   :related_assets
   has_many   :assets, -> { order("position ASC") }, :through => :related_assets
 
diff --git a/app/views/content/_featured_articles.html.erb b/app/views/content/_featured_articles.html.erb
index c69911f..6717c51 100644
--- a/app/views/content/_featured_articles.html.erb
+++ b/app/views/content/_featured_articles.html.erb
@@ -10,35 +10,35 @@
   )% -->
 
   <%= link_to(
-        image_tag( 'chaosradio.png' ),
+        '<img src="/images/chaosradio.png" alt="Chaosradio">'.html_safe,
         "https://chaosradio.ccc.de/",
         :id => "chaosradio_icon",
         :title => "Chaosradio"
   )%>
 
   <%= link_to(
-        image_tag( 'media-ccc-de-banner.svg', :size => '155x45' ),
+        '<img src="/images/media-ccc-de-banner.svg" width="155" height="45" alt="Media Dot CCC Dot de">'.html_safe,
         "https://media.ccc.de",
         :id => "media_ccc_de_icon",
         :title => "Media Dot CCC Dot de"
   )%>
 
   <%= link_to(
-        image_tag( 'ds.png' ),
+        '<img src="/images/ds.png" alt="Datenschleuder">'.html_safe,
         "https://ds.ccc.de/",
         :id => "ds_icon",
         :title => "Datenschleuder"
   )%>
 
   <%= link_to(
-        image_tag( 'events.png' ),
+        '<img src="/images/events.png" alt="Events-Blog">'.html_safe,
         "https://events.ccc.de/",
         :id => "events_icon",
-        :title => "Events Blog"
+        :title => "Events-Blog"
   )%>
 
   <%= link_to(
-        image_tag( 'Fediverse.svg', :size => '64x64' ),
+        '<img src="/images/Fediverse.svg" width="64" height="64" alt="Fediverse">'.html_safe,
         "https://social.bau-ha.us/@ccc",
         :rel => 'me',
         :id => "fediverse_icon",
@@ -46,7 +46,7 @@
   )%>
 
   <%= link_to(
-        image_tag( 'Bluesky_Logo.svg', :size => '64x64' ),
+        '<img src="/images/Bluesky_Logo.svg" width="64" height="64" alt="bsky">'.html_safe,
         "https://bsky.app/profile/ccc.de",
         :id => "bluesky_icon",
         :title => "bsky"
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
index 2a90786..890aeaa 100644
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -7,13 +7,12 @@
     <%= csrf_meta_tags %>
   
     <title><%= "#{params[:controller]} | #{params[:action]}" %></title>
-    <%= javascript_include_tag 'admin_bundle' %>
-    <%= javascript_include_tag 'tiny_mce/jquery.tinymce.js' %>
     <%= javascript_tag "var AUTH_TOKEN = #{form_authenticity_token.inspect};" if protect_against_forgery? %>
-    <%= stylesheet_link_tag 'admin' %>
-    <%= javascript_include_tag 'admin_search.js' %>
-    <%= javascript_include_tag 'admin_interface.js' %>
-    <%= stylesheet_link_tag 'admin' %>
+    <%= javascript_include_tag 'admin_bundle' %>
+    <%= tinymce_assets %>
+    <link rel="stylesheet" href="/stylesheets/admin.css">
+    <script src="/javascripts/admin_search.js"></script>
+    <script src="/javascripts/admin_interface.js"></script>
   </head>
   
   <body>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index c5cbf14..48e0a5b 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -10,11 +10,11 @@
     <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>
-    <%= stylesheet_link_tag "ccc" %>
-    <%= javascript_include_tag 'jquery-1.3.2.min' %>
-    <%= javascript_include_tag 'shadowbox/shadowbox' %>
-    <%= stylesheet_link_tag "shadowbox" %>
-    <%= javascript_include_tag 'public' %>
+    <link rel="stylesheet" href="/stylesheets/ccc.css">
+    <script src="/javascripts/jquery-1.3.2.min.js"></script>
+    <script src="/javascripts/shadowbox/shadowbox.js"></script>
+    <link rel="stylesheet" href="/stylesheets/shadowbox.css">
+    <script src="/javascripts/public.js"></script>
 
     <%= auto_discovery_link_tag(:atom, '/rss/updates.xml', title: "ATOM") %>
     <%= auto_discovery_link_tag(:rss,  '/rss/updates.rdf', title: "RSS") %>
@@ -31,7 +31,7 @@
   <body lang="<%= @page ? @page.effective_lang : 'de' %>">
     <div id="wrapper">
       <div id="header">
-        <%= image_tag("header.png") %>
+        <img src="/images/header.png" alt="">
       </div>
       <div id="toolbox">
         <div id="search">
diff --git a/app/views/revisions/diff.html.erb b/app/views/revisions/diff.html.erb
index efda85d..b8d061d 100644
--- a/app/views/revisions/diff.html.erb
+++ b/app/views/revisions/diff.html.erb
@@ -38,7 +38,7 @@
   </div>
 </pre>
 
-<%= javascript_include_tag 'cacycle_diff' %>
+<script src="/javascripts/cacycle_diff.js"></script>
 <script type="text/javascript" charset="utf-8">
   window.onload = function() {
     title1    = document.getElementById('start_title').innerHTML;