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

3 files changed, 78 insertions, 0 deletions

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