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

Converging on S5 support.

Browse source
This commit is contained in:
Jacques Distler 2007-03-01 03:05:35 -06:00
parent 02c6ed2fa0
commit 41ff4724b8
9 changed files with 41 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

10
vendor/plugins/maruku/lib/maruku/output/s5/fancy.rb vendored
View file

@ -3,11 +3,11 @@ module MaRuKu
<meta name="defaultView" content="slideshow" />
<meta name="controlVis" content="hidden" />
<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" />
<script src="s5/ui/default/slides.js" type="text/javascript"> </script>
<link rel="stylesheet" href="ui/default/slides.css" type="text/css" media="projection" id="slideProj" />
<link rel="stylesheet" href="ui/default/outline.css" type="text/css" media="screen" id="outlineStyle" />
<link rel="stylesheet" href="ui/default/print.css" type="text/css" media="print" id="slidePrint" />
<link rel="stylesheet" href="ui/default/opera.css" type="text/css" media="projection" id="operaFix" />
<script src="ui/default/slides.js" type="text/javascript"> </script>
EOF

16
vendor/plugins/maruku/lib/maruku/output/s5/to_s5.rb vendored
View file

@ -7,7 +7,7 @@ module MaRuKu
def to_s5(context={})
indent = context[:indent] || -1
ie_hack = context[:ie_hack] ||true
content_only = true #context[:content_only]
content_only = context[:content_only] ||true
doc = Document.new(nil,{:respect_whitespace =>:all})
if (content_only)
@ -34,6 +34,7 @@ module MaRuKu
slide_header = self.attributes[:slide_header]
slide_footer = self.attributes[:slide_footer]
slide_subfooter = self.attributes[:slide_subfooter]
slide_topleft = self.attributes[:slide_topleft]
slide_topright = self.attributes[:slide_topright]
slide_bottomleft = self.attributes[:slide_bottomleft]
@ -45,7 +46,10 @@ module MaRuKu
<div id='controls'></div>
<div id='currentSlide'></div>
<div id='header'> #{slide_header}</div>
<div id='footer'> #{slide_footer}</div>
<div id='footer'>
<h1>#{slide_footer}</h1>
<h2>#{slide_subfooter}</h2>
</div>
<div class='topleft'> #{slide_topleft}</div>
<div class='topright'> #{slide_topright}</div>
<div class='bottomleft'> #{slide_bottomleft}</div>
@ -59,10 +63,10 @@ module MaRuKu
first_slide="
<div class='slide'>
<h1> #{self.attributes[:title]}</h1>
<h2> #{self.attributes[:subtitle]}</h2>
<h3> #{self.attributes[:author]}</h3>
<h4> #{self.attributes[:company]}</h4>
<h1> #{self.attributes[:title] ||context[:title]}</h1>
<h2> #{self.attributes[:subtitle] ||context[:subtitle]}</h2>
<h3> #{self.attributes[:author] ||context[:author]}</h3>
<h4> #{self.attributes[:company] ||context[:company]}</h4>
</div>
"
presentation.add_element Document.new(first_slide).root