Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release'

Browse Source 
Conflicts:
	requirements/edx/base.txt
This commit is contained in:
Matt Drayer
2014-01-29 16:19:30 -05:00
parent a0bc10a1c3 b60487c85c
commit d35667384a
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lms/templates/notes.html
View File

@@ -169,6 +169,7 @@
},
};
tinyMCE.baseURL = "${settings.STATIC_URL}" + "js/vendor/ova";
var imgURLRoot = "${settings.STATIC_URL}" + "js/vendor/ova/catch/img/";
//remove old instances

1
lms/templates/static_htmlbook.html
View File

@@ -13,6 +13,7 @@
<%block name="js_extra">
<script type="text/javascript">
tinyMCE.baseURL = "${settings.STATIC_URL}" + "js/vendor/ova";
(function($) {
$.fn.myHTMLViewer = function(options) {
var urlToLoad = null;

5
lms/templates/textannotation.html
View File

@@ -162,8 +162,9 @@
},
};
var imgURLRoot = window.location.protocol;
imgURLRoot +="//" + uri.replace(imgURLRoot+"//","").split('/')[0] + "/static/js/vendor/ova/catch/img/";
var imgURLRoot = "${settings.STATIC_URL}" + "js/vendor/ova/catch/img/";
tinyMCE.baseURL = "${settings.STATIC_URL}" + "js/vendor/ova";
//remove old instances
if (Annotator._instances.length !== 0) {

5
lms/templates/videoannotation.html
View File

@@ -163,9 +163,8 @@
},
};
var imgURLRoot = window.location.protocol;
imgURLRoot +="//" + uri.replace(imgURLRoot+"//","").split('/')[0] + "/static/js/vendor/ova/catch/img/";
var imgURLRoot = "${settings.STATIC_URL}" + "js/vendor/ova/catch/img/";
tinyMCE.baseURL = "${settings.STATIC_URL}" + "js/vendor/ova";
//remove old instances
if (Annotator._instances.length !== 0) {