deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Use Standard PageRenderer for S5 Content

Browse source 
From Jason Blevins: use the standard PageRenderer class to render S5 content. This way, WikiWords (etc) are processed in S5 slideshows.
This commit is contained in:
Jacques Distler 2007-09-14 10:43:03 -05:00
parent 3f5d804c22
commit 54aada824c
4 changed files with 48 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/controllers/wiki_controller.rb
View file

@ -293,18 +293,10 @@ class WikiController < ApplicationController
end
def s5
if @web.markup == :markdownMML
my_content = Maruku.new(@page.content.delete("\r"),
{:math_enabled => true, :math_numbered => ['\\[','\\begin{equation}'], :content_only => true,
:author => @page.author, :title => @page.plain_name})
@s5_content = sanitize_xhtml(my_content.to_s5)
@s5_theme = my_content.s5_theme
elsif @web.markup == :markdown
my_content = Maruku.new(@page.content.delete("\r"),
{:math_enabled => false, :content_only => true,
:author => @page.author, :title => @page.plain_name})
@s5_content = sanitize_xhtml(my_content.to_s5)
@s5_theme = my_content.s5_theme
if @web.markup == :markdownMML || @web.markup == :markdown
my_rendered = PageRenderer.new(@page.revisions.last)
@s5_content = my_rendered.display_s5
@s5_theme = my_rendered.s5_theme
else
@s5_content = "S5 not supported with this text filter"
@s5_theme = "default"