Index: openacs-4/packages/xowf/tcl/test-item-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/tcl/test-item-procs.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/xowf/tcl/test-item-procs.tcl	24 Oct 2024 17:02:23 -0000	1.12
+++ openacs-4/packages/xowf/tcl/test-item-procs.tcl	27 Oct 2024 18:23:48 -0000	1.13
@@ -3334,9 +3334,9 @@
           -script "window.print();"
 
       return [ns_trim -delimiter | [subst {
-        |<button class="btn [::template::CSS class btn-default]" id="print-button">
+        |<adp:button class="btn btn-default" id="print-button">
         |[::xowiki::bootstrap::icon -name print] print
-        |</button>
+        |</adp:button>
         |[template::collect_body_scripts]
       }]]
     }
@@ -7245,15 +7245,14 @@
       set fields [$obj create_form_fields_from_names -lookup -set_values \
                       -form_constraints $form_constraints \
                       $field_names]
-      set data_attribute [expr {[::template::CSS toolkit] eq "bootstrap5" ? "data-bs" : "data"}]
-      return [subst {
-        <p><button type="button" class="btn [::template::CSS class btn-default]"
-        $data_attribute-toggle="collapse" $data_attribute-target="#$id">
-        [::xowiki::bootstrap::icon -name chevron-down] $label</button>
-        <div id="$id" class="collapse">
-        [:exam_configuration_render_fields -modifiable $modifiable $fields]
-        </div>
-      }]
+      return [ns_trim -delimiter | [subst {
+        | <p><adp:button type="button" class="btn btn-default" data-toggle="collapse" data-target="#$id">
+        |      <adp:icon name='chevron-down'> $label
+        |    </adp:button>
+        | <div id="$id" class="collapse">
+        | [:exam_configuration_render_fields -modifiable $modifiable $fields]
+        |</div>
+      }]]
     }
 
     #----------------------------------------------------------------------