Add diff for wiki pages

plugins/wiki/app/controllers/pages_controller.rb

@@ -130,6 +130,13 @@ class PagesController < ApplicationController
     end
   end
 
+  def diff
+    @page = Page.find(params[:id])
+    @old_version = Page::Version.find_by_page_id_and_lock_version params[:id], params[:old]
+    @new_version = Page::Version.find_by_page_id_and_lock_version params[:id], params[:new]
+    @diff = Diffy::Diff.new(@old_version.body, @new_version.body).to_s(:html)
+  end
+
   def version
     @page = Page.find(params[:id])
     @version = Page::Version.find_by_page_id_and_lock_version params[:id], params[:version]

plugins/wiki/app/views/pages/diff.html.haml

@@ -0,0 +1,7 @@
+- title t('.title', title: @page.title, old: @old_version.lock_version, new: @new_version.lock_version)
+
+%style= Diffy::CSS
+= raw @diff
+
+%hr
+= link_to t('ui.back'), 'javascript:history.go(-1)', class: 'btn btn-primary'

plugins/wiki/app/views/pages/show.html.haml

@@ -12,12 +12,16 @@
         %li= link_to t('.subpages'), "#subpages", 'data-toggle-this' => '#subpages'
 
   #versions.well.well-small{:style => "display:none"}
-    %h3= t '.title_versions'
-    %ul.unstyled
-      - @page.versions.reverse.each do |version|
-        %li
-          = link_to I18n.l(version.updated_at, :format => t('.date_format')), version_page_path(@page, :version => version.lock_version)
-          = "(#{show_user(User.find_by_id(version.updated_by))})"
+    = form_tag diff_page_path(@page), :method => :get do
+      %h3= t '.title_versions'
+      %ul.unstyled
+        - @page.versions.reverse.each_with_index do |version, index|
+          %li
+            = radio_button_tag :old, version.lock_version, index == 1
+            = radio_button_tag :new, version.lock_version, index == 0
+            = link_to I18n.l(version.updated_at, :format => t('.date_format')), version_page_path(@page, :version => version.lock_version)
+            = "(#{show_user(User.find_by_id(version.updated_by))})"
+      = submit_tag t('.diff'), class: 'btn'
 
   - unless @page.children.empty?
     #subpages.well.well-small{:style => "display:none"}