Index: openacs-4/packages/xooauth/xooauth.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xooauth/xooauth.info,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/xooauth/xooauth.info	11 Sep 2024 06:15:56 -0000	1.2
+++ openacs-4/packages/xooauth/xooauth.info	27 Oct 2024 18:23:48 -0000	1.3
@@ -9,7 +9,7 @@
     <implements-subsite-p>f</implements-subsite-p>
     <inherit-templates-p>f</inherit-templates-p>
 
-    <version name="0.4" url="http://openacs.org/repository/download/apm/xooauth-0.4.apm">
+    <version name="0.5" url="http://openacs.org/repository/download/apm/xooauth-0.5.apm">
       <owner url="mailto:michael.aram@km.co.at">Michael Aram</owner>
       <release-date>2024-09-02</release-date>
         <summary>XOTcl based OAuth implementation and OAuth based REST
@@ -32,8 +32,9 @@
         </description>
         <maturity>1</maturity>
 
-        <provides url="xooauth" version="0.4"/>
+        <provides url="xooauth" version="0.5"/>
         <requires url="acs-tcl" version="5.10.1"/>
+        <requires url="acs-templating" version="6.0.0d4"/>
         <requires url="xotcl-core" version="5.10.1"/>
         <requires url="xowf" version="5.10.1"/>
 
Index: openacs-4/packages/xooauth/tcl/lti-includelet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xooauth/tcl/lti-includelet-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/xooauth/tcl/lti-includelet-procs.tcl	11 Sep 2024 06:15:56 -0000	1.2
+++ openacs-4/packages/xooauth/tcl/lti-includelet-procs.tcl	27 Oct 2024 18:23:48 -0000	1.3
@@ -70,8 +70,8 @@
         $lti destroy
 
         return [subst {
-            <button class="btn btn-primary" title="$launch_button_title"
-            type="submit" form="[dict get $result form_name]">$launch_button_label</button>
+            <adp:button class="btn btn-primary" title="$launch_button_title"
+            type="submit" form="[dict get $result form_name]">$launch_button_label</adp:button>
             [dict get $result HTML]
         }]
     }
Index: openacs-4/packages/xowf/xowf.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/xowf.info,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/xowf/xowf.info	24 Oct 2024 17:02:23 -0000	1.14
+++ openacs-4/packages/xowf/xowf.info	27 Oct 2024 18:23:48 -0000	1.15
@@ -10,20 +10,20 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xowf</auto-mount>
 
-    <version name="6.0.0d1" url="http://openacs.org/repository/download/apm/xowf-6.0.0d1.apm">
+    <version name="6.0.0d2" url="http://openacs.org/repository/download/apm/xowf-6.0.0d2.apm">
         <owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
         <summary>XoWiki Content Flow - an XoWiki based workflow system implementing state-based behavior of wiki pages and forms</summary>
         <release-date>2024-09-02</release-date>
         <vendor url="http://wu.ac.at">WU Vienna</vendor>
         <license>BSD-Style</license>
         <maturity>2</maturity>
 
-        <provides url="xowf" version="6.0.0d1"/>
+        <provides url="xowf" version="6.0.0d2"/>
         <requires url="acs-automated-testing" version="5.10.1"/>
         <requires url="acs-tcl" version="5.10.1"/>
-        <requires url="acs-templating" version="6.0.0d2"/>
+        <requires url="acs-templating" version="6.0.0d4"/>
         <requires url="xotcl-core" version="5.10.1"/>
-        <requires url="xowiki" version="6.0.0d1"/>
+        <requires url="xowiki" version="6.0.0d2"/>
 
         <callbacks>
             <callback type="before-uninstall"  proc="::xowiki::before-uninstall"/>
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>
+      }]]
     }
 
     #----------------------------------------------------------------------
Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -r1.182 -r1.183
--- openacs-4/packages/xowiki/xowiki.info	24 Oct 2024 17:02:23 -0000	1.182
+++ openacs-4/packages/xowiki/xowiki.info	27 Oct 2024 18:23:47 -0000	1.183
@@ -10,7 +10,7 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="6.0.0d1" url="http://openacs.org/repository/download/apm/xowiki-6.0.0d1.apm">
+    <version name="6.0.0d2" url="http://openacs.org/repository/download/apm/xowiki-6.0.0d2.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.0d1"/>
+	<provides url="xowiki" version="6.0.0d2"/>
 	<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.0d2"/>
+        <requires url="acs-templating" version="6.0.0d4"/>
 	<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/bootstrap-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl	24 Oct 2024 17:02:23 -0000	1.15
+++ openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl	27 Oct 2024 18:23:48 -0000	1.16
@@ -767,22 +767,22 @@
       |  <div class="modal-dialog" role="document">
       |    <div class="modal-content">
       |      <div class="modal-header">
-      |        $before_close<button type="button" class="[template::CSS class close]"
-      |           $data_attribute-dismiss="modal" aria-label="Close">$close_button_label
-      |        </button>$after_close
+      |        $before_close<adp:button type="button" class="close"
+      |           data-dismiss="modal" aria-label="Close">$close_button_label
+      |        </adp:button>$after_close
       |      </div>
       |      <div class="modal-body">$subtitle
       |        <form class="form-horizontal" id="configuration-form" role="form" action="#" method="post">
       |        $body
       |        </form>
       |      </div>
       |      <div class="modal-footer">
-      |        <button type="button" class="btn [::template::CSS class btn-default]"
-      |                $data_attribute-dismiss="modal">#acs-kernel.common_Cancel#
-      |        </button>
-      |        <button id="$id-confirm" type="button" class="btn btn-primary confirm"
-      |                $data_attribute-dismiss="modal">#acs-subsite.Confirm#
-      |        </button>
+      |        <adp:button type="button" class="btn btn-default"
+      |                data-dismiss="modal">#acs-kernel.common_Cancel#
+      |        </adp:button>
+      |        <adp:button id="$id-confirm" type="button" class="btn btn-primary confirm"
+      |                data-dismiss="modal">#acs-subsite.Confirm#
+      |        </adp:button>
       |      </div>
       |    </div>
       |  </div>
Index: openacs-4/packages/xowiki/tcl/personal-notification-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/personal-notification-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/xowiki/tcl/personal-notification-procs.tcl	24 Oct 2024 17:02:23 -0000	1.3
+++ openacs-4/packages/xowiki/tcl/personal-notification-procs.tcl	27 Oct 2024 18:23:48 -0000	1.4
@@ -139,9 +139,8 @@
 <form role="form" class="form-vertical" method="post" action="">
   <div class="modal-content">
     <div class="modal-header">
-      $before_close<button type="button" class="[template::CSS class close]"
-      $data_attribute-dismiss="modal" aria-label="Close">$close_button_label
-      </button>$after_close
+      $before_close<adp:button type="button" class="close" data-dismiss="modal" aria-label="Close">$close_button_label
+      </adp:button>$after_close
     </div><!-- modal-header -->
 
     <div class="modal-body">
@@ -162,8 +161,8 @@
       $input_fields
     </div><!--modal-body-->
     <div class="modal-footer">
-    <button type="button" class="btn $btnDefault" $data_attribute-dismiss="modal">#acs-kernel.common_Close#</button>
-    <button type="submit" class="btn $btnDefault submit" data-id="$id" $data_attribute-dismiss="modal">#xowiki.Send#</button>
+    <adp:button type="button" class="btn btn-default" data-dismiss="modal">#acs-kernel.common_Close#</adp:button>
+    <adp:button type="submit" class="btn btn-default submit" data-id="$id" data-dismiss="modal">#xowiki.Send#</adp:button>
     </div>
   </div>
 </form>