diff options
| author | hukl <contact@smyck.org> | 2009-03-15 19:42:01 +0100 |
|---|---|---|
| committer | hukl <contact@smyck.org> | 2009-03-15 19:42:01 +0100 |
| commit | 101734cfbd0e1220ceee1065468dbee3d9bd7e68 (patch) | |
| tree | ebb203385c0968b89b92a05bf505c47d0145d9ba | |
| parent | 4ff20fb57936af76fd97242df3f8c6fe474b7a4a (diff) | |
including title and abstract in the diff view.
| -rw-r--r-- | app/views/revisions/diff.html.erb | 44 | ||||
| -rw-r--r-- | public/stylesheets/admin.css | 4 |
2 files changed, 42 insertions, 6 deletions
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 @@ | |||
| 6 | <%= submit_tag 'Diff' %> | 6 | <%= submit_tag 'Diff' %> |
| 7 | <% end %> | 7 | <% end %> |
| 8 | 8 | ||
| 9 | <div id="start_text" style="display: none;"> | 9 | |
| 10 | <div id="start_title" style="display: none;"> | ||
| 11 | <%= (@start.title) %> | ||
| 12 | </div> | ||
| 13 | |||
| 14 | <div id="end_title" style="display: none;"> | ||
| 15 | <%= (@end.title) %> | ||
| 16 | </div> | ||
| 17 | |||
| 18 | <div id="start_abstract" style="display: none;"> | ||
| 19 | <%= (@start.abstract) %> | ||
| 20 | </div> | ||
| 21 | |||
| 22 | <div id="end_abstract" style="display: none;"> | ||
| 23 | <%= (@end.abstract) %> | ||
| 24 | </div> | ||
| 25 | |||
| 26 | <div id="start_body" style="display: none;"> | ||
| 10 | <%= (@start.body) %> | 27 | <%= (@start.body) %> |
| 11 | </div> | 28 | </div> |
| 12 | 29 | ||
| 13 | <div id="end_text" style="display: none;"> | 30 | <div id="end_body" style="display: none;"> |
| 14 | <%= (@end.body) %> | 31 | <%= (@end.body) %> |
| 15 | </div> | 32 | </div> |
| 16 | 33 | ||
| @@ -18,10 +35,25 @@ | |||
| 18 | <%= javascript_include_tag 'cacycle_diff' %> | 35 | <%= javascript_include_tag 'cacycle_diff' %> |
| 19 | <script type="text/javascript" charset="utf-8"> | 36 | <script type="text/javascript" charset="utf-8"> |
| 20 | window.onload = function() { | 37 | window.onload = function() { |
| 21 | text1 = document.getElementById('start_text').innerHTML; | 38 | title1 = document.getElementById('start_title').innerHTML; |
| 22 | text2 = document.getElementById('end_text').innerHTML; | 39 | title2 = document.getElementById('end_title').innerHTML; |
| 23 | document.getElementById('diffview').innerHTML = WDiffString(text1, text2); | 40 | abstract1 = document.getElementById('start_abstract').innerHTML; |
| 41 | abstract2 = document.getElementById('end_abstract').innerHTML; | ||
| 42 | body1 = document.getElementById('start_body').innerHTML; | ||
| 43 | body2 = document.getElementById('end_body').innerHTML; | ||
| 44 | document.getElementById('diffview_title').innerHTML = WDiffString(title1, title2); | ||
| 45 | document.getElementById('diffview_abstract').innerHTML = WDiffString(abstract1, abstract2); | ||
| 46 | document.getElementById('diffview_body').innerHTML = WDiffString(body1, body2); | ||
| 24 | } | 47 | } |
| 25 | </script> | 48 | </script> |
| 26 | 49 | ||
| 27 | <div id="diffview"></div> \ No newline at end of file | 50 | <div id="diffview"> |
| 51 | <h3>Title</h3> | ||
| 52 | <p id="diffview_title"></p> | ||
| 53 | |||
| 54 | <h3>Abstract</h3> | ||
| 55 | <p id="diffview_abstract"></p> | ||
| 56 | |||
| 57 | <h3>Body</h3> | ||
| 58 | <p id="diffview_body"></p> | ||
| 59 | </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] { | |||
| 71 | 71 | ||
| 72 | #navigation a { | 72 | #navigation a { |
| 73 | text-decoration: none; | 73 | text-decoration: none; |
| 74 | } | ||
| 75 | |||
| 76 | #diffview { | ||
| 77 | width: 1024px; | ||
| 74 | } \ No newline at end of file | 78 | } \ No newline at end of file |
