Merge branch 'revisions'

6 files changed, 84 insertions, 1 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/nodes/index.html.erb b/app/views/nodes/index.html.erb
index a2a42b1..31cd53c 100644
--- a/app/views/nodes/index.html.erb
+++ b/app/views/nodes/index.html.erb
@@ -24,7 +24,8 @@
       <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 '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>
diff --git a/app/views/revisions/diff.html.erb b/app/views/revisions/diff.html.erb
new file mode 100644
index 0000000..bcbf560
--- /dev/null
+++ b/app/views/revisions/diff.html.erb
@@ -0,0 +1,27 @@
+<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_text" style="display: none;">
+  <%= (@start.body) %>
+</div>
+
+<div id="end_text" style="display: none;">
+  <%= (@end.body) %>
+</div>
+
+
+<%= javascript_include_tag 'cacycle_diff' %>
+<script type="text/javascript" charset="utf-8">
+  window.onload = function() {
+    text1 = document.getElementById('start_text').innerHTML;
+    text2 = document.getElementById('end_text').innerHTML;
+    document.getElementById('diffview').innerHTML = WDiffString(text1, text2);
+  }
+</script>
+
+<div id="diffview"></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..b41a77c
--- /dev/null
+++ b/app/views/revisions/index.html.erb
@@ -0,0 +1,2 @@
+<h1>Revisions#index</h1>
+<p>Find me in app/views/revisions/index.html.erb</p>
diff --git a/app/views/revisions/show.html.erb b/app/views/revisions/show.html.erb
new file mode 100644
index 0000000..c63e7e8
--- /dev/null
+++ b/app/views/revisions/show.html.erb
@@ -0,0 +1,17 @@
+<div id="subnavigation">
+  <%= link_to 'Diff revisions', :action => :diff, :id => params[:id] %>
+</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