Merge branch 'ns_path' of https://github.com/bjones1/RunestoneComponents into bjones1-ns_path

Author: bnmnetp

runestone/activecode/js/activecode.js

@@ -582,7 +582,7 @@ export class ActiveCode extends RunestoneBase {
             // If this is timed and already taken we should restore history info
             this.renderScrubber();
         } else {
-            let request = new Request("/assessment/gethist", {
+            let request = new Request(`${eBookConfig.new_server_prefix}/assessment/gethist`, {
                 method: "POST",
                 headers: this.jsonHeaders,
                 body: JSON.stringify(reqData),

runestone/common/js/bookfuncs.js

@@ -171,7 +171,7 @@ async function handlePageSetup() {
         Accept: "application/json",
     });
     let data = { timezoneoffset: new Date().getTimezoneOffset() / 60 };
-    let request = new Request("/logger/set_tz_offset", {
+    let request = new Request(`${eBookConfig.new_server_prefix}/logger/set_tz_offset`, {
         method: "POST",
         body: JSON.stringify(data),
         headers: headers,

runestone/common/js/runestonebase.js

@@ -93,7 +93,7 @@ export default class RunestoneBase {
             eventInfo.percent = this.percent;
         }
         if (eBookConfig.useRunestoneServices && eBookConfig.logLevel > 0) {
-            let request = new Request("/logger/bookevent", {
+            let request = new Request(`${eBookConfig.new_server_prefix}/logger/bookevent`, {
                 method: "POST",
                 headers: this.jsonHeaders,
                 body: JSON.stringify(eventInfo),
@@ -144,7 +144,7 @@ export default class RunestoneBase {
             eventInfo.save_code = "True";
         }
         if (eBookConfig.useRunestoneServices && eBookConfig.logLevel > 0) {
-            let request = new Request("/logger/runlog", {
+            let request = new Request(`${eBookConfig.new_server_prefix}/logger/runlog`, {
                 method: "POST",
                 headers: this.jsonHeaders,
                 body: JSON.stringify(eventInfo),
@@ -202,7 +202,7 @@ export default class RunestoneBase {
             // and assessmentTaken is true
             if (!eBookConfig.practice_mode && !eBookConfig.peer && this.assessmentTaken) {
                 let request = new Request(
-                    "/assessment/results",
+                    `${eBookConfig.new_server_prefix}/assessment/results`,
                     {
                         method: "POST",
                         body: JSON.stringify(data),

runestone/common/js/user-highlights.js

@@ -25,7 +25,7 @@ function getCompletions() {
     var data = { lastPageUrl: currentPathname };
     jQuery
         .ajax({
-            url: "/logger/getCompletionStatus",
+            url: `${eBookConfig.new_server_prefix}/logger/getCompletionStatus`,
             data: data,
             async: false,
         })
@@ -168,7 +168,7 @@ function decorateTableOfContents() {
         window.location.href.toLowerCase().indexOf("toc.html") != -1 ||
         window.location.href.toLowerCase().indexOf("index.html") != -1
     ) {
-        jQuery.get("/logger/getAllCompletionStatus", function (
+        jQuery.get(`${eBookConfig.new_server_prefix}/logger/getAllCompletionStatus`, function (
             data
         ) {
             var subChapterList;
@@ -234,7 +234,7 @@ function decorateTableOfContents() {
             }
         });
         var data = { course: eBookConfig.course };
-        jQuery.get("/logger/getlastpage", data, function (data) {
+        jQuery.get(`${eBookConfig.new_server_prefix}/logger/getlastpage`, data, function (data) {
             var lastPageData;
             if (data != "None") {
                 lastPageData = data.detail;
@@ -292,7 +292,7 @@ function processPageState(completionFlag) {
         console.log(e);
     });
     jQuery.ajax({
-        url: "/logger/updatelastpage",
+        url: `${eBookConfig.new_server_prefix}/logger/updatelastpage`,
         contentType: "application/json; charset=utf-8",
         dataType: "json",
         data: JSON.stringify(data),

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

@@ -1,3 +1,6 @@
+<!-- ****************************************
+     |docname| - main template for this theme
+     **************************************** -->
 {% extends "basic/layout.html" %}
 
 {% if dynamic_pages == 'True' %}
@@ -232,7 +235,7 @@
     {% raw %}
     eBookConfig.useRunestoneServices = true;
     eBookConfig.host = '';
-    eBookConfig.app = eBookConfig.host + '/' + '{{ request.application }}';
+    eBookConfig.app = eBookConfig.host + '/runestone';
     eBookConfig.course = '{{ course_name }}';
     eBookConfig.basecourse = '{{ base_course }}';
     eBookConfig.isLoggedIn = {{ is_logged_in}};
@@ -244,6 +247,8 @@
     eBookConfig.downloadsEnabled = {{downloads_enabled}};
     eBookConfig.allow_pairs = {{allow_pairs}}
     eBookConfig.enableCompareMe = {{enable_compare_me}};
+    // _`new_server_prefix`: Defined by the server to be the path to the new server.
+    eBookConfig.new_server_prefix = '{{ new_server_prefix }}';
     {% endraw %}
   {% else %}
     eBookConfig.useRunestoneServices = {% if use_services == 'true' -%}true{%- else -%}false{%- endif -%};
@@ -253,6 +258,7 @@
     eBookConfig.basecourse = '{{ basecourse }}';
     eBookConfig.isLoggedIn = false;
     eBookConfig.enableCompareMe = eBookConfig.useRunestoneServices;
+    eBookConfig.new_server_prefix = '';
   {% endif %}
   eBookConfig.ajaxURL = eBookConfig.app+'/ajax/';
   eBookConfig.logLevel = {{loglevel}};
@@ -293,7 +299,7 @@
 <div class="container" id="continue-reading"></div>
 
 <div class="container" id="main-content" role="main">
-  
+
 <!-- Ad Serving for Runestone Campaign -->
 {% if dynamic_pages == 'True' %}
     {% raw %}
@@ -317,7 +323,7 @@
   </div>
 
   {% include "subchapter.html" %}
-  
+
 </div>
 {%- endblock %}
 
@@ -386,9 +392,9 @@
   {% endif %}
 {% endif %}
 
-<script> 
+<script>
   window.addEventListener('load', (event) => {
-    runestoneComponents.getSwitch(); 
+    runestoneComponents.getSwitch();
   });
 </script>
 

runestone/fitb/js/fitb.js

@@ -355,7 +355,7 @@ export default class FITB extends RunestoneBase {
         data.div_id = this.divid;
         data.course = eBookConfig.course;
         jQuery.get(
-            "/assessment/gettop10Answers",
+            `${eBookConfig.new_server_prefix}/assessment/gettop10Answers`,
             data,
             this.compareFITB
         );

runestone/mchoice/js/mchoice.js

@@ -646,7 +646,7 @@ export default class MultipleChoice extends RunestoneBase {
         data.div_id = this.divid;
         data.course_name = eBookConfig.course;
         jQuery.get(
-            "/assessment/getaggregateresults",
+            `${eBookConfig.new_server_prefix}/assessment/getaggregateresults`,
             data,
             this.compareModal.bind(this)
         );

runestone/poll/js/poll.js

@@ -148,7 +148,7 @@ export default class Poll extends RunestoneBase {
             data.div_id = this.divid;
             data.course = eBookConfig.course;
             jQuery.get(
-                "/assessment/getpollresults",
+                `${eBookConfig.new_server_prefix}/assessment/getpollresults`,
                 data,
                 this.showPollResults
             );
@@ -225,7 +225,7 @@ export default class Poll extends RunestoneBase {
             data.div_id = this.divid;
             data.course = eBookConfig.course;
             jQuery.get(
-                "/assessment/getpollresults",
+                `${eBookConfig.new_server_prefix}/assessment/getpollresults`,
                 data,
                 this.showPollResults.bind(this)
             ).fail(this.indicate_component_ready.bind(this));

runestone/selectquestion/js/selectone.js

@@ -91,7 +91,7 @@ export default class SelectOne extends RunestoneBase {
         let opts = this.origOpts;
         let selectorId = this.selector_id;
         console.log("getting question source");
-        let request = new Request("/assessment/get_question_source", {
+        let request = new Request(`${eBookConfig.new_server_prefix}/assessment/get_question_source`, {
             method: "POST",
             headers: this.jsonHeaders,
             body: JSON.stringify(data),
@@ -268,7 +268,7 @@ export default class SelectOne extends RunestoneBase {
     // retrieve html source of a question, for use in various toggle functionalities
     async getToggleSrc(toggleQuestionID) {
         let request = new Request(
-            "/assessment/htmlsrc?acid=" + toggleQuestionID,
+            `${eBookConfig.new_server_prefix}/assessment/htmlsrc?acid=${toggleQuestionID}`,
             {
                 method: "GET",
             }
@@ -306,7 +306,7 @@ export default class SelectOne extends RunestoneBase {
         });
         $("#toggle-buttons").append(closeButton);
 
-        // if "lock" is not in toggle options, then allow adding more buttons to the preview panel 
+        // if "lock" is not in toggle options, then allow adding more buttons to the preview panel
         if (!(toggleOptions.includes("lock"))) {
             let setButton = document.createElement("button");
             $(setButton).text("Select this Problem");
@@ -351,10 +351,7 @@ export default class SelectOne extends RunestoneBase {
             useRunestoneServices: true,
         });
         let request = new Request(
-            "/assessment/set_selected_question?metaid=" +
-            parentID +
-            "&selected=" +
-            selectedQuestion,
+            `${eBookConfig.new_server_prefix}/assessment/set_selected_question?metaid=${parentID}&selected=${selectedQuestion}`,
             {}
         );
         await fetch(request);

runestone/timed/js/timed.js

@@ -110,7 +110,7 @@ export default class Timed extends RunestoneBase {
         console.log(sendInfo);
         if (eBookConfig.useRunestoneServices) {
             let request = new Request(
-                "/assessment/tookTimedAssessment",
+                `${eBookConfig.new_server_prefix}/assessment/tookTimedAssessment`,
                 {
                     method: "POST",
                     headers: this.jsonHeaders,
@@ -296,7 +296,7 @@ export default class Timed extends RunestoneBase {
         this.pagNavList.appendChild(this.rightContainer);
         this.ensureButtonSafety();
         this.navDiv.appendChild(this.pagNavList);
-        this.flagDiv.appendChild(this.flaggingPlace);           // adds flaggingPlace to the flagDiv 
+        this.flagDiv.appendChild(this.flaggingPlace);           // adds flaggingPlace to the flagDiv
         this.break = document.createElement("br");
         this.navDiv.appendChild(this.break);
         // render the question number jump buttons
@@ -393,7 +393,7 @@ export default class Timed extends RunestoneBase {
             "ul#pageNums > ul > li:eq(" + this.currentQuestionIndex + ")"
         ).addClass("active");
         if ($("ul#pageNums > ul > li:eq(" + this.currentQuestionIndex + ")"
-        ).hasClass("flagcolor")) {                                           // checking for class 
+        ).hasClass("flagcolor")) {                                           // checking for class
             this.flagButton.innerHTML = "Unflag Question";                  // changes text on button
         }
         else {