'
+ + '
'
+ ''
+ '
'
+ ''
+ '
'
+ + '{{#allow_annotations_deletion}}'
+ + '✖
'
+ + '{{/allow_annotations_deletion}}'
+ '{{#show_timecode}}{{begin}} - {{end}}
{{/show_timecode}}'
+ '' - + '{{{htitle}}}' + + '{{{htitle}}}' + '
' + '{{{hdescription}}}
' + '{{#created}}' @@ -142,7 +186,7 @@ + '{{/tags}}' + '' + '{{/tags.length}}' - + '{{#audio}}{{l10n.voice_annotation}}
{{/audio}}'
+ + '{{#audio}}{{l10n.voice_annotation}}
{{/audio}}'
+ '';
// obj.url = this.project_url + "/" + media + "/" + annotations[i].meta.project
@@ -162,6 +206,11 @@
}, this.metadata));
};
+IriSP.Widgets.AnnotationsList.prototype.showScreen = function(_screenName) {
+ this.$.find('.Ldt-AnnotationsList-Screen' + _screenName).show()
+ .siblings().hide();
+}
+
IriSP.Widgets.AnnotationsList.prototype.ajaxMashup = function() {
var _currentTime = this.media.getCurrentTime();
var _currentAnnotation = this.source.currentMedia.getAnnotationAtTime(_currentTime);
@@ -228,6 +277,10 @@
return (_currentSegments[0].begin <= _annotation_time && _currentSegments[0].end >= _annotation_time)
});
}
+ if(this.annotations_count_header && this.annotations_count != _list.length){
+ this.annotations_count = _list.length;
+ this.refreshHeader();
+ }
}
if (this.show_only_annotation_from_user){
_list = _list.filter(function(_annotation){
@@ -364,7 +417,8 @@
url : _url,
tags : _tags,
specific_style : (typeof _bgcolor !== "undefined" ? "background-color: " + _bgcolor : ""),
- l10n: _this.l10n
+ l10n: _this.l10n,
+ allow_annotations_deletion: _this.allow_annotations_deletion
};
if (_this.show_audio && _annotation.audio && _annotation.audio.href && _annotation.audio.href != "null") {
_data.audio = true;
@@ -456,6 +510,8 @@
_$.html(IriSP.textFieldHtml(_$.text(), rx));
});
}
+
+ this.$.find(".Ldt-AnnotationsList-DeleteButton").click(_this.functionWrapper("onDeleteClick"))
}
if (this.ajax_url) {
@@ -471,6 +527,65 @@
return _list.length;
};
+IriSP.Widgets.AnnotationsList.prototype.onDeleteClick = function(event){
+
+ ann_id = event.target.id;
+ console.log(ann_id)
+ delete_preview_$ = this.$.find(".Ldt-AnnotationsList-ul-ToDelete");
+ delete_preview_$.html("");
+ _list = this.getWidgetAnnotations()
+ _list = _list.filter(function(_annotation){
+ return _annotation.id == ann_id
+ })
+ var _annotation = _list[0],
+ _title = "",
+ _this = this;
+ console.log(_annotation)
+ if (_annotation.creator) {
+ _title = _annotation.creator;
+ }
+ if (_annotation.title) {
+ var tempTitle = _annotation.title;
+ if( tempTitle.substr(0, _title.length + 1) == (_title + ":") ){
+ _title = "";
+ }
+ _title = _title + ( (_title=="") ? "" : ": ") + _annotation.title;
+ }
+ var _created = false;
+ if (this.show_creation_date) {
+ _created = _annotation.created.toLocaleDateString()+", "+_annotation.created.toLocaleTimeString();
+ }
+ var _data = {
+ id : _annotation.id,
+ media_id : _annotation.getMedia().id,
+ htitle : IriSP.textFieldHtml(_title),
+ hdescription : IriSP.textFieldHtml(_annotation.description),
+ begin : _annotation.begin.toString(),
+ end : _annotation.end.toString(),
+ created : _created,
+ show_timecode : this.show_timecode,
+ tags : false,
+ l10n: this.l10n,
+ allow_annotations_deletion: false
+ }
+ _html = Mustache.to_html(this.annotationTemplate, _data)
+ delete_preview_$.html(_html)
+
+ this.$.find(".Ldt-AnnotationsList-ConfirmDelete").click(function(){
+ _this.sendDelete(ann_id);
+ });
+
+ this.showScreen("Delete");
+}
+
+IriSP.Widgets.AnnotationsList.prototype.refreshHeader = function() {
+ var annotation_count_string = " (" + this.annotations_count +" annotations)";
+ this.$.find('.Ldt-AnnotationsList-header').html("");
+ this.$.find('.Ldt-AnnotationsList-header').html(
+ this.custom_header && typeof this.custom_header == "string"? this.custom_header + annotation_count_string : this.l10n.header + annotation_count_string
+ );
+}
+
IriSP.Widgets.AnnotationsList.prototype.hide = function() {
var _this = this;
if (this.visible){
@@ -478,6 +593,7 @@
this.widget_$.slideUp(function(){
_this.$.find('.Ldt-AnnotationsList-header').hide();
});
+ this.showScreen("Main")
}
}
@@ -486,6 +602,7 @@
this.visible = true;
this.$.find('.Ldt-AnnotationsList-header').show();
this.widget_$.slideDown();
+ this.showScreen("Main")
}
}
@@ -500,8 +617,37 @@
}
};
+IriSP.Widgets.AnnotationsList.prototype.revertToMainScreen = function(){
+ if (this.$.find(".Ldt-AnnotationsList-ScreenMain").is(":hidden")){
+ this.showScreen("Main");
+ }
+}
+
+IriSP.Widgets.AnnotationsList.prototype.sendDelete = function(id){
+ console.log("deleting "+id)
+ var _this = this,
+ _url = Mustache.to_html(this.api_delete_endpoint, {annotation_id: id})
+
+ IriSP.jQuery.ajax({
+ url: _url,
+ type: this.api_delete_method,
+ contentType: 'application/json',
+ success: function(_data) {
+ _this.showScreen('Success');
+ window.setTimeout(_this.functionWrapper("revertToMainScreen"),(_this.after_send_timeout || 2000));
+ _this.currentSource.getAnnotations().removeId(id);
+ _this.player.trigger("AnnotationsList.refresh");
+ },
+ error: function(_xhr, _error, _thrown) {
+ IriSP.log("Error when sending annotation", _thrown);
+ _this.showScreen('Error');
+ window.setTimeout(_this.functionWrapper("revertToMainScreen"),(_this.after_send_timeout || 2000));
+ }
+ });
+ this.showScreen('Sending');
+}
+
IriSP.Widgets.AnnotationsList.prototype.draw = function() {
-
this.jwplayers = {};
this.mashupMode = (this.media.elementType === "mashup");
@@ -581,14 +727,15 @@
_this.currentSource.getAnnotations().trigger("clear-search");
}
});
+
+ this.$.find(".Ldt-AnnotationsList-Close").click(function(){
+ _this.showScreen("Main");
+ })
+
this.source.getAnnotations().on("search-cleared", function() {
_this.throttledRefresh();
});
- if (this.show_filters){
-
- }
-
this.onMdpEvent("AnnotationsList.refresh", function() {
if (_this.ajax_url) {
if (_this.mashupMode) {
@@ -616,6 +763,10 @@
}, this.refresh_interval);
}
+ if (this.annotations_count_header){
+ this.annotations_count = false;
+ }
+
this.onMdpEvent("AnnotationsList.toggle","toggle");
this.onMdpEvent("AnnotationsList.hide", "hide");
this.onMdpEvent("AnnotationsList.show", "show");
@@ -633,9 +784,13 @@
this.throttledRefresh();
+ this.showScreen("Main");
+ this.$.find(".Ldt-AnnotationsList-CancelDelete").click(function(){
+ _this.showScreen("Main")
+ });
+
this.visible = true;
if (!this.start_visible){
this.hide();
}
-
};
diff -r 4914a246ae46 -r a5a4c9022534 server/src/remie/static/remie/metadataplayer/LdtPlayer-core.js
--- a/server/src/remie/static/remie/metadataplayer/LdtPlayer-core.js Fri Sep 18 13:04:51 2015 +0200
+++ b/server/src/remie/static/remie/metadataplayer/LdtPlayer-core.js Thu Sep 17 11:58:01 2015 +0200
@@ -2462,15 +2462,24 @@
_this.player.trigger("widget-loaded");
}
+ if (this.pre_draw_callback){
+ onloadcallback = function(){
+ IriSP.jQuery.when(_this.pre_draw_callback()).done(onsourceloaded());
+ }
+ }
+ else {
+ onloadcallback = onsourceloaded;
+ }
+
if (this.metadata) {
/* Getting metadata */
this.source = player.loadMetadata(this.metadata);
/* Call draw when loaded */
- this.source.onLoad(onsourceloaded);
+ this.source.onLoad(onloadcallback);
} else {
if (this.source) {
- onsourceloaded();
+ onloadcallback();
}
}
diff -r 4914a246ae46 -r a5a4c9022534 server/src/remie/templates/remie/iframe_teacher.html
--- a/server/src/remie/templates/remie/iframe_teacher.html Fri Sep 18 13:04:51 2015 +0200
+++ b/server/src/remie/templates/remie/iframe_teacher.html Thu Sep 17 11:58:01 2015 +0200
@@ -124,7 +124,7 @@
},{
type: "AnnotationsList",
container: "AnnotationsList_container",
- annotation_type: "user_{{current_user}}",
+ annotation_type: "user_",
filter_by_segments: true,
segments_annotation_type: "découpage",
show_creation_date: true,
@@ -137,9 +137,11 @@
start_visible: false,
newest_first: true,
tags: false,
+ allow_annotations_deletion: true,
+ api_delete_endpoint: "{% url 'api_dispatch_list' resource_name='annotations' api_name='1.0' %}{% templatetag openvariable %}annotation_id{% templatetag closevariable %}/"
},{
type: "LatestAnnotation",
- annotation_type: "user_{% if not group_mode %}{{current_user}}{% endif %}",
+ annotation_type: "user_",
container: "LatestAnnotation_container",
filter_by_segment: true,
starts_hidden: true,
@@ -147,7 +149,7 @@
segments_annotation_type: "découpage",
selectable_annotations: true,
copy_and_edit_button: true,
- show_header: true,
+ show_header: false,
},{
type: "CurrentSegmentInfobox",
annotation_type: "découpage",