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

More progress on S5.

Browse source 
Forgot to add gremlin zapping in app/views/wiki/edit.rhtml.
This commit is contained in:
Jacques Distler 2007-02-28 18:38:52 -06:00
parent 8359047fd5
commit 02c6ed2fa0
7 changed files with 83 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/controllers/wiki_controller.rb
View file

@ -2,6 +2,7 @@ require 'fileutils'
require 'redcloth_for_tex'
require 'parsedate'
require 'zip/zip'
require 'sanitize'
class WikiController < ApplicationController
@ -11,6 +12,8 @@ class WikiController < ApplicationController
layout 'default', :except => [:rss_feed, :rss_with_content, :rss_with_headlines, :tex, :pdf, :s5, :export_tex, :export_html]
include Sanitize
def index
if @web_name
redirect_home
@ -287,7 +290,9 @@ class WikiController < ApplicationController
def s5
if @web.markup == :markdownMML or @web.markup == :markdown
@s5_content = Maruku.new(@page.content).to_s5
# @s5_content = sanitize_html(Maruku.new(@page.content.delete("\r\x01-\x08\x0B\x0C\x0E-\x1F"), {:raw => true}).to_s5)
@s5_content = sanitize_html(Maruku.new(@page.content.delete("\r\x01-\x08\x0B\x0C\x0E-\x1F"),
{:math_enabled => true, :math_numbered => ['\\[','\\begin{equation}'], :content_only => true}).to_s5)
end
end

1
app/views/layouts/s5.rhtml Normal file
View file

@ -0,0 +1 @@
<%= @content_for_layout %>

2
app/views/wiki/edit.rhtml
View file

@ -14,7 +14,7 @@
{ 'id' => 'editForm', 'method' => 'post', 'onsubmit' => 'cleanAuthorName()',
'accept-charset' => 'utf-8' }) %>
<textarea name="content" id="content"><%= h(@flash[:content] || @page.content) %></textarea>
<textarea name="content" id="content"><%= h(@flash[:content] || @page.content.delete("\x01-\x08\x0B\x0C\x0E-\x1F")) %></textarea>
<div id="editFormButtons">
<input type="submit" value="Submit" accesskey="s"/> as
<%= text_field_tag :author, @author,

31
app/views/wiki/s5.rhtml Normal file
View file

@ -0,0 +1,31 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN" "http://www.w3.org/Math/DTD/mathml2/xhtml-math11-f.dtd" >
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title><%=@page.plain_name%></title>
<!-- metadata -->
<meta name="generator" content="Instiki" />
<meta name="version" content="<%= "#{Instiki::VERSION::STRING}" %>" />
<meta name="author" content="<%=@page.author%>" />
<meta name="company" content="" />
<!-- configuration parameters -->
<meta name="defaultView" content="slideshow" />
<meta name="controlVis" content="hidden" />
<!-- style sheet links -->
<link rel="stylesheet" href="/s5/ui/default/slides.css" type="text/css" media="projection" id="slideProj" />
<link rel="stylesheet" href="/s5/ui/default/outline.css" type="text/css" media="screen" id="outlineStyle" />
<link rel="stylesheet" href="/s5/ui/default/print.css" type="text/css" media="print" id="slidePrint" />
<link rel="stylesheet" href="/s5/ui/default/opera.css" type="text/css" media="projection" id="operaFix" />
<link rel="stylesheet" href="/s5/ui/default/math.css" type="text/css" media="all" id="mathStyle" />
<!-- S5 JS -->
<script src="/s5/ui/default/slides.js" type="text/javascript"></script>
</head>
<body>
<%= @s5_content %>
</body>
</html>