From a936993a5a7bbe7bb4f679d3adc059929cd0d7c5 Mon Sep 17 00:00:00 2001
From: hukl <contact@smyck.org>
Date: Sun, 15 Mar 2009 14:07:04 +0100
Subject: first revision and diff interface

---
 app/views/revisions/diff.html.erb | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 app/views/revisions/diff.html.erb

(limited to 'app/views/revisions/diff.html.erb')

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
-- 
cgit v1.3


From 101734cfbd0e1220ceee1065468dbee3d9bd7e68 Mon Sep 17 00:00:00 2001
From: hukl <contact@smyck.org>
Date: Sun, 15 Mar 2009 19:42:01 +0100
Subject: including title and abstract in the diff view.

---
 app/views/revisions/diff.html.erb | 44 +++++++++++++++++++++++++++++++++------
 public/stylesheets/admin.css      |  4 ++++
 2 files changed, 42 insertions(+), 6 deletions(-)

(limited to 'app/views/revisions/diff.html.erb')

diff --git a/app/views/revisions/diff.html.erb b/app/views/revisions/diff.html.erb
index bcbf560..a8a0276 100644
--- a/app/views/revisions/diff.html.erb
+++ b/app/views/revisions/diff.html.erb
@@ -6,11 +6,28 @@
   <%= submit_tag 'Diff' %>
 <% end %>
 
-<div id="start_text" style="display: none;">
+
+<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_text" style="display: none;">
+<div id="end_body" style="display: none;">
   <%= (@end.body) %>
 </div>
 
@@ -18,10 +35,25 @@
 <%= 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);
+    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"></div>
\ No newline at end of file
+<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/public/stylesheets/admin.css b/public/stylesheets/admin.css
index 3e67231..49578f0 100644
--- a/public/stylesheets/admin.css
+++ b/public/stylesheets/admin.css
@@ -71,4 +71,8 @@ input[type=text] {
 
 #navigation a {
   text-decoration: none;
+}
+
+#diffview {
+  width: 1024px;
 }
\ No newline at end of file
-- 
cgit v1.3