Index: openacs-4/packages/s5/tcl/s5-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/s5/tcl/s5-procs.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/s5/tcl/s5-procs.tcl 29 Jan 2008 23:00:12 -0000 1.8
+++ openacs-4/packages/s5/tcl/s5-procs.tcl 5 Feb 2008 15:21:02 -0000 1.9
@@ -12,12 +12,6 @@
-package_key "s5" -pretty_name "S5" \
-superclass ::xowiki::Package
- # To provide downward compatibility with e.g. xowiki form oacs-5-3,
- # we set the package_key via instvar.
- # TODO: The package-key should be set via "-package_key s5"
- # during the above create statement
- ::s5::Package set package_key s5
-
Package instproc init {} {
set rich_text_spec {richtext(richtext),nospell,optional
{label Content}
@@ -83,6 +77,7 @@
}
s5 instproc slideshow_header {-title -creator -footer -s5dir -presdate} {
+ set header_stuff [::xo::Page header_stuff]
return [subst {
$title
@@ -109,7 +104,7 @@
img#me04 {top: 44px;}
img#me05 {top: 43px;left: 36px;}
-
+$header_stuff
@@ -145,14 +140,8 @@
if {$coverpage eq ""} {
set coverpage $page
}
+ set outtput ""
- set output [my slideshow_header \
- -title [$coverpage set title] \
- -creator [$coverpage set creator] \
- -presdate [lindex [$coverpage set last_modified] 0] \
- -footer [$page include "footer -decoration none"] \
- -s5dir "/resources/s5/$style/ui/default"]
-
if {$cnames ne ""} {
#append output "Filtered by categories: $cnames
"
}
@@ -171,7 +160,15 @@
$title
\n \
$content \
\n
- }
+ }
+ # eval header here to get required header stuff
+ set header [my slideshow_header \
+ -title [$coverpage set title] \
+ -creator [$coverpage set creator] \
+ -presdate [lindex [$coverpage set last_modified] 0] \
+ -footer [$page include "footer -decoration none"] \
+ -s5dir "/resources/s5/$style/ui/default"]
+
# use YAHOO event management to allow multiple event listener, and ensure, this ones is after s5's
append output "\n"
- return $output
+ return $header$output
}
s5 instproc render_overview {pages cnames menu_buttons} {