app/views/wiki_pages/changes.atom.builder app/views/wiki_pages/changes.html.haml @@ -1,5 +1,5 @@ class WikiPagesController < ApplicationController - before_filter :user_required, :except => [:index, :show, :show_diff] + before_filter :user_required, :except => [:index, :show, :revision, :changes] after_filter :marked_as_read, :only => [:show] def index @@ -78,6 +78,14 @@ class WikiPagesController < ApplicationController @was = previous ? previous.body : '' end + def changes + @versions = WikiVersion.paginate(:page => params[:page], :per_page => 30, :order => "created_at DESC", :joins => :wiki_page) + respond_to do |wants| + wants.html + wants.atom + end + end + protected def marked_as_read app/controllers/wiki_pages_controller.rb @@ -8,4 +8,4 @@ %ul - edition.versions.each do |v| %li - = link_to "#{v.user.name} : #{v.message}", wiki_page_revision_path(edition.id, v.version) + = link_to "#{v.user.name} : #{v.message}", wiki_page_revision_path(edition.friendly_id, v.version) app/views/wiki_pages/_edition.html.haml @@ -5,9 +5,9 @@ atom_feed do |feed| @wiki_pages.each do |page| feed.entry(page) do |entry| entry.title(page.title) - entry.content(page.wikified_body, :type => 'html') + entry.content(page.body, :type => 'html') entry.author do |author| - author.name(page.user.name) + author.name(page.node.user.name) end end end app/views/wiki_pages/index.atom.builder @@ -11,6 +11,6 @@ %nav %ul - if @version.higher_item - %li= link_to "Précédente révision", wiki_page_revision_path(@wiki_page.id, @version.higher_item.version) + %li= link_to "Précédente révision", wiki_page_revision_path(@wiki_page.friendly_id, @version.higher_item.version) - if @version.lower_item - %li= link_to "Révision suivante", wiki_page_revision_path(@wiki_page.id, @version.lower_item.version) + %li= link_to "Révision suivante", wiki_page_revision_path(@wiki_page.friendly_id, @version.lower_item.version) app/views/wiki_pages/revision.html.haml @@ -1,5 +1,7 @@ - title @wiki_page.title - meta_for @wiki_page +- if @wiki_page.title == WikiPage::HomePage + - feed "Flux Atom du wiki", wiki_pages_path(:format => :atom) = content_for :column do = render 'edition', :object => @wiki_page app/views/wiki_pages/show.html.haml @@ -28,6 +28,7 @@ ActionController::Routing::Routes.draw do |map| map.resources :interviews, :collection => { :comments => :get }, :as => 'entretiens' map.resources :polls, :member => { :vote => :post }, :as => 'sondages' map.resources :trackers, :collection => { :comments => :get }, :as => 'suivi' + map.wiki_changes '/wiki/changes', :controller => 'wiki_pages', :action => 'changes' map.resources :wiki_pages, :as => 'wiki' do |wiki| wiki.revision '/revisions/:revision', :controller => 'wiki_pages', :action => 'revision' end config/routes.rb app/views/wiki_pages/index.html.haml baf4e20f65adbb27f577d39c70823bab8791169d Bruno Michel bmichel@menfin.info http://github.com/nono/linuxfr.org/commit/87d58b393764fe6c977367f35dcccec3dd1b004f 87d58b393764fe6c977367f35dcccec3dd1b004f 2009-11-10T15:34:42-08:00 2009-11-10T15:34:42-08:00 Wiki: atom feeds and last changes c999ed23359ca81b8ca3902b95f5ca4d61fb0648 Bruno Michel bmichel@menfin.info