Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -r1.38 -r1.39
--- openacs-4/packages/xowiki/xowiki.info	30 Dec 2006 11:33:28 -0000	1.38
+++ openacs-4/packages/xowiki/xowiki.info	3 Jan 2007 23:13:39 -0000	1.39
@@ -8,11 +8,11 @@
     <singleton-p>f</singleton-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="0.43" url="http://openacs.org/repository/download/apm/xowiki-0.43.apm">
+    <version name="0.44" url="http://openacs.org/repository/download/apm/xowiki-0.44.apm">
         <owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
         <summary>A more generic xotcl-based wikis example with object types
 and subtypes based on the content repository (with category support)</summary>
-        <release-date>2006-12-30</release-date>
+        <release-date>2007-01-04</release-date>
         <description format="text/html">XoWiki is a wiki implementation for OpenACS in xotcl. Instead of trying to
 implement the full set of wiki markup commands of systems like MediaWiki,
 XoWiki is based on a rich text editor and focuses more on integration
@@ -29,7 +29,7 @@
         <license>BSD-Style</license>
         <maturity>0</maturity>
 
-        <provides url="xowiki" version="0.43"/>
+        <provides url="xowiki" version="0.44"/>
         <requires url="acs-datetime" version="4.0"/>
         <requires url="categories" version="1.0d3"/>
         <requires url="file-storage" version="4.7d3"/>
@@ -42,6 +42,7 @@
             <callback type="after-upgrade"  proc="::xowiki::upgrade_callback"/>
         </callbacks>
         <parameters>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="extra_css"  description="One or more additional css file for this Instance "/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="index_page"  description="name of the page to be shown when the package instance is browsed (e.g. en:index)" section_name="Pages"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="my_yahoo_publisher"  description="When specified, a button for adding the content to myyahoo is added, containing the specified publisher" section_name="Options"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="package_prefix"  description="Part of the URL used before language and page name. This setting is used, when an url is computed. Per default, the package_prefix is determined by the side not. When for example  a default xowiki instance is used as start page of openacs, the package_prefix can be set to /" section_name="URL"/>
Index: openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/Attic/xowiki-portlet-procs.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl	31 Dec 2006 16:47:00 -0000	1.9
+++ openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl	3 Jan 2007 23:13:39 -0000	1.10
@@ -544,7 +544,7 @@
           }
           set parent_node [expr {[info exists node($parent)] ? $node($parent) : "root"}]
           append js \
-              "var $jsobj = {label: '$label', href:\"$href\"};" \
+              "var $jsobj = {label: \"$label\", href:\"$href\"};" \
               "var $node($page_order) = new YAHOO.widget.TextNode($jsobj, $parent_node, $expand);\n"
         }
     set navigation(count) $node_cnt
Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v
diff -u -r1.27 -r1.28
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	30 Dec 2006 11:33:29 -0000	1.27
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	3 Jan 2007 23:13:39 -0000	1.28
@@ -220,6 +220,7 @@
         }
       } else {
         # use adp file
+        foreach css [$package_id get_parameter extra_css ""] {::xowiki::Page requireCSS $css}
         set template_file [my query_parameter "template_file" \
                                [::$package_id get_parameter template_file view-default]]
 
Index: openacs-4/packages/xowiki/www/admin/import.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/import.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/xowiki/www/admin/import.tcl	17 Aug 2006 01:44:26 -0000	1.6
+++ openacs-4/packages/xowiki/www/admin/import.tcl	3 Jan 2007 23:13:40 -0000	1.7
@@ -33,7 +33,7 @@
       if {[catch {eval $content} error]} {
         set msg "Error: $error"
       } else {
-        set msg [::xowiki::Page import]
+        set msg [::xowiki::Page import -replace 1]
       }
     }