Merge pull request #21 from RunestoneInteractive/master

Bringing master branch up to date with the main runestone components repo

Author: riknos314

runestone/common/js/runestonebase.js

@@ -0,0 +1,11 @@
+function RunestoneBase () {   // Basic parent stuff
+
+}
+
+RunestoneBase.prototype.logBookEvent = function (info) {
+    console.log("logging event " + this.divid);
+};
+
+RunestoneBase.prototype.logRunEvent = function (info) {
+    console.log("running " + this.divid);
+};

runestone/parsons/README.md

@@ -0,0 +1,24 @@
+#Parsons problem
+
+The parsons problem allows for giving students simple programming problems where the code is already there but not indented or in the correct order.  They drag-and-drop lines of code into the proper order.
+
+Each line of code is delimited by `---` and the indentation of the line is the same as the indentation of that line in the markup.
+
+```html
+<pre  data-component="parsons" id="example1">
+    <span data-question>This is the question</span>
+x = 0
+---
+for i in range(10)
+---
+  x = x + 1
+---
+print(x)
+</pre>
+```
+
+
+
+The master repository for the parsons problems code is https://github.com/vkaravir/js-parsons.git
+
+If you want to make customizations ONLY for runestone you should use the RunestoneComponents repository https://github.com/RunestoneInteractive/RunestoneComponents

runestone/parsons/README.rst

@@ -1,3 +1 @@
-
 from .parsons import *
-

runestone/parsons/__init__.py

@@ -72,13 +72,13 @@ li.correctPosition, .testcase.pass {
 .testcase .msg { font-weight: bold; }
 .testcase .error { color: red;}
 .testcase .feedback { font-weight: bolder;}
-.testcase.fail .expected, .testcase.fail .actual { 
-    color: red; 
+.testcase.fail .expected, .testcase.fail .actual {
+    color: red;
     font-weight: bolder;
 }
-.testcase .output { 
-    display: block; 
-    white-space: pre; 
+.testcase .output {
+    display: block;
+    white-space: pre;
     background-color: #555555;
     color: white;
     font-size: 12px;