Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -r1.183 -r1.184
--- openacs-4/packages/xowiki/xowiki.info	27 Oct 2024 18:23:47 -0000	1.183
+++ openacs-4/packages/xowiki/xowiki.info	30 Oct 2024 15:33:31 -0000	1.184
@@ -10,7 +10,7 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="6.0.0d2" url="http://openacs.org/repository/download/apm/xowiki-6.0.0d2.apm">
+    <version name="6.0.0d3" url="http://openacs.org/repository/download/apm/xowiki-6.0.0d3.apm">
 	<owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
 	<summary>A xotcl-based enterprise wiki system with multiple object types</summary>
 	<release-date>2024-09-02</release-date>
@@ -55,12 +55,12 @@
 	<license>BSD-Style</license>
 	<maturity>2</maturity>
 
-	<provides url="xowiki" version="6.0.0d2"/>
+	<provides url="xowiki" version="6.0.0d3"/>
 	<requires url="xotcl-core" version="5.10.1"/>
 	<requires url="acs-datetime" version="5.9.1"/>
 	<requires url="acs-kernel" version="5.10.1"/>
 	<requires url="acs-tcl" version="5.10.1"/>
-        <requires url="acs-templating" version="6.0.0d4"/>
+        <requires url="acs-templating" version="6.0.0d5"/>
 	<requires url="acs-subsite" version="5.10.1"/>
 	<requires url="acs-lang" version="5.10.1"/>
         <requires url="richtext-ckeditor4" version="0.33"/>
Index: openacs-4/packages/xowiki/tcl/includelet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/includelet-procs.tcl,v
diff -u -r1.244 -r1.245
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	24 Oct 2024 17:02:23 -0000	1.244
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	30 Oct 2024 15:33:32 -0000	1.245
@@ -602,30 +602,25 @@
                     : $localized_title}]
     ::xo::render_localizer
 
-    switch [::template::CSS toolkit] {
-      bootstrap -
-      bootstrap5 {
-        if {$link ne ""} {
-          set template [ns_trim -delimiter | {
-            |<div class="[template::CSS class card]">
-            |  <div class="[template::CSS class card-header]">$link</div>
-            |  <div $id class="[template::CSS class card-body]">$html</div>
-            |</div>}]
-        } else {
-          set template [ns_trim -delimiter | {
-            |<div class="[template::CSS class card]">
-            |  <div $id class="[template::CSS class card-body]">$html</div>
-            |</div>}]
-        }
-      }
-      yui {
-        set template [ns_trim -delimiter | {
-          |<div class='portlet-header'>
-          |  <div class='portlet-title-no-controls'>$link</div>
-          |</div>
-          |<div $id class='portlet'>$html</div>}]
-      }
+    set card_class [template::CSS class card]
+    set card_header_class [template::CSS class card-header]
+    set card_body_class [template::CSS class card-body]
+
+    if {$link ne ""} {
+       set template {
+          <div class="$card_class">
+            <div class="$card_header_class">$link</div>
+            <div class="$card_body_class">$html</div>
+          </div>
+       }
+    } else {
+       set template {
+          <div class="$card_class">
+            <div class="$card_body_class">$html</div>
+          </div>
+       }
     }
+
     return [subst [ns_trim -delimiter | {
       |<div class='$class'>
       |  <div class='portlet-wrapper'>