update for 2.9.4 (collapsed menu; sage)

Author: wiobber

public/javascripts/main.min.js

@@ -168628,7 +168628,7 @@ var palette = require('./math-palette');
 var buttonlessTemplate = '<input class="form-control" type="text"/>';
 
 // add labels for screenreader
-var template = '<div class="input-group" style="width:100%">' + '<input class="form-control answer-input-part" aria-label="answer" type="text"/>' + '<span class="input-group-btn answer-input-part">' + '<button class="px-0 btn btn-success btn-ximera-correct" data-toggle="tooltip" data-placement="top" title="Juist!" style="display: none; z-index: 1;" aria-label="juist" aria-live="assertive">' + '<i class="fa fa-fw fa-check"></i>' + '</button>' + '<button class="px-0 btn btn-danger btn-ximera-incorrect" data-toggle="tooltip" data-placement="top" title="Fout. Probeer opnieuw!" style="display: none; z-index: 1;" aria-label="fout! probeer opnieuw" aria-live="assertive">' + '<i class="fa fa-fw fa-times"></i>' + '</button>' + '<button class="px-0 btn btn-primary disabled btn-ximera-checking" aria-label="aan het controleren" data-toggle="tooltip" data-placement="top" title="Controleren..." style="z-index: 1; display: none;">' + '<i class="fa fa-fw fa-spinner fa-spin"></i>' + '</button>' + '<button class="px-0 btn btn-primary btn-ximera-submit" aria-label="kijk na" data-toggle="tooltip" data-placement="top" title="Klik om je antwoord na te kijken." style="z-index: 1;">' + '<i class="fa fa-fw fa-question"></i>' + '</button>' + '</span>' + '<span class="input-group-btn show-answer-small">' + '<button class="px-0 btn btn-primary btn-info btn-ximera-show-answer" style="vertical-align:baseline" aria-label="Toon antwoord" data-toggle="tooltip" data-placement="top" title="Klik om het antwoord te tonen." style="z-index: 1;">' + '<i class="fa fa-fw fa-key"></i>' + '</button>' + '</span>' + '<span class="input-group-btn show-answer-large" style="width:100%">' + '<button class="px-0 btn btn-primary btn-info btn-ximera-show-answer" style="vertical-align:baseline; width:100%" aria-label="Toon antwoord" data-toggle="tooltip" data-placement="top" title="Klik om het antwoord te tonen." style="z-index: 1;">' + '<i class="fa fa-fw fa-key"></i><span class="show-answer-text">Toon Antwoord</span>' + '</button>' + '</span>' + '</div>';
+var template = '<div class="input-group" style="width:100%">' + '<input class="form-control answer-input-part" aria-label="answer" type="text"/>' + '<span class="input-group-btn answer-input-part">' + '<button class="px-0 btn btn-success btn-ximera-correct" data-toggle="tooltip" data-placement="top" title="Correct!" style="display: none; z-index: 1;" aria-label="Correct" aria-live="polite">' + '<i class="fa fa-fw fa-check"></i>' + '</button>' + '<button class="px-0 btn btn-danger btn-ximera-incorrect" data-toggle="tooltip" data-placement="top" title="Incorrect, try again!" style="display: none; z-index: 1;" aria-label="Incorrect, try again" aria-live="polite">' + '<i class="fa fa-fw fa-times"></i>' + '</button>' + '<button class="px-0 btn btn-primary disabled btn-ximera-checking" aria-label="Checking" data-toggle="tooltip" data-placement="top" title="Check..." style="z-index: 1; display: none;">' + '<i class="fa fa-fw fa-spinner fa-spin"></i>' + '</button>' + '<button class="px-0 btn btn-primary btn-ximera-submit" aria-label="Check" data-toggle="tooltip" data-placement="top" title="Click to check your answer." style="z-index: 1;">' + '<i class="fa fa-fw fa-question"></i>' + '</button>' + '</span>' + '<span class="input-group-btn show-answer-small">' + '<button class="px-0 btn btn-primary btn-info btn-ximera-show-answer" style="vertical-align:baseline" aria-label="Show Answer" data-toggle="tooltip" data-placement="top" title="Click to Show Answer." style="z-index: 1;">' + '<i class="fa fa-fw fa-key"></i>' + '</button>' + '</span>' + '<span class="input-group-btn show-answer-large" style="width:100%">' + '<button class="px-0 btn btn-primary btn-info btn-ximera-show-answer" style="vertical-align:baseline; width:100%" aria-label="Show Answer" data-toggle="tooltip" data-placement="top" title="Click to Show Answer." style="z-index: 1;">' + '<i class="fa fa-fw fa-key"></i><span class="show-answer-text">Show Answer</span>' + '</button>' + '</span>' + '</div>';
 
 function parseFormattedInput(format, input) {
 	if (format == 'integer') return parseInt(input);else if (format == 'float') return parseFloat(input);else if (format == 'string') return input;else {
@@ -168756,7 +168756,7 @@ exports.connectMathAnswer = function (result, answer) {
 
 		var control = result.find("input.form-control");
 
-		var table = '<table class="table table-striped">' + '<thead>' + '  <tr>' + '    <th>Aantal</th>' + '    <th>Antwoord</th>' + '  </tr>' + '</thead><tbody>';
+		var table = '<table class="table table-striped">' + '<thead>' + '  <tr>' + '    <th>Number</th>' + '    <th>Answer</th>' + '  </tr>' + '</thead><tbody>';
 
 		var sortedAnswers = Object.keys(answers).sort(function (a, b) {
 			return -(+(answers[a] > answers[b]) || +(answers[a] === answers[b]) - 1);
@@ -168770,15 +168770,15 @@ exports.connectMathAnswer = function (result, answer) {
 
 		table = table + '</tbody></table>';
 
-		var modal = $('<div class="modal fade" tabindex="-1" role="dialog">' + '  <div class="modal-dialog">' + '    <div class="modal-content">' + '      <div class="modal-header">' + '        <button type="button" class="close" data-dismiss="modal" aria-label="Sluit"><span aria-hidden="true">&times;</span></button>' + '        <h4 class="modal-title">' + total + ' antwoorden</h4>' + '      </div>' + '      <div class="modal-body">' + '        ' + table + '        <p>Bijkomende antwoorden: ' + additionalAnswers + '<p>' + '      </div>' + '      <div class="modal-footer">' + '        <button type="button" class="btn btn-default" data-dismiss="modal">Sluit</button>' + '      </div>' + '    </div><!-- /.modal-content -->' + '  </div><!-- /.modal-dialog -->' + '</div><!-- /.modal -->');
+		var modal = $('<div class="modal fade" tabindex="-1" role="dialog">' + '  <div class="modal-dialog">' + '    <div class="modal-content">' + '      <div class="modal-header">' + '        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>' + '        <h4 class="modal-title">' + total + ' Answers</h4>' + '      </div>' + '      <div class="modal-body">' + '        ' + table + '        <p>Additional Answers: ' + additionalAnswers + '<p>' + '      </div>' + '      <div class="modal-footer">' + '        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>' + '      </div>' + '    </div><!-- /.modal-content -->' + '  </div><!-- /.modal-dialog -->' + '</div><!-- /.modal -->');
 		modal.uniqueId();
 
 		$('body').prepend(modal);
 		modal.find('button').click(function () {
 			modal.modal('hide');
 		});
 
-		result.find('span.input-group-btn').prepend($('<button class="btn btn-info" data-toggle="tooltip" data-placement="top" title="' + total + '  antwoorden">' + '<i class="fa fa-bar-chart"/>' + '</button>'));
+		result.find('span.input-group-btn').prepend($('<button class="btn btn-info" data-toggle="tooltip" data-placement="top" title="' + total + '  Answers">' + '<i class="fa fa-bar-chart"/>' + '</button>'));
 
 		result.find('button.btn-info').click(function () {
 			$('#' + modal.attr('id')).modal('show');
@@ -169248,9 +169248,9 @@ var Javascript = require('./javascript');
 
 var buttonTemplate = _.template('<button class="text-left btn btn-secondary <%= correct %>" id="<%= id %>"></button>');
 
-var answerHtml = '<div class="btn-group" style="vertical-align: bottom; " aria-live="assertive">' + '<button class="btn btn-success btn-ximera-correct" data-toggle="tooltip" data-placement="top" title="Juiste antwoord!" style="display: none">' + '<i class="fa fa-check"></i>&nbsp;Correct' + '</button></div>' + '<div class="btn-group" style="vertical-align: bottom; " aria-live="assertive">' + '<button class="btn btn-danger btn-ximera-incorrect" data-toggle="tooltip" data-placement="top" title="Fout. Probeer opnieuw!" style="display: none">' + '<i class="fa fa-times"></i>&nbsp;Probeer opnieuw' + '</button></div>' + '<div class="btn-group" style="vertical-align: bottom; ">' + '<button class="btn btn-primary btn-ximera-submit btn-ximera-check" data-toggle="tooltip" data-placement="top" title="Klik om je antwoord te controleren.">' + '<i class="fa fa-question"></i><span class="show-check-text">&nbsp;Controleer</span>' + '</button>' + '</div>';
+var answerHtml = '<div class="btn-group" style="vertical-align: bottom; " aria-live="assertive">' + '<button class="btn btn-success btn-ximera-correct" data-toggle="tooltip" data-placement="top" title="Correct answer!" style="display: none">' + '<i class="fa fa-check"></i>&nbsp;Correct' + '</button></div>' + '<div class="btn-group" style="vertical-align: bottom; " aria-live="assertive">' + '<button class="btn btn-danger btn-ximera-incorrect" data-toggle="tooltip" data-placement="top" title="Incorrect.  Try again!" style="display: none">' + '<i class="fa fa-times"></i>&nbsp;Try again' + '</button></div>' + '<div class="btn-group" style="vertical-align: bottom; ">' + '<button class="btn btn-primary btn-ximera-submit" data-toggle="tooltip" data-placement="top" title="Click to check your answer.">' + '<i class="fa fa-question"></i>&nbsp;Check work' + '</button>' + '</div>';
 
-var ungradedAnswerHtml = '<div class="btn-group" style="vertical-align: bottom; " aria-live="assertive">' + '<button class="btn btn-success btn-ximera-correct" data-toggle="tooltip" data-placement="top" title="Bedankt voor je inzending" style="display: none">' + '<i class="fa fa-envelope"></i>&nbsp;Verzonden' + '</button></div>' + '<div class="btn-group" style="vertical-align: bottom; " aria-live="assertive">' + '<button class="btn btn-danger btn-ximera-incorrect" data-toggle="tooltip" data-placement="top" title="Verzend opnieuw!" style="display: none">' + '<i class="fa fa-times"></i>&nbsp;Probeer opnieuw' + '</button></div>' + '<div class="btn-group" style="vertical-align: bottom; ">' + '<button class="btn btn-primary btn-ximera-submit" data-toggle="tooltip" data-placement="top" title="Klik om je antwoord te verzenden.">' + '<i class="fa fa-envelope-open"></i>&nbsp;Verzend' + '</button>' + '</div>';
+var ungradedAnswerHtml = '<div class="btn-group" style="vertical-align: bottom; " aria-live="assertive">' + '<button class="btn btn-success btn-ximera-correct" data-toggle="tooltip" data-placement="top" title="Thank you for your submission" style="display: none">' + '<i class="fa fa-envelope"></i>&nbsp;Submitted' + '</button></div>' + '<div class="btn-group" style="vertical-align: bottom; " aria-live="assertive">' + '<button class="btn btn-danger btn-ximera-incorrect" data-toggle="tooltip" data-placement="top" title="Submit again!" style="display: none">' + '<i class="fa fa-times"></i>&nbsp;Try again' + '</button></div>' + '<div class="btn-group" style="vertical-align: bottom; ">' + '<button class="btn btn-primary btn-ximera-submit" data-toggle="tooltip" data-placement="top" title="Click to submit your answer.">' + '<i class="fa fa-envelope-open"></i>&nbsp;Submit your work' + '</button>' + '</div>';
 
 function assignGlobalVariable(multipleChoice, choice) {
 	if (multipleChoice.attr('data-id')) {
@@ -170635,8 +170635,14 @@ exports.createKernel = _.once(function () {
 
 												var d = document.createElement('div');
 												window.sagecell.makeSagecell({ inputLocation: d, linked: true });
-												d.children[0].children[1].click();
-
+												// console.log(d);
+												var observer = new MutationObserver(function (mutations, observer) {
+															if (d.children && d.children[0] && d.children[0].children[1]) {
+																		d.children[0].children[1].click();
+																		observer.disconnect();
+															}
+												});
+												observer.observe(d, { childList: true, subtree: true });
 												// Make sage cells---but make them linked so there's just one kernel.
 												window.sagecell.makeSagecell({ "inputLocation": ".sage", linked: true });
 												window.sagecell.makeSagecell({ "inputLocation": ".sageOutput", "hide": ["editor", "evalButton"], "autoeval": true, linked: true });
@@ -170702,7 +170708,7 @@ var TinCan = require('./tincan');
 
 var buttonTemplate = _.template('<button class="btn text-left btn-secondary <%= correct %>" id="<%= id %>"></button>');
 
-var answerHtml = '<div class="btn-group" style="vertical-align: bottom; " aria-live="assertive">' + '<button class="btn btn-success btn-ximera-correct" data-toggle="tooltip" data-placement="top" title="Juiste answer!" style="display: none">' + '<i class="fa fa-check"></i>&nbsp;Correct' + '</button></div>' + '<div class="btn-group" style="vertical-align: bottom; " aria-live="assertive">' + '<button class="btn btn-danger btn-ximera-incorrect" data-toggle="tooltip" data-placement="top" title="Fout. Probeer opnieuw!" style="display: none">' + '<i class="fa fa-times"></i>&nbsp;Probeer opnieuw' + '</button></div>' + '<div class="btn-group" style="vertical-align: bottom; ">' + '<button class="btn btn-primary btn-ximera-submit btn-ximera-check" data-toggle="tooltip" data-placement="top" title="Klik om je antwoord na te kijken.">' + '<i class="fa fa-question"></i><span class="show-check-text">&nbsp;Controleer</span>' + '</button>' + '</div>';
+var answerHtml = '<div class="btn-group" style="vertical-align: bottom; " aria-live="assertive">' + '<button class="btn btn-success btn-ximera-correct" data-toggle="tooltip" data-placement="top" title="Correct answer!" style="display: none">' + '<i class="fa fa-check"></i>&nbsp;Correct' + '</button></div>' + '<div class="btn-group" style="vertical-align: bottom; " aria-live="assertive">' + '<button class="btn btn-danger btn-ximera-incorrect" data-toggle="tooltip" data-placement="top" title="Incorrect.  Try again!" style="display: none">' + '<i class="fa fa-times"></i>&nbsp;Try again' + '</button></div>' + '<div class="btn-group" style="vertical-align: bottom; ">' + '<button class="btn btn-primary btn-ximera-submit" data-toggle="tooltip" data-placement="top" title="Click to check your answer.">' + '<i class="fa fa-question"></i>&nbsp;Check work' + '</button>' + '</div>';
 
 var createSelectAll = function createSelectAll() {
 	var selectAll = $(this);
@@ -171653,6 +171659,11 @@ var layoutXourse = function layoutXourse() {
 		});
 	});
 
+	/* make sure the part with the current activity is open */
+	document.querySelectorAll('.activity-card.active').forEach(function (crd) {
+		$('.part').eq($(crd).attr("data-part-counter") - 1).addClass('part-open');
+	});
+
 	xourse.show();
 
 	var options = {