wiki branch merged into trunk

git-svn-id: http://redmine.rubyforge.org/svn/trunk@323 e93f8b46-1217-0410-a6f0-8f06a7374b81

19 files changed, 504 insertions, 6 deletions

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 91cf074e6..c0b24902c 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -32,6 +32,10 @@ class ApplicationController < ActionController::Base
     end

   end

   

+  def logged_in_user_membership

+    @user_membership ||= Member.find(:first, :conditions => ["user_id=? and project_id=?", self.logged_in_user.id, @project.id])

+  end

+  

   # check if login is globally required to access the application

   def check_if_login_required

     require_login if Setting.login_required?

@@ -89,6 +93,16 @@ class ApplicationController < ActionController::Base
     render :nothing => true, :status => 403

     false

   end

+  

+  # make sure that the user is a member of the project (or admin) if project is private

+  # used as a before_filter for actions that do not require any particular permission on the project

+  def check_project_privacy

+    return true if @project.is_public?

+    return false unless logged_in_user

+    return true if logged_in_user.admin? || logged_in_user_membership

+    render :nothing => true, :status => 403

+    false

+  end

 

   # store current uri in session.
   # return to this location by calling redirect_back_or_default
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 4a957a9cb..69d775c11 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -68,6 +68,10 @@ class ProjectsController < ApplicationController
         @project.repository = Repository.new

         @project.repository.attributes = params[:repository]

       end

+      if "1" == params[:wiki_enabled]

+        @project.wiki = Wiki.new

+        @project.wiki.attributes = params[:wiki]

+      end

       if @project.save
         flash[:notice] = l(:notice_successful_create)
         redirect_to :controller => 'admin', :action => 'projects'

@@ -113,6 +117,15 @@ class ProjectsController < ApplicationController
           @project.repository.update_attributes params[:repository]

         end

       end

+      if params[:wiki_enabled]

+        case params[:wiki_enabled]

+        when "0"

+          @project.wiki.destroy

+        when "1"

+          @project.wiki ||= Wiki.new

+          @project.wiki.update_attributes params[:wiki]

+        end

+      end      

       @project.attributes = params[:project]

       if @project.save
         flash[:notice] = l(:notice_successful_update)
diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
new file mode 100644
index 000000000..88c5b4e4a
--- /dev/null
+++ b/app/controllers/wiki_controller.rb
@@ -0,0 +1,111 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+class WikiController < ApplicationController
+  layout 'base'
+  before_filter :find_wiki, :check_project_privacy, :except => [:preview]
+    
+  # display a page (in editing mode if it doesn't exist)
+  def index
+    page_title = params[:page]
+    @page = @wiki.find_or_new_page(page_title)
+    if @page.new_record?
+      edit
+      render :action => 'edit' and return
+    end
+    @content = (params[:version] ? @page.content.versions.find_by_version(params[:version]) : @page.content)
+    if params[:export] == 'html'
+      export = render_to_string :action => 'export', :layout => false
+      send_data(export, :type => 'text/html', :filename => "#{@page.title}.html")
+      return
+    elsif params[:export] == 'txt'
+      send_data(@content.text, :type => 'text/plain', :filename => "#{@page.title}.txt")
+      return
+    end
+    render :action => 'show'
+  end
+  
+  # edit an existing page or a new one
+  def edit
+    @page = @wiki.find_or_new_page(params[:page])    
+    @page.content = WikiContent.new(:page => @page) if @page.new_record?
+    @content = @page.content
+    @content.text = "h1. #{@page.pretty_title}" if @content.text.empty?
+    # don't keep previous comment
+    @content.comment = nil
+    if request.post?      
+      if @content.text == params[:content][:text]
+        # don't save if text wasn't changed
+        redirect_to :action => 'index', :id => @project, :page => @page.title
+        return
+      end
+      @content.text = params[:content][:text]
+      @content.comment = params[:content][:comment]
+      @content.author = logged_in_user
+      # if page is new @page.save will also save content, but not if page isn't a new record
+      if (@page.new_record? ? @page.save : @content.save)
+        redirect_to :action => 'index', :id => @project, :page => @page.title
+      end
+    end
+  end
+  
+  # show page history
+  def history
+    @page = @wiki.find_page(params[:page])
+    # don't load text
+    @versions = @page.content.versions.find :all, 
+                                            :select => "id, author_id, comment, updated_on, version",
+                                            :order => 'version DESC'
+  end
+
+  # display special pages
+  def special
+    page_title = params[:page].downcase
+    case page_title
+    # show pages index, sorted by title
+    when 'page_index'
+      # eager load information about last updates, without loading text
+      @pages = @wiki.pages.find :all, :select => "wiki_pages.*, wiki_contents.updated_on",
+                                      :joins => "LEFT JOIN wiki_contents ON wiki_contents.page_id = wiki_pages.id",
+                                      :order => 'title'
+    # export wiki to a single html file
+    when 'export'
+      @pages = @wiki.pages.find :all, :order => 'title'
+      export = render_to_string :action => 'export_multiple', :layout => false
+      send_data(export, :type => 'text/html', :filename => "wiki.html")
+      return      
+    else
+      # requested special page doesn't exist, redirect to default page
+      redirect_to :action => 'index', :id => @project, :page => nil and return
+    end
+    render :action => "special_#{page_title}"
+  end
+  
+  def preview
+    @text = params[:content][:text]
+    render :partial => 'preview'
+  end
+
+private
+  
+  def find_wiki
+    @project = Project.find(params[:id])
+    @wiki = @project.wiki
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 5ef82c90f..f9010df15 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -63,7 +63,7 @@ module ApplicationHelper
   end

   

   def format_time(time)

-    l_datetime(time) if time

+    l_datetime((time.is_a? String) ? time.to_time : time) if time

   end

   

   def day_name(day)

@@ -92,10 +92,42 @@ module ApplicationHelper
     html  

   end

   

-  def textilizable(text)

-    text = (Setting.text_formatting == 'textile') && (ActionView::Helpers::TextHelper.method_defined? "textilize") ? RedCloth.new(h(text)).to_html : simple_format(auto_link(h(text)))

-    # turn "#id" patterns into links to issues

-    text = text.gsub(/#(\d+)([^;\d])/, "<a href='/issues/show/\\1'>#\\1</a>\\2")

+  # textilize text according to system settings and RedCloth availability

+  def textilizable(text, options = {})

+    # different methods for formatting wiki links

+    case options[:wiki_links]

+    when :local

+      # used for local links to html files

+      format_wiki_link = Proc.new {|title| "#{title}.html" }

+    when :anchor

+      # used for single-file wiki export

+      format_wiki_link = Proc.new {|title| "##{title}" }

+    else

+      if @project

+        format_wiki_link = Proc.new {|title| url_for :controller => 'wiki', :action => 'index', :id => @project, :page => title }

+      else

+        format_wiki_link = Proc.new {|title| title }

+      end

+    end

+    

+    # turn wiki links into textile links: 

+    # example:

+    #   [[link]] -> "link":link

+    #   [[link|title]] -> "title":link

+    text = text.gsub(/\[\[([^\]\|]+)(\|([^\]\|]+))?\]\]/) {|m| "\"#{$3 || $1}\":" + format_wiki_link.call(Wiki.titleize($1)) }

+

+    # turn issue ids to textile links

+    # example:

+    #   #52 -> "#52":/issues/show/52

+    text = text.gsub(/#(\d+)([\s\.\(\)\-,:;])/) {|m| "\"##{$1}\":" + url_for(:controller => 'issues', :action => 'show', :id => $1) + $2 }

+       

+    # turn revision ids to textile links (@project needed)

+    # example:

+    #   r52 -> "r52":/repositories/revision/6?rev=52 (@project.id is 6)

+    text = text.gsub(/r(\d+)([\s\.\(\)\-,:;])/) {|m| "\"r#{$1}\":" + url_for(:controller => 'repositories', :action => 'revision', :id => @project.id, :rev => $1) + $2 } if @project

+   

+    # finally textilize text

+    text = (Setting.text_formatting == 'textile') && (ActionView::Helpers::TextHelper.method_defined? "textilize") ? auto_link(RedCloth.new(text, [:filter_html]).to_html) : simple_format(auto_link(h(text)))

   end

   

   def error_messages_for(object_name, options = {})

diff --git a/app/helpers/wiki_helper.rb b/app/helpers/wiki_helper.rb
new file mode 100644
index 000000000..32b376925
--- /dev/null
+++ b/app/helpers/wiki_helper.rb
@@ -0,0 +1,19 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+module WikiHelper
+end
diff --git a/app/models/project.rb b/app/models/project.rb
index e36100dcf..3f9ec1680 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -26,13 +26,14 @@ class Project < ActiveRecord::Base
   has_many :news, :dependent => :delete_all, :include => :author

   has_many :issue_categories, :dependent => :delete_all, :order => "issue_categories.name"

   has_one :repository, :dependent => :destroy

+  has_one :wiki, :dependent => :destroy

   has_and_belongs_to_many :custom_fields, :class_name => 'IssueCustomField', :join_table => 'custom_fields_projects', :association_foreign_key => 'custom_field_id'

   acts_as_tree :order => "name", :counter_cache => true

 

   validates_presence_of :name, :description

   validates_uniqueness_of :name

   validates_associated :custom_values, :on => :update

-  validates_associated :repository

+  validates_associated :repository, :wiki

   validates_format_of :name, :with => /^[\w\s\'\-]*$/i

 

   # returns latest created projects

diff --git a/app/models/wiki.rb b/app/models/wiki.rb
new file mode 100644
index 000000000..d99e757e5
--- /dev/null
+++ b/app/models/wiki.rb
@@ -0,0 +1,44 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+class Wiki < ActiveRecord::Base
+  belongs_to :project
+  has_many :pages, :class_name => 'WikiPage', :dependent => :destroy
+  
+  validates_presence_of :project_id, :start_page
+  
+  # find the page with the given title
+  # if page doesn't exist, return a new page
+  def find_or_new_page(title)
+    title = Wiki.titleize(title || start_page)
+    find_page(title) || WikiPage.new(:wiki => self, :title => title)  
+  end
+  
+  # find the page with the given title
+  def find_page(title)
+    pages.find_by_title(Wiki.titleize(title || start_page))
+  end
+  
+  # turn a string into a valid page title
+  def self.titleize(title)
+    # replace spaces with _ and remove unwanted caracters
+    title = title.gsub(/\s+/, '_').delete(',;|') if title
+    # upcase the first letter
+    title = title[0..0].upcase + title[1..-1] if title
+    title
+  end  
+end
diff --git a/app/models/wiki_content.rb b/app/models/wiki_content.rb
new file mode 100644
index 000000000..b0382cfaf
--- /dev/null
+++ b/app/models/wiki_content.rb
@@ -0,0 +1,58 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+require 'zlib'
+
+class WikiContent < ActiveRecord::Base
+  belongs_to :page, :class_name => 'WikiPage', :foreign_key => 'page_id'
+  belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
+  validates_presence_of :text
+  
+  acts_as_versioned
+  class Version
+    belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
+    attr_protected :data
+    
+    def text=(plain)
+      case Setting.wiki_compression
+      when 'gzip'
+      begin
+        self.data = Zlib::Deflate.deflate(plain, Zlib::BEST_COMPRESSION)
+        self.compression = 'gzip'
+      rescue
+        self.data = plain
+        self.compression = ''
+      end
+      else
+        self.data = plain
+        self.compression = ''
+      end
+      plain
+    end
+    
+    def text
+      @text ||= case compression
+      when 'gzip'
+         Zlib::Inflate.inflate(data)
+      else
+        # uncompressed data
+        data
+      end      
+    end
+  end
+  
+end
diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb
new file mode 100644
index 000000000..e99bb314e
--- /dev/null
+++ b/app/models/wiki_page.rb
@@ -0,0 +1,34 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+class WikiPage < ActiveRecord::Base
+  belongs_to :wiki
+  has_one :content, :class_name => 'WikiContent', :foreign_key => 'page_id', :dependent => :destroy
+  
+  validates_presence_of :title
+  validates_format_of :title, :with => /^[^,\s]*$/
+  validates_uniqueness_of :title, :scope => :wiki_id, :case_sensitive => false
+  validates_associated :content
+  
+  def before_save
+    self.title = Wiki.titleize(title)
+  end
+  
+  def pretty_title
+    title.tr '_', ' '
+  end
+end
diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml
index 42275b11f..7665632ef 100644
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -91,6 +91,7 @@
         <%= link_to l(:label_change_log), {:controller => 'projects', :action => 'changelog', :id => @project }, :class => "menuItem" %>

         <%= link_to l(:label_roadmap), {:controller => 'projects', :action => 'roadmap', :id => @project }, :class => "menuItem" %>

         <%= link_to l(:label_document_plural), {:controller => 'projects', :action => 'list_documents', :id => @project }, :class => "menuItem" %>

+        <%= link_to l(:label_wiki), {:controller => 'wiki', :id => @project, :page => nil }, :class => "menuItem" if @project.wiki and !@project.wiki.new_record? %>

         <%= link_to l(:label_member_plural), {:controller => 'projects', :action => 'list_members', :id => @project }, :class => "menuItem" %>

         <%= link_to l(:label_attachment_plural), {:controller => 'projects', :action => 'list_files', :id => @project }, :class => "menuItem" %>

         <%= link_to l(:label_search), {:controller => 'projects', :action => 'search', :id => @project }, :class => "menuItem" %>

@@ -115,6 +116,7 @@
 				<li><%= link_to l(:label_change_log), :controller => 'projects', :action => 'changelog', :id => @project %></li>

 				<li><%= link_to l(:label_roadmap), :controller => 'projects', :action => 'roadmap', :id => @project %></li>

 				<li><%= link_to l(:label_document_plural), :controller => 'projects', :action => 'list_documents', :id => @project %></li>

+				<li><%= link_to l(:label_wiki), :controller => 'wiki', :id => @project, :page => nil if @project.wiki and !@project.wiki.new_record? %></li>

 				<li><%= link_to l(:label_member_plural), :controller => 'projects', :action => 'list_members', :id => @project %></li>

 				<li><%= link_to l(:label_attachment_plural), :controller => 'projects', :action => 'list_files', :id => @project %></li>

 				<li><%= link_to l(:label_search), :controller => 'projects', :action => 'search', :id => @project %></li>

diff --git a/app/views/projects/_form.rhtml b/app/views/projects/_form.rhtml
index 2191e9fa3..0bb7ebfb5 100644
--- a/app/views/projects/_form.rhtml
+++ b/app/views/projects/_form.rhtml
@@ -38,6 +38,20 @@
 <%= javascript_tag "Element.hide('repository');" if @project.repository.nil? %>
 </div>
 
+<div class="box">
+<h3><%= check_box_tag "wiki_enabled", 1, !@project.wiki.nil?, :onclick => "Element.toggle('wiki');" %> <%= l(:label_wiki) %></h3>
+<%= hidden_field_tag "wiki_enabled", 0 %>
+<div id="wiki">
+<% fields_for :wiki, @project.wiki, { :builder => TabularFormBuilder, :lang => current_language} do |wiki| %>
+<p><%= wiki.text_field :start_page, :size => 60, :required => true %></p>
+<% # content_tag("div", "", :id => "wiki_start_page_auto_complete", :class => "auto_complete") +
+   # auto_complete_field("wiki_start_page", { :url => { :controller => 'wiki', :action => 'auto_complete_for_wiki_page', :id => @project } })
+%>
+<% end %>
+</div>
+<%= javascript_tag "Element.hide('wiki');" if @project.wiki.nil? %>
+</div>
+
 <% content_for :header_tags do %>
 <%= javascript_include_tag 'calendar/calendar' %>
 <%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>
diff --git a/app/views/settings/edit.rhtml b/app/views/settings/edit.rhtml
index ed42d3478..aac4ab686 100644
--- a/app/views/settings/edit.rhtml
+++ b/app/views/settings/edit.rhtml
@@ -38,6 +38,9 @@
 <p><label><%= l(:setting_text_formatting) %></label>
 <%= select_tag 'settings[text_formatting]', options_for_select( [[l(:label_none), 0], ["textile", "textile"]], Setting.text_formatting) %></p>
 
+<p><label><%= l(:setting_wiki_compression) %></label>
+<%= select_tag 'settings[wiki_compression]', options_for_select( [[l(:label_none), 0], ["gzip", "gzip"]], Setting.wiki_compression) %></p>
+
 </div>
 <%= submit_tag l(:button_save) %>
 <% end %>
\ No newline at end of file
diff --git a/app/views/wiki/_preview.rhtml b/app/views/wiki/_preview.rhtml
new file mode 100644
index 000000000..c17200ab1
--- /dev/null
+++ b/app/views/wiki/_preview.rhtml
@@ -0,0 +1,3 @@
+<fieldset class="preview"><legend><%= l(:label_preview) %></legend>

+<%= textilizable @text %>

+</fieldset>

diff --git a/app/views/wiki/edit.rhtml b/app/views/wiki/edit.rhtml
new file mode 100644
index 000000000..ca29aa1e6
--- /dev/null
+++ b/app/views/wiki/edit.rhtml
@@ -0,0 +1,39 @@
+<div class="contextual">

+<%= link_to(l(:label_page_index), {:action => 'special', :page => 'Page_index'}, :class => 'icon icon-index') %>

+</div>

+

+<h2><%= @page.pretty_title %></h2>

+

+<% form_for :content, @content, :url => {:action => 'edit', :page => @page.title}, :html => {:id => 'wiki_form'} do |f| %>

+<%= error_messages_for 'content' %>

+<p><%= f.text_area :text, :cols => 100, :rows => 25, :style => "width:99%;" %></p>

+<p><label><%= l(:field_comment) %></label><br /><%= f.text_field :comment, :size => 120 %></p>

+<p><%= submit_tag l(:button_save) %>

+   <%= link_to_remote l(:label_preview), 

+                       { :url => { :controller => 'wiki', :action => 'preview' },

+                         :method => 'get',

+                         :update => 'preview',

+                         :with => "Form.serialize('wiki_form')",

+                         :loading => "Element.show('indicator')",

+                         :loaded => "Element.hide('indicator')"

+                       } %>

+   <span id="indicator" style="display:none"><%= image_tag "loading.gif", :align => "absmiddle" %></span>

+</p>

+

+<% end %>

+

+<% if Setting.text_formatting == 'textile' %>

+<%= javascript_include_tag 'jstoolbar' %>

+<script type="text/javascript">

+//<![CDATA[

+if (document.getElementById) { 

+	if (document.getElementById('content_text')) { 

+		var commentTb = new jsToolBar(document.getElementById('content_text')); 

+		commentTb.draw(); 

+	}

+}

+//]]>

+</script>

+<% end %>

+

+<div id="preview" class="wiki"></div>
\ No newline at end of file
diff --git a/app/views/wiki/export.rhtml b/app/views/wiki/export.rhtml
new file mode 100644
index 000000000..c31568246
--- /dev/null
+++ b/app/views/wiki/export.rhtml
@@ -0,0 +1,14 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">

+<head>

+<title><%=h @page.pretty_title %></title>

+<meta http-equiv="content-type" content="text/html; charset=utf-8" />

+<style>

+body { font:80% Verdana,Tahoma,Arial,sans-serif; }

+h1, h2, h3, h4 {  font-family: Trebuchet MS,Georgia,"Times New Roman",serif; }

+</style>

+</head>

+<body>

+<%= textilizable @content.text, :wiki_links => :local %>

+</body>

+</html>

diff --git a/app/views/wiki/export_multiple.rhtml b/app/views/wiki/export_multiple.rhtml
new file mode 100644
index 000000000..cecb40b42
--- /dev/null
+++ b/app/views/wiki/export_multiple.rhtml
@@ -0,0 +1,26 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">

+<head>

+<title><%=h @wiki.project.name %></title>

+<meta http-equiv="content-type" content="text/html; charset=utf-8" />

+<style>

+body { font:80% Verdana,Tahoma,Arial,sans-serif; }

+h1, h2, h3, h4 {  font-family: Trebuchet MS,Georgia,"Times New Roman",serif; }

+</style>

+</head>

+<body>

+

+<strong><%= l(:label_page_index) %></strong>

+<ul>

+<% @pages.each do |page| %>

+    <li><a href="#<%= page.title %>"><%= page.pretty_title %></a></li>

+<% end %>

+</ul>

+

+<% @pages.each do |page| %>

+<hr />

+<%= textilizable page.content.text, :wiki_links => :anchor %>

+<% end %>

+

+</body>

+</html>

diff --git a/app/views/wiki/history.rhtml b/app/views/wiki/history.rhtml
new file mode 100644
index 000000000..e44a08168
--- /dev/null
+++ b/app/views/wiki/history.rhtml
@@ -0,0 +1,28 @@
+<div class="contextual">

+<%= link_to(l(:label_page_index), {:action => 'special', :page => 'Page_index'}, :class => 'icon icon-index') %>

+</div>

+

+<h2><%= @page.pretty_title %></h2>

+

+<h3><%= l(:label_history) %></h3>

+

+<table class="list">

+<thead><tr>

+    <th>#</th>

+    <th><%= l(:field_updated_on) %></th>

+    <th><%= l(:field_author) %></th>

+    <th><%= l(:field_comment) %></th>

+</tr></thead>

+<tbody>

+<% @versions.each do |ver| %>

+<tr class="<%= cycle("odd", "even") %>">

+    <th align="center"><%= link_to ver.version, :action => 'index', :page => @page.title, :version => ver.version %></th>

+    <td align="center"><%= format_time(ver.updated_on) %></td>

+    <td><em><%= ver.author ? ver.author.name : "anonyme" %></em></td>

+    <td><%=h ver.comment %></td>

+</tr>

+<% end %>

+</tbody>

+</table>

+

+<p><%= link_to l(:button_back), :action => 'index', :page => @page.title %></p>
\ No newline at end of file
diff --git a/app/views/wiki/show.rhtml b/app/views/wiki/show.rhtml
new file mode 100644
index 000000000..e0369ed30
--- /dev/null
+++ b/app/views/wiki/show.rhtml
@@ -0,0 +1,30 @@
+<div class="contextual">

+<%= link_to(l(:button_edit), {:action => 'edit', :page => @page.title}, :class => 'icon icon-edit') if @content.version == @page.content.version %>

+<%= link_to(l(:label_history), {:action => 'history', :page => @page.title}, :class => 'icon icon-history') %>

+<%= link_to(l(:label_page_index), {:action => 'special', :page => 'Page_index'}, :class => 'icon icon-index') %>

+</div>

+

+<% if @content.version != @page.content.version %>

+    <p>    

+    <%= link_to(('&#171; ' + l(:label_previous)), :action => 'index', :page => @page.title, :version => (@content.version - 1)) + " - " if @content.version > 1 %>

+    <%= "#{l(:label_version)} #{@content.version}/#{@page.content.version}"  %> - 

+    <%= link_to((l(:label_next) + ' &#187;'), :action => 'index', :page => @page.title, :version => (@content.version + 1)) + " - " if @content.version < @page.content.version %>

+    <%= link_to(l(:label_current_version), :action => 'index', :page => @page.title) %>

+    <br />

+    <em><%= @content.author ? @content.author.name : "anonyme" %>, <%= format_time(@content.updated_on) %> </em><br />

+    <%=h @content.comment %>

+    </p>

+    <hr />

+<% end %>

+

+<div class="wiki">

+<% cache "wiki/show/#{@page.id}/#{@content.version}" do %>

+<%= textilizable @content.text %>

+<% end %>

+</div>

+

+<div class="contextual">

+<%= l(:label_export_to) %>

+<%= link_to 'HTML', {:export => 'html', :version => @content.version}, :class => 'icon icon-html' %>,

+<%= link_to 'TXT', {:export => 'txt', :version => @content.version}, :class => 'icon icon-txt' %>

+</div>
\ No newline at end of file
diff --git a/app/views/wiki/special_page_index.rhtml b/app/views/wiki/special_page_index.rhtml
new file mode 100644
index 000000000..e6e3e7020
--- /dev/null
+++ b/app/views/wiki/special_page_index.rhtml
@@ -0,0 +1,13 @@
+<div class="contextual">

+<% unless @pages.empty? %>

+<%= l(:label_export_to) %> <%= link_to 'HTML', {:action => 'special', :page => 'export'}, :class => 'icon icon-html' %>

+<% end %>

+</div>

+

+<h2><%= l(:label_page_index) %></h2>

+

+<% if @pages.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>

+<ul><% @pages.each do |page| %>

+    <li><%= link_to page.pretty_title, :action => 'index', :page => page.title %> -

+    <%= l(:label_last_updates) %>: <%= format_time(page.updated_on) %></li>

+<% end %></ul>
\ No newline at end of file