'+
'{{this}}'+
@@ -348,14 +348,22 @@ CatchAnnotation.prototype = {
this.HTMLTEMPLATES = CatchSources.HTMLTEMPLATES(this.options.imageUrlRoot);
this.TEMPLATES = {};
this._compileTemplates();
+
+ // the default annotations are the user's personal ones instead of instructor
+ // if the default tab is instructor, we must refresh the catch to pull the ones
+ // under the instructor's email. passing empty strings as arguments will default
+ // to pulling the annotations for the email within this.options.userId.
if(this.options.default_tab.toLowerCase() == 'instructor'){
- this.options.userId = this.options.instructor_username;
+ this.options.userId = this.options.instructor_email;
this._refresh('','');
}
},
//
// GLOBAL UTILITIES
//
+ getTemplate: function(templateName){
+ return this.TEMPLATES[templateName]() || '';
+ },
refreshCatch: function(newInstance) {
var mediaType = this.options.media || 'text',
annotationItems = [],
@@ -396,18 +404,16 @@ CatchAnnotation.prototype = {
if (newInstance){
var videoFormat = (mediaType === "video") ? true:false;
- var publicprivatetemplate = '';
+ var publicPrivateTemplate = '';
if (self.options.showPublicPrivate) {
- if(self.options.instructor_username != ''){
- publicprivatetemplate = self.TEMPLATES.annotationPublicPrivateInstructor();
- } else{
- publicprivatetemplate = self.TEMPLATES.annotationPublicPrivate();
- }
+ var templateName = this.options.instructor_email ?
+ "annotationPublicPrivateInstructor" :
+ "annotationPublicPrivate";
}
el.html(self.TEMPLATES.annotationList({
annotationItems: annotationItems,
videoFormat: videoFormat,
- PublicPrivate: publicprivatetemplate,
+ PublicPrivate: this.getTemplate(templateName),
MediaSelector: self.options.showMediaSelector?self.TEMPLATES.annotationMediaSelector():'',
}));
}else{
@@ -433,7 +439,7 @@ CatchAnnotation.prototype = {
self.options.userId = '';
break;
case 'instructor':
- self.options.userId = this.options.instructor_username;
+ self.options.userId = this.options.instructor_email;
break;
default:
self.options.userId = this.annotator.plugins.Permissions.user.id;
@@ -1055,7 +1061,7 @@ CatchAnnotation.prototype = {
userId = '';
break;
case 'instructor':
- userId = this.options.instructor_username;
+ userId = this.options.instructor_email;
break;
default:
userId = this.annotator.plugins.Permissions.user.id;
@@ -1119,7 +1125,7 @@ CatchAnnotation.prototype = {
},
_onClearSearchButtonClick: function(evt){
- this._refresh("","");
+ this._refresh('','');
},
_clearAnnotator: function(){
var annotator = this.annotator,
diff --git a/lms/templates/imageannotation.html b/lms/templates/imageannotation.html
index e938abee42..74ce462560 100644
--- a/lms/templates/imageannotation.html
+++ b/lms/templates/imageannotation.html
@@ -9,70 +9,69 @@
-
- % if instructions_html is not UNDEFINED and instructions_html is not None:
-
-
-
- ${instructions_html}
-
-
- % endif
-
-
-
+
+ % if instructions_html is not UNDEFINED and instructions_html is not None:
+
+
+
+ ${instructions_html}
+
+
+ % endif
+
+
+
<%namespace name='static' file='/static_content.html'/>
${static.css(group='style-vendor-tinymce-content', raw=True)}
${static.css(group='style-vendor-tinymce-skin', raw=True)}
-
- ## Translators: Notes below refer to annotations. They wil later be put under a "Notes" section.
-
${_('Note: only instructors may annotate.')}
-
-
-
+
+
${_('Note: only instructors may annotate.')}
+
+
+
\ No newline at end of file
diff --git a/lms/templates/textannotation.html b/lms/templates/textannotation.html
index 5a55410434..19a261f7fa 100644
--- a/lms/templates/textannotation.html
+++ b/lms/templates/textannotation.html
@@ -177,10 +177,9 @@ ${static.css(group='style-vendor-tinymce-skin', raw=True)}
//Load the plugin Video/Text Annotation
var ova = new OpenVideoAnnotation.Annotator($('#textHolder'),options);
- var userId = '${user.email}';
- if('${default_tab}'.toLowerCase() == 'instructor'){
- userId = '${instructor_username}';
- }
+ var userId = ('${default_tab}'.toLowerCase() === 'instructor') ?
+ '${instructor_email}':
+ '${user.email}';
//Catch
var annotator = ova.annotator;
@@ -194,7 +193,7 @@ ${static.css(group='style-vendor-tinymce-skin', raw=True)}
pagination:pagination,//Number of Annotations per load in the pagination,
flags:is_staff,
default_tab: "${default_tab}",
- instructor_username: "${instructor_username}",
+ instructor_email: "${instructor_email}",
annotation_mode: "${annotation_mode}",
};
var Catch = new CatchAnnotation($('#catchDIV'),catchOptions);
diff --git a/lms/templates/videoannotation.html b/lms/templates/videoannotation.html
index 1ec4e18751..07b61213c5 100644
--- a/lms/templates/videoannotation.html
+++ b/lms/templates/videoannotation.html
@@ -175,10 +175,9 @@ ${static.css(group='style-vendor-tinymce-skin', raw=True)}
var ova = new OpenVideoAnnotation.Annotator($('#videoHolder'),options);
ova.annotator.addPlugin('Tags');
- var userId = '${user.email}';
- if('${default_tab}'.toLowerCase() == 'instructor'){
- userId = '${instructor_username}';
- }
+ var userId = ('${default_tab}'.toLowerCase() === 'instructor') ?
+ '${instructor_email}':
+ '${user.email}';
//Catch
var annotator = ova.annotator;
@@ -192,7 +191,7 @@ ${static.css(group='style-vendor-tinymce-skin', raw=True)}
pagination:pagination,//Number of Annotations per load in the pagination,
flags:is_staff,
default_tab: "${default_tab}",
- instructor_username: "${instructor_username}",
+ instructor_email: "${instructor_email}",
annotation_mode: "${annotation_mode}",
};
var Catch = new CatchAnnotation($('#catchDIV'),catchOptions);