9 files changed, 128 insertions, 5 deletions

diff --git a/app/controllers/revisions_controller.rb b/app/controllers/revisions_controller.rb
new file mode 100644
index 0000000..565a25f
--- /dev/null
+++ b/app/controllers/revisions_controller.rb
@@ -0,0 +1,34 @@
+class RevisionsController < ApplicationController
+  
+  layout 'admin'
+  
+  def index
+  end
+
+  def diff
+    @node = Node.find(params[:id])
+    
+    if @node.pages.length > 1
+      params[:start]  ||= @node.pages.all[-1].revision
+      params[:end]    ||= @node.pages.all[-2].revision
+    else
+      params[:start], params[:end] = 1, 1
+    end
+    
+    @start = Page.find( :first, :conditions => {
+      :node_id => params[:id],
+      :revision => params[:start]
+    })
+    
+    @end = Page.find( :first, :conditions => {
+      :node_id => params[:id],
+      :revision => params[:end]
+    })
+    
+  end
+
+  def show
+    @node = Node.find(params[:id])
+  end
+
+end
diff --git a/app/helpers/revisions_helper.rb b/app/helpers/revisions_helper.rb
new file mode 100644
index 0000000..fdb51f8
--- /dev/null
+++ b/app/helpers/revisions_helper.rb
@@ -0,0 +1,2 @@
+module RevisionsHelper
+end
diff --git a/app/views/admin/index.html.erb b/app/views/admin/index.html.erb
index 00a5c09..c5bb5de 100644
--- a/app/views/admin/index.html.erb
+++ b/app/views/admin/index.html.erb
@@ -14,6 +14,8 @@
       <td><%= draft.node.unique_name %></td>
       <td><%= draft.user.login rescue "" %></td>
       <td><%= link_to 'Show', node_path(draft.node) %></td>
+      <td><%= link_to "Diff revisions", :controller => :revisions, :action => :diff, :id => draft.node.id %></td>
+      <td><%= link_to "Publish", publish_node_path(draft.node), :method => :put, :confirm => "Do you really want to publish?" %></td>
     </tr>
     <% end %>
   </table>
diff --git a/app/views/nodes/edit.html.erb b/app/views/nodes/edit.html.erb
index 2dade0f..577a075 100644
--- a/app/views/nodes/edit.html.erb
+++ b/app/views/nodes/edit.html.erb
@@ -2,6 +2,8 @@
   <%= link_to 'Show', @node %>
   <%= link_to 'Back', nodes_path %>
   <%= link_to 'Publish', publish_node_path, :method => :put %>
+  <%= link_to 'Diff revisions', :controller => :revisions, :action => :diff, :id => params[:id] %>
+  
 </div>
 
 <h1>Editing page</h1>
diff --git a/app/views/nodes/index.html.erb b/app/views/nodes/index.html.erb
index a2a42b1..ad60498 100644
--- a/app/views/nodes/index.html.erb
+++ b/app/views/nodes/index.html.erb
@@ -23,15 +23,16 @@
       <td><%= node.unique_name %></td>
       <td>
         <%= link_to 'Show',     node_path(node) %>
-        <%= link_to 'Edit',     edit_node_path(node) %>
-        <%= link_to 'Destroy',  node, :method => :delete, :confirm => "Are you sure you want to delete this node?" %>
+          <%= link_to 'Edit',     edit_node_path(node) %>
+        <%= link_to 'Revision', :controller => :revisions, :action => :show, :id => node.id %>
+        <%# link_to 'Destroy',  node, :method => :delete, :confirm => "Are you sure you want to delete this node?" %>
         <%= link_to 'Unlock', unlock_node_path(node), :method => :put, :confirm => "Are you sure you want to unlock?" %>
       </td>
       <td>
         <%= "#{node.draft.user.login}" if node.draft && node.draft.user %>
       </td>
       <td>
-        <%= node.head.revision if node.head %>
+        <%= node.pages.length %>
       </td>
     </tr>
     <% end %>
diff --git a/app/views/nodes/show.html.erb b/app/views/nodes/show.html.erb
index 67dd7fc..bbbefe9 100644
--- a/app/views/nodes/show.html.erb
+++ b/app/views/nodes/show.html.erb
@@ -1,5 +1,9 @@
 <h1>Node</h1>
-
+<p>
 There is no draft to preview. Click <%= link_to 'edit', edit_node_path %> to 
 create one or view the currently 
-<%= link_to_path 'published version', @node.unique_path %>. 
\ No newline at end of file
+<%= link_to_path 'published version', @node.unique_path %>. 
+</p>
+<p>
+  View the revisions of this node
+</p>
\ No newline at end of file
diff --git a/app/views/revisions/diff.html.erb b/app/views/revisions/diff.html.erb
new file mode 100644
index 0000000..a8a0276
--- /dev/null
+++ b/app/views/revisions/diff.html.erb
@@ -0,0 +1,59 @@
+<h1>Revisions#diff</h1>
+
+<% form_tag url_for(:action => :diff), :method => :get do %>
+  <%= select_tag :start, options_for_select(@node.pages.map{|x| x.revision}, params[:start].to_i) %>
+  <%= select_tag :end, options_for_select(@node.pages.map{|x| x.revision}, params[:end].to_i) %>
+  <%= submit_tag 'Diff' %>
+<% end %>
+
+
+<div id="start_title" style="display: none;">
+  <%= (@start.title) %>
+</div>
+
+<div id="end_title" style="display: none;">
+  <%= (@end.title) %>
+</div>
+
+<div id="start_abstract" style="display: none;">
+  <%= (@start.abstract) %>
+</div>
+
+<div id="end_abstract" style="display: none;">
+  <%= (@end.abstract) %>
+</div>
+
+<div id="start_body" style="display: none;">
+  <%= (@start.body) %>
+</div>
+
+<div id="end_body" style="display: none;">
+  <%= (@end.body) %>
+</div>
+
+
+<%= javascript_include_tag 'cacycle_diff' %>
+<script type="text/javascript" charset="utf-8">
+  window.onload = function() {
+    title1    = document.getElementById('start_title').innerHTML;
+    title2    = document.getElementById('end_title').innerHTML;
+    abstract1 = document.getElementById('start_abstract').innerHTML;
+    abstract2 = document.getElementById('end_abstract').innerHTML;
+    body1     = document.getElementById('start_body').innerHTML;
+    body2     = document.getElementById('end_body').innerHTML;
+    document.getElementById('diffview_title').innerHTML = WDiffString(title1, title2);
+    document.getElementById('diffview_abstract').innerHTML = WDiffString(abstract1, abstract2);
+    document.getElementById('diffview_body').innerHTML = WDiffString(body1, body2);
+  }
+</script>
+
+<div id="diffview">
+  <h3>Title</h3>
+  <p id="diffview_title"></p>
+  
+  <h3>Abstract</h3>
+  <p id="diffview_abstract"></p>
+  
+  <h3>Body</h3>
+  <p id="diffview_body"></p>
+</div>
\ No newline at end of file
diff --git a/app/views/revisions/index.html.erb b/app/views/revisions/index.html.erb
new file mode 100644
index 0000000..e3134d7
--- /dev/null
+++ b/app/views/revisions/index.html.erb
@@ -0,0 +1 @@
+<h1>Revisions#index</h1>
diff --git a/app/views/revisions/show.html.erb b/app/views/revisions/show.html.erb
new file mode 100644
index 0000000..64979fc
--- /dev/null
+++ b/app/views/revisions/show.html.erb
@@ -0,0 +1,18 @@
+<div id="subnavigation">
+  <%= link_to 'Diff revisions', :action => :diff, :id => params[:id] %>
+  <%= link_to 'Edit',     edit_node_path(@node) %>
+</div>
+
+<h2>Revisions for Node: <%= @node.unique_name %></h2>
+
+<h3>Current title: <%= @node.head.title %></h3>
+<table>
+<% @node.pages.reverse.each do |page| %>
+  <tr>
+    <td><%= page.revision %></td>
+    <td><%= page.title %></td>
+    <td><%= page.user.try(:login)  %></td>
+    <td><%= page.updated_at %></td>
+  </tr>
+<% end %>
+</table>
\ No newline at end of file