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

Render HTML pages for ExportHTML 'manually'

Browse source
This commit is contained in:
Alexey Verkhovsky 2005-10-27 05:29:24 +00:00
parent d28be2b0ef
commit af25237a90
4 changed files with 44 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
app/controllers/wiki_controller.rb
View file

@ -51,11 +51,41 @@ class WikiController < ApplicationController
end end
def export_html def export_html
stylesheet = File.read(File.join(RAILS_ROOT, 'public', 'stylesheets', 'instiki.css'))
export_pages_as_zip('html') do |page| export_pages_as_zip('html') do |page|
@page = page
@renderer = PageRenderer.new(page.revisions.last) renderer = PageRenderer.new(page.revisions.last)
@link_mode = :export rendered_page = <<-EOL
render_to_string('wiki/print', use_layout = (@params['layout'] != 'no')) <!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>#{page.plain_name} in #{@web.name}</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<style type="text/css">
h1#pageName, .newWikiWord a, a.existingWikiWord, .newWikiWord a:hover {
color: ##{@web ? @web.color : "393" };
}
.newWikiWord { background-color: white; font-style: italic; }
#{stylesheet}
</style>
<style type="text/css">
#{@web.additional_style}
</style>
</head>
<body>
#{renderer.display_content_for_export}
<div class="byline">
#{page.revisions? ? "Revised" : "Created" } on #{ page.revised_at.strftime('%B %d, %Y %H:%M:%S') }
by
#{ UrlGenerator.new(self).make_link(page.author.name, @web, nil, { :mode => :export }) }
</div>
</body>
</html>
EOL
rendered_page
end end
end end
@ -256,7 +286,7 @@ class WikiController < ApplicationController
def export_page_to_tex(file_path) def export_page_to_tex(file_path)
tex tex
File.open(file_path, 'w') { |f| f.write(render_to_string('wiki/tex')) } File.open(file_path, 'w') { |f| f.write(render_to_string(:template => 'wiki/tex', :layout => nil)) }
end end
def export_pages_as_zip(file_type, &block) def export_pages_as_zip(file_type, &block)
@ -285,7 +315,7 @@ class WikiController < ApplicationController
def export_web_to_tex(file_path) def export_web_to_tex(file_path)
@tex_content = table_of_contents(@web.page('HomePage').content, render_tex_web) @tex_content = table_of_contents(@web.page('HomePage').content, render_tex_web)
File.open(file_path, 'w') { |f| f.write(render_to_string('wiki/tex_web')) } File.open(file_path, 'w') { |f| f.write(render_to_string(:template => 'wiki/tex_web', :layout => nil)) }
end end
def get_page_and_revision def get_page_and_revision
@ -346,16 +376,6 @@ class WikiController < ApplicationController
end end
end end
def render_to_string(template_name, with_layout = false)
add_variables_to_assigns
self.assigns['content_for_layout'] = @template.render_file(template_name)
if with_layout
@template.render_file('layouts/default')
else
self.assigns['content_for_layout']
end
end
def rss_with_content_allowed? def rss_with_content_allowed?
@web.password.nil? or @web.published? @web.password.nil? or @web.published?
end end

4
app/models/page.rb
View file

@ -94,6 +94,10 @@ class Page < ActiveRecord::Base
locked_at + LOCKING_PERIOD > comparison_time unless locked_at.nil? locked_at + LOCKING_PERIOD > comparison_time unless locked_at.nil?
end end
def to_param
name
end
private private
def continous_revision?(time, author) def continous_revision?(time, author)

4
app/models/web.rb
View file

@ -79,6 +79,10 @@ class Web < ActiveRecord::Base
PageSet.new(self, pages, nil) PageSet.new(self, pages, nil)
end end
def to_param
address
end
private private
# Returns an array of all the wiki words in any current revision # Returns an array of all the wiki words in any current revision

2
test/functional/wiki_controller_test.rb
View file

@ -116,7 +116,6 @@ class WikiControllerTest < Test::Unit::TestCase
assert_match /attachment; filename="wiki1-html-\d\d\d\d-\d\d-\d\d-\d\d-\d\d-\d\d.zip"/, assert_match /attachment; filename="wiki1-html-\d\d\d\d-\d\d-\d\d-\d\d-\d\d-\d\d.zip"/,
r.headers['Content-Disposition'] r.headers['Content-Disposition']
assert_equal 'PK', r.body[0..1], 'Content is not a zip file' assert_equal 'PK', r.body[0..1], 'Content is not a zip file'
assert_equal :export, r.template_objects['link_mode']
# Tempfile doesn't know how to open files with binary flag, hence the two-step process # Tempfile doesn't know how to open files with binary flag, hence the two-step process
Tempfile.open('instiki_export_file') { |f| @tempfile_path = f.path } Tempfile.open('instiki_export_file') { |f| @tempfile_path = f.path }
@ -145,7 +144,6 @@ class WikiControllerTest < Test::Unit::TestCase
assert_match /attachment; filename="wiki1-html-\d\d\d\d-\d\d-\d\d-\d\d-\d\d-\d\d.zip"/, assert_match /attachment; filename="wiki1-html-\d\d\d\d-\d\d-\d\d-\d\d-\d\d-\d\d.zip"/,
r.headers['Content-Disposition'] r.headers['Content-Disposition']
assert_equal 'PK', r.body[0..1], 'Content is not a zip file' assert_equal 'PK', r.body[0..1], 'Content is not a zip file'
assert_equal :export, r.template_objects['link_mode']
end end
def test_export_markup def test_export_markup