Merge pull request #420 from foodcoop1040/wiki_diff

Add diff for wiki pages

plugins/wiki/app/controllers/pages_controller.rb

@@ -131,6 +131,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"}
+    = form_tag diff_page_path(@page), :method => :get do
       %h3= t '.title_versions'
       %ul.unstyled
-      - @page.versions.reverse.each do |version|
+        - @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"}

plugins/wiki/config/locales/de.yml

@@ -0,0 +1,6 @@
+de:
+  pages:
+    diff:
+      title: "%{title} - Änderung von Version %{old} auf %{new}"
+    show:
+      diff: Versionen vergleichen

plugins/wiki/config/locales/en.yml

@@ -32,6 +32,8 @@ en:
       redirect_notice: Redirected from %{page} ...
     destroy:
       notice: The page '%{page}' and all subpages have been deleted successfully.
+    diff:
+      title: "%{title} - changes from version %{old} to %{new}"
     edit:
       title: Edit page
     error_stale_object: Warning, the page has just been edited by someone else. Please try again.
@@ -68,6 +70,7 @@ en:
       date_format: ! '%d-%m-%y %H:%M'
       delete: Delete page
       delete_confirm: ! 'Warning: all subpages will be deleted as well. Are you sure?'
+      diff: Compare versions
       edit: Edit page
       last_updated: Last updated by <b>%{user}</b> on %{when}
       subpages: subpages

plugins/wiki/config/routes.rb

@@ -6,6 +6,7 @@ Rails.application.routes.draw do
       get :all, :on => :collection
       get :version, :on => :member
       get :revert, :on => :member
+      get :diff, :on => :member
     end
     get '/wiki/:permalink' => 'pages#show', :as => 'wiki_page' # , :constraints => {:permalink => /[^\s]+/}
     get '/wiki' => 'pages#show', :defaults => {:permalink => 'Home'}, :as => 'wiki'