Index: openacs-4/packages/xowf/xowf.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/xowf.info,v
diff -u -r1.12.2.40 -r1.12.2.41
--- openacs-4/packages/xowf/xowf.info	14 Jul 2021 17:36:15 -0000	1.12.2.40
+++ openacs-4/packages/xowf/xowf.info	15 Jul 2021 13:17:48 -0000	1.12.2.41
@@ -10,15 +10,15 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xowf</auto-mount>
 
-    <version name="5.10.0d44" url="http://openacs.org/repository/download/apm/xowf-5.10.0d44.apm">
+    <version name="5.10.0d45" url="http://openacs.org/repository/download/apm/xowf-5.10.0d45.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>2017-08-06</release-date>
         <vendor url="http://wu.ac.at">WU Vienna</vendor>
         <license>BSD-Style</license>
         <maturity>2</maturity>
 
-        <provides url="xowf" version="5.10.0d44"/>
+        <provides url="xowf" version="5.10.0d45"/>
         <requires url="xowiki" version="5.10.0d80"/>
         <requires url="xotcl-core" version="5.10.0d40"/>
         <requires url="acs-tcl" version="5.10.0d40"/>
Index: openacs-4/packages/xowf/catalog/xowf.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/catalog/xowf.de_DE.ISO-8859-1.xml,v
diff -u -r1.2.2.52 -r1.2.2.53
--- openacs-4/packages/xowf/catalog/xowf.de_DE.ISO-8859-1.xml	22 Jun 2021 10:03:37 -0000	1.2.2.52
+++ openacs-4/packages/xowf/catalog/xowf.de_DE.ISO-8859-1.xml	15 Jul 2021 13:17:49 -0000	1.2.2.53
@@ -219,4 +219,5 @@
   <msg key="detailed_summary">Detail�bersicht</msg>
   <msg key="out_of">aus</msg>
   <msg key="question_structure">Aufbau</msg>
+  <msg key="Twocol_layout">2-Spaltig</msg>
 </message_catalog>
Index: openacs-4/packages/xowf/catalog/xowf.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/catalog/xowf.en_US.ISO-8859-1.xml,v
diff -u -r1.2.2.54 -r1.2.2.55
--- openacs-4/packages/xowf/catalog/xowf.en_US.ISO-8859-1.xml	14 Jul 2021 17:36:15 -0000	1.2.2.54
+++ openacs-4/packages/xowf/catalog/xowf.en_US.ISO-8859-1.xml	15 Jul 2021 13:17:49 -0000	1.2.2.55
@@ -239,4 +239,5 @@
   <msg key="out_of">of</msg>
   <msg key="question_structure">Structure</msg>
   <msg key="Download_file_submissions">Download all displayed file submissions</msg>
+  <msg key="Twocol_layout">2 columns</msg>
 </message_catalog>
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.7.2.150 -r1.7.2.151
--- openacs-4/packages/xowf/tcl/test-item-procs.tcl	14 Jul 2021 17:36:16 -0000	1.7.2.150
+++ openacs-4/packages/xowf/tcl/test-item-procs.tcl	15 Jul 2021 13:17:49 -0000	1.7.2.151
@@ -131,6 +131,12 @@
     return ""
   }
 
+  TestItemField instproc twocol_layout {} {
+    return [expr {[${:parent_field} get_named_sub_component_value -default 0 twocol]
+                  ? "col-sm-6" : ""}]
+  }
+
+
   ###########################################################
   #
   # ::xowiki::formfield::test_item_name
@@ -313,6 +319,7 @@
       {points number,form_item_wrapper_CSSclass=form-inline,min=0.0,step=0.1,label=#xowf.Points#}
       $shuffleSpec
       $gradingSpec
+      {twocol boolean_checkbox,horizontal=true,label=#xowf.Twocol_layout#,default=f,form_item_wrapper_CSSclass=form-inline}
       $typeSpecificComponentSpec
       {interaction {$interaction_class,$options,feedback_level=${:feedback_level},auto_correct=${:auto_correct},label=}}
       [:feed_back_definition]
@@ -562,11 +569,12 @@
       dict set fc_dict correct_when [:comp_correct_when_from_value [:get_named_sub_component_value correct_when]]
     }
 
+    set twocol [:twocol_layout]
     append form \
         "<form>\n" \
-        "<div class='text_interaction'>\n" \
-        "<div class='question_text'>$intro_text</div>\n" \
-        "@answer@\n" \
+        "<div class='text_interaction row'>\n" \
+        "<div class='question_text first-column $twocol'>$intro_text</div>\n" \
+        "<div class='second-column $twocol'>@answer@</div>\n" \
         "</div>\n" \
         "</form>\n"
     append fc \
@@ -624,11 +632,10 @@
     append intro_text [:text_attachments]
     set answerFields  [:get_named_sub_component_value -from_repeat answer]
     if {[acs_user::site_wide_admin_p]} {
-      set substvalues   [:get_named_sub_component_value substvalues]
+      set substvalues [:get_named_sub_component_value substvalues]
     } else {
       set substvalues ""
     }
-
     set options {}
     set render_hints {}
     set answer {}
@@ -655,11 +662,12 @@
     dict set fc_dict descriptions $solution
     dict set fc_dict render_hints $render_hints
 
+    set twocol [:twocol_layout]
     append form \
         "<form>\n" \
-        "<div class='short_text_interaction'>\n" \
-        "<div class='question_text'>$intro_text</div>\n" \
-        "@answer@" \n \
+        "<div class='short_text_interaction row'>\n" \
+        "<div class='question_text first-column $twocol'>$intro_text</div>\n" \
+        "<div class='second-column $twocol'>@answer@</div>\n" \
         "</div>\n" \
         "</form>\n"
 
@@ -782,11 +790,12 @@
     dict set fc_dict answer $answer
     dict set fc_dict grading [${:parent_field} get_named_sub_component_value grading]
 
+    set twocol [:twocol_layout]
     append form \
         "<form>\n" \
-        "<div class='reorder_interaction'>\n" \
-        "<div class='question_text'>$intro_text</div>\n" \
-        "@answer@" \n \
+        "<div class='reorder_interaction row'>\n" \
+        "<div class='question_text first-column $twocol'>$intro_text</div>\n" \
+        "<div class='second-column $twocol'>@answer@</div>\n" \
         "</div>\n" \
         "</form>\n"
 
@@ -866,11 +875,12 @@
     dict set fc_dict show_max [${:parent_field} get_named_sub_component_value show_max]
 
     set interaction_class [expr {${:multiple} ? "mc_interaction" : "sc_interaction"}]
+    set twocol [:twocol_layout]
     append form \
         "<form>\n" \
-        "<div class='$interaction_class'>\n" \
-        "<div class='question_text'>$intro_text</div>\n" \
-        "@answer@" \n \
+        "<div class='$interaction_class row'>\n" \
+        "<div class='question_text first-column $twocol'>$intro_text</div>\n" \
+        "<div class='second-column $twocol'>@answer@</div>\n" \
         "</div>" \n \
         "</form>\n"
 
@@ -954,11 +964,12 @@
     }
 
     append intro_text [:text_attachments]
+    set twocol [:twocol_layout]
     append form \
         "<form>\n" \
-        "<div class='upload_interaction'>\n" \
-        "<div class='question_text'>$intro_text</div>\n" \
-        "@answer@" \
+        "<div class='upload_interaction row'>\n" \
+        "<div class='question_text first-column $twocol'>$intro_text</div>\n" \
+        "<div class='second-column $twocol'>@answer@</div>\n" \
         "</div>\n" \
         "</form>\n"
     append fc \