Index: openacs-4/packages/xowf/xowf.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/xowf.info,v
diff -u -r1.12.2.83 -r1.12.2.84
--- openacs-4/packages/xowf/xowf.info	4 Apr 2022 13:47:41 -0000	1.12.2.83
+++ openacs-4/packages/xowf/xowf.info	8 Apr 2022 09:46:03 -0000	1.12.2.84
@@ -10,19 +10,20 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xowf</auto-mount>
 
-    <version name="5.10.1d35" url="http://openacs.org/repository/download/apm/xowf-5.10.1d35.apm">
+    <version name="5.10.1d36" url="http://openacs.org/repository/download/apm/xowf-5.10.1d36.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>2021-09-15</release-date>
         <vendor url="http://wu.ac.at">WU Vienna</vendor>
         <license>BSD-Style</license>
         <maturity>2</maturity>
 
-        <provides url="xowf" version="5.10.1d35"/>
+        <provides url="xowf" version="5.10.1d36"/>
         <requires url="xowiki" version="5.10.1d25"/>
         <requires url="xotcl-core" version="5.10.1d6"/>
         <requires url="acs-tcl" version="5.10.1d11"/>
         <requires url="acs-automated-testing" version="5.10.0"/>
+        <requires url="acs-templating" version="5.10.1d6"/>
 
         <callbacks>
             <callback type="before-uninstall"     proc="::xowiki::before-uninstall"/>
Index: openacs-4/packages/xowf/resources/prototypes/select_question.form.page
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/resources/prototypes/select_question.form.page,v
diff -u -r1.1.2.10 -r1.1.2.11
--- openacs-4/packages/xowf/resources/prototypes/select_question.form.page	28 Mar 2022 15:51:25 -0000	1.1.2.10
+++ openacs-4/packages/xowf/resources/prototypes/select_question.form.page	8 Apr 2022 09:46:03 -0000	1.1.2.11
@@ -7,13 +7,13 @@
     -form {{<form>
         @question@
         <h4>#xowf.Detail_configuration#</h4>
-        <p><button type="button" class="btn btn-secondary" data-toggle="collapse" data-target="#question_management"><span class="glyphicon glyphicon-chevron-down">&nbsp;</span>#xowf.Question_management#</button><div id="question_management" class="collapse">        
+        <p><adp:toggle_button type="button" class="btn btn-secondary" toggle="collapse" target="#question_management"><adp:icon name='chevron-down'> #xowf.Question_management#</adp:toggle_button><div id="question_management" class="collapse">        
         @shuffle_items@ @max_items@ @allow_paste@ @allow_spellcheck@ @show_minutes@ @show_points@ @show_ip@
         </div>
-        <p><button type="button" class="btn btn-secondary" data-toggle="collapse" data-target="#time_management"><span class="glyphicon glyphicon-chevron-down">&nbsp;</span>#xowf.Time_management#</button><div id="time_management" class="collapse">
+        <p><adp:toggle_button type="button" class="btn btn-secondary" toggle="collapse" target="#time_management"><adp:icon name='chevron-down'> #xowf.Time_management#</adp:toggle_button><div id="time_management" class="collapse">
         @synchronized@ @time_window@ @time_budget@ @countdown_audio_alarm@
         </div><p>
-        <p><button type="button" class="btn btn-secondary" data-toggle="collapse" data-target="#proctoring"><span class="glyphicon glyphicon-chevron-down">&nbsp;</span>#xowf.Security#</button><div id="proctoring" class="collapse">
+        <p><adp:toggle_button class="btn btn-secondary" toggle="collapse" target="#proctoring"><adp:icon name='chevron-down'> #xowf.Security#</adp:toggle_button><div id="proctoring" class="collapse">
         @proctoring@
         @proctoring_options@
         @proctoring_record@