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

extend changes of url/raw issue to video annotions

Browse Source
This commit is contained in:
lduarte1991
2014-05-20 14:40:40 -04:00
parent 4f981d9961
commit 0d8a4797f1
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lms/templates/videoannotation.html
View File

@@ -1,9 +1,10 @@
<%! from django.utils.translation import ugettext as _ %>
<%namespace name='static' file='/static_content.html'/>
<%static:css group='style-vendor-tinymce-content'/>
<%static:css group='style-vendor-tinymce-skin'/>
<script type="text/javascript" src="${static.url('js/vendor/tinymce/js/tinymce/tinymce.full.min.js')}" />
<script type="text/javascript" src="${static.url('js/vendor/tinymce/js/tinymce/jquery.tinymce.min.js')}" />
${static.css(group='style-vendor-tinymce-content', raw=True)}
${static.css(group='style-vendor-tinymce-skin', raw=True)}
<script type="text/javascript" src="${static.url('js/vendor/tinymce/js/tinymce/tinymce.full.min.js', raw=True)}" />
<script type="text/javascript" src="${static.url('js/vendor/tinymce/js/tinymce/jquery.tinymce.min.js', raw=True)}" />
<div class="annotatable-wrapper">
<div class="annotatable-header">
@@ -35,7 +36,7 @@
</div>
</div>
</div>
<script>
function onClickHideInstructions(){
@@ -70,16 +71,16 @@
optionsAnnotator: {
permissions:{
user: {
id:"${user.email}",
id:"${user.email}",
name:"${user.username}"
},
userString: function (user) {
if (user && user.name)
if (user && user.name)
return user.name;
return user;
},
userId: function (user) {
if (user && user.id)
if (user && user.id)
return user.id;
return user;
},
@@ -103,7 +104,7 @@
}
for (_i = 0, _len = tokens.length; _i < _len; _i++) {
token = tokens[_i];
if (this.userId(user) === token) {
return true;
@@ -168,7 +169,7 @@
var imgURLRoot = "${settings.STATIC_URL}" + "js/vendor/ova/catch/img/";
tinymce.baseURL = "${settings.STATIC_URL}" + "js/vendor/tinymce/js/tinymce";
//remove old instances
if (Annotator._instances.length !== 0) {
$('#videoHolder').annotator("destroy");
@@ -176,9 +177,9 @@
delete ova;
//Load the plugin Video/Text Annotation
var ova = new OpenVideoAnnotation.Annotator($('#videoHolder'),options);
ova.annotator.addPlugin('Tags');
//Catch
var annotator = ova.annotator,
catchOptions = {