Migration from Rails 2.3.5 to Rails 8.1 successful.

Merging dev branch.

5 files changed, 93 insertions, 11 deletions

diff --git a/app/views/admin/_drafts.html.erb b/app/views/admin/_drafts.html.erb
index 58b946b..a35b0ab 100644
--- a/app/views/admin/_drafts.html.erb
+++ b/app/views/admin/_drafts.html.erb
@@ -17,9 +17,9 @@
       <td class="actions">
         <%= link_to 'Show', node_path(draft.node) %>
         <%= link_to "Revisions", revision_path(draft.node.id) %>
-        <%= link_to "Publish", publish_node_path(draft.node), :method => :put, :confirm => "Do you really want to publish?" %>
+        <%= button_to "Publish", publish_node_path(draft.node), method: :put, form: { data: { confirm: "Do you really want to publish?" } } %>
       </td>
     </tr>
     <% end %>
   </table>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb
index e8b39ce..6f217eb 100644
--- a/app/views/admin/_menu.html.erb
+++ b/app/views/admin/_menu.html.erb
@@ -1,7 +1,7 @@
 <%= language_selector %>
-<%= link_to 'Logout', :controller => :sessions, :action => :destroy %>
-<%= link_to 'Overview', :controller => :admin, :action => 'index' %>
+<%= button_to 'Logout', logout_path, method: :delete %>
+<%= link_to 'Overview', admin_path %>
 <%= link_to 'Nodes', nodes_path, selected?('nodes') %>
 <%= link_to 'Assets', assets_path, selected?('assets') %>
 <%= link_to 'User', users_path, selected?('users') %>
-<%= link_to 'Navigation', menu_items_path, selected?('menu_items') %> &gt;&nbsp;
\ No newline at end of file
+<%= link_to 'Navigation', menu_items_path, selected?('menu_items') %> &gt;&nbsp;
diff --git a/app/views/admin/_recent_changes.html.erb b/app/views/admin/_recent_changes.html.erb
index 300d088..88b5e93 100644
--- a/app/views/admin/_recent_changes.html.erb
+++ b/app/views/admin/_recent_changes.html.erb
@@ -13,7 +13,7 @@
       <td><%= truncated_title_for_node node %></td>
       <td><%= node.unique_name %></td>
       <td><%= node.draft.user.login rescue "" %></td>
-      <td><%= node.updated_at.to_s(:db) %></td>
+      <td><%= node.updated_at.to_fs(:db) %></td>
       <td class="actions">
         <%= link_to 'Show', node_path(node) %>
         <%= link_to "Revisions", revision_path(:id => node.id) %>
diff --git a/app/views/admin/index.html.erb b/app/views/admin/index.html.erb
index 526aa88..2741db3 100644
--- a/app/views/admin/index.html.erb
+++ b/app/views/admin/index.html.erb
@@ -1,6 +1,15 @@
+<div id="admin_wizard">
+  <div class="admin_wizard_button"><%= link_to 'Create Update or Pressemitteilung', new_node_path, :only_path => false %></div>
+  <div class="admin_wizard_button"><a href="#" id="admin_wizard_my_work" class="button">Continue my work</a></div>
+  <div class="admin_wizard_button"><a href="#" id="admin_wizard_create_page" class="button">Add a page in the page tree</a></div>
+  <div class="admin_wizard_button"><%= link_to("Upload a new asset", new_asset_path, :only_path => false) %></div>
+</div>
+
 <p id="overview_toggle">
   <a href="#" id="recent_changes_toggle" class="button">recent changes</a>
-  <a href="#" id="current_drafts_toggle" class="button">current drafts</a>
+  <a href="#" id="my_work_toggle" class="button">my work</a>
+  <a href="#" id="current_drafts_toggle" class="button">current drafts (<%= @drafts_count %>)</a>
+  <a href="#" id="admin_sitemap_toggle" class="button">site map</a>
 </p>
 
 <div id="recent_changes_table">
@@ -30,7 +39,41 @@
         <%= node.lock_owner.login if node.lock_owner %>
       </td>
       <td>
-        <%= node.draft ? node.draft.revision : node.head.revision %>
+        <%= link_to ( node.draft ? node.draft.revision : (node.head ? node.head.revision : "EMPTY" ) ), node_revisions_path(node) %>
+      </td>
+    </tr>
+    <% end %>
+  </table>
+</div>
+
+<div id="my_work_table">
+  
+  <h1>My Work</h1>
+
+  <table class="node_table">
+    <tr class="header">
+      <th class="node_id">ID</th>
+      <th class="title">Title</th>
+      <th class="actions">Actions</th>
+      <th class="editor">Locked by</th>
+      <th class="revision">Rev.</th>
+    </tr>
+    <% @mynodes.each do |node| %>
+    <tr class="<%= cycle("even", "odd") %>">
+      <td class="node_id"><%= node.id %></td>
+      <td class="title">
+        <h4><%= link_to title_for_node(node), node_path(node) %></h4>
+        <p><%= link_to_path(node.unique_name, node.unique_name) %></p>
+      </td>
+      <td class="actions">
+        <%= link_to 'show',      node_path(node) %>
+        <%= link_to 'Revisions', node_revisions_path(node) %>
+      </td>
+      <td>
+        <%= node.lock_owner.login if node.lock_owner %>
+      </td>
+      <td>
+        <%= link_to ( node.draft ? node.draft.revision : (node.head ? node.head.revision : "EMPTY" ) ), node_revisions_path(node) %>
       </td>
     </tr>
     <% end %>
@@ -39,7 +82,7 @@
 
 <div id="current_drafts_table">
   
-  <h1>Current Drafts</h1>
+  <h1>Current Drafts (<%= @drafts_count %>)</h1>
   
   <table class="node_table">
     <tr class="header">
@@ -64,9 +107,41 @@
         <%= node.lock_owner.login if node.lock_owner %>
       </td>
       <td>
-        <%= node.draft ? node.draft.revision : node.head.revision %>
+        <%= link_to ( node.draft ? node.draft.revision : (node.head ? node.head.revision : "EMPTY" ) ), node_revisions_path(node) %>
+      </td>
+    </tr>
+    <% end %>
+  </table>
+</div>
+
+<div id="admin_sitemap_table">
+
+  <h1>Sitemap</h1>
+
+  <table class="node_table">
+    <tr class="header">
+      <th class="node_id">ID</th>
+      <th class="title">Title</th>
+      <th class="actions">Actions</th>
+      <th class="editor">Locked by</th>
+    </tr>
+    <% @sitemap.each do |node| %>
+    <% if !node.nil? %>
+      <tr class="<%= cycle("even", "odd") %>">
+      <td class="node_id" style="padding-left: <%= @sitemap_depth[node.id] * 30 %>px;"><%= node.id %></td>
+      <td class="title"  style="padding-left: <%= @sitemap_depth[node.id] * 30 %>px;">
+        <h4><%= link_to title_for_node(node), node_path(node) %></h4>
+        <p><%= link_to_path(node.unique_name, node.unique_name) %></p>
+      </td>
+      <td class="actions">
+        <%= link_to 'create subpage', new_node_path(:parent_id => node.id) %>
+        <%= link_to 'Revisions',      node_revisions_path(node) %>
+      </td>
+      <td>
+        <%= node.lock_owner.login if node.lock_owner %>
       </td>
     </tr>
     <% end %>
+    <% end %>
   </table>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/admin/search_results.html.erb b/app/views/admin/search_results.html.erb
new file mode 100644
index 0000000..671b665
--- /dev/null
+++ b/app/views/admin/search_results.html.erb
@@ -0,0 +1,7 @@
+<h1>Search Results</h1>
+
+<ul>
+<%- @results.each do |result| %>
+  <li><a href="<%= node_path(result) %>"><%= result.title %></a></li>
+<% end %>
+</ul>