Migration from Rails 2.3.5 to Rails 8.1 successful.

Merging dev branch.

8 files changed, 22 insertions, 14 deletions

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>