diff --git a/app/views/wiki/page.rhtml b/app/views/wiki/page.rhtml index 6974bbf6..66fbade3 100644 --- a/app/views/wiki/page.rhtml +++ b/app/views/wiki/page.rhtml @@ -9,7 +9,7 @@

Showing changes from revision #<%= @page.revisions.size - 1 %> to #<%= @page.revisions.size %>: - Added | Removed + Added | Removed | Changed

<%= @renderer.display_diff %> diff --git a/app/views/wiki/revision.rhtml b/app/views/wiki/revision.rhtml index 2c0bcefe..5f5e2521 100644 --- a/app/views/wiki/revision.rhtml +++ b/app/views/wiki/revision.rhtml @@ -8,14 +8,14 @@

Showing changes from revision #<%= @revision_number - 1 %> to #<%= @revision_number %>: - Added | Removed + Added | Removed | Changed

<%= @renderer.display_diff %> <% else %> <%= @renderer.display_content %> <% end %> - +
<%= "Revision from #{format_date(@revision.revised_at)} by" %> diff --git a/public/stylesheets/instiki.css b/public/stylesheets/instiki.css index 46f32c11..0d92b291 100644 --- a/public/stylesheets/instiki.css +++ b/public/stylesheets/instiki.css @@ -162,10 +162,16 @@ padding-top:1px; .diffdel,del.diffmod, .diffdel *, del.diffmod * { background-color:#FAA; +text-decoration:strike-through; } .diffins,ins.diffmod, .diffins *, ins.diffmod * { background-color:#AFA; +text-decoration:underline; +} + +.diffmod, .diffmod * { +border: 2px solid #FE0; } #footer {