Index: openacs-4/packages/xowiki/www/portlets/wiki.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/portlets/Attic/wiki.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/xowiki/www/portlets/wiki.tcl 3 May 2006 12:03:23 -0000 1.5 +++ openacs-4/packages/xowiki/www/portlets/wiki.tcl 19 Jun 2006 00:40:04 -0000 1.6 @@ -1,7 +1,12 @@ # $Id$ # display a wiki page included in a different wiki page # -gustaf neumann +# +# valid parameters from the include are +# name: name of the xowiki page to render +# skin: name of adp-file to render content + set folder_id [$__including_page set parent_id] set item_id [::Generic::CrItem lookup -name $name -parent_id $folder_id] set page [::Generic::CrItem instantiate -item_id $item_id] @@ -17,3 +22,8 @@ ::xowiki::Page incr recursion_count -1 #strip language prefix for name regexp {^..:(.*)$} $name _ name + +if {![info exists skin]} {set skin portlet-skin} +if {![string match /* $skin]} {set skin [file dir $__adp_stub]/$skin} +template::set_file $skin +