Index: openacs-4/packages/proctoring-support/proctoring-support.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/proctoring-support/proctoring-support.info,v
diff -u -r1.1.2.7 -r1.1.2.8
--- openacs-4/packages/proctoring-support/proctoring-support.info	21 Aug 2020 15:18:34 -0000	1.1.2.7
+++ openacs-4/packages/proctoring-support/proctoring-support.info	28 Aug 2020 13:33:40 -0000	1.1.2.8
@@ -10,7 +10,7 @@
     <inherit-templates-p>f</inherit-templates-p>
     <auto-mount>proctoring</auto-mount>
 
-    <version name="1.1.0" url="http://openacs.org/repository/download/apm/proctoring-support-1.1.0.apm">
+    <version name="1.1.1" url="http://openacs.org/repository/download/apm/proctoring-support-1.1.1.apm">
         <owner url="mailto:apisano@wu.ac.at">Antonio Pisano</owner>
         <summary>Set of tools to implement proctoring of user interaction</summary>
         <vendor url="https://www.wu.ac.at/">Wirtschaftsuniversität Wien</vendor>
@@ -21,7 +21,7 @@
 No real UI is provided by the package itself. Other packages must integrate the provided includes.</description>
         <maturity>0</maturity>
 
-        <provides url="proctoring-support" version="1.1.0"/>
+        <provides url="proctoring-support" version="1.1.1"/>
         <requires url="xotcl-core" version="5.10.0d34"/>
 
         <callbacks>
Index: openacs-4/packages/proctoring-support/catalog/proctoring-support.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/proctoring-support/catalog/proctoring-support.de_DE.ISO-8859-1.xml,v
diff -u -r1.1.2.5 -r1.1.2.6
--- openacs-4/packages/proctoring-support/catalog/proctoring-support.de_DE.ISO-8859-1.xml	21 Aug 2020 15:18:34 -0000	1.1.2.5
+++ openacs-4/packages/proctoring-support/catalog/proctoring-support.de_DE.ISO-8859-1.xml	28 Aug 2020 13:33:40 -0000	1.1.2.6
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <message_catalog package_key="proctoring-support" locale="de_DE" charset="ISO-8859-1">
 
+  <msg key="accept">Best�tigen</msg>
   <msg key="accept_message">Zur Erkennung einer &#34;Erschleichung der Pr�fungsleistung&#34; findet eine automatisierte Online-Aufsicht statt. Dabei werden Sie, Ihr Bildschirm und Ihr Mikrofon aufgezeichnet. Ihre Daten werden nur zum angegebenen Zweck verwendet, sicher verwahrt und nicht an Dritte weitergegeben.</msg>
   <msg key="audio_grabbing_not_supported">Sie arbeiten mit einem Browser der die automatische Online-Aufsicht nicht unterst�tzt. Bitte verwenden Sie die neueste Version von &lt;a href=&#39;https://www.google.de/chrome&#39;&gt;Google Chrome&lt;/a&gt;.</msg>
   <msg key="banner_message">Der Pr�fungsmodus l�uft. Schlie�en Sie das Browserfenster daher erst nach Beendigung der Pr�fung.</msg>
Index: openacs-4/packages/proctoring-support/catalog/proctoring-support.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/proctoring-support/catalog/proctoring-support.en_US.ISO-8859-1.xml,v
diff -u -r1.1.2.7 -r1.1.2.8
--- openacs-4/packages/proctoring-support/catalog/proctoring-support.en_US.ISO-8859-1.xml	21 Aug 2020 15:18:34 -0000	1.1.2.7
+++ openacs-4/packages/proctoring-support/catalog/proctoring-support.en_US.ISO-8859-1.xml	28 Aug 2020 13:33:40 -0000	1.1.2.8
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <message_catalog package_key="proctoring-support" locale="en_US" charset="ISO-8859-1">
 
+  <msg key="accept">Accept</msg>
   <msg key="accept_message">An automated exam-supervision is activated to detect any fraudulent examination performance. You, your screen and your microphone will be recorded. Your data will only be used for the stated purpose, will be stored securely and will not be passed on to third parties.</msg>
   <msg key="audio_grabbing_not_supported">You are working with a browser that does not support the automated exam-supervision. Please use the latest version of Google &lt;a href=&#39;https://www.google.com/chrome/&#39;&gt;Chrome&lt;/a&gt;.</msg>
   <msg key="banner_message">The examination mode is activated. Close your browser window after the exam.</msg>
Index: openacs-4/packages/proctoring-support/lib/proctored-page.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/proctoring-support/lib/proctored-page.adp,v
diff -u -r1.1.2.4 -r1.1.2.5
--- openacs-4/packages/proctoring-support/lib/proctored-page.adp	18 Aug 2020 12:46:10 -0000	1.1.2.4
+++ openacs-4/packages/proctoring-support/lib/proctored-page.adp	28 Aug 2020 13:33:40 -0000	1.1.2.5
@@ -25,11 +25,6 @@
     <h1>#xowf.menu-New-App-OnlineExam#</h1>
 
     <!-- One "tab" for each step in the form: -->
-    <if @examination_statement_p;literal@ true>
-      <div class="tab">
-        <div id="examination-statement">@msg.exam_mode;literal@</div>
-      </div>
-    </if>
     <if @proctoring_p;literal@ true>
       <div class="tab">
         <div>@msg.proctoring_accept@</div>
@@ -50,6 +45,11 @@
         <video class="wizard-video" width="640" id="desktop" autoplay playsinline muted="false" volume=0></video>
       </div>
     </if>
+    <if @examination_statement_p;literal@ true>
+      <div class="tab">
+        <div id="examination-statement">@msg.exam_mode;literal@</div>
+      </div>
+    </if>
     <div id="error-message" class="text-danger"></div>
     <div style="overflow:auto;">
       <div style="float:right;">
@@ -117,6 +117,7 @@
     var isMobile = @mobile_p;literal@;
     var nextLabel = "#acs-kernel.common_Next#";
     var submitLabel = "#proctoring-support.wizard_finish#";
+    var acceptLabel = "#proctoring-support.accept#";
     var blackPictureSizeThreshold = 24000; // kbytes
   </script>
   <script src="/resources/proctoring-support/proctored-page.js"></script>
Index: openacs-4/packages/proctoring-support/www/resources/proctored-page.js
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/proctoring-support/www/resources/proctored-page.js,v
diff -u -r1.1.2.4 -r1.1.2.5
--- openacs-4/packages/proctoring-support/www/resources/proctored-page.js	18 Aug 2020 12:46:10 -0000	1.1.2.4
+++ openacs-4/packages/proctoring-support/www/resources/proctored-page.js	28 Aug 2020 13:33:40 -0000	1.1.2.5
@@ -174,9 +174,6 @@
 
 var streams = [];
 var handlers = [];
-if (hasExaminationStatement) {
-    handlers.push(approveStartExam);
-}
 if (hasProctoring) {
     handlers.push(function () {
         clearError();
@@ -290,16 +287,22 @@
         });
     });
 }
+if (hasExaminationStatement) {
+    handlers.push(function () {
+        var acceptButton = document.getElementById("nextBtn");
+        acceptButton.innerHTML = acceptLabel;
+        var clickHandler = function(e) {
+            approveStartExam();
+            this.removeEventListener("click", clickHandler);
+        };
+        acceptButton.addEventListener("click", clickHandler);
+    });
+}
 
 function showTab(n) {
     // This function will display the specified tab of the form...
     var x = document.getElementsByClassName("tab");
     x[n].style.display = "block";
-    if (typeof handlers[n] == "function") {
-        handlers[n]();
-    } else {
-        valid = true;
-    }
     //... and fix the Previous/Next buttons:
     if (n == 0) {
         document.getElementById("prevBtn").style.display = "none";
@@ -312,7 +315,13 @@
         document.getElementById("nextBtn").innerHTML = nextLabel;
     }
     //... and run a function that will display the correct step indicator:
-    fixStepIndicator(n)
+    fixStepIndicator(n);
+
+    if (typeof handlers[n] == "function") {
+        handlers[n]();
+    } else {
+        valid = true;
+    }
 }
 
 var errorEl = document.querySelector("#error-message");