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.5 -r1.6 --- openacs-4/packages/s5/tcl/s5-procs.tcl 9 Dec 2007 20:08:32 -0000 1.5 +++ openacs-4/packages/s5/tcl/s5-procs.tcl 28 Jan 2008 13:01:00 -0000 1.6 @@ -45,8 +45,9 @@ {parameter_declaration { {-category_id} {-slideshow:boolean false} + {-pagenr 0} {-style standard} - {-menu_buttons "edit-item-button create-item-button delete-item-button"} + {-menu_buttons "edit copy create delete"} }} } @@ -75,7 +76,7 @@ $pages mixin add ::xo::OrderedComposite::IndexCompare $pages orderby page_order if {$slideshow} { - return [my render_slideshow $pages $cnames] + return [my render_slideshow $pages $cnames $pagenr] } else { return [my render_overview $pages $cnames $menu_buttons] } @@ -94,7 +95,6 @@ - @@ -109,6 +109,15 @@ img#me04 {top: 44px;} img#me05 {top: 43px;left: 36px;} + + + + @@ -128,10 +137,14 @@ }] } - s5 instproc render_slideshow {pages cnames} { + s5 instproc render_slideshow {pages cnames pagenr} { my instvar package_id style page ::xo::cc set_parameter master 0 + set output { + + } + set output [my slideshow_header \ -title [$page set title] \ -creator [$page set creator] \ @@ -141,6 +154,7 @@ if {$cnames ne ""} { #append output "
Filtered by categories: $cnames
" } + set count 0 foreach o [$pages children] { $o instvar page_order title page_id name title set level [expr {[regsub {[.]} $page_order . page_order] + 1}] @@ -149,11 +163,21 @@ #$p set render_adp 0 set content [$p get_content] set content [string map [list "\{\{" "\\\{\{"] $content] - append output "
" \ + set evenodd [expr {[incr count]%2 ? "even" : "odd"}] + append output "
" \

$title

\n \ $content \
\n } + # use YAHOO event management to allow multiple event listener, and ensure, this ones is after s5's + append output "\n" + return $output } @@ -163,19 +187,27 @@ if {$cnames ne ""} { append output "
Filtered by categories: $cnames
" } - set return_url [::xo::cc url] + #set return_url [::xo::cc url] + + set count -1 foreach o [$pages children] { $o instvar page_order title page_id name title + incr count + set level [expr {[regsub {[.]} $page_order . page_order] + 1}] set p [::xo::db::CrClass get_instance_from_db -item_id 0 -revision_id $page_id] $p destroy_on_cleanup set menu [list] foreach b $menu_buttons { - set html [$p include $b] - if {$html ne ""} {lappend menu $html} + if {[info command ::xowiki::includelet::$b] eq ""} { + set b $b-item-button + } + set html [$p include "$b -book_mode true"] + if {$html ne ""} {lappend menu $html} } + set pagenr_link "presentation?slideshow=1&pagenr=$count'" set menu "
[join $menu { }]
" $p set unresolved_references 0 #$p set render_adp 0 @@ -185,9 +217,36 @@ regexp {^.*:([^:]+)$} $name _ anchor append output "" \ $menu \ - "$page_order $title" \ + "$page_order $title" \ $content } return $output } } + + +namespace eval ::xowiki::includelet { + # + # vertical spacer + # + ::xowiki::IncludeletClass create vspace \ + -superclass ::xowiki::Includelet \ + -parameter { + {__decoration none} + {parameter_declaration { + {-height ""} + {-width ""} + }} + } + + vspace instproc render {} { + my get_parameters + if {$height ne ""} { + set height "height: $height;" + } + if {$width ne ""} { + set width "width: $width;" + } + return "
\n" + } +} Index: openacs-4/packages/s5/www/null =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/s5/www/null,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/s5/www/null 28 Jan 2008 13:01:00 -0000 1.1 @@ -0,0 +1 @@ \ No newline at end of file Index: openacs-4/packages/s5/www/prototypes/cover.page =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/s5/www/prototypes/cover.page,v diff -u -r1.1 -r1.2 --- openacs-4/packages/s5/www/prototypes/cover.page 4 Sep 2007 11:33:29 -0000 1.1 +++ openacs-4/packages/s5/www/prototypes/cover.page 28 Jan 2008 13:01:00 -0000 1.2 @@ -1,6 +1,6 @@ ::xowiki::Page new -title "Title of Your Presentation" -creator "Your Name here" -page_order 1.0 -text { Subtitle of your Presentation -@creator@ +{{get -variable creator -source cover}} • Your Affiliation } Index: openacs-4/packages/s5/www/prototypes/footer.page =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/s5/www/prototypes/footer.page,v diff -u -r1.1 -r1.2 --- openacs-4/packages/s5/www/prototypes/footer.page 4 Sep 2007 11:33:29 -0000 1.1 +++ openacs-4/packages/s5/www/prototypes/footer.page 28 Jan 2008 13:01:00 -0000 1.2 @@ -1,6 +1,4 @@ ::xowiki::Page new -title "Footer" -text {

{{get -variable title -source cover}}

-

{{aggregator -includelet "get -variable creator"}} • -{{aggregator -includelet "creation-date"}}

- +

{{get -variable creator -source cover}} • {{creation-date -source cover}}

} Index: openacs-4/packages/s5/www/resources/standard/ui/default/pretty.css =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/s5/www/resources/standard/ui/default/pretty.css,v diff -u -r1.1 -r1.2 --- openacs-4/packages/s5/www/resources/standard/ui/default/pretty.css 4 Sep 2007 11:33:31 -0000 1.1 +++ openacs-4/packages/s5/www/resources/standard/ui/default/pretty.css 28 Jan 2008 13:01:00 -0000 1.2 @@ -83,4 +83,18 @@ /* diagnostics li:after {content: " [" attr(class) "]"; color: #F88;} - */ \ No newline at end of file + */ + + +/*** local configuration **/ +div.slide ul { + margin-top: 1em; +} + +div.slide ul li { + margin-top: 1em; + margin-bottom: 1em; +} +div.slide ul > ul li { + list-style-type: circle; +} \ No newline at end of file Index: openacs-4/packages/s5/www/resources/standard/ui/default/print.css =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/s5/www/resources/standard/ui/default/print.css,v diff -u -r1.1 -r1.2 --- openacs-4/packages/s5/www/resources/standard/ui/default/print.css 4 Sep 2007 11:33:31 -0000 1.1 +++ openacs-4/packages/s5/www/resources/standard/ui/default/print.css 28 Jan 2008 13:01:00 -0000 1.2 @@ -2,15 +2,21 @@ .slide, ul {page-break-inside: avoid; visibility: visible !important;} h1 {page-break-after: avoid;} -body {font-size: 12pt; background: white;} +body {font-size: 14pt; background: white;} * {color: black;} #slide0 h1 {font-size: 200%; border: none; margin: 0.5em 0 0.25em;} #slide0 h3 {margin: 0; padding: 0;} #slide0 h4 {margin: 0 0 0.5em; padding: 0;} #slide0 {margin-bottom: 3em;} -h1 {border-top: 2pt solid gray; border-bottom: 1px dotted silver;} +h1 {border-top: 2pt solid gray; + border-bottom: 1px dotted silver; + margin-bottom: 0.7cm; + font-size: 140%; + padding-top: 10px; + padding-bottom: 10px; +} .extra {background: transparent !important;} div.extra, pre.extra, .example {font-size: 10pt; color: #333;} ul.extra a {font-weight: bold;} @@ -22,3 +28,7 @@ /* The following rule keeps the layout stuff out of print. Remove at your own risk! */ .layout, .layout * {display: none !important;} + +div.slide {height: 11.55cm;} +div.odd {page-break-after: always;} +div.slide {font-size: 16px; font-family: sans-serif;} \ No newline at end of file Index: openacs-4/packages/s5/www/resources/standard/ui/default/slides.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/s5/www/resources/standard/ui/default/slides.js,v diff -u -r1.1 -r1.2 --- openacs-4/packages/s5/www/resources/standard/ui/default/slides.js 4 Sep 2007 11:33:31 -0000 1.1 +++ openacs-4/packages/s5/www/resources/standard/ui/default/slides.js 28 Jan 2008 13:01:00 -0000 1.2 @@ -554,5 +554,6 @@ } } -window.onload = startup; +YAHOO.util.Event.addListener(window, 'load', startup); +// window.onload = startup; window.onresize = function(){setTimeout('fontScale()', 50);}