Merge branch 'master' of ssh://git@svn.medienhaus.udk-berlin.de/usr/local/git/cccms

3 files changed, 12 insertions, 5 deletions

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