Add component id as caption for all gradeable elements

Author: runestonetest

runestone/activecode/js/activecode.js

@@ -95,9 +95,9 @@ ActiveCode.prototype.init = function(opts) {
     if ($(orig).data('caption')) {
         this.caption = $(orig).data('caption');
     } else {
-        this.caption = ""
+        this.caption = "ActiveCode"
     }
-    this.addCaption();
+    this.addCaption('runestone');
     this.addJSONLibrary();
 
     if (this.autorun) {
@@ -573,15 +573,6 @@ ActiveCode.prototype.downloadFile = function (lang) {
   }
 };
 
-ActiveCode.prototype.addCaption = function() {
-    //someElement.parentNode.insertBefore(newElement, someElement.nextSibling);
-    var capDiv = document.createElement('p');
-    $(capDiv).html(this.caption + " (" + this.divid + ")");
-    $(capDiv).addClass("ac_caption");
-    $(capDiv).addClass("ac_caption_text");
-
-    this.outerDiv.parentNode.insertBefore(capDiv, this.outerDiv.nextSibling);
-};
 
 
 

runestone/assess/js/mchoice.js

@@ -34,6 +34,7 @@ MultipleChoice.prototype.init = function (opts) {
     this.useRunestoneServices = opts.useRunestoneServices;
     this.multipleanswers = false;
     this.divid = orig.id;
+    this.caption = 'Multiple Choice'
 
     if ($(this.origElem).data("multipleanswers") === true) {
         this.multipleanswers = true;
@@ -60,6 +61,8 @@ MultipleChoice.prototype.init = function (opts) {
     this.createCorrectList();
     this.createMCForm();
     this.checkServer("mChoice");
+
+    this.addCaption('runestone');
 };
 
 /*====================================

runestone/clickableArea/js/clickable.js

@@ -54,6 +54,10 @@ ClickableArea.prototype.init = function (opts) {
     this.getQuestion();
     this.getFeedback();
     this.renderNewElements();
+
+    this.caption="Clickable"
+	this.addCaption('runestone')
+
 };
 
 /*===========================

runestone/codelens/visualizer.py

@@ -42,7 +42,7 @@ def setup(app):
 <div class="runestone" style="max-width: none;">
 <div class="%(divclass)s">
 <div id="%(divid)s"></div>
-<p class="cl_caption"><span class="cl_caption_text">%(caption)s (%(divid)s)</span> </p>
+<p class="runestone_caption"><span class="runestone_caption_text">CodeLens: %(caption)s (%(divid)s)</span> </p>
 </div>'''
 
 QUESTION = '''

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

@@ -58,6 +58,7 @@ div.ExecutionVisualizer table#pyCodeOutput .lineNo {
 body {
     padding-top: 60px;
     background-color: #eeeeee;
+    counter-reset: rscomponent;
 }
 
 pre {
@@ -866,4 +867,14 @@ textarea#lp-result {
 
 #subchapterprogress > div {
     background: green;
-}
+}
+
+.runestone_caption {
+    text-align: center;
+}
+
+.runestone_caption:before {
+    content: "Activity: " counter(rscomponent) " -- ";
+    counter-increment: rscomponent;
+}
+

runestone/common/js/runestonebase.js

@@ -38,7 +38,9 @@ RunestoneBase.prototype.logBookEvent = function (eventInfo) {
                                       null, 'json');
     }
     console.log("logging event " + JSON.stringify(eventInfo));
-    pageProgressTracker.updateProgress(eventInfo.div_id);
+    if (typeof pageProgressTracker.updateProgress === "function") {
+        pageProgressTracker.updateProgress(eventInfo.div_id);
+    }
     return post_return;
 };
 
@@ -61,7 +63,9 @@ RunestoneBase.prototype.logRunEvent = function (eventInfo) {
                 this.forceSave = true; }).bind(this))
     }
     console.log("running " + JSON.stringify(eventInfo));
-    pageProgressTracker.updateProgress(eventInfo.div_id);
+    if (typeof pageProgressTracker.updateProgress === "function") {
+        pageProgressTracker.updateProgress(eventInfo.div_id);
+    }
 
 };
 
@@ -137,3 +141,15 @@ RunestoneBase.prototype.shouldUseServer = function (data) {
 RunestoneBase.prototype.localStorageKey = function () {
     return eBookConfig.email + ":" + eBookConfig.course + ":" + this.divid + "-given";
 }
+
+
+RunestoneBase.prototype.addCaption = function(elType) {
+    //someElement.parentNode.insertBefore(newElement, someElement.nextSibling);
+    var capDiv = document.createElement('p');
+    $(capDiv).html(this.caption + " (" + this.divid + ")");
+    $(capDiv).addClass(`${elType}_caption`);
+    $(capDiv).addClass(`${elType}_caption_text`);
+
+    //this.outerDiv.parentNode.insertBefore(capDiv, this.outerDiv.nextSibling);
+    this.containerDiv.appendChild(capDiv);
+};

runestone/dragndrop/js/dragndrop.js

@@ -39,6 +39,10 @@ DragNDrop.prototype.init = function (opts) {
     this.populate();   // Populates this.dragPairArray, this.feedback and this.question
 
     this.createNewElements();
+
+    this.caption="Drag-N-Drop"
+	this.addCaption('runestone')
+
 };
 /*======================
 === Update variables ===

runestone/fitb/js/fitb.js

@@ -41,6 +41,9 @@ FITB.prototype.init = function (opts) {
 
     this.createFITBElement();
     this.checkServer("fillb");
+    this.caption="Fill in the Blank";
+	this.addCaption('runestone');
+
 };
 
 // Find the script tag containing JSON in a given root DOM node.

runestone/parsons/js/parsons.js

@@ -1118,6 +1118,9 @@ Parsons.prototype.init = function (opts) {
 	} else {
 		this.checkLocalStorage();
 	}
+
+	this.caption="Parsons"
+	this.addCaption('runestone')
 };
 
 // Based on the data-fields in the original HTML, initialize options

runestone/poll/js/poll.js

@@ -31,6 +31,9 @@ Poll.prototype.init = function (opts) {
     this.getOptionText(); //populates optionList
     this.renderPoll();  //generates HTML
     this.checkPollStorage(); //checks localStorage to see if this poll has already been completed by this user
+
+    this.caption="Poll"
+    this.addCaption('runestone')
 };
 
 Poll.prototype.getQuestionText = function() {