Migration from Rails 2.3.5 to Rails 8.1 successful.

Merging dev branch.

83 files changed, 1305 insertions, 637 deletions

diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
new file mode 100644
index 0000000..56d7f6d
--- /dev/null
+++ b/app/assets/config/manifest.js
@@ -0,0 +1 @@
+//= link admin_bundle.js
diff --git a/app/assets/javascripts/admin_bundle.js b/app/assets/javascripts/admin_bundle.js
new file mode 100644
index 0000000..687266c
--- /dev/null
+++ b/app/assets/javascripts/admin_bundle.js
@@ -0,0 +1,5 @@
+//= require jquery
+//= require jquery_ujs
+//= require jquery-ui
+//= require jquery.hotkeys
+//= require_self
diff --git a/app/assets/javascripts/jquery.hotkeys.js b/app/assets/javascripts/jquery.hotkeys.js
new file mode 100755
index 0000000..9a8f2de
--- /dev/null
+++ b/app/assets/javascripts/jquery.hotkeys.js
@@ -0,0 +1,244 @@
+/*
+(c) Copyrights 2007 - 2008
+
+Original idea by by Binny V A, http://www.openjs.com/scripts/events/keyboard_shortcuts/
+ 
+jQuery Plugin by Tzury Bar Yochay 
+tzury.by@gmail.com
+http://evalinux.wordpress.com
+http://facebook.com/profile.php?id=513676303
+
+Project's sites: 
+http://code.google.com/p/js-hotkeys/
+http://github.com/tzuryby/hotkeys/tree/master
+
+License: same as jQuery license. 
+
+USAGE:
+    // simple usage
+    $(document).bind('keydown', 'Ctrl+c', function(){ alert('copy anyone?');});
+    
+    // special options such as disableInIput
+    $(document).bind('keydown', {combi:'Ctrl+x', disableInInput: true} , function() {});
+    
+Note:
+    This plugin wraps the following jQuery methods: $.fn.find, $.fn.bind and $.fn.unbind
+*/
+
+(function (jQuery){
+    // keep reference to the original $.fn.bind, $.fn.unbind and $.fn.find
+    jQuery.fn.__bind__ = jQuery.fn.bind;
+    jQuery.fn.__unbind__ = jQuery.fn.unbind;
+    jQuery.fn.__find__ = jQuery.fn.find;
+    
+    var hotkeys = {
+        version: '0.7.9',
+        override: /keypress|keydown|keyup/g,
+        triggersMap: {},
+        
+        specialKeys: { 27: 'esc', 9: 'tab', 32:'space', 13: 'return', 8:'backspace', 145: 'scroll', 
+            20: 'capslock', 144: 'numlock', 19:'pause', 45:'insert', 36:'home', 46:'del',
+            35:'end', 33: 'pageup', 34:'pagedown', 37:'left', 38:'up', 39:'right',40:'down', 
+            109: '-', 
+            112:'f1',113:'f2', 114:'f3', 115:'f4', 116:'f5', 117:'f6', 118:'f7', 119:'f8', 
+            120:'f9', 121:'f10', 122:'f11', 123:'f12', 191: '/'},
+        
+        shiftNums: { "`":"~", "1":"!", "2":"@", "3":"#", "4":"$", "5":"%", "6":"^", "7":"&", 
+            "8":"*", "9":"(", "0":")", "-":"_", "=":"+", ";":":", "'":"\"", ",":"<", 
+            ".":">",  "/":"?",  "\\":"|" },
+        
+        newTrigger: function (type, combi, callback) { 
+            // i.e. {'keyup': {'ctrl': {cb: callback, disableInInput: false}}}
+            var result = {};
+            result[type] = {};
+            result[type][combi] = {cb: callback, disableInInput: false};
+            return result;
+        }
+    };
+    // add firefox num pad char codes
+    //if (jQuery.browser.mozilla){
+    // add num pad char codes
+    hotkeys.specialKeys = jQuery.extend(hotkeys.specialKeys, { 96: '0', 97:'1', 98: '2', 99: 
+        '3', 100: '4', 101: '5', 102: '6', 103: '7', 104: '8', 105: '9', 106: '*', 
+        107: '+', 109: '-', 110: '.', 111 : '/'
+        });
+    //}
+    
+    // a wrapper around of $.fn.find 
+    // see more at: http://groups.google.com/group/jquery-en/browse_thread/thread/18f9825e8d22f18d
+    jQuery.fn.find = function( selector ) {
+        this.query = selector;
+        return jQuery.fn.__find__.apply(this, arguments);
+        };
+    
+    jQuery.fn.unbind = function (type, combi, fn){
+        if (jQuery.isFunction(combi)){
+            fn = combi;
+            combi = null;
+        }
+        if (combi && typeof combi === 'string'){
+            var selectorId = ((this.prevObject && this.prevObject.query) || (this[0].id && this[0].id) || this[0]).toString();
+            var hkTypes = type.split(' ');
+            for (var x=0; x<hkTypes.length; x++){
+                delete hotkeys.triggersMap[selectorId][hkTypes[x]][combi];
+            }
+        }
+        // call jQuery original unbind
+        return  this.__unbind__(type, fn);
+    };
+    
+    jQuery.fn.bind = function(type, data, fn){
+        // grab keyup,keydown,keypress
+        var handle = type.match(hotkeys.override);
+        
+        if (jQuery.isFunction(data) || !handle){
+            // call jQuery.bind only
+            return this.__bind__(type, data, fn);
+        }
+        else{
+            // split the job
+            var result = null,            
+            // pass the rest to the original $.fn.bind
+            pass2jq = jQuery.trim(type.replace(hotkeys.override, ''));
+            
+            // see if there are other types, pass them to the original $.fn.bind
+            if (pass2jq){
+                result = this.__bind__(pass2jq, data, fn);
+            }            
+            
+            if (typeof data === "string"){
+                data = {'combi': data};
+            }
+            if(data.combi){
+                for (var x=0; x < handle.length; x++){
+                    var eventType = handle[x];
+                    var combi = data.combi.toLowerCase(),
+                        trigger = hotkeys.newTrigger(eventType, combi, fn),
+                        selectorId = ((this.prevObject && this.prevObject.query) || (this[0].id && this[0].id) || this[0]).toString();
+                        
+                    //trigger[eventType][combi].propagate = data.propagate;
+                    trigger[eventType][combi].disableInInput = data.disableInInput;
+                    
+                    // first time selector is bounded
+                    if (!hotkeys.triggersMap[selectorId]) {
+                        hotkeys.triggersMap[selectorId] = trigger;
+                    }
+                    // first time selector is bounded with this type
+                    else if (!hotkeys.triggersMap[selectorId][eventType]) {
+                        hotkeys.triggersMap[selectorId][eventType] = trigger[eventType];
+                    }
+                    // make trigger point as array so more than one handler can be bound
+                    var mapPoint = hotkeys.triggersMap[selectorId][eventType][combi];
+                    if (!mapPoint){
+                        hotkeys.triggersMap[selectorId][eventType][combi] = [trigger[eventType][combi]];
+                    }
+                    else if (mapPoint.constructor !== Array){
+                        hotkeys.triggersMap[selectorId][eventType][combi] = [mapPoint];
+                    }
+                    else {
+                        hotkeys.triggersMap[selectorId][eventType][combi][mapPoint.length] = trigger[eventType][combi];
+                    }
+                    
+                    // add attribute and call $.event.add per matched element
+                    this.each(function(){
+                        // jQuery wrapper for the current element
+                        var jqElem = jQuery(this);
+                        
+                        // element already associated with another collection
+                        if (jqElem.attr('hkId') && jqElem.attr('hkId') !== selectorId){
+                            selectorId = jqElem.attr('hkId') + ";" + selectorId;
+                        }
+                        jqElem.attr('hkId', selectorId);
+                    });
+                    result = this.__bind__(handle.join(' '), data, hotkeys.handler)
+                }
+            }
+            return result;
+        }
+    };
+    // work-around for opera and safari where (sometimes) the target is the element which was last 
+    // clicked with the mouse and not the document event it would make sense to get the document
+    hotkeys.findElement = function (elem){
+        if (!jQuery(elem).attr('hkId')){
+            if (jQuery.browser.opera || jQuery.browser.safari){
+                while (!jQuery(elem).attr('hkId') && elem.parentNode){
+                    elem = elem.parentNode;
+                }
+            }
+        }
+        return elem;
+    };
+    // the event handler
+    hotkeys.handler = function(event) {
+        var target = hotkeys.findElement(event.currentTarget), 
+            jTarget = jQuery(target),
+            ids = jTarget.attr('hkId');
+        
+        if(ids){
+            ids = ids.split(';');
+            var code = event.which,
+                type = event.type,
+                special = hotkeys.specialKeys[code],
+                // prevent f5 overlapping with 't' (or f4 with 's', etc.)
+                character = !special && String.fromCharCode(code).toLowerCase(),
+                shift = event.shiftKey,
+                ctrl = event.ctrlKey,            
+                // patch for jquery 1.2.5 && 1.2.6 see more at:  
+                // http://groups.google.com/group/jquery-en/browse_thread/thread/83e10b3bb1f1c32b
+                alt = event.altKey || event.originalEvent.altKey,
+                mapPoint = null;
+
+            for (var x=0; x < ids.length; x++){
+                if (hotkeys.triggersMap[ids[x]][type]){
+                    mapPoint = hotkeys.triggersMap[ids[x]][type];
+                    break;
+                }
+            }
+            
+            //find by: id.type.combi.options            
+            if (mapPoint){ 
+                var trigger;
+                // event type is associated with the hkId
+                if(!shift && !ctrl && !alt) { // No Modifiers
+                    trigger = mapPoint[special] ||  (character && mapPoint[character]);
+                }
+                else{
+                    // check combinations (alt|ctrl|shift+anything)
+                    var modif = '';
+                    if(alt) modif +='alt+';
+                    if(ctrl) modif+= 'ctrl+';
+                    if(shift) modif += 'shift+';
+                    // modifiers + special keys or modifiers + character or modifiers + shift character or just shift character
+                    trigger = mapPoint[modif+special];
+                    if (!trigger){
+                        if (character){
+                            trigger = mapPoint[modif+character] 
+                                || mapPoint[modif+hotkeys.shiftNums[character]]
+                                // '$' can be triggered as 'Shift+4' or 'Shift+$' or just '$'
+                                || (modif === 'shift+' && mapPoint[hotkeys.shiftNums[character]]);
+                        }
+                    }
+                }
+                if (trigger){
+                    var result = false;
+                    for (var x=0; x < trigger.length; x++){
+                        if(trigger[x].disableInInput){
+                            // double check event.currentTarget and event.target
+                            var elem = jQuery(event.target);
+                            if (jTarget.is("input") || jTarget.is("textarea") || jTarget.is("select") 
+                                || elem.is("input") || elem.is("textarea") || elem.is("select")) {
+                                return true;
+                            }
+                        }                       
+                        // call the registered callback function
+                        result = result || trigger[x].cb.apply(this, [event]);
+                    }
+                    return result;
+                }
+            }
+        }
+    };
+    // place it under window so it can be extended and overridden by others
+    window.hotkeys = hotkeys;
+    return jQuery;
+})(jQuery);
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 1d1a1ca..9e8564e 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -2,31 +2,46 @@ class AdminController < ApplicationController
   
   # Private
   
-  before_filter :login_required
+  before_action :login_required
 
   def index
-    @drafts = Node.all(
-      :limit => 20,
-      :order => "updated_at desc",
-      :conditions => ["draft_id IS NOT NULL"]
-    )
-    @recent_changes = Node.all(
-      :limit => 20,
-      :order => "updated_at desc",
-      :conditions => [ 
-        "updated_at < ? AND updated_at > ? AND parent_id IS NOT NULL", Time.now, Time.now-14.days
-      ]
-    )
+    @drafts = Node.where("draft_id IS NOT NULL")
+      .limit(50).order("updated_at desc")
+
+    @drafts_count = Node.where("draft_id IS NOT NULL").count
+
+    @recent_changes = Node.where(
+      "updated_at < ? AND updated_at > ? AND parent_id IS NOT NULL",
+      Time.now, Time.now - 14.days
+    ).limit(50).order("updated_at desc")
+
+    all_nodes = Node.root.self_and_descendants
+    @sitemap_depth = {}
+    Node.each_with_level(all_nodes) do |node, level|
+      @sitemap_depth[node.id] = level
+    end
+    @sitemap = all_nodes.to_a.sort! { |node1,node2| node1.lft <=> node2.lft }.delete_if { |node| node.update? }
+
+    @mypages = Page.where("user_id = ? or editor_id = ?", @current_user, @current_user)
+
+    @mynodes = Node.joins(:pages)
+              .where("pages.user_id = ? or pages.editor_id = ?", @current_user, @current_user)
+              .order("updated_at desc")
+              .uniq.first(50)
   end
   
   def search
-    @results = Node.search params[:search_term]
+    @results = Node.search params[:search_term], :per_page => 1000
     
     respond_to do |format|
-      format.html
+      format.html do
+        render :template => 'admin/search_results.html'
+      end
       format.js do 
         render( :json => @results.map do |node| 
-          {:id => node.id, :title => node.title, :edit_path => node_path(node)} 
+            if node
+              {:id => node.id, :title => node.title, :edit_path => node_path(node)}
+            end
           end
         )
         
@@ -46,7 +61,6 @@ class AdminController < ApplicationController
         render :partial => 'admin/menu_search_results'
       end
       
-      
       format.js do 
         render( :json => @results.map do |node| 
           {:node_id => node.id, :title => node.title, :unique_name => node.unique_name} 
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index bce0c71..75f92c3 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,26 +1,21 @@
-# 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 ExceptionNotifiable
   include AuthenticatedSystem
-    
-  helper :all # include all helpers, all the time
-  protect_from_forgery # See ActionController::RequestForgeryProtection for details
 
-  # Scrub sensitive parameters from your log
-  filter_parameter_logging :password, :password_confirmation
-  
-  before_filter :set_locale
-  
+  protect_from_forgery
+
+  before_action :set_locale
+
   protected
-  
-    def set_locale
-      if params[:locale] && I18n.available_locales.include?(params[:locale].to_sym)
-        I18n.locale = params[:locale].to_sym
-      else
-        params.delete(:locale)
-      end
+
+  def set_locale
+    if params[:locale] && I18n.available_locales.include?(params[:locale].to_sym)
+      I18n.locale = params[:locale].to_sym
+    else
+      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/controllers/assets_controller.rb b/app/controllers/assets_controller.rb
index cfaf176..d150e06 100644
--- a/app/controllers/assets_controller.rb
+++ b/app/controllers/assets_controller.rb
@@ -2,15 +2,14 @@ class AssetsController < ApplicationController
   
   # Private
   
-  before_filter :login_required
+  before_action :login_required
   
   layout 'admin'
   
   def index
-    @assets = Asset.all.paginate(
-      :page => params[:page], 
-      :per_page => 20,
-      :order => 'id DESC'
+    @assets = Asset.order('id DESC').paginate(
+      :page     => params[:page],
+      :per_page => 20
     )
   end
 
@@ -44,7 +43,7 @@ class AssetsController < ApplicationController
   # POST /assets
   # POST /assets.xml
   def create
-    @asset = Asset.new(params[:asset])
+    @asset = Asset.new(asset_params)
 
     respond_to do |format|
       if @asset.save
@@ -64,7 +63,7 @@ class AssetsController < ApplicationController
     @asset = Asset.find(params[:id])
 
     respond_to do |format|
-      if @asset.update_attributes(params[:asset])
+      if @asset.update(asset_params)
         flash[:notice] = 'Asset was successfully updated.'
         format.html { redirect_to(@asset) }
         format.xml  { head :ok }
@@ -86,4 +85,10 @@ class AssetsController < ApplicationController
       format.xml  { head :ok }
     end
   end
+
+  private
+
+    def asset_params
+      params.require(:asset).permit(:name, :upload)
+    end
 end
diff --git a/app/controllers/content_controller.rb b/app/controllers/content_controller.rb
index 1b13456..8d33105 100644
--- a/app/controllers/content_controller.rb
+++ b/app/controllers/content_controller.rb
@@ -1,30 +1,31 @@
 class ContentController < ApplicationController
-  
+
   # Public
-  
-  before_filter :find_page
-  
+
+  before_action :find_page
+
   # This is the method that renders most of the the public content. It recieves
-  # a :locale and a :page_path parameter through the params hash. It looks up 
+  # a :locale and a :page_path parameter through the params hash. It looks up
   # the node with the corresponding unique_name attribute. The method doesn't
-  # return a node though, the node is really a proxy object for pages. It 
+  # return a node though, the node is really a proxy object for pages. It
   # returns the most recent page associated to this node instead.
   def render_page
-    
+
     expires_in 20.minutes, :public => true
-    
+
     if @page and @page.public?
       render(
-        :file => @page.valid_template,
+        :template => @page.valid_template,
         :layout => true
       )
     else
-      render( 
-        :file => File.join(RAILS_ROOT, 'public', '404.html'),
-        :status => 404
+      render(
+        :file => Rails.root.join('public', '404.html').to_s,
+        :status => 404,
+        :layout => false
       )
     end
-    
+
   end
 
   def render_gallery
@@ -32,13 +33,17 @@ class ContentController < ApplicationController
       @images = @page.assets.images
       render :file => "content/gallery"
     else
-      render :nothing => true, :status => 404
+      head :not_found
     end
   end
-  
+
   private
     def find_page
-      path = params[:page_path].join('/')
-      @page = Node.find_page(path)
+      path = params[:page_path].is_a?(Array) ? params[:page_path].join('/') : params[:page_path]
+      if path =~ /^[a-zA-Z\:\/\/\.\-\d_]+$/
+        @page = Node.find_page(path)
+      else
+        @page = nil
+      end
     end
 end
diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
index 805e941..7695e9b 100644
--- a/app/controllers/events_controller.rb
+++ b/app/controllers/events_controller.rb
@@ -2,7 +2,7 @@ class EventsController < ApplicationController
   
   # Private
   
-  before_filter :login_required
+  before_action :login_required
   
   layout 'admin'
   
@@ -47,7 +47,7 @@ class EventsController < ApplicationController
   # POST /events
   # POST /events.xml
   def create
-    @event = Event.new(params[:event])
+    @event = Event.new(event_params)
 
     respond_to do |format|
       if @event.save
@@ -67,7 +67,7 @@ class EventsController < ApplicationController
     @event = Event.find(params[:id])
 
     respond_to do |format|
-      if @event.update_attributes(params[:event])
+      if @event.update(event_params)
         flash[:notice] = 'Event was successfully updated.'
         format.html { redirect_to(edit_node_path(@event.node)) }
         format.xml  { head :ok }
@@ -89,4 +89,10 @@ class EventsController < ApplicationController
       format.xml  { head :ok }
     end
   end
+
+  private
+
+    def event_params
+      params.require(:event).permit(:start_time, :end_time, :rrule, :custom_rrule, :allday, :url, :latitude, :longitude, :node_id, :location)
+    end
 end
diff --git a/app/controllers/menu_items_controller.rb b/app/controllers/menu_items_controller.rb
index 808da15..1b1eb59 100644
--- a/app/controllers/menu_items_controller.rb
+++ b/app/controllers/menu_items_controller.rb
@@ -2,23 +2,23 @@ class MenuItemsController < ApplicationController
 
   # Private
 
-  before_filter :login_required
+  before_action :login_required
   
   layout 'admin'
   
   def index
-    @menu_items = MenuItem.all(:order => "position ASC")
+    @menu_items = MenuItem.order("position ASC").all
   end
 
   def show
   end
 
   def new
-    @menu_item = MenuItem.new params[:menu_item]
+    @menu_item = MenuItem.new menu_item_params
   end
 
   def create
-    if MenuItem.create( params[:menu_item] )
+    if MenuItem.create( menu_item_params )
       redirect_to menu_items_path
     else
       render :new
@@ -32,7 +32,7 @@ class MenuItemsController < ApplicationController
   def update
     @menu_item = MenuItem.find( params[:id] )
     
-    if @menu_item.update_attributes( params[:menu_item] )
+    if @menu_item.update( menu_item_params )
       redirect_to menu_items_path
     else
       render :edit
@@ -48,10 +48,15 @@ class MenuItemsController < ApplicationController
   def sort
     params[:menu_items].each_with_index do |item_id, index|
       menu_item = MenuItem.find(item_id)
-      menu_item.update_attributes(:position => index + 1)
+      menu_item.update(:position => index + 1)
     end
     
-    render :nothing => true
+    head :ok
   end
 
+  private
+
+    def menu_item_params
+      params.require(:menu_item).permit(:node_id, :path, :position, :type, :type_id)
+    end
 end
diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index 4f72744..494887d 100644
--- a/app/controllers/nodes_controller.rb
+++ b/app/controllers/nodes_controller.rb
@@ -4,8 +4,8 @@ class NodesController < ApplicationController
   
   layout 'admin'
   
-  before_filter :login_required
-  before_filter :find_node, :only => [
+  before_action :login_required
+  before_action :find_node, :only => [
                               :show, 
                               :edit, 
                               :update, 
@@ -15,16 +15,17 @@ class NodesController < ApplicationController
                             ]
 
   def index
-    @nodes = Node.root.descendants.paginate( 
-      :include => [:head, :draft],
-      :page => params[:page], 
-      :per_page => 25,
-      :order => 'id DESC'
-    )
+    @nodes = Node.root.descendants.includes(:head, :draft)
+      .order('id DESC')
+      .paginate(:page => params[:page], :per_page => 25)
   end
 
   def new
-    @node = Node.new params[:node]
+    @node = Node.new node_params
+    if params.has_key?(:parent_id)
+      @parent_id = params[:parent_id]
+      @parent_name = Node.find(@parent_id).title
+    end
   end
   
   def create
@@ -33,9 +34,16 @@ class NodesController < ApplicationController
     @node = Node.new
     @node.parent_id = find_parent
     @node.slug = params[:title].parameterize.to_s
-    
+   
     if @node.save
-      @node.draft.update_attributes(:title => params[:title])
+      @node.draft.update(:title => params[:title])
+      case params[:kind]
+        when "update"
+          @node.draft.tag_list.add("update")
+        when "press_release"
+          @node.draft.tag_list.add("update", "pressemitteilung")
+      end
+      @node.draft.save!
       redirect_to(edit_node_path(@node))
     else
       render :new
@@ -44,6 +52,7 @@ class NodesController < ApplicationController
   
   def show
     node = Node.find(params[:id])
+    node.wipe_draft!
     @page = node.draft || node.head
   end
 
@@ -53,7 +62,7 @@ class NodesController < ApplicationController
     rescue LockedByAnotherUser => e
       flash[:error] = e.message
       if request.referer
-        redirect_to :back
+        redirect_to request.referer || node_path(@node)
       else
         redirect_to node_path(@node)
       end
@@ -61,10 +70,10 @@ class NodesController < ApplicationController
   end
 
   def update
-    @node.update_attributes(params[:node])
+    @node.update(node_params)
     @draft = @node.find_or_create_draft current_user
     @draft.tag_list = params[:tag_list]
-    if @draft.update_attributes( params[:page] )
+    if @draft.update( page_params )
       flash[:notice] = "Draft has been saved: #{Time.now}"
       respond_to do |format|
         format.html { redirect_to edit_node_path(@node) }
@@ -82,7 +91,7 @@ class NodesController < ApplicationController
   def publish
     @node.publish_draft!
     flash[:notice] = "Draft has been published"
-    redirect_to node_path
+    redirect_to node_path(@node)
   end
   
   def unlock
@@ -96,6 +105,14 @@ class NodesController < ApplicationController
   end
   
   private
+
+    def node_params
+      params.fetch(:node, {}).permit(:slug, :parent_id, :staged_slug, :staged_parent_id)
+    end
+
+    def page_params
+      params.fetch(:page, {}).permit(:title, :abstract, :body, :template_name, :published_at, :user_id)
+    end
   
     def find_node
       @node = Node.find(params[:id])
@@ -107,6 +124,8 @@ class NodesController < ApplicationController
         Node.root.id
       when "update"
         Update.find_or_create_parent.id
+      when "press_release"
+        Update.find_or_create_parent.id
       when "generic"
         if params[:parent_id] && Node.find(params[:parent_id])
           params[:parent_id]
diff --git a/app/controllers/occurrences_controller.rb b/app/controllers/occurrences_controller.rb
index 751be40..0f30ce3 100644
--- a/app/controllers/occurrences_controller.rb
+++ b/app/controllers/occurrences_controller.rb
@@ -2,7 +2,7 @@ class OccurrencesController < ApplicationController
   
   # Private
   
-  before_filter :login_required
+  before_action :login_required
   
   # GET /occurrences
   # GET /occurrences.xml
@@ -45,7 +45,7 @@ class OccurrencesController < ApplicationController
   # POST /occurrences
   # POST /occurrences.xml
   def create
-    @occurrence = Occurrence.new(params[:occurrence])
+    @occurrence = Occurrence.new(occurrence_params)
 
     respond_to do |format|
       if @occurrence.save
@@ -65,7 +65,7 @@ class OccurrencesController < ApplicationController
     @occurrence = Occurrence.find(params[:id])
 
     respond_to do |format|
-      if @occurrence.update_attributes(params[:occurrence])
+      if @occurrence.update(occurrence_params)
         flash[:notice] = 'Occurrence was successfully updated.'
         format.html { redirect_to(@occurrence) }
         format.xml  { head :ok }
@@ -87,4 +87,11 @@ class OccurrencesController < ApplicationController
       format.xml  { head :ok }
     end
   end
+
+  private
+
+    def occurrence_params
+      params.require(:occurrence).permit(:start_time, :end_time, :node_id, :event_id)
+    end
+
 end
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index a684327..2d08dea 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -2,26 +2,24 @@ class PagesController < ApplicationController
   
   # Private
   
-  before_filter :login_required
-  
+  before_action :login_required
+
   def preview
     @page = Page.find(params[:id])
-    
+
     if @page
       template = @page.valid_template
       render(
-        :file => template,
-        :layout => "application"
+        template: template,
+        layout: "application"
       )
     end
-    
   end
-  
-  
+
   def sort_images
     page = Page.find(params[:id])
     page.update_assets(params[:images])
     
-    render :nothing => true, :status => 200
+    head :ok
   end
 end
diff --git a/app/controllers/revisions_controller.rb b/app/controllers/revisions_controller.rb
index 05e8acc..42d667e 100644
--- a/app/controllers/revisions_controller.rb
+++ b/app/controllers/revisions_controller.rb
@@ -2,12 +2,13 @@ class RevisionsController < ApplicationController
   
   # Private
   
-  before_filter :login_required
+  before_action :login_required
   
   layout 'admin'
   
   def index
     @node = Node.find(params[:node_id])
+    @pages = @node.pages.all
   end
 
   def diff
diff --git a/app/controllers/rss_controller.rb b/app/controllers/rss_controller.rb
index acffc0e..4b47218 100644
--- a/app/controllers/rss_controller.rb
+++ b/app/controllers/rss_controller.rb
@@ -1,19 +1,21 @@
 class RssController < ApplicationController
   
-  before_filter :authenticate, :only => :recent_changes
-  before_filter :get_host
+  before_action :authenticate, :only => :recent_changes
+  before_action :get_host
   
   def updates
     expires_in 31.minutes, :public => true
     
     I18n.locale = :de
-    
-    @items = Page.heads.find_tagged_with(
-      "update",
-      :order => "published_at DESC",
-      :limit => 20
-    )
-    
+  
+    @items = Page.heads
+      .joins("JOIN taggings ON taggings.taggable_id = pages.id
+            AND taggings.taggable_type = 'Page'
+            AND taggings.context = 'tags'")
+      .joins("JOIN tags ON tags.id = taggings.tag_id")
+      .where("LOWER(tags.name) = ?", "update")
+      .order("published_at DESC").limit(20)
+
     respond_to do |format|
       format.xml {}
       format.rdf {}
@@ -21,13 +23,9 @@ class RssController < ApplicationController
   end
 
   def recent_changes
-    @items = Page.all(
-      :limit => 20,
-      :order => "updated_at desc",
-      :conditions => [ 
-        "updated_at < ? AND updated_at > ?", Time.now, Time.now-14.days
-      ]
-    )
+    @items = Page.where(
+      "updated_at < ? AND updated_at > ?", Time.now, Time.now - 14.days
+    ).limit(20).order("updated_at desc")
   end
   
   protected
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 565cdd4..bf6a029 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -1,33 +1,44 @@
 class TagsController < ApplicationController
-  
+
   # Public
-  
+
   def index
     @page = Page.new :title => "Tags"
-    
-    @tags = Tag.all(:limit => 500)
+
+    @tags = Tag.limit(500).all
   end
 
   def show
-    @tag    = Tag.find_by_name(params[:id])
-    
-    @tag = @tag ? @tag.name : params[:id]
-    
-    @page   = Page.new
+    tag_name = params[:id]
+
+    if tag_name.match(/^[a-zA-Z0-9_\w\s\-\.\']+$/)
+      @tag = ActsAsTaggableOn::Tag.find_by_name(tag_name)
+      @tag  = @tag ? @tag.name : tag_name
+      @page = Page.new
 
-    params[:page] = ( params[:page].is_a?(Fixnum) ? params[:page] : 1 )
-    
-    @pages  = Page.heads.paginate(
-      Page.find_options_for_find_tagged_with(@tag).merge(
-        :order => 'published_at DESC',
-        :page=>params[:page],
-        :per_page => 23
-      )
-    )
-    
-    respond_to do |format|
-      format.html {}
+      params[:page] = (params[:page].is_a?(Integer) ? params[:page] : 1)
+
+      @pages = Page.heads
+        .joins("JOIN taggings ON taggings.taggable_id = pages.id
+            AND taggings.taggable_type = 'Page'
+            AND taggings.context = 'tags'")
+        .joins("JOIN tags ON tags.id = taggings.tag_id")
+        .where("LOWER(tags.name) = ?", @tag.downcase)
+        .order('published_at DESC')
+        .paginate(
+          :page     => params[:page],
+          :per_page => 23
+        )
+
+      respond_to do |format|
+        format.html {}
+      end
+    else
+      respond_to do |format|
+        format.html { head :bad_request }
+      end
     end
+
   end
 
 end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 87df678..98fd534 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -2,24 +2,24 @@ class UsersController < ApplicationController
 
   # Private
 
-  before_filter :login_required
-  before_filter :find_user,     :only => [:show, :edit, :update, :destroy]
-  before_filter :verify_status, :except => [:index, :show]
+  before_action :login_required
+  before_action :find_user,     :only => [:show, :edit, :update, :destroy]
+  before_action :verify_status, :except => [:index, :show]
 
   layout 'admin'
 
   def index
-    @users = User.all(:order => "login ASC").group_by do |user|
+    @users = User.order("login ASC").all.group_by do |user|
       user.admin? ? :admin : :user
     end
   end
 
   def new
-    @user = User.new( params[:user] )
+    @user = User.new
   end
 
   def create
-    @user = User.new params[:user]
+    @user = User.new user_params
 
     if @user.save
       flash[:notice] = "User created #{@user.login}"
@@ -33,8 +33,10 @@ class UsersController < ApplicationController
   end
 
   def update
-    params[:user].delete(:admin) unless current_user.is_admin?
-    if @user.update_attributes(params[:user])
+    permitted = user_params
+    permitted.delete(:admin) unless current_user.is_admin?
+            
+    if @user.update(permitted)
       flash[:notice] = "Updated user #{@user.login}"
       redirect_to user_path(@user)
     else
@@ -51,6 +53,11 @@ class UsersController < ApplicationController
   end
 
   private
+
+    def user_params
+      params.fetch(:user, {}).permit(:login, :email, :password, :password_confirmation, :admin)
+    end
+
     def find_user
       @user = User.find(params[:id])
     end
diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb
index da8945e..e5c3d5c 100644
--- a/app/helpers/admin_helper.rb
+++ b/app/helpers/admin_helper.rb
@@ -1,11 +1,11 @@
 module AdminHelper
-  
+
   def language_selector
     case I18n.locale
     when :de
-      link_to 'English', url_for(:overwrite_params => {:locale => :en})
+      link_to raw('<span class="inactive">English</span>'), url_for(params.permit!.to_h.merge('locale' => 'en'))
     when :en
-      link_to 'Deutsch', url_for(:overwrite_params => {:locale => :de})
+      link_to raw('<span class="inactive">Deutsch</span>'), url_for(params.permit!.to_h.merge('locale' => 'de'))
     end
   end
-end
\ No newline at end of file
+end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 22a7940..0be66e9 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,3 +1,14 @@
 # Methods added to this helper will be available to all templates in the application.
 module ApplicationHelper
+  def form_error_messages(form_object)
+    object = form_object.is_a?(ActionView::Helpers::FormBuilder) ? form_object.object : form_object
+    return "" unless object && object.errors.any?
+    content_tag(:div, :class => "error_messages") do
+      content_tag(:ul) do
+        object.errors.full_messages.map do |msg|
+          content_tag(:li, msg)
+        end.join.html_safe
+      end
+    end
+  end
 end
diff --git a/app/helpers/content_helper.rb b/app/helpers/content_helper.rb
index d6c96f1..21cc579 100644
--- a/app/helpers/content_helper.rb
+++ b/app/helpers/content_helper.rb
@@ -1,7 +1,7 @@
 module ContentHelper
 
   def main_menu
-    menu_items = MenuItem.all(:order => "position ASC")
+    menu_items = MenuItem.order("position ASC").all
     render(
       :partial => 'content/main_navigation',
       :locals => {:menu_items => menu_items}
@@ -9,13 +9,13 @@ module ContentHelper
   end
 
   def calendar
-    occurrences = Occurrence.find_in_range(Time.now, (Time.now+14.days))
+    occurrences = Occurrence.find_in_range(Time.now, (Time.now+6.weeks))
 
     if occurrences.empty?
       occurrences = Occurrence.find_next
     end
 
-    occurrences = occurrences.reject { |o| o.node.head.nil? }
+    occurrences = occurrences.reject { |o| o.node.nil? || o.node.head.nil? }
 
     render(
       :partial  => 'content/front_page_calendar',
@@ -43,7 +43,7 @@ module ContentHelper
   # Returns the published_at attribute of a page if it is not nil, otherwise
   # it returns the auto-filled value of the created_at attribute
   def date_for_page page
-    page.published_at.to_s(:db) rescue page.created_at.to_s(:db)
+    I18n.l(page.published_at, :format => :ccc) rescue I18n.l(page.created_at, :format => :ccc)
   end
 
   def author_for_page page
@@ -51,7 +51,7 @@ module ContentHelper
   end
 
   def page_title
-    if @page.title && @page.title != ""
+    if @page && @page.title && @page.title != ""
       "CCC | #{@page.title}"
     else
       "CCC | Chaos Computer Club"
@@ -59,41 +59,43 @@ module ContentHelper
   end
 
   # This method is an output filter for templates. It accepts any kind of text
-  # and checks for an <aggregate /> tag within it. If such a tag is found, its
-  # attributes are parsed and converted into parameters for the
-  # render_collection method. The <aggregate /> tag will then be replaced
+  # and checks for an [aggregate short code within it. If such a code is found,
+  # its # attributes are parsed and converted into parameters for the
+  # render_collection method. The [aggregate ] short code will then be replaced
   # entirely with the output of the render_collection method.
   #
-  # Syntax of the <aggregate /> tag:
+  # Syntax of the [aggregate ] short code:
   #
-  # <aggregate
+  # [aggregate
   #   flags="update, pressemitteilung"
   #   limit="20"
   #   order_by="published_at"
   #   order_direction="DESC"
-  # />
+  # ]
   def aggregate? content
     options = {}
 
+    cccms_attributes = ActionView::Base.sanitized_allowed_attributes + ['lang']
+
     begin
-      if content =~ /<aggregate([^<>]*)>/
+      if content =~ /\[aggregate([^\]]*)\]/
         tag = $~.to_s
-        matched_data = $1.scan(/\w+\=\"[a-zA-Z\s\/_\d,]*\"/)
+        matched_data = $1.scan(/\w+\="[a-zA-Z\s\/_\d,.=]*"/)
 
         matched_data.each do |data|
-          splitted_data = data.split("=")
-          options[splitted_data[0].to_sym] = splitted_data[1].gsub(/\"/, "")
+          splitted_data = data.split("=", 2)
+          options[splitted_data[0].to_sym] = splitted_data[1].gsub(/"/, "")
         end
 
-        options[:partial] = select_partial( options[:partial] )
+        options[:partial] = select_partial(options[:partial])
 
-        sanitize( content.sub(tag, render_collection(options)) )
+        sanitize(content.sub(tag, render_collection(options)), :attributes => cccms_attributes)
       else
-        sanitize( content )
+        sanitize(content, :attributes => cccms_attributes)
       end
 
     rescue
-      sanitize( content )
+      sanitize(content, :attributes => cccms_attributes)
     end
   end
 
@@ -124,9 +126,7 @@ module ContentHelper
   # Check if a custom partial exists in the proper location
   def partial_exists? partial
     File.exist?(
-      File.join(
-        RAILS_ROOT, 'app', 'views', 'custom', 'partials', "_#{partial}.html.erb"
-      )
+      Rails.root.join('app', 'views', 'custom', 'partials', "_#{partial}.html.erb")
     )
   end
 
diff --git a/app/helpers/link_helper.rb b/app/helpers/link_helper.rb
index 1b20e6d..878e8e4 100644
--- a/app/helpers/link_helper.rb
+++ b/app/helpers/link_helper.rb
@@ -1,54 +1,62 @@
 module LinkHelper
-  
+
   def content_path_helper path_array
     url_for(
       :controller => :content,
       :action => :render_page,
-      :locale => params[:locale] || I18n.locale,
+      :locale => (params[:locale] || I18n.locale).to_sym == I18n.default_locale ? nil : (params[:locale] || I18n.locale),
       :page_path => path_array
     )
   end
-  
+
   def content_url_helper path_array
     request.protocol + request.host_with_port + content_path_helper(path_array)
   end
-  
+
   def link_to_path title, path, html_options = {}
+    return "" if path.nil?
+
     if params[:page_path]
-      active = (params[:page_path].join("/") == path.sub(/^\//, ""))
+      page_path = params[:page_path].is_a?(Array) ? params[:page_path].join("/") : params[:page_path]
+      active = (page_path == path.sub(/^\//, ""))
     end
-    
+
     active_class = active ? {:class => 'active'} : {:class => 'inactive'}
-    
     html_options = html_options.merge(active_class)
-    
-    params[:locale] ||= I18n.locale
-    
-    link_to( 
-      title, {
-        :controller => :content,
-        :action => :render_page,
-        :locale => params[:locale],
-        :page_path => (path.sub(/^\//, "").split("/") rescue "")
-      },
+    locale = (params[:locale] || I18n.locale).to_sym == I18n.default_locale ? nil : (params[:locale] || I18n.locale)
+
+    link_to(
+      title,
+      content_path(path.sub(/^\//, ""), :locale => locale),
       html_options
     )
   end
-  
+
   def selected? controller_name
     if params[:controller] == controller_name
       return :class => "selected"
     end
   end
-  
+
   def unlock_link
-    message = "Are you sure you want to unlock?\n" +
-              "Locked by #{@node.lock_owner.login}\n" +
-              "Last modified #{@page.updated_at.to_s(:db)}"
-    
-    link_to(
-      'Unlock', unlock_node_path(@node), :method => :put, :confirm => message
+    message = "Are you sure you want to unlock?\n" \
+      "Locked by #{@node.lock_owner.login}\n" \
+      "Last modified #{@page.updated_at.to_fs(:db)}"
+    button_to 'Unlock', unlock_node_path(@node),
+      method: :put,
+      form: { data: { confirm: message } }
+  end
+
+  def content_path(page_path = nil, options = {})
+    if page_path.is_a?(Hash)
+      options = page_path
+      page_path = options.delete(:page_path)
+    end
+    locale = options[:locale] || params[:locale] || I18n.locale
+    options[:locale] = (locale.to_sym == I18n.default_locale) ? nil : locale
+    Rails.application.routes.url_helpers.content_path(
+      Array(page_path).join("/").sub(/^\//, ""),
+      options
     )
   end
-  
-end
\ No newline at end of file
+end
diff --git a/app/helpers/nodes_helper.rb b/app/helpers/nodes_helper.rb
index d889719..a054a2e 100644
--- a/app/helpers/nodes_helper.rb
+++ b/app/helpers/nodes_helper.rb
@@ -4,6 +4,10 @@ module NodesHelper
     if node.head
       node.head.title
     else
+      if not node.draft or not node.draft.title
+        logger.error "Missing title in node #{node.id}"
+        return "NO TITLE"
+      end
       node.draft.title
     end
   end
@@ -24,14 +28,20 @@ module NodesHelper
   def user_list
     User.all.map {|u| [u.login, u.id]}
   end
-  
+
   def event_information
     if @node.event
-      "#{@node.event.start_time.to_s(:db)} - #{@node.event.end_time.to_s(:db)} > " \
-      "#{link_to 'show', event_path(@node.event)} " \
-      "#{link_to 'edit', edit_event_path(@node.event)}"
+      safe_join([
+        "#{@node.event.start_time.to_fs(:db)} - #{@node.event.end_time.to_fs(:db)} > ",
+        link_to('show', event_path(@node.event)),
+        ' ',
+        link_to('edit', edit_event_path(@node.event))
+      ])
     else
-      "no event attached > #{link_to 'add', new_event_path(:node_id => @node.id)}"
+      safe_join([
+        'no event attached > ',
+        link_to('add', new_event_path(:node_id => @node.id))
+      ])
     end
   end
 end
diff --git a/app/models/application_record.rb b/app/models/application_record.rb
new file mode 100644
index 0000000..10a4cba
--- /dev/null
+++ b/app/models/application_record.rb
@@ -0,0 +1,3 @@
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end
diff --git a/app/models/asset.rb b/app/models/asset.rb
index 5bfea76..aca0ee8 100644
--- a/app/models/asset.rb
+++ b/app/models/asset.rb
@@ -1,39 +1,12 @@
-class Asset < ActiveRecord::Base
+class Asset < ApplicationRecord
+
+  include FileAttachment
   
   has_many :related_assets, :dependent => :destroy
   has_many :pages, :through => :related_assets
-  
-  has_attached_file(
-    :upload,
-    :styles => {
-      :medium   => "300x300",
-      :thumb    => "100x100",
-      :headline => "460x250#"
-    }
-  )
-  
-  named_scope :images, :conditions => {
-    :upload_content_type => [
-      "image/gif",
-      "image/jpeg",
-      "image/png"
-    ]
-  }
-  
-  named_scope :documents, :conditions => {
-    :upload_content_type => [
-      "application/pdf",
-      "text/plain",
-      "text/rtf"
-    ]
-  }
-  
-  named_scope :audio, :conditions => {
-    :upload_content_type => [
-      "audio/mpeg",
-      "audio/x-m4a",
-      "audio/wav",
-      "audio/x-wav"
-    ]
-  }
+
+  scope :images,    -> { where(:upload_content_type => ["image/gif", "image/jpeg", "image/png", "image/webp"]) }
+  scope :documents, -> { where(:upload_content_type => ["application/pdf", "text/plain", "text/rtf"]) }
+  scope :audio,     -> { where(:upload_content_type => ["audio/mpeg", "audio/x-m4a", "audio/wav", "audio/x-wav"]) }
+
 end
diff --git a/app/models/concerns/file_attachment.rb b/app/models/concerns/file_attachment.rb
new file mode 100644
index 0000000..0e99fa2
--- /dev/null
+++ b/app/models/concerns/file_attachment.rb
@@ -0,0 +1,139 @@
+# FileAttachment — minimal drop-in replacement for Paperclip's has_attached_file.
+#
+# Provides the same interface used throughout this codebase:
+#   asset.upload.url              -> "/system/uploads/:id/original/:filename"
+#   asset.upload.url(:thumb)      -> "/system/uploads/:id/thumb/:filename"
+#   asset.upload.content_type     -> string
+#   asset.upload.size             -> integer (bytes)
+#
+# Files are stored at:
+#   Rails.root/public/system/uploads/:id/:style/:filename
+#
+# Image variants are generated via ImageMagick (convert) on upload.
+# Non-image files get only an original, no variants.
+#
+# To replace an asset: assign a new file to asset.upload= and save.
+# The filename is fixed on first upload and preserved on replacement,
+# keeping all public URLs stable.
+#
+# Future: if more sophisticated asset management is needed (versioning,
+# S3, on-demand resizing), replace this module and keep the interface.
+
+module FileAttachment
+  extend ActiveSupport::Concern
+
+  STYLES = {
+    medium:   { geometry: "300x300>",  format: nil },
+    thumb:    { geometry: "100x100>",  format: nil },
+    headline: { geometry: "460x250!",  format: nil }
+  }.freeze
+
+  IMAGE_CONTENT_TYPES    = %w[image/jpeg image/gif image/png image/webp].freeze
+  VECTOR_CONTENT_TYPES   = %w[image/svg+xml].freeze
+  DISPLAYABLE_AS_IMAGE   = IMAGE_CONTENT_TYPES + VECTOR_CONTENT_TYPES
+
+  included do
+    attr_reader :upload
+
+    after_initialize :build_upload_proxy
+    after_save       :process_upload
+    before_destroy   :delete_upload_files
+  end
+
+  def upload=(uploaded_file)
+    return if uploaded_file.blank?
+    @pending_upload = uploaded_file
+    # Populate the database columns immediately so validations can use them
+    self.upload_file_name    = sanitize_filename(uploaded_file.original_filename)
+    self.upload_content_type = uploaded_file.content_type.to_s.split(';').first.strip
+    self.upload_file_size    = uploaded_file.size
+    self.upload_updated_at   = Time.current
+    build_upload_proxy
+  end
+
+  private
+
+  def build_upload_proxy
+    @upload = UploadProxy.new(self)
+  end
+
+  def process_upload
+    return unless @pending_upload
+    uploaded_file = @pending_upload
+    @pending_upload = nil
+
+    old_dir = Rails.root.join("public", "system", "uploads", id.to_s)
+    FileUtils.rm_rf(old_dir) if Dir.exist?(old_dir)
+
+    original_path = file_path(:original)
+    FileUtils.mkdir_p(File.dirname(original_path))
+    FileUtils.cp(uploaded_file.tempfile.path, original_path)
+
+    if IMAGE_CONTENT_TYPES.include?(upload_content_type)
+      generate_variants(original_path)
+    elsif VECTOR_CONTENT_TYPES.include?(upload_content_type)
+      generate_svg_variants(original_path)
+    end
+  end
+
+  def generate_variants(original_path)
+    STYLES.each do |style, options|
+      dest_path = file_path(style)
+      FileUtils.mkdir_p(File.dirname(dest_path))
+      system("magick", original_path, "-resize", options[:geometry], dest_path)
+    end
+  end
+
+  def generate_svg_variants(original_path)
+    STYLES.each do |style, _|
+      dest_path = file_path(style)
+      FileUtils.mkdir_p(File.dirname(dest_path))
+      FileUtils.cp(original_path, dest_path)
+    end
+  end
+
+  def delete_upload_files
+    dir = Rails.root.join("public", "system", "uploads", id.to_s)
+    FileUtils.rm_rf(dir) if Dir.exist?(dir)
+  end
+
+  def file_path(style)
+    Rails.root.join(
+      "public", "system", "uploads",
+      id.to_s, style.to_s, upload_file_name
+    ).to_s
+  end
+
+  def sanitize_filename(filename)
+    File.basename(filename).gsub(/[^\w\.\-]/, '_')
+  end
+
+  # Proxy object returned by asset.upload, providing the Paperclip-compatible
+  # interface used in views: .url, .url(:style), .content_type, .size
+  class UploadProxy
+    def initialize(record)
+      @record = record
+    end
+
+    def url(style = :original)
+      return "" if @record.upload_file_name.blank?
+      "/system/uploads/#{@record.id}/#{style}/#{@record.upload_file_name}"
+    end
+
+    def content_type
+      @record.upload_content_type.to_s
+    end
+
+    def size
+      @record.upload_file_size.to_i
+    end
+
+    def present?
+      @record.upload_file_name.present?
+    end
+
+    def blank?
+      !present?
+    end
+  end
+end
diff --git a/app/models/event.rb b/app/models/event.rb
index 60b8521..94a22e3 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -1,4 +1,4 @@
-class Event < ActiveRecord::Base
+class Event < ApplicationRecord
   
   # Associations
   
@@ -12,14 +12,12 @@ class Event < ActiveRecord::Base
   # Instance Methods
   
   def occurrences_in_range start_time, end_time
-    self.occurrences.find(
-      :all, :conditions => [
-        "start_time > ? AND end_time < ?", 
-        start_time, end_time
-      ]
+    self.occurrences.where(
+      "start_time > ? AND end_time < ?",
+      start_time, end_time
     )
-  end
-  
+  end 
+
   private
     def generate_occurences
       Occurrence.generate self
diff --git a/app/models/locked_by_another_user.rb b/app/models/locked_by_another_user.rb
new file mode 100644
index 0000000..6f9e272
--- /dev/null
+++ b/app/models/locked_by_another_user.rb
@@ -0,0 +1 @@
+class LockedByAnotherUser < StandardError; end
diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb
index 054e7ee..7769b7f 100644
--- a/app/models/menu_item.rb
+++ b/app/models/menu_item.rb
@@ -1,6 +1,6 @@
-class MenuItem < ActiveRecord::Base
-  
-  default_scope :conditions => {:type => "MenuItem"}
+class MenuItem < ApplicationRecord
+ 
+  default_scope -> { where(:type => "MenuItem") }
   
   translates    :title
   
@@ -24,5 +24,5 @@ end
 
 
 class FeaturedArticle < MenuItem
-  default_scope :conditions => {:type => "FeaturedArticle"}
-end
\ No newline at end of file
+  default_scope -> { where(:type => "FeaturedArticle") }
+end
diff --git a/app/models/node.rb b/app/models/node.rb
index 6c11fed..92ecc12 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -1,14 +1,14 @@
-class Node < ActiveRecord::Base
+class Node < ApplicationRecord
   # Mixins and Plugins
   acts_as_nested_set
 
   # Associations
-  has_many    :pages, :order => "revision ASC"
-  belongs_to  :head,  :class_name => "Page",  :foreign_key => :head_id
-  belongs_to  :draft, :class_name => "Page",  :foreign_key => :draft_id
-  has_many    :permissions
-  has_one     :event
-  belongs_to  :lock_owner, :class_name => "User", :foreign_key => :locking_user_id
+  has_many    :pages, -> { order("revision ASC") }, :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, optional: true
 
   # Callbacks
   after_create  :initialize_empty_page
@@ -16,20 +16,20 @@ class Node < ActiveRecord::Base
   after_save    :update_unique_names_of_children
 
   # Validations
-  validates_length_of     :slug, :within => 1..255,    :unless => "parent_id.nil?"
-  validates_presence_of   :slug,                       :unless => "parent_id.nil?"
-  validates_uniqueness_of :slug, :scope => :parent_id, :unless => "parent_id.nil?"
-  validates_presence_of   :parent_id,                  :unless => "Node.root.nil?"
+  validates_length_of     :slug, :within => 1..255,    :unless => -> { parent_id.nil? }
+  validates_presence_of   :slug,                       :unless => -> { parent_id.nil? }
+  validates_uniqueness_of :slug, :scope => :parent_id, :unless => -> { parent_id.nil? }
+  validates_presence_of   :parent_id,                  :unless => -> { Node.root.nil? }
 
   validate :borders       # This should never ever happen.
 
   # Index for Fulltext Search
-  define_index do
-    indexes head.translations.title
-    indexes slug
-    indexes unique_name
-    indexes head.translations.body
-  end
+  # define_index do
+  #   indexes head.translations.title
+  #   indexes slug
+  #   indexes unique_name
+  #   indexes head.translations.body
+  # end
 
   # Class methods
 
@@ -39,8 +39,8 @@ class Node < ActiveRecord::Base
   # revision with -1. It raises an Argument error if the revision is not a
   # Fixnum
   def self.find_page path, revision = -1
-    unless revision.class == Fixnum
-      raise ArgumentError, "revision must be a Fixnum"
+    unless revision.is_a?(Integer)
+      raise ArgumentError, "revision must be a Integer"
     end
 
     node = Node.find_by_unique_name(path)
@@ -60,6 +60,7 @@ class Node < ActiveRecord::Base
   # Instance Methods
 
   def find_or_create_draft current_user
+    self.wipe_draft!
     if draft && self.lock_owner == current_user
       draft
     elsif draft && self.lock_owner.nil?
@@ -72,7 +73,7 @@ class Node < ActiveRecord::Base
       raise(
         LockedByAnotherUser,
         "Page is locked by another user who is working on it! " \
-        "Last modification: #{draft.updated_at.to_s(:db)}"
+        "Last modification: #{draft.updated_at.to_fs(:db)}"
       )
     else
       lock_for! current_user
@@ -94,25 +95,55 @@ class Node < ActiveRecord::Base
   end
 
   def publish_draft!
+    # Return nil if nothing to publish and no staged changes
+    return nil unless self.draft || staged_slug || staged_parent_id
+
     if self.draft
       self.head = self.draft
       self.head.published_at ||= Time.now
       self.head.save!
-
       self.draft = nil
+    end
 
-      if staged_slug && (staged_slug != slug)
-        self.slug = staged_slug
-      end
+    if staged_slug && (staged_slug != slug)
+      self.slug = staged_slug
+      self.staged_slug = nil
+    end
 
-      if staged_parent_id && (staged_parent_id != parent_id)
-        self.parent_id = staged_parent_id
+    if staged_parent_id && (staged_parent_id != parent_id)
+      new_parent = Node.find(staged_parent_id)
+      self.staged_parent_id = nil
+      self.save!
+      self.move_to_child_of(new_parent)
+    else
+      unless self.save
+        raise ActiveRecord::RecordInvalid.new(self)
       end
+    end
 
-      self.save!
+    self.reload
+    self.update_unique_name
+    self.send(:update_unique_names_of_children)
+    self.unlock!
+    self
+  end
+
+  # removes a draft and the lock if it is older than a day and still
+  # identical to head
+  def wipe_draft!
+    unless self.draft
       self.unlock!
-      self
+      return
     end
+    return unless self.head
+    return unless self.draft.updated_at < 1.day.ago
+    return if self.head.has_changes_to? self.draft
+
+    self.draft.destroy
+    self.draft_id = nil
+    self.unlock!
+    self.save!
+    self.reload
   end
 
   def restore_revision! revision
@@ -126,7 +157,7 @@ class Node < ActiveRecord::Base
 
   # returns an array with all parts of a unique_name rather than a string
   def unique_path
-    unique_name.split("/") rescue [unique_name]
+    unique_name.to_s.split("/")
   end
 
   # returns array with pages up to root excluding root
@@ -180,6 +211,15 @@ class Node < ActiveRecord::Base
     self.created_at < new_id_format_date ? unique_path : id
   end
 
+  # Full-text search across all locale translations using PostgreSQL tsvector.
+  # Uses 'simple' dictionary (no stemming, no stopwords) so queries work
+  # across German and English content without language detection.
+  def self.search(term, _ = {})
+    joins(head: :translations)
+      .where("page_translations.search_vector @@ plainto_tsquery('simple', ?)", term)
+      .distinct
+  end
+
   protected
     def lock_for! current_user
       self.lock_owner = current_user
@@ -208,8 +248,12 @@ class Node < ActiveRecord::Base
     # Hopefully until no childrens occur
     def update_unique_names_of_children
       unless root?
-        self.descendants.each do |descendant|
-          descendant.update_unique_name
+        # Use parent_id-based traversal instead of lft/rgt descendants
+        # due to awesome_nested_set not refreshing parent lft/rgt in memory
+        Node.where(:parent_id => self.id).each do |child|
+          child.reload
+          child.update_unique_name
+          child.send(:update_unique_names_of_children)
         end
       end
     end
@@ -220,7 +264,3 @@ class Node < ActiveRecord::Base
       end
     end
 end
-
-class LockedByAnotherUser < StandardError; end
-
-
diff --git a/app/models/occurrence.rb b/app/models/occurrence.rb
index 591e1e0..3baf447 100644
--- a/app/models/occurrence.rb
+++ b/app/models/occurrence.rb
@@ -1,7 +1,7 @@
 # TODO Make a gem out of the c wrapper
 require 'chaos_calendar'
 
-class Occurrence < ActiveRecord::Base
+class Occurrence < ApplicationRecord
   
   # Associations
   
@@ -11,29 +11,22 @@ class Occurrence < ActiveRecord::Base
   # Class Methods
   
   def self.find_in_range start_time, end_time
-    find(
-      :all,
-      :include => :node, 
-      :conditions => [
-        "start_time > ? AND end_time < ?", start_time, end_time 
-      ]
-    )
+    includes(:node)
+      .where("start_time > ? AND end_time < ?", start_time, end_time)
+      .order("start_time")
   end
-  
+
   def self.find_next
-    find(
-      :all,
-      :limit => 1,
-      :include => :node,
-      :conditions => ["start_time > ?", Time.now]
-    )
+    includes(:node)
+      .where("start_time > ?", Time.now)
+      .limit(1)
   end
-  
+
   # Deletes all Occurrences which belong to the given event. Afterwards a few
   # variables are set to save repetitive queries. The occurrences of the given
   # event are then calculated and created.
   def self.generate event
-    self.delete_all(:event_id => event.id)
+    self.where(:event_id => event.id).delete_all
     
     node        = event.node
     duration    = (event.end_time - event.start_time)
diff --git a/app/models/page.rb b/app/models/page.rb
index c5da386..e6baf20 100644
--- a/app/models/page.rb
+++ b/app/models/page.rb
@@ -1,25 +1,9 @@
 require 'xml'
 
-class Page < ActiveRecord::Base
+class Page < ApplicationRecord
 
   PUBLIC_TEMPLATE_PATH = File.join(%w(custom page_templates public))
-  FULL_PUBLIC_TEMPLATE_PATH = File.join(RAILS_ROOT, 'app', 'views', PUBLIC_TEMPLATE_PATH)
-
-  # named scopes
-
-  named_scope(
-    :drafts,
-    :joins => :node,
-    :include => [:translations],
-    :conditions => ["nodes.draft_id = pages.id"]
-  )
-
-  named_scope(
-    :heads,
-    :joins => :node,
-    :include => [:translations],
-    :conditions => ["nodes.head_id = pages.id"]
-  )
+  FULL_PUBLIC_TEMPLATE_PATH = Rails.root.join('app', 'views', PUBLIC_TEMPLATE_PATH)
 
   # Mixins and Plugins
   acts_as_taggable
@@ -28,20 +12,21 @@ class Page < ActiveRecord::Base
   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, :through => :related_assets, :order => "position ASC"
+  has_many   :assets, -> { order("position ASC") }, :through => :related_assets
+
+  # Named scopes
+  scope :drafts, -> { joins(:node).includes(:translations).where("nodes.draft_id = pages.id") }
+  scope :heads,  -> { joins(:node).includes(:translations).where("nodes.head_id = pages.id") }
 
   # Filter
   before_create :set_page_title
   before_create :set_template
   before_save   :rewrite_links_in_body
 
-  # Security
-  attr_accessible :title, :abstract, :body, :template_name, :published_at, :user_id
-
   # Class Methods
 
   # This method is most likely called from the ContentHelper.render_collection
@@ -51,8 +36,8 @@ class Page < ActiveRecord::Base
   # partially or entirely overwritten by the options hash. Afterwards the merged
   # parameters are used to query the DB for Pages matching these parameters.
   # The aggregation only takes published pages into account.
-  def self.aggregate options, page=1
 
+  def self.aggregate options, page=1
     defaults = {
       :tags             => "",
       :limit            => 25,
@@ -62,15 +47,24 @@ class Page < ActiveRecord::Base
 
     options = defaults.merge options
 
-    Page.heads.paginate(
-      find_options_for_find_tagged_with(
-        options[:tags].gsub(/\s/, ","), :match_all => true
-      ).merge(
-        :page     => page,
-        :per_page => options[:limit],
-        :order    => "#{options[:order_by]} #{options[:order_direction]}"
-      )
-    )
+    scope = Page.heads
+    unless options[:tags].blank?
+      tag_names = options[:tags].gsub(/\s/, ",").split(",").map(&:strip).map(&:downcase).uniq.reject(&:blank?)
+
+      unless tag_names.empty?
+        scope = scope
+          .joins("JOIN taggings ON taggings.taggable_id = pages.id
+                  AND taggings.taggable_type = 'Page'
+                  AND taggings.context = 'tags'")
+          .joins("JOIN tags ON tags.id = taggings.tag_id")
+          .where("LOWER(tags.name) IN (?)", tag_names)
+          .group("pages.id")
+          .having("COUNT(DISTINCT tags.id) = ?", tag_names.length)
+      end
+    end
+
+    scope.order("#{options[:order_by]} #{options[:order_direction]}")
+      .paginate(:page => page, :per_page => options[:limit])
   end
 
   def self.custom_templates
@@ -89,11 +83,24 @@ class Page < ActiveRecord::Base
   # outdated_translations? for more information.
   # Takes :locale => <locale> and :delta_time => 12.hours as options
   def self.find_with_outdated_translations options = {}
-    Page.all(:include => :translations).select do |page|
+    Page.includes(:translations).select do |page|
       page.outdated_translations? options
     end
   end
 
+  # Is used to compare a node's head with the node's draft
+
+  def has_changes_to? draft
+    return true unless node == draft.node
+    return true unless assets == draft.assets
+    return true unless tag_list == draft.tag_list
+    return true unless template_name == draft.template_name
+    return true unless translated_locales.sort_by(&:to_s) == draft.translated_locales.sort_by(&:to_s)
+    changed = false
+    translated_locales.each { |locale| I18n.with_locale(locale) { changed = true unless title == draft.title && abstract == draft.abstract && body == draft.body } }
+    return changed
+  end
+
   # Instance Methods
 
   def public_template_path
@@ -105,7 +112,7 @@ class Page < ActiveRecord::Base
   end
 
   def template_exists?
-    File.exists? "#{full_public_template_path}.html.erb"
+    File.exist? "#{full_public_template_path}.html.erb"
   end
 
   def valid_template
@@ -136,7 +143,7 @@ class Page < ActiveRecord::Base
 
     # Clone translated attributes
     page.translations.each do |translation|
-      self.translations.create!(translation.attributes)
+      self.translations.create!(translation.attributes.except("id", "page_id", "created_at", "updated_at"))
     end
 
     # Clone asset references
@@ -149,6 +156,16 @@ class Page < ActiveRecord::Base
     published_at.nil? ? true : published_at < Time.now
   end
 
+  def effective_lang
+    if translated_locales.empty?
+      return 'de'
+    elsif translated_locales.include?(I18n.locale)
+      return I18n.locale
+    else
+      return translated_locales.first
+    end
+  end
+
   # Returns true if a page has translations where one of them is significantly
   # older than the other.
   # Takes the I18n.default locale and a second :locale to test if the
@@ -165,8 +182,8 @@ class Page < ActiveRecord::Base
 
     translations = self.translations
 
-    default = *(translations.select {|x| x.locale == I18n.default_locale})
-    custom  = *(translations.select {|x| x.locale == options[:locale]})
+    default = translations.find {|x| x.locale.to_s == I18n.default_locale.to_s }
+    custom  = translations.find {|x| x.locale.to_s == options[:locale].to_s }
 
     if translations.size > 1 && default && custom
       difference = (default.updated_at - custom.updated_at).to_i.abs
@@ -215,11 +232,6 @@ class Page < ActiveRecord::Base
           links       = links.reject { |l| l[:href] =~ /system\/uploads/ }
           locales     = I18n.available_locales.reject {|l| l == :root}
 
-          if xml_doc.find("//p/aggregate")[0]
-            aggregate_tags   = xml_doc.find("//aggregate")
-            aggregate_tags[0].parent.replace_with aggregate_tags[0]
-          end
-
           links.each do |link|
             unless locales.include? link[:href].slice(1,2).to_sym
               unless link[:href] =~ /sytem\/uploads/
@@ -238,4 +250,4 @@ class Page < ActiveRecord::Base
       end
     end
 
-end
\ No newline at end of file
+end
diff --git a/app/models/permission.rb b/app/models/permission.rb
index 438538e..1383a4b 100644
--- a/app/models/permission.rb
+++ b/app/models/permission.rb
@@ -1,4 +1,4 @@
-class Permission < ActiveRecord::Base
+class Permission < ApplicationRecord
   # Validations
   validates_presence_of   :user_id, :node_id, :granted
   validates_inclusion_of  :granted, :in => [true, false]
@@ -8,6 +8,6 @@ class Permission < ActiveRecord::Base
   belongs_to :node
   
   # Named scopes
-  named_scope :for_node, lambda { |node| { :conditions => ['node_id = ?', (node.is_a? Node ? node.id : node)] } }
-  named_scope :for_user, lambda { |user| { :conditions => ['user_id = ?', (user.is_a? User ? user.id : user)] } }
+  scope :for_node, ->(node) { where('node_id = ?', (node.is_a?(Node) ? node.id : node)) }
+  scope :for_user, ->(user) { where('user_id = ?', (user.is_a?(User) ? user.id : user)) }
 end
diff --git a/app/models/related_asset.rb b/app/models/related_asset.rb
index af09420..8f16460 100644
--- a/app/models/related_asset.rb
+++ b/app/models/related_asset.rb
@@ -1,8 +1,8 @@
-class RelatedAsset < ActiveRecord::Base
+class RelatedAsset < ApplicationRecord
   belongs_to :page
   belongs_to :asset
   
   acts_as_list :scope => :page_id
-  
-  default_scope :order => "position ASC"
-end
\ No newline at end of file
+
+  default_scope -> { order("position ASC") }
+end
diff --git a/app/models/user.rb b/app/models/user.rb
index ce5503f..92ac33a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,6 +1,6 @@
 require 'digest/sha1'
 
-class User < ActiveRecord::Base
+class User < ApplicationRecord
   # Mixins and Plugins
   include Authentication
   include Authentication::ByPassword
@@ -21,8 +21,6 @@ class User < ActiveRecord::Base
   validates_format_of       :email, :with => Authentication.email_regex,
                             :message => Authentication.bad_email_message
 
-  attr_accessible :login, :email, :password, :password_confirmation, :admin
-
   # Authenticates a user by their login name and unencrypted password. Returns the user or nil.
   def self.authenticate(login, password)
     return nil if login.blank? || password.blank?
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 %>