Getting latest updates from master

runestone/__main__.py

@@ -30,6 +30,7 @@ def init():
     conf_dict['author'] = click.prompt("Your Name ", default=getpass.getuser())
     conf_dict['project_title'] = click.prompt("Title for this project ", default="Runestone Default")
     conf_dict['python3'] = click.prompt("Use Simple Python3 Semantics ", default="false")
+    conf_dict['basecourse'] = conf_dict['project_name']
     if conf_dict['use_services'] == "true":
         conf_dict['login_req'] = click.prompt("Require login  ", default="false")
         conf_dict['master_url'] = click.prompt("URL for ajax server ", default="http://127.0.0.1:8000")

runestone/activecode/css/activecode.css

@@ -92,6 +92,6 @@
     border: 2px solid black;
 }
 
-ol.arabic {
+.full_width ol {
 	max-width: 100% !important;
 }

runestone/activecode/js/activecode.js

@@ -551,7 +551,7 @@ errorText.NotImplementedErrorFix = "For now the only way to fix this is to not u
 
 
 ActiveCode.prototype.setTimeLimit = function (timer) {
-    var timelimit = this.timeLimit;
+    var timelimit = this.timelimit;
     if (timer !== undefined ) {
         timelimit = timer
     }
@@ -986,11 +986,14 @@ AudioTour.prototype.tour = function (divid, audio_type, bcount) {
         // str+="<audio id="+akey+" preload='auto'><source src='http://ice-web.cc.gatech.edu/ce21/audio/"+
         // akey+".mp3' type='audio/mpeg'><source src='http://ice-web.cc.gatech.edu/ce21/audio/"+akey+
         // ".ogg' type='audio/ogg'>Your browser does not support the audio tag</audio>";
+
+        var dir = "http://media.interactivepython.org/" + eBookConfig.basecourse + "/audio/" 
+        //var dir = "../_static/audio/"
         str += "<audio id=" + akey + " preload='auto' >";
-        str += "<source src='../_static/audio/" + akey + ".wav' type='audio/wav'>";
-        str += "<source src='../_static/audio/" + akey + ".mp3' type='audio/mpeg'>";
-        str += "<source src='_static/audio/" + akey + ".wav' type='audio/wav'>";
-        str += "<source src='_static/audio/" + akey + ".mp3' type='audio/mpeg'>";
+        str += "<source src='" + dir + akey + ".wav' type='audio/wav'>";
+        str += "<source src='" + dir + akey + ".mp3' type='audio/mpeg'>";
+        str += "<source src='" + dir + akey + ".wav' type='audio/wav'>";
+        str += "<source src='" + dir + akey + ".mp3' type='audio/mpeg'>";
         str +=  "<br />Your browser does not support the audio tag</audio>";
         this.ahash[akey] = lnums;
         this.aname.push(akey);

runestone/assess/js/fitb.js

@@ -250,7 +250,7 @@ FITB.prototype.checkFITBStorage = function () {
     // Starts chain of functions which ends with feedBack() displaying feedback to user
     this.evaluateAnswers();
     this.renderFITBFeedback();
-    var answerInfo = "answer:" + this.given_arr + ":" + (this.isCorrect ? "correct" : "no");
+    var answerInfo = "answer:" + this.given_arr + ":" + (this.correct ? "correct" : "no");
     this.logBookEvent({"event": "fillb", "act": answerInfo, "div_id": this.divid});
     this.enableCompareButton.disabled = false;
 };

runestone/assess/js/mchoice.js

@@ -232,12 +232,12 @@ MultipleChoice.prototype.renderMCFormButtons = function () {
     });
     if (this.multipleanswers) {
         this.submitButton.addEventListener("click", function () {
-            this.processMCMASubmission();
+            this.processMCMASubmission(true);
         }.bind(this), false);
     } else {
         this.submitButton.addEventListener("click", function (ev) {
             ev.preventDefault();
-            this.processMCMFSubmission();
+            this.processMCMFSubmission(true);
         }.bind(this), false);
     } // end else
     this.optsForm.appendChild(this.submitButton);
@@ -313,7 +313,9 @@ MultipleChoice.prototype.restoreMultipleSelect = function () {
                         $(this.optionArray[b].input).attr("checked", "true");
                     }
                 }
-                this.enableMCComparison();
+                if (this.useRunestoneServices) {
+                    this.enableMCComparison();
+                }
             } // end for
         } // end if
     } // end if len > 0
@@ -346,12 +348,14 @@ MultipleChoice.prototype.restoreRadio = function () {
 === Processing MC Submissions ===
 ===============================*/
 
-MultipleChoice.prototype.processMCMASubmission = function () {
+MultipleChoice.prototype.processMCMASubmission = function (logFlag) {
     // Called when the submit button is clicked
     this.getSubmittedOpts();
     this.scoreMCMASubmission();
     this.populateMCMALocalStorage();
-    this.logMCMAsubmission();
+    if (logFlag) {
+       this.logMCMAsubmission();
+    }
     this.renderMCMAFeedBack();
     if (this.useRunestoneServices) {
         this.enableMCComparison();
@@ -428,12 +432,14 @@ MultipleChoice.prototype.renderMCMAFeedBack = function () {
     }
 };
 
-MultipleChoice.prototype.processMCMFSubmission = function () {
+MultipleChoice.prototype.processMCMFSubmission = function (logFlag) {
     // Called when the submit button is clicked
     this.getSubmittedOpts();
     this.populateMCMFLocalStorage();
     this.scoreMCMFSubmission();
-    this.logMCMFsubmission();
+    if (logFlag) {
+        this.logMCMFsubmission();
+    }
     this.renderMCMFFeedback(this.givenArray[0] == this.correctIndexList[0], this.singlefeedback);
     if (this.useRunestoneServices) {
         this.enableMCComparison();

runestone/assess/js/timed.js

@@ -349,7 +349,7 @@ Timed.prototype.handlePrevAssessment = function () {
         this.running = 0;
         this.done = 1;
         $(this.timedDiv).show();
-        this.submitTimedProblems();
+        this.submitTimedProblems(false); // do not log these results
 }
 
 Timed.prototype.startAssessment = function () {
@@ -508,7 +508,7 @@ Timed.prototype.finishAssessment = function () {
         this.running = 0;
         this.done = 1;
         this.taken = 1;
-        this.submitTimedProblems();
+        this.submitTimedProblems(true); // log results
         this.checkScore();
         this.displayScore();
         this.storeScore();
@@ -518,9 +518,9 @@ Timed.prototype.finishAssessment = function () {
     }
 };
 
-Timed.prototype.submitTimedProblems = function () {
+Timed.prototype.submitTimedProblems = function (logFlag) {
     for (var i = 0; i < this.renderedQuestionArray.length; i++) {
-        this.renderedQuestionArray[i].processTimedSubmission();
+        this.renderedQuestionArray[i].processTimedSubmission(logFlag);
     }
     if (!this.showFeedback) {
         this.hideTimedFeedback();

runestone/assess/js/timedmc.js

@@ -133,13 +133,13 @@ TimedMC.prototype.hideFeedback = function () {
     }
 };
 
-TimedMC.prototype.processTimedSubmission = function () {
+TimedMC.prototype.processTimedSubmission = function (logFlag) {
     for (var i = 0; i < this.optionArray.length; i++) {
         this.optionArray[i]["input"].disabled = true;
     }
     if (this.multipleanswers) {
-        this.processMCMASubmission();
+        this.processMCMASubmission(logFlag);
     } else {
-        this.processMCMFSubmission();
+        this.processMCMFSubmission(logFlag);
     }
 };

runestone/common/css/runestone-custom-sphinx-bootstrap.css

@@ -48,12 +48,22 @@ div.section {
 	padding-left:0;
 	padding-right:0;
 }
- .container  .section >*:not(.section) {
+.container  .section >*:not(.section) {
 	max-width: 500pt;
 	margin-left: auto;
 	margin-right: auto;
 }
 
+/* This rule is meant to override the behavior of the
+   previous rule since it is not possible to exclude
+   more than one section in the not() part of the rule
+*/
+.container .section div.full-width.container {
+	margin-left: auto;
+	margin-right: auto;
+    max-width: 90%;
+}
+
 .container .section>img {
 	display: block;
 	margin-left: auto;

runestone/common/project_template/_templates/plugin_layouts/sphinx_bootstrap/layout.html

@@ -216,6 +216,7 @@
   eBookConfig.isLoggedIn = false;
   eBookConfig.useRunestoneServices = {{ use_services }};
   eBookConfig.python3 = {{ python3 }};
+  eBookConfig.basecourse = '{{ basecourse }}';
 </script>
 
 <div id="fb-root"></div>

runestone/common/project_template/pavement.tmpl

@@ -30,7 +30,8 @@ options(
                        'course_url':master_url,
                        'use_services': '%(use_services)s',
                        'python3': '%(python3)s',
-                       'dburl': '%(dburl)s'
+                       'dburl': '%(dburl)s',
+                       'basecourse': '%(basecourse)s'
                         }
     )
 )

runestone/parsons/css/parsons.css

@@ -1,6 +1,7 @@
 /** Stylesheet for the puzzles */
 
 .sortable-code {
+    position: static;
     padding-left: 0px;
     margin-left: 2%;
     display:inline-block;
@@ -19,6 +20,12 @@
     margin-left: 0;
     border: 1px solid #efefff;;
 }
+.sortable-code ul:empty {
+  padding-bottom: 30px;
+}
+.sortable-code li, .sortable-code li:before, .sortable-code li:after {
+  box-sizing: content-box;
+}
 ul.output {
     background-color: #FFA;
 }
@@ -72,13 +79,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;
@@ -104,6 +111,7 @@ li.correctPosition, .testcase.pass {
     display: block;
     color: red;
 }
+
 .parsons{
 	/*background-color: #fbfcfd;
 	border-color: #e6e6e6;

runestone/parsons/js/lib/lis.js

@@ -95,6 +95,31 @@ var LIS = {};
     return _.difference(list, best);
   };
 
+  // Returns an array of those indices of the input that 
+  // are not included in the chosen longest increasing
+  // subsequence of the input values.
+  LIS.best_lise_inverse_indices = function(input) {
+    var decks = this.patience_sort(_.toArray(input)),
+        lises = this.find_lises(decks),
+        best = this.best_lise(lises),
+        inverse_indices = [];
+    var j = 0;
+    for (var i = 0; i < best.length; i++) {
+      for ( ; j < input.length; j++) {
+    	if (input[j] === best[i]) {
+    	  j++;
+    	  break;
+    	} else {
+      	  inverse_indices.push(j);
+  		}
+      }
+    }
+    for ( ; j < input.length; j++) {
+ 	  inverse_indices.push(j);
+    }
+    return inverse_indices;
+  };
+
 // Takes an iterable sequence and returns a list of the inverses of
 // all the longest increasing subsequences of this sequence
 /*