Stage 1 complete: Rails 2.3.5 to Rails 3.2.22.5 upgrade

- Converted plugins to gems (Gemfile)
- Updated config structure (application.rb, boot.rb, environment.rb)
- Converted routes to Rails 3 DSL
- Converted named_scope to scope throughout models
- Converted find(:all, :conditions) to where() chains
- Fixed has_many :order to use ordering scope
- Updated session store and secret token configuration
- Fixed exception_notification middleware configuration
- Patched Ruby 2.4 / Rails 3.2 incompatibilities:
  - Integer/Float duration arithmetic (ActiveSupport)
  - Arel visit_Integer for PostgreSQL adapter
  - create_database String/Integer coercion
  - ActionController consider_all_requests_local
- Migrated taggings schema for acts-as-taggable-on
- Replaced dynamic_form gem with custom form_error_messages helper
- Fixed Rails 3 block helper syntax (form_for, form_tag, fields_for)
- Fixed admin layout yield
- Updated test suite for Rails 3 APIs

24 files changed, 129 insertions, 50 deletions

diff --git a/app/views/assets/edit.html.erb b/app/views/assets/edit.html.erb
index d60db94..e65d600 100644
--- a/app/views/assets/edit.html.erb
+++ b/app/views/assets/edit.html.erb
@@ -1,7 +1,7 @@
 <h1>Editing asset</h1>
 
-<% form_for(@asset) do |f| %>
-  <%= f.error_messages %>
+<%= form_for(@asset) do |f| %>
+  <%= form_error_messages(f) %>
 
   <p>
     <%= f.submit 'Update' %>
@@ -9,4 +9,4 @@
 <% end %>
 
 <%= link_to 'Show', @asset %> |
-<%= link_to 'Back', assets_path %>
\ No newline at end of file
+<%= link_to 'Back', assets_path %>
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/content/_search.html.erb b/app/views/content/_search.html.erb
index e654462..aa91424 100644
--- a/app/views/content/_search.html.erb
+++ b/app/views/content/_search.html.erb
@@ -1,3 +1,3 @@
-<% form_tag search_path, :method => 'get' do %>
+<%= 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 fd808b6..169ae84 100644
--- a/app/views/content/_tags.html.erb
+++ b/app/views/content/_tags.html.erb
@@ -1,4 +1,4 @@
-<% unless @page.tags.empty? %>
+<% unless @page.nil? || @page.tags.empty? %>
 <div id="tags">
   <h2>Tags</h2>
   <ul class="teasertext">
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/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/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..9f36021 100644
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -34,7 +34,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 d2a624f..2a46f09 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -28,7 +28,7 @@
 
   </head>
 
-  <body lang="<%= @page.effective_lang %>">
+  <body lang="<%= @page ? @page.effective_lang : 'de' %>">
     <div id="wrapper">
       <div id="header">
         <%= image_tag("header.png") %>
diff --git a/app/views/layouts/application.html.erb.bak b/app/views/layouts/application.html.erb.bak
new file mode 100644
index 0000000..3c95d75
--- /dev/null
+++ b/app/views/layouts/application.html.erb.bak
@@ -0,0 +1,54 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+
+    <title><%= 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' %>
+
+    <%= 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>
+    <div id="wrapper">
+      <div id="header">
+        <%= link_to_path(image_tag("header.png"), "/home") %>
+      </div>
+      <div id="search">
+        <%= render :partial => "content/search" %>
+      </div>
+      <div id="left_column">
+        <%= main_menu %>
+
+        <%= language_selector %>
+        <% if current_user && @page.node %>
+          <%= link_to "Edit", node_path(:id => @page.node) %>
+        <% end %>
+
+        <%= 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") %>
+          </p>
+        </div>
+      </div>
+      <div id="right_column">
+        <%= tags %>
+        <%= featured_articles %>
+      </div>
+    </div>
+  </body>
+</html>
\ No newline at end of file
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/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 612a3d3..d40d4e7 100644
--- a/app/views/nodes/edit.html.erb
+++ b/app/views/nodes/edit.html.erb
@@ -7,8 +7,12 @@
 <% 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">
     <div class="node_description">Event</div>
@@ -35,7 +39,7 @@
          %>
     </div>
       
-    <% fields_for @draft do |d| %>
+    <%= 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>
 
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 7d744de..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>
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/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/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..efda85d 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' %>
@@ -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..306f9ea 100644
--- a/app/views/revisions/index.html.erb
+++ b/app/views/revisions/index.html.erb
@@ -4,7 +4,7 @@
 
 <h2>Revisions for Node: <%= @node.unique_name %></h2>
 
-<% form_tag diff_node_revisions_path(@node) do %>
+<%= form_tag diff_node_revisions_path(@node) do %>
 <table id="revisions">
   <tr class="header">
     <th>First</th>
@@ -15,7 +15,7 @@
     <th>Date</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>
@@ -41,4 +41,4 @@
   </tr>
 </table>
 
-<% 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/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 %>