diff --git a/common/djangoapps/pipeline_mako/templates/static_content.html b/common/djangoapps/pipeline_mako/templates/static_content.html
index c153da22fe..302d4d7aa5 100644
--- a/common/djangoapps/pipeline_mako/templates/static_content.html
+++ b/common/djangoapps/pipeline_mako/templates/static_content.html
@@ -3,8 +3,7 @@ from staticfiles.storage import staticfiles_storage
from pipeline_mako import compressed_css, compressed_js
%>
-<%def name='url(file)'>
-<%
+<%def name='url(file)'><%
try:
url = staticfiles_storage.url(file)
except:
diff --git a/common/lib/xmodule/xmodule/js/src/capa/schematic.js b/common/lib/xmodule/xmodule/js/src/capa/schematic.js
index b01f6e12e8..e65b0ecad6 100644
--- a/common/lib/xmodule/xmodule/js/src/capa/schematic.js
+++ b/common/lib/xmodule/xmodule/js/src/capa/schematic.js
@@ -1995,7 +1995,7 @@ cktsim = (function() {
// set up each schematic entry widget
function update_schematics() {
// set up each schematic on the page
- var schematics = document.getElementsByClassName('schematic');
+ var schematics = $('.schematic');
for (var i = 0; i < schematics.length; ++i)
if (schematics[i].getAttribute("loaded") != "true") {
try {
@@ -2036,7 +2036,7 @@ function add_schematic_handler(other_onload) {
// ask each schematic input widget to update its value field for submission
function prepare_schematics() {
- var schematics = document.getElementsByClassName('schematic');
+ var schematics = $('.schematic');
for (var i = schematics.length - 1; i >= 0; i--)
schematics[i].schematic.update_value();
}
@@ -3339,23 +3339,28 @@ schematic = (function() {
}
// add method to canvas to compute relative coords for event
- HTMLCanvasElement.prototype.relMouseCoords = function(event){
- // run up the DOM tree to figure out coords for top,left of canvas
- var totalOffsetX = 0;
- var totalOffsetY = 0;
- var currentElement = this;
- do {
- totalOffsetX += currentElement.offsetLeft;
- totalOffsetY += currentElement.offsetTop;
- }
- while (currentElement = currentElement.offsetParent);
-
- // now compute relative position of click within the canvas
- this.mouse_x = event.pageX - totalOffsetX;
- this.mouse_y = event.pageY - totalOffsetY;
-
- this.page_x = event.pageX;
- this.page_y = event.pageY;
+ try {
+ if (HTMLCanvasElement)
+ HTMLCanvasElement.prototype.relMouseCoords = function(event){
+ // run up the DOM tree to figure out coords for top,left of canvas
+ var totalOffsetX = 0;
+ var totalOffsetY = 0;
+ var currentElement = this;
+ do {
+ totalOffsetX += currentElement.offsetLeft;
+ totalOffsetY += currentElement.offsetTop;
+ }
+ while (currentElement = currentElement.offsetParent);
+
+ // now compute relative position of click within the canvas
+ this.mouse_x = event.pageX - totalOffsetX;
+ this.mouse_y = event.pageY - totalOffsetY;
+
+ this.page_x = event.pageX;
+ this.page_y = event.pageY;
+ }
+ }
+ catch (err) { // ignore
}
///////////////////////////////////////////////////////////////////////////////
@@ -3718,7 +3723,7 @@ schematic = (function() {
// look for property input fields in the content and give
// them a keypress listener that interprets ENTER as
// clicking OK.
- var plist = content.getElementsByClassName('property');
+ var plist = content.$('.property');
for (var i = plist.length - 1; i >= 0; --i) {
var field = plist[i];
field.dialog = dialog; // help event handler find us...
@@ -4091,48 +4096,52 @@ schematic = (function() {
// add dashed lines!
// from http://davidowens.wordpress.com/2010/09/07/html-5-canvas-and-dashed-lines/
- CanvasRenderingContext2D.prototype.dashedLineTo = function(fromX, fromY, toX, toY, pattern) {
- // Our growth rate for our line can be one of the following:
- // (+,+), (+,-), (-,+), (-,-)
- // Because of this, our algorithm needs to understand if the x-coord and
- // y-coord should be getting smaller or larger and properly cap the values
- // based on (x,y).
- var lt = function (a, b) { return a <= b; };
- var gt = function (a, b) { return a >= b; };
- var capmin = function (a, b) { return Math.min(a, b); };
- var capmax = function (a, b) { return Math.max(a, b); };
-
- var checkX = { thereYet: gt, cap: capmin };
- var checkY = { thereYet: gt, cap: capmin };
-
- if (fromY - toY > 0) {
- checkY.thereYet = lt;
- checkY.cap = capmax;
- }
- if (fromX - toX > 0) {
- checkX.thereYet = lt;
- checkX.cap = capmax;
- }
-
- this.moveTo(fromX, fromY);
- var offsetX = fromX;
- var offsetY = fromY;
- var idx = 0, dash = true;
- while (!(checkX.thereYet(offsetX, toX) && checkY.thereYet(offsetY, toY))) {
- var ang = Math.atan2(toY - fromY, toX - fromX);
- var len = pattern[idx];
-
- offsetX = checkX.cap(toX, offsetX + (Math.cos(ang) * len));
- offsetY = checkY.cap(toY, offsetY + (Math.sin(ang) * len));
-
- if (dash) this.lineTo(offsetX, offsetY);
- else this.moveTo(offsetX, offsetY);
-
- idx = (idx + 1) % pattern.length;
- dash = !dash;
- }
- };
-
+ try {
+ if (CanvasRenderingContext2D)
+ CanvasRenderingContext2D.prototype.dashedLineTo = function(fromX, fromY, toX, toY, pattern) {
+ // Our growth rate for our line can be one of the following:
+ // (+,+), (+,-), (-,+), (-,-)
+ // Because of this, our algorithm needs to understand if the x-coord and
+ // y-coord should be getting smaller or larger and properly cap the values
+ // based on (x,y).
+ var lt = function (a, b) { return a <= b; };
+ var gt = function (a, b) { return a >= b; };
+ var capmin = function (a, b) { return Math.min(a, b); };
+ var capmax = function (a, b) { return Math.max(a, b); };
+
+ var checkX = { thereYet: gt, cap: capmin };
+ var checkY = { thereYet: gt, cap: capmin };
+
+ if (fromY - toY > 0) {
+ checkY.thereYet = lt;
+ checkY.cap = capmax;
+ }
+ if (fromX - toX > 0) {
+ checkX.thereYet = lt;
+ checkX.cap = capmax;
+ }
+
+ this.moveTo(fromX, fromY);
+ var offsetX = fromX;
+ var offsetY = fromY;
+ var idx = 0, dash = true;
+ while (!(checkX.thereYet(offsetX, toX) && checkY.thereYet(offsetY, toY))) {
+ var ang = Math.atan2(toY - fromY, toX - fromX);
+ var len = pattern[idx];
+
+ offsetX = checkX.cap(toX, offsetX + (Math.cos(ang) * len));
+ offsetY = checkY.cap(toY, offsetY + (Math.sin(ang) * len));
+
+ if (dash) this.lineTo(offsetX, offsetY);
+ else this.moveTo(offsetX, offsetY);
+
+ idx = (idx + 1) % pattern.length;
+ dash = !dash;
+ }
+ };
+ }
+ catch (err) { //noop
+ }
// given a range of values, return a new range [vmin',vmax'] where the limits
// have been chosen "nicely". Taken from matplotlib.ticker.LinearLocator
function view_limits(vmin,vmax) {
diff --git a/lms/djangoapps/courseware/views.py b/lms/djangoapps/courseware/views.py
index 58bd6924af..d8def76473 100644
--- a/lms/djangoapps/courseware/views.py
+++ b/lms/djangoapps/courseware/views.py
@@ -217,6 +217,7 @@ def index(request, course_id, chapter=None, section=None,
'init': '',
'content': '',
'staff_access': staff_access,
+ 'xqa_server': settings.MITX_FEATURES.get('USE_XQA_SERVER','http://xqa:server@content-qa.mitx.mit.edu/xqa')
}
chapter_descriptor = course.get_child_by_url_name(chapter)
diff --git a/lms/templates/courseware/courseware.html b/lms/templates/courseware/courseware.html
index 62af7d6f82..1ea3df1b5a 100644
--- a/lms/templates/courseware/courseware.html
+++ b/lms/templates/courseware/courseware.html
@@ -25,7 +25,9 @@
<%static:js group='discussion'/>
<%include file="../discussion/_js_body_dependencies.html" />
-
+ % if staff_access:
+ <%include file="xqa_interface.html"/>
+ % endif
+
\ No newline at end of file
diff --git a/lms/templates/staff_problem_info.html b/lms/templates/staff_problem_info.html
index 6d9d1a3a30..0f1893ee4f 100644
--- a/lms/templates/staff_problem_info.html
+++ b/lms/templates/staff_problem_info.html
@@ -1,6 +1,14 @@
${module_content}
%if edit_link:
-
+
% endif
@@ -50,77 +58,19 @@ category = ${category | h}
-## leanModal needs to be included here otherwise this breaks when in a
-
-