Index: openacs-4/packages/xowf/lib/inclass-exam-answer.wf
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/lib/inclass-exam-answer.wf,v
diff -u -r1.1.2.9 -r1.1.2.10
--- openacs-4/packages/xowf/lib/inclass-exam-answer.wf	2 Apr 2020 12:53:00 -0000	1.1.2.9
+++ openacs-4/packages/xowf/lib/inclass-exam-answer.wf	4 Apr 2020 11:32:34 -0000	1.1.2.10
@@ -228,10 +228,11 @@
   #
   #
   #
+  set container [$ctx wf_container]
   if {[$obj exists __feedback_mode] && [$obj set __feedback_mode] > 0} {
-    set container [$ctx wf_container]
     set result [$container summary_form $ctx $form_name]
   } else {
+    $container plain_template $obj
     set result [::xowiki::Form new \
                     -destroy_on_cleanup \
                     -set name en:finished \
@@ -247,7 +248,6 @@
   return $result
 }
 
-
 #
 # Set "title" with question/user/IP information.  Note that the
 # "set_title" method is as well responsible for calling the rename
@@ -280,15 +280,8 @@
   $obj title [join $title " · "]
 
   #:msg set_title-set_parameter-MenuBar-[$obj state]
-  ::xo::cc set_parameter MenuBar 0
-  ::xo::cc set_parameter template_file view-plain-master
+  :plain_template $obj
 
-  if {[$obj property proctor 0]} {
-    template::set_css_property -class header -property display -value none
-    template::set_css_property -class footer -property display -value none
-    template::set_css_property -class sidebar -property display -value none
-  }
-
   if {[$parent_obj state] eq "published" && [$obj state] ne "done"} {
     set synchronized [$parent_obj property synchronized]
     if {$synchronized eq ""} {set synchronized 0}
@@ -302,6 +295,16 @@
   }
 }
 
+:proc plain_template {obj} {
+  ::xo::cc set_parameter MenuBar 0
+  ::xo::cc set_parameter template_file view-plain-master
+
+  if {[$obj property proctor 0]} {
+    template::set_css_property -class header -property display -value none
+    template::set_css_property -class footer -property display -value none
+    template::set_css_property -class sidebar -property display -value none
+  }
+}
 #
 # Form loader for summary (shows all submission data of a user)
 #
Index: openacs-4/packages/xowf/lib/inclass-exam.wf
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/lib/inclass-exam.wf,v
diff -u -r1.1.2.14 -r1.1.2.15
--- openacs-4/packages/xowf/lib/inclass-exam.wf	2 Apr 2020 16:10:07 -0000	1.1.2.14
+++ openacs-4/packages/xowf/lib/inclass-exam.wf	4 Apr 2020 11:32:34 -0000	1.1.2.15
@@ -204,7 +204,7 @@
       # In inclass cases, never show all questions on screen, since
       # the teacher might have the screen on the projector.
       #
-      template::add_body_script -script urn:ad:js:bootstrap3
+      template::add_body_script -src urn:ad:js:bootstrap3
       set fullQuestionForm [subst {
         <span class="glyphicon glyphicon-chevron-down"><button type="button" class="btn btn-small" data-toggle="collapse" data-target="#questions">#xowf.questions#</button></span>
         <div id="questions" class="collapse">
@@ -219,7 +219,7 @@
     "created"   {
       append extraAction "<br>" \
           "#xowf.online-exam-try_out# " \
-          "<a class='btn btn-default' href='[ns_quotehtml $tLink]'>#xowf.testrun#</a>"
+          "<a class='btn btn-default' href='[ns_quotehtml $tLink]' target=”_blank”>#xowf.testrun#</a>"
     }
     "published" {
       append extraAction "<br>" \
@@ -491,7 +491,7 @@
     }
   }
 
-  
+
   :proc www-qrcode {} {
     set aLink [:pretty_link -absolute true -query m=answer]
     set fn /tmp/qr-${:item_id}.png
@@ -513,11 +513,20 @@
     ::xo::cc set_parameter template_file view-plain-master
     ::xo::cc set_parameter MenuBar 0
 
-    return [:www-view [subst {
-      <!-- real-proctering-code -->
-      <h1>You ([xo::cc user_id]) are being proctored in exam ${:object_id}!</h1>
-      <iframe src="$link" width="100%" height="600"></iframe>
-    }]]
+    if {[file exists [acs_package_root_dir xowf]/lib/proctored-page.adp]} {
+      set object_id ${:object_id}
+      set object_url $link
+      ${:package_id} return_page -adp /packages/xowf/lib/proctored-page -variables {
+        object_id
+        object_url
+      }
+    } else {
+      return [:www-view [subst {
+        <!-- ... proctor::start_dialog... -->
+        <h1>You ([xo::cc user_id]) are being proctored in exam ${:object_id}!</h1>
+        <iframe src="$link" width="100%" height="600"></iframe>
+      }]]
+    }
   }
 
   ########################################################################