IAV: fix vips layout

virtUOS · Apr 30, 2020 · e3e7b30 · e3e7b30
1 parent 5f7d375
commit e3e7b30
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/assets/static/courseware.js b/assets/static/courseware.js
diff --git a/blocks/InteractiveVideoBlock/js/student_view.js b/blocks/InteractiveVideoBlock/js/student_view.js
@@ -21,6 +21,26 @@ export default StudentView.extend({
         var $view =  this,
         $player_element = $view.$('.cw-iav-player').get(0);
 
+        let mathjaxP;
+
+        if (window.MathJax && window.MathJax.Hub) {
+          mathjaxP = Promise.resolve(window.MathJax);
+        } else if (window.STUDIP && window.STUDIP.loadChunk) {
+          mathjaxP = window.STUDIP.loadChunk('mathjax');
+        }
+
+        mathjaxP && mathjaxP
+          .then(({ Hub }) => {
+            Hub.Queue(['Typeset', Hub, this.el]);
+          })
+          .catch(() => {
+            console.log('Warning: Could not load MathJax.');
+          });
+
+        if (this.$('.numexes').val() == 1) {
+            this.$('.exercisenavbutton').hide();
+        }
+
         if (typeof $player_element !== 'undefined') {
             if ($player_element.readyState >= 2) {      //if firefox
                 $view.setupVideo();

diff --git a/blocks/InteractiveVideoBlock/templates/student_view.mustache b/blocks/InteractiveVideoBlock/templates/student_view.mustache
@@ -28,16 +28,19 @@
                         <input type="hidden" name="subaction" value="submit_exercise">
                         <input type="hidden" name="submit_exercise" value="1">
                         <input type="hidden" name="exercise_id" value="{{id}}">
-                    <h2 class="cw-iav-test-content-title">{{title}}</h2>
                     <input type="hidden" class="cw-iav-test-content-test-id" value="{{id}}">
                     {{#has_solution}}
                         {{#correct}}
                             <input type="hidden" class="cw-iav-test-correct" value="true">
                             <div class="messagebox messagebox_success">{{#i18n}}Ihre Lösung ist korrekt!{{/i18n}}</div>
+                            <h2 class="cw-iav-test-content-title">{{title}}</h2>
+                            <p class="cw-iav-test-content-question-description">{{{question_description}}}</p>
                             <div class="cw-iav-test-content-question">{{{solution}}}</div>
                         {{/correct}}
                         {{^correct}}
                             <div class="messagebox messagebox_error">{{#i18n}}Ihr Lösungsversuch war noch nicht korrekt. {{#tries_left}} Versuchen Sie es bitte nochmal. Sie haben noch {{tries_left}} Versuch{{#tries_pl}}e{{/tries_pl}}.{{/tries_left}}{{/i18n}}</div>
+                             <h2 class="cw-iav-test-content-title">{{title}}</h2>
+                            <p class="cw-iav-test-content-question-description">{{{question_description}}}</p>
                             {{^no_more_tries}}
                                 <div class="cw-iav-test-content-question">{{{question}}}</div>
                                 <button name="submit-exercise" class="button" style="display: inline-block">{{#i18n}}Abschicken{{/i18n}}</button>
@@ -49,6 +52,7 @@
                         {{/correct}}
                     {{/has_solution}}
                     {{^has_solution}}
+                        <h2 class="cw-iav-test-content-title">{{title}}</h2>
                         <p class="cw-iav-test-content-question-description">{{{question_description}}}</p>
                         <div class="cw-iav-test-content-question">{{{question}}}</div>
                         <button name="submit-exercise" class="button" style="display: inline-block">{{#i18n}}Abschicken{{/i18n}}</button>