Merge branch 'RunestoneInteractive:master' into master

Author: xinyinghou

makeRelease.sh

@@ -42,9 +42,8 @@ if [ -d ~/.virtualenvs/json2xml ]
     source ~/.virtualenvs/json2xml/bin/activate
     python scripts/dist2xml.py $1 
     cd runestone
-    tar zcf dist-$1.tgz dist
+    tar --strip-components 1 -zcf dist-$1.tgz dist/*
+    scp dist-$1.tgz balance.runestoneacademy.org:~/
   else
     echo "Warning: no json2xml ve found skipping pretext"
 fi
-
-

runestone/activecode/js/livecode.js

@@ -29,7 +29,7 @@ export default class LiveCode extends ActiveCode {
         }
         this.createErrorOutput();
     }
-    outputfun(a) { }
+    outputfun(a) {}
     createInputElement() {
         var label = document.createElement("label");
         label.for = this.divid + "_stdin";
@@ -43,7 +43,7 @@ export default class LiveCode extends ActiveCode {
         this.outerDiv.appendChild(input);
         this.stdin_el = input;
     }
-    createErrorOutput() { }
+    createErrorOutput() {}
 
     /*  Main runProg method for livecode
      *
@@ -205,9 +205,9 @@ export default class LiveCode extends ActiveCode {
             public static void main(String[] args) {
                 CodeTestHelper.resetFinalResults();
                 Result result = JUnitCore.runClasses(${testdrivername.replace(
-            ".java",
-            ".class"
-        )});
+                    ".java",
+                    ".class"
+                )});
                 System.out.println(CodeTestHelper.getFinalResults());
 
                 int total = result.getRunCount();
@@ -315,7 +315,10 @@ export default class LiveCode extends ActiveCode {
                 $(odiv).html(this.parsedOutput.stdout);
                 if (this.suffix) {
                     if (this.parsedOutput.pct === undefined) {
-                        this.parsedOutput.pct = this.parsedOutput.passed = this.parsedOutput.failed = 0;
+                        this.parsedOutput.pct =
+                            this.parsedOutput.passed =
+                            this.parsedOutput.failed =
+                                0;
                     }
                     this.unit_results = `percent:${this.parsedOutput.pct}:passed:${this.parsedOutput.passed}:failed:${this.parsedOutput.failed}`;
                 }

runestone/parsons/js/parsons-i18n.en.js

@@ -3,7 +3,7 @@ $.i18n().load({
         msg_parson_check_me: "Check",
         msg_parson_reset: "Reset",
         msg_parson_help: "Help me",
-        msg_parson_too_short: "Your program is too short. Add more blocks.",
+        msg_parson_too_short: "Your answer is too short. Add more blocks.",
         msg_parson_drag_from_here: "Drag from here",
         msg_parson_drag_to_here: "Drop blocks here",
         msg_parson_correct_first_try:
@@ -15,7 +15,7 @@ $.i18n().load({
         msg_parson_wrong_indents:
             "These blocks are not indented correctly. To indent a block more, drag it to the right. To reduce the indention, drag it to the left.",
         msg_parson_wrong_order:
-            "Highlighted blocks in your program are wrong or are in the wrong order. This can be fixed by moving, removing, or replacing highlighted blocks.",
+            "Highlighted blocks in your answer are wrong or are in the wrong order. This can be fixed by moving, removing, or replacing highlighted blocks.",
         msg_parson_arrow_navigate:
             "Arrow keys to navigate. Space to select / deselect block to move.",
         msg_parson_help_info:

runestone/pretext/chapter_pop.py

@@ -153,6 +153,7 @@ def manifest_data_to_db(course_name, manifest_path):
                     idchild = el.attrib["id"]
                 else:
                     el = question.find("./div")
+                    idchild = el.attrib["id"] or "foo_id"
                 try:
                     qtype = el.attrib["data-component"]
                     # translate qtype to question_type

setup.py

@@ -11,7 +11,7 @@
     dependencies = [l.strip() for l in fh]
 
 
-VERSION = "6.2.1"
+VERSION = "6.2.2"
 
 # These pre-install hooks are useful to make sure any pre-requisite
 # programs that are not pip installable are in place.