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 -N -r1.239.2.93 -r1.239.2.94
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	20 Aug 2022 10:28:17 -0000	1.239.2.93
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	20 Aug 2022 16:36:57 -0000	1.239.2.94
@@ -595,20 +595,46 @@
     set class      [namespace tail [:info class]]
     set id         [expr {[info exists :id] ? "id='[:id]'" : ""}]
     set html       [next]
-    set localized_title [::xo::localize $title]
-    set link [expr {[string match "*:*" $name] ?
-                    "<a href='[ns_quotehtml [::$package_id pretty_link -parent_id [::$package_id folder_id] $name]]'>[ns_quotehtml $localized_title]</a>" :
-                    $localized_title}]
+    set localized_title [ns_quotehtml [::xo::localize $title]]
+    set href [::$package_id pretty_link -parent_id [::$package_id folder_id] $name]
+    set link [expr {[string match "*:*" $name]
+                    ? "<a href='[ns_quotehtml $href]'>$localized_title</a>"
+                    : $localized_title}]
     ::xo::render_localizer
-    return [subst [[self class] set template]]
-  } -set template [expr {[apm_version_names_compare [ad_acs_version] 5.3.0] == 1 ?
-                         {<div class='$class'><div class='portlet-wrapper'><div class='portlet-header'>
-                           <div class='portlet-title-no-controls'>$link</div></div>
-                           <div $id class='portlet'>$html</div></div></div>
-                         } : {<div class='$class'><div class='portlet-title'><span>$link</span></div>
-                           <div $id class='portlet'>[next]</div></div>}
-                       }]
 
+    switch [::xowiki::CSS toolkit] {
+      bootstrap -
+      bootstrap5 {
+        if {$link ne ""} {
+          set template [ns_trim -delimiter | {
+            |<div class="[xowiki::CSS class card]">
+            |  <div class="[xowiki::CSS class card-header]">$link</div>
+            |  <div $id class="[xowiki::CSS class card-body]">$html</div>
+            |</div>}]
+        } else {
+          set template [ns_trim -delimiter | {
+            |<div class="[xowiki::CSS class card]">
+            |  <div $id class="[xowiki::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>}]
+      }
+    }
+    return [subst [ns_trim -delimiter | {
+      |<div class='$class'>
+      |  <div class='portlet-wrapper'>
+      |    [subst $template]
+      |  </div>
+      |</div>}]]
+  }
+
+
   Class create ::xowiki::includelet::decoration=edit -instproc render {} {
     set name       ${:name}
     set title      ${:title}
Index: openacs-4/packages/xowiki/www/resources/xowiki.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/xowiki.css,v
diff -u -N -r1.64.2.19 -r1.64.2.20
--- openacs-4/packages/xowiki/www/resources/xowiki.css	18 Apr 2022 18:00:58 -0000	1.64.2.19
+++ openacs-4/packages/xowiki/www/resources/xowiki.css	20 Aug 2022 16:36:57 -0000	1.64.2.20
@@ -639,6 +639,13 @@
     margin: 0px 4px 0px 0px;
 }
 
+.xowiki-content .portlet-wrapper .panel-heading,
+.xowiki-content .portlet-wrapper .card-header
+{
+    color: #FFFFFF;
+    background-color: #428bca;
+}
+
 /*
  * Local Variables:
  * mode: css