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

Fix merge conflicts

Browse Source
This commit is contained in:
Calen Pennington
2014-05-22 11:15:04 -04:00
parent cd862b3253
commit 240fcc1d5a
19 changed files with 24 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lms/templates/notes.html
View File

@@ -64,21 +64,12 @@
<section id="catchDIV">
<div class="annotationListContainer">${_('You do not have any notes.')}</div>
</section>
<<<<<<< HEAD
<script>
//Grab uri of the course
var parts = window.location.href.split("/"),
uri = '';
for (var index = 0; index <= 6; index += 1) uri += parts[index]+"/"; //Get the unit url
=======
<script>
//Grab uri of the course
var parts = window.location.href.split("/"),
uri = '';
for (var index = 0; index <= 6; index += 1) uri += parts[index]+"/"; //Get the unit url
>>>>>>> edx/master
var pagination = 100,
is_staff = false,
options = {
@@ -177,11 +168,7 @@
},
},
auth: {
<<<<<<< HEAD
tokenUrl: location.protocol+'//'+location.host+"/token?course_id=${course.id.to_deprecated_string()}"
=======
token: "${token}"
>>>>>>> edx/master
},
store: {
// The endpoint of the store on your server.

46
lms/templates/textannotation.html
View File

@@ -35,34 +35,6 @@ ${static.css(group='style-vendor-tinymce-skin', raw=True)}
<script>
<<<<<<< HEAD
function onClickHideInstructions(){
//Reset function if there is more than one event handler
$(this).off();
$(this).on('click',onClickHideInstructions);
var hide = $(this).html()=='Collapse Instructions'?true:false,
cls, txt,slideMethod;
txt = (hide ? 'Expand' : 'Collapse') + ' Instructions';
cls = (hide ? ['expanded', 'collapsed'] : ['collapsed', 'expanded']);
slideMethod = (hide ? 'slideUp' : 'slideDown');
$(this).text(txt).removeClass(cls[0]).addClass(cls[1]);
$(this).parents('.annotatable-section:first').find('.annotatable-instructions')[slideMethod]();
}
$('.annotatable-toggle-instructions').on('click', onClickHideInstructions);
//Grab uri of the course
var parts = window.location.href.split("/"),
uri = '';
for (var index = 0; index <= 9; index += 1) uri += parts[index]+"/"; //Get the unit url
//Change uri in cms
var lms_location = $('.sidebar .preview-button').attr('href');
if (typeof lms_location!='undefined'){
uri = window.location.protocol;
for (var index = 0; index <= 9; index += 1) uri += lms_location.split("/")[index]+"/"; //Get the unit url
}
var pagination = 100,
is_staff = !('${user.is_staff}'=='False'),
=======
function onClickHideInstructions(){
//Reset function if there is more than one event handler
$(this).off();
@@ -91,7 +63,6 @@ ${static.css(group='style-vendor-tinymce-skin', raw=True)}
uri += unit_id;
var pagination = 100,
is_staff = !('${user.is_staff}'=='False'),
>>>>>>> edx/master
options = {
optionsAnnotator: {
permissions:{
@@ -148,11 +119,7 @@ ${static.css(group='style-vendor-tinymce-skin', raw=True)}
},
},
auth: {
<<<<<<< HEAD
tokenUrl: location.protocol+'//'+location.host+"/token?course_id=${course_key.to_deprecated_string()}"
=======
token: "${token}"
>>>>>>> edx/master
},
store: {
// The endpoint of the store on your server.
@@ -198,20 +165,11 @@ ${static.css(group='style-vendor-tinymce-skin', raw=True)}
}
},
};
<<<<<<< HEAD
var imgURLRoot = "${settings.STATIC_URL}" + "js/vendor/ova/catch/img/";
tinyMCE.baseURL = "${settings.STATIC_URL}" + "js/vendor/ova";
//remove old instances
=======
var imgURLRoot = "${settings.STATIC_URL}" + "js/vendor/ova/catch/img/";
tinymce.baseURL = "${settings.STATIC_URL}" + "js/vendor/tinymce/js/tinymce";
//remove old instances
>>>>>>> edx/master
if (Annotator._instances.length !== 0) {
$('#textHolder').annotator("destroy");
}
@@ -219,10 +177,6 @@ ${static.css(group='style-vendor-tinymce-skin', raw=True)}
//Load the plugin Video/Text Annotation
var ova = new OpenVideoAnnotation.Annotator($('#textHolder'),options);
<<<<<<< HEAD
=======
>>>>>>> edx/master
//Catch
var annotator = ova.annotator,
catchOptions = {

21
lms/templates/videoannotation.html
View File

@@ -54,11 +54,7 @@ ${static.css(group='style-vendor-tinymce-skin', raw=True)}
$('.annotatable-toggle-instructions').on('click', onClickHideInstructions);
//Grab uri of the course
<<<<<<< HEAD
var parts = window.location.href.split("/"),
=======
var parts = window.location.href.split("/"),
>>>>>>> edx/master
uri = '';
for (var index = 0; index <= 9; index += 1) uri += parts[index]+"/"; //Get the unit url
//Change uri in cms
@@ -67,12 +63,8 @@ ${static.css(group='style-vendor-tinymce-skin', raw=True)}
uri = window.location.protocol;
for (var index = 0; index <= 9; index += 1) uri += lms_location.split("/")[index]+"/"; //Get the unit url
}
<<<<<<< HEAD
=======
var unit_id = $('#sequence-list').find('.active').attr("data-element");
uri += unit_id;
>>>>>>> edx/master
var pagination = 100,
is_staff = !('${user.is_staff}'=='False'),
options = {
@@ -131,11 +123,7 @@ ${static.css(group='style-vendor-tinymce-skin', raw=True)}
},
},
auth: {
<<<<<<< HEAD
tokenUrl: location.protocol+'//'+location.host+"/token?course_id=${course_key.to_deprecated_string()}"
=======
token: "${token}"
>>>>>>> edx/master
},
store: {
// The endpoint of the store on your server.
@@ -180,11 +168,7 @@ ${static.css(group='style-vendor-tinymce-skin', raw=True)}
};
var imgURLRoot = "${settings.STATIC_URL}" + "js/vendor/ova/catch/img/";
<<<<<<< HEAD
tinyMCE.baseURL = "${settings.STATIC_URL}" + "js/vendor/ova";
=======
tinymce.baseURL = "${settings.STATIC_URL}" + "js/vendor/tinymce/js/tinymce";
>>>>>>> edx/master
//remove old instances
if (Annotator._instances.length !== 0) {
@@ -196,11 +180,6 @@ ${static.css(group='style-vendor-tinymce-skin', raw=True)}
ova.annotator.addPlugin('Tags');
<<<<<<< HEAD
=======
>>>>>>> edx/master
//Catch
var annotator = ova.annotator,
catchOptions = {