Migration from Rails 2.3.5 to Rails 8.1 successful.

Merging dev branch.

50 files changed, 440 insertions, 279 deletions

diff --git a/app/views/admin/_drafts.html.erb b/app/views/admin/_drafts.html.erb
index 58b946b..a35b0ab 100644
--- a/app/views/admin/_drafts.html.erb
+++ b/app/views/admin/_drafts.html.erb
@@ -17,9 +17,9 @@
       <td class="actions">
         <%= link_to 'Show', node_path(draft.node) %>
         <%= link_to "Revisions", revision_path(draft.node.id) %>
-        <%= link_to "Publish", publish_node_path(draft.node), :method => :put, :confirm => "Do you really want to publish?" %>
+        <%= button_to "Publish", publish_node_path(draft.node), method: :put, form: { data: { confirm: "Do you really want to publish?" } } %>
       </td>
     </tr>
     <% end %>
   </table>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb
index e8b39ce..6f217eb 100644
--- a/app/views/admin/_menu.html.erb
+++ b/app/views/admin/_menu.html.erb
@@ -1,7 +1,7 @@
 <%= language_selector %>
-<%= link_to 'Logout', :controller => :sessions, :action => :destroy %>
-<%= link_to 'Overview', :controller => :admin, :action => 'index' %>
+<%= button_to 'Logout', logout_path, method: :delete %>
+<%= link_to 'Overview', admin_path %>
 <%= link_to 'Nodes', nodes_path, selected?('nodes') %>
 <%= link_to 'Assets', assets_path, selected?('assets') %>
 <%= link_to 'User', users_path, selected?('users') %>
-<%= link_to 'Navigation', menu_items_path, selected?('menu_items') %> &gt;&nbsp;
\ No newline at end of file
+<%= link_to 'Navigation', menu_items_path, selected?('menu_items') %> &gt;&nbsp;
diff --git a/app/views/admin/_recent_changes.html.erb b/app/views/admin/_recent_changes.html.erb
index 300d088..88b5e93 100644
--- a/app/views/admin/_recent_changes.html.erb
+++ b/app/views/admin/_recent_changes.html.erb
@@ -13,7 +13,7 @@
       <td><%= truncated_title_for_node node %></td>
       <td><%= node.unique_name %></td>
       <td><%= node.draft.user.login rescue "" %></td>
-      <td><%= node.updated_at.to_s(:db) %></td>
+      <td><%= node.updated_at.to_fs(:db) %></td>
       <td class="actions">
         <%= link_to 'Show', node_path(node) %>
         <%= link_to "Revisions", revision_path(:id => node.id) %>
diff --git a/app/views/admin/index.html.erb b/app/views/admin/index.html.erb
index 526aa88..2741db3 100644
--- a/app/views/admin/index.html.erb
+++ b/app/views/admin/index.html.erb
@@ -1,6 +1,15 @@
+<div id="admin_wizard">
+  <div class="admin_wizard_button"><%= link_to 'Create Update or Pressemitteilung', new_node_path, :only_path => false %></div>
+  <div class="admin_wizard_button"><a href="#" id="admin_wizard_my_work" class="button">Continue my work</a></div>
+  <div class="admin_wizard_button"><a href="#" id="admin_wizard_create_page" class="button">Add a page in the page tree</a></div>
+  <div class="admin_wizard_button"><%= link_to("Upload a new asset", new_asset_path, :only_path => false) %></div>
+</div>
+
 <p id="overview_toggle">
   <a href="#" id="recent_changes_toggle" class="button">recent changes</a>
-  <a href="#" id="current_drafts_toggle" class="button">current drafts</a>
+  <a href="#" id="my_work_toggle" class="button">my work</a>
+  <a href="#" id="current_drafts_toggle" class="button">current drafts (<%= @drafts_count %>)</a>
+  <a href="#" id="admin_sitemap_toggle" class="button">site map</a>
 </p>
 
 <div id="recent_changes_table">
@@ -30,7 +39,41 @@
         <%= node.lock_owner.login if node.lock_owner %>
       </td>
       <td>
-        <%= node.draft ? node.draft.revision : node.head.revision %>
+        <%= link_to ( node.draft ? node.draft.revision : (node.head ? node.head.revision : "EMPTY" ) ), node_revisions_path(node) %>
+      </td>
+    </tr>
+    <% end %>
+  </table>
+</div>
+
+<div id="my_work_table">
+  
+  <h1>My Work</h1>
+
+  <table class="node_table">
+    <tr class="header">
+      <th class="node_id">ID</th>
+      <th class="title">Title</th>
+      <th class="actions">Actions</th>
+      <th class="editor">Locked by</th>
+      <th class="revision">Rev.</th>
+    </tr>
+    <% @mynodes.each do |node| %>
+    <tr class="<%= cycle("even", "odd") %>">
+      <td class="node_id"><%= node.id %></td>
+      <td class="title">
+        <h4><%= link_to title_for_node(node), node_path(node) %></h4>
+        <p><%= link_to_path(node.unique_name, node.unique_name) %></p>
+      </td>
+      <td class="actions">
+        <%= link_to 'show',      node_path(node) %>
+        <%= link_to 'Revisions', node_revisions_path(node) %>
+      </td>
+      <td>
+        <%= node.lock_owner.login if node.lock_owner %>
+      </td>
+      <td>
+        <%= link_to ( node.draft ? node.draft.revision : (node.head ? node.head.revision : "EMPTY" ) ), node_revisions_path(node) %>
       </td>
     </tr>
     <% end %>
@@ -39,7 +82,7 @@
 
 <div id="current_drafts_table">
   
-  <h1>Current Drafts</h1>
+  <h1>Current Drafts (<%= @drafts_count %>)</h1>
   
   <table class="node_table">
     <tr class="header">
@@ -64,9 +107,41 @@
         <%= node.lock_owner.login if node.lock_owner %>
       </td>
       <td>
-        <%= node.draft ? node.draft.revision : node.head.revision %>
+        <%= link_to ( node.draft ? node.draft.revision : (node.head ? node.head.revision : "EMPTY" ) ), node_revisions_path(node) %>
+      </td>
+    </tr>
+    <% end %>
+  </table>
+</div>
+
+<div id="admin_sitemap_table">
+
+  <h1>Sitemap</h1>
+
+  <table class="node_table">
+    <tr class="header">
+      <th class="node_id">ID</th>
+      <th class="title">Title</th>
+      <th class="actions">Actions</th>
+      <th class="editor">Locked by</th>
+    </tr>
+    <% @sitemap.each do |node| %>
+    <% if !node.nil? %>
+      <tr class="<%= cycle("even", "odd") %>">
+      <td class="node_id" style="padding-left: <%= @sitemap_depth[node.id] * 30 %>px;"><%= node.id %></td>
+      <td class="title"  style="padding-left: <%= @sitemap_depth[node.id] * 30 %>px;">
+        <h4><%= link_to title_for_node(node), node_path(node) %></h4>
+        <p><%= link_to_path(node.unique_name, node.unique_name) %></p>
+      </td>
+      <td class="actions">
+        <%= link_to 'create subpage', new_node_path(:parent_id => node.id) %>
+        <%= link_to 'Revisions',      node_revisions_path(node) %>
+      </td>
+      <td>
+        <%= node.lock_owner.login if node.lock_owner %>
       </td>
     </tr>
     <% end %>
+    <% end %>
   </table>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/admin/search_results.html.erb b/app/views/admin/search_results.html.erb
new file mode 100644
index 0000000..671b665
--- /dev/null
+++ b/app/views/admin/search_results.html.erb
@@ -0,0 +1,7 @@
+<h1>Search Results</h1>
+
+<ul>
+<%- @results.each do |result| %>
+  <li><a href="<%= node_path(result) %>"><%= result.title %></a></li>
+<% end %>
+</ul>
diff --git a/app/views/assets/edit.html.erb b/app/views/assets/edit.html.erb
index d60db94..f198600 100644
--- a/app/views/assets/edit.html.erb
+++ b/app/views/assets/edit.html.erb
@@ -1,12 +1,24 @@
 <h1>Editing asset</h1>
 
-<% form_for(@asset) do |f| %>
-  <%= f.error_messages %>
+<%= form_for(@asset, html: { multipart: true }) do |f| %>
+  <%= form_error_messages(f) %>
+
+  <% if @asset.upload.present? %>
+    <p>
+      <strong>Current file:</strong>
+      <%= @asset.upload.url %>
+      (<%= number_to_human_size(@asset.upload.size) %>)
+    </p>
+  <% end %>
+
+  <p>
+    <label>Replace file:</label><br>
+    <%= f.file_field :upload %>
+  </p>
 
   <p>
     <%= f.submit 'Update' %>
   </p>
 <% end %>
 
-<%= link_to 'Show', @asset %> |
-<%= link_to 'Back', assets_path %>
\ No newline at end of file
+<%= link_to 'Show', @asset %> | <%= link_to 'Back', assets_path %>
diff --git a/app/views/assets/index.html.erb b/app/views/assets/index.html.erb
index fc7c029..51fc486 100644
--- a/app/views/assets/index.html.erb
+++ b/app/views/assets/index.html.erb
@@ -10,12 +10,12 @@
   </tr>
 <% @assets.each do |asset| %>
   <tr>
-    <td><%= image_tag asset.upload.url(:thumb) %></td>
+    <td><%= image_tag asset.upload.url(:thumb), style: "max-width: 100px; max-height: 100px;" %></td>
     <td><%= link_to asset.name, asset.upload.url %></td>
     <td><%= asset.upload.content_type %></td>
     <td><%= link_to 'Show', asset %></td>
     <td><%= link_to 'Edit', edit_asset_path(asset) %></td>
-    <td><%= link_to 'Destroy', asset, :confirm => 'Are you sure?', :method => :delete %></td>
+    <td><%= button_to 'Destroy', asset, method: :delete, form: { data: { confirm: 'Are you sure?' } } %></td>
   </tr>
 <% end %>
-</table>
\ No newline at end of file
+</table>
diff --git a/app/views/assets/new.html.erb b/app/views/assets/new.html.erb
index 366488f..6c1310a 100644
--- a/app/views/assets/new.html.erb
+++ b/app/views/assets/new.html.erb
@@ -1,7 +1,7 @@
 <h1>New asset</h1>
 
-<% form_for(@asset, :html => { :multipart => true }) do |f| %>
-  <%= f.error_messages %>
+<%= form_for(@asset, :html => { :multipart => true }) do |f| %>
+  <%= form_error_messages(f) %>
   
   <p>
     <%= f.label :name %><br />
@@ -14,4 +14,4 @@
   </p>
 <% end %>
 
-<%= link_to 'Back', assets_path %>
\ No newline at end of file
+<%= link_to 'Back', assets_path %>
diff --git a/app/views/assets/show.html.erb b/app/views/assets/show.html.erb
index a64987c..694be5a 100644
--- a/app/views/assets/show.html.erb
+++ b/app/views/assets/show.html.erb
@@ -6,7 +6,7 @@
 <table>
   <tr>
     <td>Thumbnail</td>
-    <td><%= image_tag @asset.upload.url(:medium) %></td>
+    <td><%= image_tag @asset.upload.url(:medium), style: "max-width: 300px; max-height: 300px;" %></td>
   </tr>
   <tr>
     <td>Public Path</td>
@@ -20,4 +20,4 @@
     <td>Size</td>
     <td><%= "#{@asset.upload.size/1024} KB" %></td>
   </tr>
-</table>
\ No newline at end of file
+</table>
diff --git a/app/views/content/_featured_articles.html.erb b/app/views/content/_featured_articles.html.erb
index 75e2e1d..6717c51 100644
--- a/app/views/content/_featured_articles.html.erb
+++ b/app/views/content/_featured_articles.html.erb
@@ -1,31 +1,56 @@
 <div id="featured_articles">
   <h2>Featured</h2>
+
+  <!-- %= link_to(
+        image_tag( '34c3-tuwat.1e4e25c.png' ),
+        "https://events.ccc.de/congress/2017/wiki/Main_Page",
+        :id => "34C3_icon",
+        :size => "155x90",
+        :title => "Chaos Communication Congress 2017"
+  )% -->
+
   <%= link_to(
-        image_tag( 'chaosradio.png' ),
-        "http://chaosradio.ccc.de/",
+        '<img src="/images/chaosradio.png" alt="Chaosradio">'.html_safe,
+        "https://chaosradio.ccc.de/",
         :id => "chaosradio_icon",
         :title => "Chaosradio"
   )%>
 
   <%= link_to(
-        image_tag( 'ds.png' ),
-        "http://ds.ccc.de/",
+        '<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(
+        '<img src="/images/ds.png" alt="Datenschleuder">'.html_safe,
+        "https://ds.ccc.de/",
         :id => "ds_icon",
         :title => "Datenschleuder"
   )%>
 
   <%= link_to(
-        image_tag( 'events.png' ),
-        "http://events.ccc.de/",
+        '<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( 'twitter.png' ),
-        "https://twitter.com/chaosupdates",
-        :id => "twitter_icon",
-        :title => "Twitter"
+        '<img src="/images/Fediverse.svg" width="64" height="64" alt="Fediverse">'.html_safe,
+        "https://social.bau-ha.us/@ccc",
+        :rel => 'me',
+        :id => "fediverse_icon",
+        :title => "Fediverse"
   )%>
+
+  <%= link_to(
+        '<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"
+  )%>
+
 </div>
 
diff --git a/app/views/content/_main_navigation.html.erb b/app/views/content/_main_navigation.html.erb
index 67d4ecc..2fe8b77 100644
--- a/app/views/content/_main_navigation.html.erb
+++ b/app/views/content/_main_navigation.html.erb
@@ -4,4 +4,4 @@
     <li><%= link_to_path item.title, item.path %></li>
     <% end %>
   </ul>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/content/_search.html.erb b/app/views/content/_search.html.erb
index 9f61042..aa91424 100644
--- a/app/views/content/_search.html.erb
+++ b/app/views/content/_search.html.erb
@@ -1,8 +1,3 @@
-<% form_tag search_path, :method => 'get' do %>
-<table>
-  <tr>
-    <td><%= text_field_tag :search_term, params[:search_term] %></td>
-    <td style="padding-top: 2px"><%= image_submit_tag("search_button.png") %></td>
-  </tr>
-</table>
-<% end %>
\ No newline at end of file
+<%= form_tag search_path, :method => 'get' do %>
+  <div><%= text_field_tag :search_term, params[:search_term], :placeholder => 'suchen', :type => 'search' %></div>
+<% end %>
diff --git a/app/views/content/_tags.html.erb b/app/views/content/_tags.html.erb
index d33bc10..f0e7210 100644
--- a/app/views/content/_tags.html.erb
+++ b/app/views/content/_tags.html.erb
@@ -1,8 +1,10 @@
+<% unless @page.nil? || @page.tags.empty? %>
 <div id="tags">
   <h2>Tags</h2>
   <ul class="teasertext">
     <% @page.tags.each do |tag| %>
-      <li><%= link_to tag.name, tag_path(:id => tag.name) %></li>
+      <li><%= link_to tag.name, tag_path(tag.name) %></li>
     <% end %>
   </ul>
-</div>
\ No newline at end of file
+</div>
+<% end %>
diff --git a/app/views/custom/page_templates/public/no_date_and_author.html.erb b/app/views/custom/page_templates/public/no_date_and_author.html.erb
index b019805..fa39e54 100644
--- a/app/views/custom/page_templates/public/no_date_and_author.html.erb
+++ b/app/views/custom/page_templates/public/no_date_and_author.html.erb
@@ -1,8 +1,8 @@
-<div class="article">
+<div class="article" lang="<%= @page.effective_lang %>">
   <h2 class="headline"><%= @page.title %></h2>
   <p><%= sanitize( @page.abstract ) %></p>
   <div id="headline_image"><%= headline_image %></div>
   <%= aggregate?(@page.body) %>
 </div>
 
-<%= will_paginate(@content_collection) if @content_collection %>
\ No newline at end of file
+<%= will_paginate(@content_collection) if @content_collection %>
diff --git a/app/views/custom/page_templates/public/no_date_and_author_with_map.html.erb b/app/views/custom/page_templates/public/no_date_and_author_with_map.html.erb
new file mode 100644
index 0000000..6e86edf
--- /dev/null
+++ b/app/views/custom/page_templates/public/no_date_and_author_with_map.html.erb
@@ -0,0 +1,8 @@
+<div class="article">
+  <h2 class="headline"><%= @page.title %></h2>
+  <p><%= sanitize( @page.abstract ) %></p>
+  <object data="/system/uploads/327/original/map.svg" type="image/svg+xml"/>
+  <%= aggregate?(@page.body) %>
+</div>
+
+<%= will_paginate(@content_collection) if @content_collection %>
diff --git a/app/views/custom/page_templates/public/no_title_abstract_date_and_author.html.erb b/app/views/custom/page_templates/public/no_title_abstract_date_and_author.html.erb
index 83cbff6..64e2a7c 100644
--- a/app/views/custom/page_templates/public/no_title_abstract_date_and_author.html.erb
+++ b/app/views/custom/page_templates/public/no_title_abstract_date_and_author.html.erb
@@ -1,6 +1,6 @@
-<div class="article">
+<div class="article" lang="<%= @page.effective_lang %>">
   <div id="headline_image"><%= headline_image %></div>
   <%= aggregate?(@page.body) %>
 </div>
 
-<%= will_paginate(@content_collection) if @content_collection %>
\ No newline at end of file
+<%= will_paginate(@content_collection) if @content_collection %>
diff --git a/app/views/custom/page_templates/public/standard_template.html.erb b/app/views/custom/page_templates/public/standard_template.html.erb
index 8000af5..bbc8cd0 100644
--- a/app/views/custom/page_templates/public/standard_template.html.erb
+++ b/app/views/custom/page_templates/public/standard_template.html.erb
@@ -1,8 +1,8 @@
-<div class="article">
+<div class="article" lang="<%= @page.effective_lang %>">
   <h2 class="headline"><%= @page.title %></h2>
   <div class="abstract"><p><%= sanitize( @page.abstract )%></p></div>
   <div id="headline_image"><%= headline_image %></div>
   <div class="body"><%= aggregate?(@page.body) %></div>
 </div>
 
-<%= will_paginate(@content_collection) if @content_collection %>
\ No newline at end of file
+<%= will_paginate(@content_collection) if @content_collection %>
diff --git a/app/views/custom/page_templates/public/title_only.html.erb b/app/views/custom/page_templates/public/title_only.html.erb
index 09c7455..42fe9a6 100644
--- a/app/views/custom/page_templates/public/title_only.html.erb
+++ b/app/views/custom/page_templates/public/title_only.html.erb
@@ -1,7 +1,7 @@
-<div class="article">
+<div class="article" lang="<%= @page.effective_lang %>">
   <h2 class="headline"><%= @page.title %></h2>
   <div id="headline_image"><%= headline_image %></div>
   <%= aggregate?(@page.body) %>
 </div>
 
-<%= will_paginate(@content_collection) if @content_collection %>
\ No newline at end of file
+<%= will_paginate(@content_collection) if @content_collection %>
diff --git a/app/views/custom/page_templates/public/update.html.erb b/app/views/custom/page_templates/public/update.html.erb
index 5ea277a..d5995ac 100644
--- a/app/views/custom/page_templates/public/update.html.erb
+++ b/app/views/custom/page_templates/public/update.html.erb
@@ -1,4 +1,4 @@
-<div class="article">
+<div class="article" lang="<%= @page.effective_lang %>">
   <h2 class="headline"><%= @page.title %></h2>
   <div class="author_and_date"><%= date_for_page @page %>, <%= @page.user.try(:login) %></div>
   <div class="abstract"><p><%= sanitize( @page.abstract )%></p></div>
@@ -6,4 +6,4 @@
   <div class="body"><%= aggregate?(@page.body) %></div>
 </div>
 
-<%= will_paginate(@content_collection) if @content_collection %>
\ No newline at end of file
+<%= will_paginate(@content_collection) if @content_collection %>
diff --git a/app/views/custom/partials/_article.html.erb b/app/views/custom/partials/_article.html.erb
index 433c31c..b738ac7 100644
--- a/app/views/custom/partials/_article.html.erb
+++ b/app/views/custom/partials/_article.html.erb
@@ -1,7 +1,7 @@
-<div class="article_partial">
+<div class="article_partial" lang="<%= page.effective_lang %>">
   <h2 class="headline"><%= link_to_path page.title, page.node.unique_name %></h2>
   <div class="author_and_date">
     <%= date_for_page page %>, <%= author_for_page page %>
   </div>
   <p class="excerpt"><%= page.abstract %> <%= link_to_path t(:more), page.node.unique_name %></p>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/custom/partials/_no_date_and_author.html.erb b/app/views/custom/partials/_no_date_and_author.html.erb
index 61d6aac..fed02ac 100644
--- a/app/views/custom/partials/_no_date_and_author.html.erb
+++ b/app/views/custom/partials/_no_date_and_author.html.erb
@@ -1,4 +1,4 @@
-<div class="article_partial">
+<div class="article_partial" lang="<%= page.effective_lang %>">
   <h2 class="headline"><%= link_to page.title, content_path(page.node.unique_path) %></h2>
   <p class="excerpt"><%= page.abstract %></p>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/events/edit.html.erb b/app/views/events/edit.html.erb
index 17b6980..824cd66 100644
--- a/app/views/events/edit.html.erb
+++ b/app/views/events/edit.html.erb
@@ -6,8 +6,8 @@
 
 <h1>Editing event</h1>
 
-<% form_for(@event) do |f| %>
-  <%= f.error_messages %>
+<%= form_for(@event) do |f| %>
+  <%= form_error_messages(f) %>
 
   <p>
     <%= f.label :start_time %><br />
@@ -47,4 +47,4 @@
   <p>
     <%= f.submit 'Update' %>
   </p>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb
index c1b5b48..19b21ce 100644
--- a/app/views/events/index.html.erb
+++ b/app/views/events/index.html.erb
@@ -26,11 +26,11 @@
     <td><%=h event.node_id %></td>
     <td><%= link_to 'Show', event %></td>
     <td><%= link_to 'Edit', edit_event_path(event) %></td>
-    <td><%= link_to 'Destroy', event, :confirm => 'Are you sure?', :method => :delete %></td>
+    <td><%= button_to 'Destroy', event, method: :delete, form: { data: { confirm: 'Are you sure?' } } %></td>
   </tr>
 <% end %>
 </table>
 
 <br />
 
-<%= link_to 'New event', new_event_path %>
\ No newline at end of file
+<%= link_to 'New event', new_event_path %>
diff --git a/app/views/events/new.html.erb b/app/views/events/new.html.erb
index 8c9812e..cd892c5 100644
--- a/app/views/events/new.html.erb
+++ b/app/views/events/new.html.erb
@@ -1,7 +1,7 @@
 <h1>New event</h1>
 
-<% form_for(@event) do |f| %>
-  <%= f.error_messages %>
+<%= form_for(@event) do |f| %>
+  <%= form_error_messages(f) %>
 
   <p>
     <%= f.label :start_time %><br />
@@ -43,4 +43,4 @@
   </p>
 <% end %>
 
-<%= link_to 'Back', events_path %>
\ No newline at end of file
+<%= link_to 'Back', events_path %>
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
index 97b81df..890aeaa 100644
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -4,16 +4,15 @@
 <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"/>
+    <%= csrf_meta_tags %>
   
     <title><%= "#{params[:controller]} | #{params[:action]}" %></title>
-    <%= javascript_include_tag 'jquery-1.3.2.min' %>
-    <%= javascript_include_tag 'jquery-ui-1.7.2.custom.min' %>
-    <%= javascript_include_tag 'jquery.hotkeys' %>
-    <%= 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' %>
+    <%= 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>
@@ -34,7 +33,7 @@
         <% end %>
       </div>
       <div id="content">
-        <%= yield :layout %>
+        <%= yield %>
       </div>
       
       <div id="results"></div>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 3c95d75..48e0a5b 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -1,47 +1,74 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE HTML>
 
 <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"/>
+    <meta name="viewport" content="width=device-width,initial-scale=1"/>
+    <meta name="description" content="Der Chaos Computer Club ist eine galaktische Gemeinschaft von Lebewesen für Informationsfreiheit und Technikfolgenabschätzung."/>
+
+    <meta property="og:image" content="https://www.ccc.de/images/chaosknoten.svg" />
+    <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") %>
+
+    <script>
+      (function() { document.addEventListener("DOMContentLoaded", function() {
+        if (localStorage.getItem('override-prefers-color-scheme', false))
+          document.getElementById("light-mode").checked = true;
+      }); })();
+    </script>
 
-    <%= auto_discovery_link_tag(:atom, {:locale => :de, :controller => "rss", :action => "updates", :format => :xml}) %>
-    <%= auto_discovery_link_tag(:rss,  {:locale => :de, :controller => "rss", :action => "updates", :format => :rdf}) %>
   </head>
 
-  <body>
+  <body lang="<%= @page ? @page.effective_lang : 'de' %>">
     <div id="wrapper">
       <div id="header">
-        <%= link_to_path(image_tag("header.png"), "/home") %>
+        <img src="/images/header.png" alt="">
       </div>
-      <div id="search">
-        <%= render :partial => "content/search" %>
+      <div id="toolbox">
+        <div id="search">
+          <%= render :partial => "content/search" %>
+        </div>
+        <div id="light-mode-div">
+          <input id="light-mode" type="checkbox" aria-label="Switch between dark and light mode" /><label for="light-mode"><span class="hide-me">lights</span></label>
+        </div>
+        <div id="burger-div">
+          <input type="checkbox" id="menu-toggle" class="menu-checkbox">
+          <label for="menu-toggle" class="burger-menu"><span></span><span></span><span></span></label>
+        </div>
       </div>
       <div id="left_column">
         <%= main_menu %>
 
-        <%= language_selector %>
         <% if current_user && @page.node %>
-          <%= link_to "Edit", node_path(:id => @page.node) %>
+          <div class="main_navigation">
+            <h2>Admin</h2>
+            <ul>
+              <li><%= link_to raw('<span class="inactive admin_edit_link">⚙️ Overview</span>'), admin_path %></li>
+              <li><%= link_to raw('<span class="inactive admin_edit_link">✎ Edit</span>'), node_path(@page.node) %></li>
+            </ul>
+          </div>
         <% end %>
 
-        <%= calendar %>
+        <%= calendar %>
       </div>
       <div id="center_column">
         <%= yield :layout %>
-
         <div id="footer">
           <br />
-          <br />
           <p style="text-align: center">
-            <%= link_to t(:sponsors), content_path("sponsors") %>
+            <%= link_to "Impressum", content_path("imprint") %>
+            <%= link_to "Datenschutz", content_path("datenschutz") %>
+            <%= language_selector %>
+            <!-- %= link_to t(:sponsors), content_path("sponsors") % -->
           </p>
         </div>
       </div>
@@ -50,5 +77,6 @@
         <%= featured_articles %>
       </div>
     </div>
+
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/app/views/layouts/pages.html.erb b/app/views/layouts/pages.html.erb
index 327e0eb..70ceece 100644
--- a/app/views/layouts/pages.html.erb
+++ b/app/views/layouts/pages.html.erb
@@ -4,6 +4,8 @@
 <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" />
+  <meta name="viewport" content="width=device-width,initial-scale=1" />
+  <meta property="og:image" content="https://www.ccc.de/images/chaosknoten.svg" />
   <title>Pages: <%= controller.action_name %></title>
   <%= stylesheet_link_tag 'scaffold' %>
 </head>
diff --git a/app/views/menu_items/edit.html.erb b/app/views/menu_items/edit.html.erb
index 9ea0fcc..9891708 100644
--- a/app/views/menu_items/edit.html.erb
+++ b/app/views/menu_items/edit.html.erb
@@ -1,6 +1,6 @@
 <h1>Edit Menu Item</h1>
 
-<% form_for @menu_item do |f| %>
+<%= form_for @menu_item do |f| %>
   <table>
     
     <tr>
@@ -29,4 +29,4 @@
       <td class="right"><%= f.submit 'Update' %></td>
     </tr>
   </table>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/menu_items/index.html.erb b/app/views/menu_items/index.html.erb
index 123a07a..c52c150 100644
--- a/app/views/menu_items/index.html.erb
+++ b/app/views/menu_items/index.html.erb
@@ -14,13 +14,10 @@
     <td class="menu_item_title"><%= menu_item.title %></td>
     <td><%= link_to "Edit", edit_menu_item_path(menu_item) %></td>
     <td>
-      <%= link_to( 
-            "Delete", 
-            menu_item_path(menu_item),
-            :method => :delete,
-            :confirm => "Are you sure?"
-          ) %>
+      <%= button_to "Delete", menu_item_path(menu_item),
+            method: :delete,
+            form: { data: { confirm: "Are you sure?" } } %>
     </td>
   </tr>
   <% end %>
-</table>
\ No newline at end of file
+</table>
diff --git a/app/views/menu_items/new.html.erb b/app/views/menu_items/new.html.erb
index 64b9abb..68081d0 100644
--- a/app/views/menu_items/new.html.erb
+++ b/app/views/menu_items/new.html.erb
@@ -1,6 +1,6 @@
 <h1>Add Menu Item</h1>
 
-<% form_for @menu_item do |f| %>
+<%= form_for @menu_item do |f| %>
   <table>
     
     <tr>
@@ -29,4 +29,4 @@
       <td class="right"><%= f.submit 'Create' %></td>
     </tr>
   </table>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/nodes/edit.html.erb b/app/views/nodes/edit.html.erb
index 8e27d0f..b45c700 100644
--- a/app/views/nodes/edit.html.erb
+++ b/app/views/nodes/edit.html.erb
@@ -2,109 +2,89 @@
   <%= link_to 'metadata', '#', :id => 'button', :class => "unselected" %>
   <%= link_to 'Show', @node %>
   <%= link_to 'Preview', preview_page_path(@draft) %>
-  <%= link_to 'Publish', publish_node_path, :method => :put, :confirm => "Publish this draft?" %>
+  <%= button_to 'Publish', publish_node_path(@node), method: :put, form: { data: { confirm: "Publish this draft?" } } %>
   <%= link_to 'Revisions', node_revisions_path(@node) %>  
 <% end %>
 
 <div id="page_editor">
-<% form_for(@node) do |f| %>
-  <%= f.error_messages %>
+<%= form_for(@node) do |f| %>
+  <% if @node.errors.any? %>
+    <div class="error_messages">
+      <ul><% @node.errors.full_messages.each do |msg| %><li><%= msg %></li><% end %></ul>
+    </div>
+  <% end %>
   
   <div id="metadata">
-    <table>
-      <tr>
-        <td class="description">Event</td>
-        <td><%= event_information %></td>
-      </tr>
-      <tr>
-        <td class="description">Slug</td>
-        <td>
-          <%= 
-            f.text_field(
-              :staged_slug, :value => @node.staged_slug || @node.slug
-            ) 
-          %>
-        </td>
-      </tr>
-      <tr>
-        <td class="description">parent</td>
-        <td>
-          <%= text_field_tag :move_to_search_term, @node.parent.title rescue "" %>
-          <div id="search_results">
+    <div class="node_description">Event</div>
+    <div class="node_content"><%= event_information %></div>
+
+    <div class="node_description">Slug</div>
+    <div class="node_content">
+      <%= f.text_field(
+            :staged_slug, :value => @node.staged_slug || @node.slug
+          ) 
+        %>
+    </div>
+
+    <div class="node_description">parent</div>
+    <div class="node_content">
+      <%= text_field_tag :move_to_search_term, @node.parent.title rescue "" %>
+        <div id="search_results">
 
-          </div>
-          <%= f.hidden_field(
-                :staged_parent_id, 
-                :value => @node.staged_parent_id || @node.parent_id
-              )
-           %>
-        </td>
-      </tr>
+        </div>
+        <%= f.hidden_field(
+              :staged_parent_id, 
+              :value => @node.staged_parent_id || @node.parent_id
+            )
+         %>
+    </div>
       
-      <% fields_for @draft do |d| %>
-      <tr>
-        <td class="description">Tags - comma seperated</td>
-        <td><%= text_field_tag :tag_list, @draft.tag_list %></td>
-      </tr>
-      <tr>
-        <td class="description">Publish at</td>
-        <td><%= d.datetime_select :published_at, :value => @draft.published_at %></td>
-      </tr>
-      <tr>
-        <td class="description">Template</td>
-        <td><%= d.select :template_name, custom_page_templates, {:prompt => 'Select Template'} %></td>
-      </tr>
-      <tr>
-        <td class="description">Author</td>
-        <td><%= d.select :user_id, user_list %></td>
-      </tr>
-      <tr>
-        <td class="description">Images</td>
-        <td> 
-          <ul id="image_box" rel="<%= @draft.id %>">
-            <% @draft.assets.images.each do |image| %>
-              <li rel="images_<%= image.id %>">
-                <%= image_tag(image.upload.url(:thumb)) %>
-              </li>
-            <% end %>
-          </ul>
-          <div class="clear_left right">
-            <a id="image_browser_toggle" class="unselected" href="#">image browser</a>
-          </div>
-          <div id="image_browser">
-            <ul>
-              <% Asset.images.each do |image| %>
-              <li rel="images_<%= image.id %>"><%= image_tag(image.upload.url(:thumb)) %></li>
-              <% end %>
-            </ul>
-          </div>
-        </td>
-      </tr>
-    </table>
+    <%= fields_for @draft do |d| %>
+    <div class="node_description">Tags - comma seperated</div>
+    <div class="node_content"><%= text_field_tag :tag_list, @draft.tag_list %></div>
+
+    <div class="node_description">Publish at</div>
+    <div class="node_content"><%= d.datetime_select :published_at, :value => @draft.published_at %></div>
+
+    <div class="node_description">Template</div>
+    <div class="node_content"><%= d.select :template_name, custom_page_templates, {:prompt => 'Select Template'} %></div>
+
+    <div class="node_description">Author</div>
+    <div class="node_content"><%= d.select :user_id, user_list %></div>
+
+    <div class="node_description">Images</div>
+    <div class="node_content"> 
+      <ul id="image_box" rel="<%= @draft.id %>">
+        <% @draft.assets.images.each do |image| %>
+          <li rel="images_<%= image.id %>">
+            <%= image_tag(image.upload.url(:thumb)) %>
+          </li>
+        <% end %>
+      </ul>
+      <div class="clear_left right">
+        <a id="image_browser_toggle" class="unselected" href="#">image browser</a>
+      </div>
+      <div id="image_browser">
+        <ul>
+          <% Asset.images.each do |image| %>
+          <li rel="images_<%= image.id %>"><%= image_tag(image.upload.url(:thumb)) %></li>
+          <% end %>
+        </ul>
+      </div>
+    </div>
   </div>
   
-  <table id="content">
-    <tr>
-      <th class="description"></th>
-      <th class="content"></th>
-    </tr>
-    <tr>
-      <td class="description">Title</td>
-      <td><%= d.text_field :title %></td>
-    </tr>
-    <tr>
-      <td class="description">Abstract</td>
-      <td><%= d.text_area :abstract %></td>
-    </tr>
-    <tr>
-      <td class="description">Body</td>
-      <td><%= d.text_area :body, :class => 'with_editor' %></td>
-    </tr>
-    <tr>
-      <td></td>
-      <td class="right"><%= d.submit 'save' %></td>
-    </tr>
-  </table>
+  <div id="content">
+    <div class="node_description">Title</div>
+    <div class="node_content"><%= d.text_field :title %></div>
+
+    <div class="node_description">Abstract</div>
+    <div class="node_content"><%= d.text_area :abstract %></div>
+
+    <div class="node_description">Body</div>
+    <div class="node_content"><%= d.text_area :body, :class => 'with_editor' %></div>
+
+    <div><%= d.submit 'save' %></div>
   <% end %>
 <% end %>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/nodes/index.html.erb b/app/views/nodes/index.html.erb
index bf01645..e5a55d4 100644
--- a/app/views/nodes/index.html.erb
+++ b/app/views/nodes/index.html.erb
@@ -27,7 +27,7 @@
         <%= node.lock_owner.login if node.lock_owner %>
       </td>
       <td>
-        <%= node.draft ? node.draft.revision : node.head.revision %>
+        <%= node.draft ? node.draft.revision : (node.head ? node.head.revision : "EMPTY") %>
       </td>
     </tr>
     <% end %>
diff --git a/app/views/nodes/new.html.erb b/app/views/nodes/new.html.erb
index 850207b..028d727 100644
--- a/app/views/nodes/new.html.erb
+++ b/app/views/nodes/new.html.erb
@@ -1,11 +1,14 @@
 <h1>Create new node</h1>
 
-<%= error_messages_for( :node ).gsub("Slug", "Title") %>
-
+<% if @node.errors.any? %>
+  <div class="error_messages">
+    <ul><% @node.errors.full_messages.each do |msg| %><li><%= msg.to_s.gsub("Slug", "Title") %></li><% end %></ul>
+  </div>
+<% end %>
 
 <p>What kind of node do you want to create?</p>
 
-<% form_tag nodes_path do %>
+<%= form_tag nodes_path do %>
 <table id="new_node">
   <tr>
     <td class="description">Type</td>
@@ -20,7 +23,11 @@
       </p>
       <p>
         <%= radio_button_tag :kind, "update" %>
-        Update / Press release ( is automatically created in /updates )
+        Update ( is automatically created in /updates/<%= Time.now.year.to_s %>/ and gets tag "update" )
+      </p>
+      <p>
+        <%= radio_button_tag :kind, "press_release" %>
+        Pressemitteilung ( is automatically created in /updates/<%= Time.now.year.to_s %>/ and gets tags "update, pressemitteilung" )
       </p>
     </td>
   </tr>
@@ -31,8 +38,8 @@
   <tr id="parent_search_field">
     <td class="description">Parent</td>
     <td>
-      <%= text_field_tag :parent_search_term %>
-      <%= hidden_field_tag :parent_id %>
+      <%= text_field_tag :parent_search_term, @parent_name %>
+      <%= hidden_field_tag :parent_id, @parent_id %>
       <div id="search_results">
 
       </div>
@@ -43,4 +50,4 @@
     <td class="right"><%= submit_tag "Create" %></td>
   </tr>
 </table>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/nodes/update.js.erb b/app/views/nodes/update.js.erb
index be26fab..35dfeee 100644
--- a/app/views/nodes/update.js.erb
+++ b/app/views/nodes/update.js.erb
@@ -1,3 +1,5 @@
-$("#flash").html(
-  "<span><%= escape_javascript(flash.delete(:notice)) %></span>"
-);
\ No newline at end of file
+<% if flash[:notice] %>
+  $("#flash").html(
+    "<span><%= escape_javascript(flash.delete(:notice)) %></span>"
+  );
+<% end %>
diff --git a/app/views/occurrences/edit.html.erb b/app/views/occurrences/edit.html.erb
index 6a81188..aa4f6e0 100644
--- a/app/views/occurrences/edit.html.erb
+++ b/app/views/occurrences/edit.html.erb
@@ -1,7 +1,7 @@
 <h1>Editing occurrence</h1>
 
-<% form_for(@occurrence) do |f| %>
-  <%= f.error_messages %>
+<%= form_for(@occurrence) do |f| %>
+  <%= form_error_messages(f) %>
 
   <p>
     <%= f.label :summary %><br />
@@ -29,4 +29,4 @@
 <% end %>
 
 <%= link_to 'Show', @occurrence %> |
-<%= link_to 'Back', occurrences_path %>
\ No newline at end of file
+<%= link_to 'Back', occurrences_path %>
diff --git a/app/views/occurrences/index.html.erb b/app/views/occurrences/index.html.erb
index 06dbf07..0e99857 100644
--- a/app/views/occurrences/index.html.erb
+++ b/app/views/occurrences/index.html.erb
@@ -18,11 +18,11 @@
     <td><%=h occurrence.event_id %></td>
     <td><%= link_to 'Show', occurrence %></td>
     <td><%= link_to 'Edit', edit_occurrence_path(occurrence) %></td>
-    <td><%= link_to 'Destroy', occurrence, :confirm => 'Are you sure?', :method => :delete %></td>
+    <td><%= button_to 'Destroy', occurrence, method: :delete, form: { data: { confirm: 'Are you sure?' } } %></td>
   </tr>
 <% end %>
 </table>
 
 <br />
 
-<%= link_to 'New occurrence', new_occurrence_path %>
\ No newline at end of file
+<%= link_to 'New occurrence', new_occurrence_path %>
diff --git a/app/views/occurrences/new.html.erb b/app/views/occurrences/new.html.erb
index 0a77af1..c05ce40 100644
--- a/app/views/occurrences/new.html.erb
+++ b/app/views/occurrences/new.html.erb
@@ -1,7 +1,7 @@
 <h1>New occurrence</h1>
 
-<% form_for(@occurrence) do |f| %>
-  <%= f.error_messages %>
+<%= form_for(@occurrence) do |f| %>
+  <%= form_error_messages(f) %>
 
   <p>
     <%= f.label :summary %><br />
@@ -28,4 +28,4 @@
   </p>
 <% end %>
 
-<%= link_to 'Back', occurrences_path %>
\ No newline at end of file
+<%= link_to 'Back', occurrences_path %>
diff --git a/app/views/pages/edit.html.erb b/app/views/pages/edit.html.erb
index 749d7e3..8b1242c 100644
--- a/app/views/pages/edit.html.erb
+++ b/app/views/pages/edit.html.erb
@@ -1,7 +1,7 @@
 <h1>Editing page</h1>
 
-<% form_for(@page) do |f| %>
-  <%= f.error_messages %>
+<%= form_for(@page) do |f| %>
+  <%= form_error_messages(f) %>
 
   <p>
     <%= f.label :title %><br />
diff --git a/app/views/pages/index.html.erb b/app/views/pages/index.html.erb
index 16539da..91e5359 100644
--- a/app/views/pages/index.html.erb
+++ b/app/views/pages/index.html.erb
@@ -10,9 +10,9 @@
   <tr>
     <td><%=h page.node_id %></td>
     <td><%=h page.title %></td>
-    <td><%= link_to 'Show', link_to_path(page.node.unique_path) %></td>
+    <td><%= link_to 'Show', content_path(:page_path => page.node.unique_path) %></td>
     <td><%= link_to 'Edit', edit_page_path(page) %></td>
-    <td><%= link_to 'Destroy', page, :confirm => 'Are you sure?', :method => :delete %></td>
+    <td><%= button_to 'Destroy', page, method: :delete, form: { data: { confirm: 'Are you sure?' } } %></td>
   </tr>
 <% end %>
 </table>
diff --git a/app/views/pages/new.html.erb b/app/views/pages/new.html.erb
index b27dc62..2758faf 100644
--- a/app/views/pages/new.html.erb
+++ b/app/views/pages/new.html.erb
@@ -1,7 +1,7 @@
 <h1>New page</h1>
 
-<% form_for(@page) do |f| %>
-  <%= f.error_messages %>
+<%= form_for(@page) do |f| %>
+  <%= form_error_messages(f) %>
 
   <p>
     <%= f.label :node_id %><br />
diff --git a/app/views/revisions/diff.html.erb b/app/views/revisions/diff.html.erb
index f7ad79c..b8d061d 100644
--- a/app/views/revisions/diff.html.erb
+++ b/app/views/revisions/diff.html.erb
@@ -5,7 +5,7 @@
 
 <h1>Revisions#diff</h1>
 
-<% form_tag diff_node_revisions_path do %>
+<%= form_tag diff_node_revisions_path do %>
   <%= select_tag :start_revision, options_for_select(@node.pages.map{|x| x.revision}, params[:start_revision].to_i) %>
   <%= select_tag :end_revision, options_for_select(@node.pages.map{|x| x.revision}, params[:end_revision].to_i) %>
   <%= submit_tag 'Diff' %>
@@ -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;
@@ -62,4 +62,4 @@
   
   <h3>Body</h3>
   <p id="diffview_body"></p>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/revisions/index.html.erb b/app/views/revisions/index.html.erb
index dc9ad51..b875a4f 100644
--- a/app/views/revisions/index.html.erb
+++ b/app/views/revisions/index.html.erb
@@ -4,7 +4,6 @@
 
 <h2>Revisions for Node: <%= @node.unique_name %></h2>
 
-<% form_tag diff_node_revisions_path(@node) do %>
 <table id="revisions">
   <tr class="header">
     <th>First</th>
@@ -14,8 +13,9 @@
     <th>Editor</th>
     <th>Date</th>
     <th></th>
+    <th></th>
   </tr>
-<% @node.pages.reverse.each do |page| %>
+<% (@pages || @node.pages.all).reverse.each do |page| %>
   <tr>
     <td><%= radio_button_tag :start_revision, page.revision %></td>
     <td><%= radio_button_tag :end_revision, page.revision %></td>
@@ -23,22 +23,36 @@
     <td class="title"><%= page.title %></td>
     <td class="user"><%= page.editor.try(:login) %></td>
     <td class="date"><%= page.updated_at %></td>
+    <td><%= link_to 'show', node_revision_path(@node, page) %></td>
     <td>
-      <%= link_to 'show', node_revision_path(@node, page) %>
-    </td>
-    <td>
-      <%= link_to(
-            'restore', 
-            restore_node_revision_path(@node, page), 
-            :method => :put, 
-            :confirm => "Restore this revision?"
-          ) %>
+      <%= button_to 'restore', restore_node_revision_path(@node, page),
+            method: :put,
+            form: { data: { confirm: "Restore this revision?" } } %>
     </td>
   </tr>
 <% end %>
   <tr class="no_hover">
-    <td colspan="8" class="right"><%= submit_tag 'Diff revisions' %></td>
+    <td colspan="8" class="right">
+      <%= button_to 'Diff revisions', diff_node_revisions_path(@node),
+            method: :post,
+            form: { id: 'diff_form' } %>
+    </td>
   </tr>
 </table>
 
-<% end %>
\ No newline at end of file
+<script>
+  document.getElementById('diff_form').addEventListener('submit', function(e) {
+    var start = document.querySelector('input[name="start_revision"]:checked');
+    var end = document.querySelector('input[name="end_revision"]:checked');
+    if (start) {
+      var s = document.createElement('input');
+      s.type = 'hidden'; s.name = 'start_revision'; s.value = start.value;
+      this.appendChild(s);
+    }
+    if (end) {
+      var en = document.createElement('input');
+      en.type = 'hidden'; en.name = 'end_revision'; en.value = end.value;
+      this.appendChild(en);
+    }
+  });
+</script>
diff --git a/app/views/rss/recent_changes.xml.builder b/app/views/rss/recent_changes.xml.builder
index c3b3ec9..cce3b5d 100644
--- a/app/views/rss/recent_changes.xml.builder
+++ b/app/views/rss/recent_changes.xml.builder
@@ -2,19 +2,19 @@ xml.instruct!
 
 xml.feed(:xmlns => "http://www.w3.org/2005/Atom", "xml:base" => @host) do
   xml.title("CCC.de Recent Change")
-  xml.link(:href => "http://www.ccc.de/")
+  xml.link(:href => "https://www.ccc.de/")
   xml.link(:rel => "self", :href => "/rss/updates.xml")
   xml.updated(@items.first.updated_at.xmlschema)
   xml.author do
     xml.name("Chaos Computer Club e.V.")
   end
-  xml.id("http://www.ccc.de/")
+  xml.id("https://www.ccc.de/")
   
   @items.each do |item|
     xml.entry do
       xml.title(item.title)
       xml.link(
-        :href => "http://www.ccc.de/#{item.node.unique_path}",
+        :href => "https://www.ccc.de/#{item.node.unique_path}",
         :rel => "alternate"
       )
       xml.id(content_url_helper(item.node.unique_path))
@@ -26,4 +26,4 @@ xml.feed(:xmlns => "http://www.w3.org/2005/Atom", "xml:base" => @host) do
     
   end
   
-end
\ No newline at end of file
+end
diff --git a/app/views/rss/updates.rdf.builder b/app/views/rss/updates.rdf.builder
index 00b6242..b02d34f 100644
--- a/app/views/rss/updates.rdf.builder
+++ b/app/views/rss/updates.rdf.builder
@@ -2,26 +2,26 @@ xml.instruct!
 xml.tag!("rdf:RDF", "xmlns:rdf" => "http://www.w3.org/1999/02/22-rdf-syntax-ns#", "xmlns:dc"  => "http://purl.org/dc/elements/1.1/", "xmlns" => "http://purl.org/rss/1.0/") do
   xml.tag!( "rdf:Description",  "rdf:about" => "http://www.w3.org/TR/rdf-syntax-grammar", "dc:title"=>"RDF/XML Syntax Specification (Revised)")
 
-  xml.channel do
+  xml.channel( "rdf:about" => "https://www.ccc.de/de/rss/updates.xml" ) do
     xml.title("Chaos Computer Club: Updates")
-    xml.link("http://www.ccc.de")
+    xml.link("https://www.ccc.de")
     xml.description("Kabelsalat ist gesund.")
     xml.tag!("dc:date", @items.first.published_at.xmlschema)
   end
-  
-  xml.image( "rdf:about" => "http://www.ccc.de/images/chaosknoten.gif") do
+
+  xml.image( "rdf:about" => "https://www.ccc.de/images/chaosknoten.gif") do
     xml.title("Chaos Computer Club (Chaosknoten)")
-    xml.link("http://www.ccc.de")
-    xml.url("http://www.ccc.de/images/chaosknoten.gif")
+    xml.link("https://www.ccc.de")
+    xml.url("https://www.ccc.de/images/chaosknoten.gif")
   end
-  
+
   @items.each do |item|
     xml.item("rdf:about" => content_url(:page_path => item.node.unique_path)) do
-      xml.title(item.title)
+      xml.title(CGI.escapeHTML(item.title.to_s))
       xml.link(content_url(:page_path => item.node.unique_path))
-      xml.description(item.abstract)
-      xml.tag!("dc:creator", item.user.login)
+      xml.description(CGI.escapeHTML(item.abstract.to_s))
+      xml.tag!("dc:creator", (item.user ? item.user.login : "CCC"))
       xml.tag!("dc:date", item.published_at.xmlschema)
     end
   end
-end
\ No newline at end of file
+end
diff --git a/app/views/rss/updates.xml.builder b/app/views/rss/updates.xml.builder
index c09c9c9..4b2e2f7 100644
--- a/app/views/rss/updates.xml.builder
+++ b/app/views/rss/updates.xml.builder
@@ -2,17 +2,17 @@ xml.instruct!
 
 xml.feed(:xmlns => "http://www.w3.org/2005/Atom", "xml:base" => @host) do
   xml.title("Chaos Computer Club Updates")
-  xml.link(:href => "http://www.ccc.de/")
-  xml.link(:rel => "self", :href => "#{@host}/rss/updates")
+  xml.link(:href => "https://www.ccc.de/")
+  xml.link(:rel => "self", :href => "#{@host}/rss/updates.xml")
   xml.updated(@items.first.published_at.xmlschema)
   xml.author do
     xml.name("Chaos Computer Club e.V.")
   end
-  xml.id("#{@host}/rss/updates")
+  xml.id("https://www.ccc.de/rss/updates")
   
   @items.each do |item|
     xml.entry do
-      xml.title(item.title)
+      xml.title(CGI.escapeHTML(item.title.to_s))
       xml.link(
         :href => content_url(:page_path => item.node.unique_path),
         :rel  => "alternate",
@@ -21,6 +21,7 @@ xml.feed(:xmlns => "http://www.w3.org/2005/Atom", "xml:base" => @host) do
       xml.id(content_url(:page_path => item.node.feed_id))
       xml.updated(item.updated_at.xmlschema)
       xml.published(item.published_at.xmlschema)
+      xml.summary(CGI.escapeHTML(item.abstract.to_s))
       xml.content(:type => "xhtml") do
         xml.div(item.body, :xmlns => "http://www.w3.org/1999/xhtml")
       end
@@ -28,4 +29,4 @@ xml.feed(:xmlns => "http://www.w3.org/2005/Atom", "xml:base" => @host) do
     
   end
   
-end
\ No newline at end of file
+end
diff --git a/app/views/search/_search_result.html.erb b/app/views/search/_search_result.html.erb
index 14898a2..6cd01f8 100644
--- a/app/views/search/_search_result.html.erb
+++ b/app/views/search/_search_result.html.erb
@@ -1,6 +1,6 @@
-<% if node.head %>
-<div class="article_partial">
+<% if node and node.head %>
+<div class="article_partial" lang="<%= node.head.effective_lang %>">
     <h2 class="headline"><%= link_to node.head.title, content_path(node.unique_path) %></h2>
     <p class="excerpt"><%= node.head.abstract %></p>
 </div>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index fef0912..3c10303 100644
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -1,5 +1,5 @@
 <div id="login_form">
-  <% form_tag session_path do -%>
+  <%= form_tag session_path do -%>
   <table>
     <tr>
       <td></td>
@@ -21,4 +21,4 @@
     </tr>
   </table>
   <% end -%>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/users/_user.html.erb b/app/views/users/_user.html.erb
index 8117bcd..ddb7afd 100644
--- a/app/views/users/_user.html.erb
+++ b/app/views/users/_user.html.erb
@@ -7,13 +7,10 @@
     <%= link_to "edit", edit_user_path(user) %>
   </td>
   <td>
-    <%= link_to(
-          "destroy",
-          user_path(user),
-          :method => :delete,
-          :confirm => "Do you really want to delete user #{user.login}?"
-        ) %>
+    <%= button_to "destroy", user_path(user),
+          method: :delete,
+          form: { data: { confirm: "Do you really want to delete user #{user.login}?" } } %>
   </td>
   <% end %>
 </tr>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index 226e821..df1005b 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -1,8 +1,13 @@
 <h1>Edit existing user</h1>
 
-<%= error_messages_for :user %>
+<% if @user.errors.any? %>
+  <div class="error_messages">
+    <ul><% @user.errors.full_messages.each do |msg| %><li><%= msg.gsub("Slug", "Title") %></li><% end %></ul>
+  </div>
+<% end %>
 
-<% form_for @user do |f| %>
+
+<%= form_for @user do |f| %>
 <table id="new_node">
   <tr>
     <td class="description">Login</td>
@@ -31,4 +36,4 @@
     <td class="right"><%= f.submit "Update" %></td>
   </tr>
 </table>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index 6990c27..6beda4f 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -1,8 +1,13 @@
 <h1>Create new user</h1>
 
-<%= error_messages_for :user %>
+<% if @user.errors.any? %>
+  <div class="error_messages">
+    <ul><% @user.errors.full_messages.each do |msg| %><li><%= msg.gsub("Slug", "Title") %></li><% end %></ul>
+  </div>
+<% end %>
 
-<% form_for @user do |f| %>
+
+<%= form_for @user do |f| %>
 <table id="new_node">
   <tr>
     <td class="description">Login</td>
@@ -29,4 +34,4 @@
     <td class="right"><%= f.submit "Create" %></td>
   </tr>
 </table>
-<% end %>
\ No newline at end of file
+<% end %>