added config for compare button

Author: nenadmilutinovic

runestone/assess/assess.py

@@ -33,7 +33,7 @@ def setup(app):
     app.add_directive('timed', TimedDirective)
 
     app.add_config_value('mchoice_div_class', 'runestone alert alert-warning', 'html')
-
+    app.add_config_value('mchoice_compare_button_show', True, 'html');
     app.add_autoversioned_javascript('mchoice.js')
     app.add_autoversioned_javascript('timedmc.js')
     app.add_autoversioned_javascript('timed.js')

runestone/assess/js/mchoice.js

@@ -35,6 +35,7 @@ MultipleChoice.prototype.init = function (opts) {
     this.multipleanswers = false;
     this.divid = orig.id;
     this.caption = 'Multiple Choice'
+    this.showcomparebutton = $(orig).data('showcomparebutton');
 
     if ($(this.origElem).data("multipleanswers") === true) {
         this.multipleanswers = true;
@@ -233,7 +234,7 @@ MultipleChoice.prototype.renderMCFormButtons = function () {
     this.optsForm.appendChild(this.submitButton);
 
     // Create compare button
-    if (this.useRunestoneServices) {
+    if (this.useRunestoneServices && this.showcomparebutton) {
         this.compareButton = document.createElement("button");
         $(this.compareButton).attr({
             "class": "btn btn-default",

runestone/assess/multiplechoice.py

@@ -179,10 +179,16 @@ def run(self):
 
         super(MChoice, self).run()
 
+        env = self.state.document.settings.env
+        if env.config.mchoice_compare_button_show:
+            self.options['showcomparebutton'] = 'data-showcomparebutton=true'
+        else:
+            self.options['showcomparebutton'] = ''
+
         TEMPLATE_START = '''
             <div class="%(divclass)s">
-            <ul data-component="multiplechoice" data-multipleanswers="%(multipleAnswers)s" %(random)s id="%(divid)s">
-            '''
+            <ul data-component="multiplechoice" data-multipleanswers="%(multipleAnswers)s" %(random)s %(showcomparebutton)s id="%(divid)s">
+           '''
 
         OPTION = '''
             <li data-component="answer" %(is_correct)s id="%(divid)s_opt_%(alabel)s">%(atext)s</li><li data-component="feedback">%(feedtext)s</li>

runestone/common/project_template/conf.tmpl

@@ -297,3 +297,5 @@ htmlhelp_basename = 'PythonCoursewareProjectdoc'
 #shortanswer_optional_div_class = 'journal alert alert-success'
 #showeval_div_class = 'runestone explainer alert alert-warning'
 #tabbed_div_class = 'alert alert-warning'
+#mchoice_compare_button_show = True
+#fitb_compare_button_show = True

runestone/fitb/fitb.py

@@ -38,7 +38,7 @@ def setup(app):
     app.add_node(BlankNode, html=(visit_blank_node, depart_blank_node))
     app.add_node(FITBFeedbackNode, html=(visit_fitb_feedback_node, depart_fitb_feedback_node))
     app.add_config_value('fitb_div_class', 'runestone', 'html')
-
+    app.add_config_value('fitb_compare_button_show', True, 'html');
 
 class FITBNode(nodes.General, nodes.Element, RunestoneNode):
     def __init__(self, content, **kwargs):
@@ -136,10 +136,17 @@ def run(self):
 
         super(FillInTheBlank, self).run()
 
+        env = self.state.document.settings.env
+        if env.config.fitb_compare_button_show:
+            self.options['showcomparebutton'] = 'data-showcomparebutton=true'
+        else:
+            self.options['showcomparebutton'] = ''
+        
         TEMPLATE_START = '''
         <div class="%(divclass)s">
-        <div data-component="fillintheblank" id="%(divid)s">
-            '''
+        
+        <div data-component="fillintheblank" id="%(divid)s" %(showcomparebutton)s>
+        '''
 
         TEMPLATE_END = '''
         <script type="application/json">

runestone/fitb/js/fitb.js

@@ -34,6 +34,7 @@ FITB.prototype.init = function (opts) {
     this.origElem = orig;
     this.divid = orig.id;
     this.correct = null;
+    this.showcomparebutton = $(orig).data('showcomparebutton');
     // See comments in fitb.py for the format of ``feedbackArray`` (which is identical in both files).
     //
     // Find the script tag containing JSON and parse it. See `SO <https://stackoverflow.com/questions/9320427/best-practice-for-embedding-arbitrary-json-in-the-dom>`_. If this parses to ``false``, then no feedback is available; server-side grading will be performed.
@@ -97,7 +98,7 @@ FITB.prototype.renderFITBButtons = function () {
     this.containerDiv.appendChild(document.createElement("br"));
     this.containerDiv.appendChild(document.createElement("br"));
     this.containerDiv.appendChild(this.submitButton);
-    if (this.useRunestoneServices) {
+    if (this.useRunestoneServices && this.showcomparebutton) {
         this.compareButton = document.createElement("button");
         $(this.compareButton).attr({
             "class": "btn btn-default",