app/views/pages/_page.html.erb app/views/pages/_right.html.erb app/views/pages/diff.html.erb app/views/pages/revisions.html.erb lib/html_diff.rb @@ -4,7 +4,7 @@ class PagesController < ApplicationController before_filter :check_private, :only => [:show, :revision] caches_page :show cache_sweeper :page_sweeper, :only => [:create, :update] - + include HTMLDiff # GET /pages # GET /pages.xml @@ -21,7 +21,7 @@ class PagesController < ApplicationController # GET /pages/1.xml def show @page = site.pages.find_by_permalink(params[:id] || "home") - + @version = @page.versions.find_by_version(@page.version) if @page respond_to do |format| @@ -33,13 +33,31 @@ class PagesController < ApplicationController redirect_to new_page_url() end end + + def diff + @page = site.pages.find_by_permalink(params[:id]) + @v1 = @page.versions.find_by_version(params[:v1]) + @v2 = @page.versions.find_by_version(params[:v2]) + @diff = htmldiff(@v2.body,@v1.body) + respond_to do |format| + format.html + end + end + + def revisions + @page = site.pages.find_by_permalink(params[:id]) + @revisions = @page.versions + respond_to do |format| + format.html + end + end def revision @page = site.pages.find_by_permalink(params[:id]) - @page = site.pages.find_version(@page.id, params[:version]) + @version = @page.versions.find_by_version(params[:version]) respond_to do |format| - format.html + format.html { render :action => "show"} end end app/controllers/pages_controller.rb @@ -59,6 +59,14 @@ class Page < ActiveRecord::Base end end + def next_version + self.versions.size > self.version ? self.version + 1 : false + end + + def previous_version + self.version > 1 ? self.version - 1 : false + end + def set_links Link.transaction do # outbound_links.delete_all app/models/page.rb @@ -1,11 +1,7 @@ -<h2><%= link_to @page.title, wiki_page_url(@page.permalink) %></h2> - - -<p class="wiki_body"> - <%= wikified_body(@page.body) %> -</p> +<%= render :partial => "page", :locals => {:page => @version} %> <% content_for :right do -%> + <h5>Author: <%= author(@page.user_id) %></h5> <ul class="meta_info"> <li><%= link_to('View previous revision', revision_page_url(:id => @page.permalink, :version => (@page.previous.version))) if @page.previous %></li> @@ -14,4 +10,6 @@ <%# FIXME Clean up this revision link logic %> <li><%= link_to 'Return to current revision', wiki_page_url(@page.permalink) %></li> </ul> + <%= render :partial => "right", :locals => {:page => @page, :version => @version} %> + <% end -%> \ No newline at end of file app/views/pages/revision.html.erb @@ -1,25 +1,6 @@ -<h2 class="title"><%=h @page.title %></h2> +<%= render :partial => "page", :locals => {:page => @version} %> -<div id="flag" title="<%= @page.class.name %>_<%= @page.id %>">Login or sign up to flag this page.</div> - -<p class="wiki_body"> - <%= wikified_body(auto_link(@page.body)) %> -</p> <% content_for :right do -%> -<h5>Author: <%= author(@page.user_id) %></h5> -<ul class="meta_info"> - <li><%= link_to 'Edit this page', edit_page_path(@page) unless @page.locked? && logged_in? && !current_user.admin? %></li> - <li><%= link_to((@page.locked? ? "Unlock this page" : "Lock this page"), lock_page_path(@page)) if logged_in? && current_user.admin? %></li> - <li><%= link_to "Delete this page and all revisions", page_path(@page), :method => :delete if logged_in? && current_user.admin? && @page.permalink != 'home' %></li> - <li><%= link_to('View previous revision', revision_page_url(:id => @page.permalink, :version => (@page.version - 1) )) if (@page.versions.size > 1 && @page.version > 1) %></li> - <li><%= link_to 'Return to home', pages_path unless @page.permalink == "home" %></li> - <li>Inbound links: - <ul> - <% @page.inbound_links.each do |link| -%> - <li><%= link_to link.from_page.title, link.from_page %> - <% end %> - </ul> - </li> -</ul> + <%= render :partial => "right", :locals => {:page => @page, :version => @version}%> <% end -%> \ No newline at end of file app/views/pages/show.html.erb @@ -6,7 +6,7 @@ ActionController::Routing::Routes.draw do |map| map.resource :session map.resource :site, :member => {:expire_cache => :get, :mark_all_private => :get} map.resources :users - map.resources :pages, :member => {:revision => :get, :rollback => :get, :lock => :get}, :collection => {:search => :get} + map.resources :pages, :member => {:revision => :get, :rollback => :get, :lock => :get, :revisions => :get, :diff => :get}, :collection => {:search => :get} map.resources :attachments map.login '/login', :controller => 'sessions', :action => 'new' config/routes.rb @@ -225,3 +225,14 @@ a.attachment_link { text-decoration: none; margin: 0 auto; } + +del { + color: #999; + background-color: #ddd; +} + +ins { + background-color: #cfc; + text-decoration: none; + color: #000; +} \ No newline at end of file public/stylesheets/style.css 2899d21f259e8ad291590271afc47d330e398ed3 Codafoo codafoo@gmail.com http://github.com/queso/signal-wiki/commit/a4bb4c42027ce1cc8bffde040084ee791160f0a0 a4bb4c42027ce1cc8bffde040084ee791160f0a0 2008-04-18T10:41:19-07:00 2008-04-13T19:36:59-07:00 Added revisions, diffs, and refactored the page rendering code fa618644a2942d8ecbad5675a25bfe561d4aac0e Josh Owens joshua.owens@gmail.com