'
+ '
+
'
+ '
+
'
- + '
✖
'
+ + '{{^preview_mode}}
✖
{{/preview_mode}}'
+ + '{{#preview_mode}}
✖
{{/preview_mode}}'
+ '
'
+ '
'
+ ''
@@ -86,7 +88,8 @@
'{{#edit}}
{{/edit}}'
@@ -96,6 +99,8 @@
send : "Send",
submit_delete: "Delete",
cancel : "Cancel",
+ preview_mode_submit: "You cannot submit a marker in preview mode.",
+ preview_mode_delete: "You cannot delete a marker in preview mode",
wait_while_processing: "Please wait while your annotation is being processed...",
delete_text: "The selected marker will be deleted. Continue?",
error_while_contacting: "An error happened while contacting the server. Your annotation has not been saved.",
@@ -108,6 +113,8 @@
send : "Envoyer",
submit_delete: "Supprimer",
cancel : "Annuler",
+ preview_mode_submit: "Vous ne pouvez pas créer ou éditer de marqueur en mode aperçu",
+ preview_mode_delete: "Vous ne pouvez pas supprimer de marqueur en mode aperçu",
wait_while_processing: "Veuillez patienter pendant le traitement de votre annotation...",
delete_text: "Le marqueur sélectionné sera supprimé. Continuer?",
error_while_contacting: "Une erreur s'est produite en contactant le serveur. Votre annotation n'a pas été enregistrée.",
@@ -169,13 +176,13 @@
return ((_time < (_marker.begin-_this.markers_gap))||(_time > (_marker.begin+_this.markers_gap)))
});
if (can_create){
- if ((this.$.find(".Ldt-Markers-Create").is(":hidden"))&&(this.$.find(".Ldt-Markers-Delete").is(":hidden"))){
+ if ((this.$.find(".Ldt-Markers-Create").is(":hidden"))&&(this.$.find(".Ldt-Markers-Delete").is(":hidden")||this.$.find(".Ldt-Markers-PreviewDelete").is(":hidden"))){
this.$.find(".Ldt-Markers-RoundButton").hide();
this.$.find(".Ldt-Markers-Create").show();
}
}
else {
- if ((this.$.find(".Ldt-Markers-CannotCreate").is(":hidden"))&&(this.$.find(".Ldt-Markers-Delete").is(":hidden"))){
+ if ((this.$.find(".Ldt-Markers-CannotCreate").is(":hidden"))&&(this.$.find(".Ldt-Markers-Delete").is(":hidden")||this.$.find(".Ldt-Markers-PreviewDelete").is(":hidden"))){
this.$.find(".Ldt-Markers-RoundButton").hide();
this.$.find(".Ldt-Markers-CannotCreate").show();
}
@@ -207,6 +214,8 @@
if (this.selectedMarker){
_divHtml = Mustache.to_html(this.infoTemplate, {
edit: true,
+ preview_mode: this.preview_mode,
+ preview_mode_text: this.l10n.preview_mode_submit,
marker_info: this.selectedMarker.description,
send: this.custom_send_button? this.custom_send_button : this.l10n.send,
cancel: this.custom_cancel_button? this.custom_cancel_button :this.l10n.cancel
@@ -216,6 +225,8 @@
_divHtml = Mustache.to_html(this.infoTemplate, {
edit: true,
marker_info: "",
+ preview_mode: this.preview_mode,
+ preview_mode_text: this.l10n.preview_mode_submit,
send: this.custom_send_button? this.custom_send_button : this.l10n.send,
cancel: this.custom_cancel_button? this.custom_cancel_button :this.l10n.cancel
})
@@ -225,7 +236,12 @@
this.$.find(".Ldt-Markers-MarkerCancel").click(this.functionWrapper("cancelEdit"));
this.$.find(".Ldt-Markers-MarkerTextArea").bind("change keyup input paste", this.functionWrapper("onDescriptionChange"));
this.$.find(".Ldt-Markers-RoundButton").hide();
- this.$.find(".Ldt-Markers-Delete").show();
+ if (this.preview_mode){
+ this.$.find(".Ldt-Markers-PreviewDelete").show();
+ }
+ else {
+ this.$.find(".Ldt-Markers-Delete").show();
+ }
this.editing = true;
}
@@ -287,7 +303,12 @@
this.cancelEdit();
if (this.selectedMarker){
this.$.find(".Ldt-Markers-RoundButton").hide();
- this.$.find(".Ldt-Markers-Delete").show();
+ if (this.preview_mode){
+ this.$.find(".Ldt-Markers-PreviewDelete").show();
+ }
+ else {
+ this.$.find(".Ldt-Markers-Delete").show();
+ }
}
else {
this.$.find(".Ldt-Markers-RoundButton").hide();
@@ -388,7 +409,12 @@
_this.$.find(".Ldt-Markers-Info").html(_divHtml);
_this.$.find(".Ldt-Markers-MarkerDescription").click(_this.functionWrapper("startEdit"));
_this.$.find(".Ldt-Markers-RoundButton").hide();
- _this.$.find(".Ldt-Markers-Delete").show();
+ if (_this.preview_mode){
+ _this.$.find(".Ldt-Markers-PreviewDelete").show();
+ }
+ else {
+ _this.$.find(".Ldt-Markers-Delete").show();
+ }
}
else {
diff -r b3fe63cdb3fd -r d7e38162478a server/src/remie/templates/remie/iframe_markers.html
--- a/server/src/remie/templates/remie/iframe_markers.html Thu Sep 24 12:25:05 2015 +0200
+++ b/server/src/remie/templates/remie/iframe_markers.html Thu Sep 24 17:24:15 2015 +0200
@@ -26,6 +26,7 @@
var metadata_key = "metadata";
IriSP.libFiles.defaultDir = '{% static "remie/js/" %}';
+ IriSP.libFiles.inDefaultDir.jQuery = 'jquery.js';
IriSP.libFiles.locations.jwPlayerSWF = '{% static "remie/swf/player.swf" %}';
IriSP.libFiles.locations.recordMicSwf = '{% static "remie/swf/record_mic.swf" %}';
IriSP.libFiles.locations.zeroClipboardSwf = '{% static "remie/swf/ZeroClipboard10.swf" %}';
diff -r b3fe63cdb3fd -r d7e38162478a server/src/remie/templates/remie/iframe_markers_preview.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/server/src/remie/templates/remie/iframe_markers_preview.html Thu Sep 24 17:24:15 2015 +0200
@@ -0,0 +1,94 @@
+{% load staticfiles %}
+
+
+
Test
+
+
+
+
+
+
\ No newline at end of file
diff -r b3fe63cdb3fd -r d7e38162478a server/src/remie/templates/remie/iframe_segments_group.html
--- a/server/src/remie/templates/remie/iframe_segments_group.html Thu Sep 24 12:25:05 2015 +0200
+++ b/server/src/remie/templates/remie/iframe_segments_group.html Thu Sep 24 17:24:15 2015 +0200
@@ -26,6 +26,7 @@
var metadata_key = "metadata";
IriSP.libFiles.defaultDir = '{% static "remie/js/" %}';
+ IriSP.libFiles.inDefaultDir.jQuery = 'jquery.js';
IriSP.libFiles.locations.jwPlayerSWF = '{% static "remie/swf/player.swf" %}';
IriSP.libFiles.locations.recordMicSwf = '{% static "remie/swf/record_mic.swf" %}';
IriSP.libFiles.locations.zeroClipboardSwf = '{% static "remie/swf/ZeroClipboard10.swf" %}';
diff -r b3fe63cdb3fd -r d7e38162478a server/src/remie/templates/remie/iframe_segments_preview.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/server/src/remie/templates/remie/iframe_segments_preview.html Thu Sep 24 17:24:15 2015 +0200
@@ -0,0 +1,186 @@
+{% load staticfiles %}
+
+
+
Test
+
+
+
+
+
+
\ No newline at end of file
diff -r b3fe63cdb3fd -r d7e38162478a server/src/remie/templates/remie/iframe_segments_single.html
--- a/server/src/remie/templates/remie/iframe_segments_single.html Thu Sep 24 12:25:05 2015 +0200
+++ b/server/src/remie/templates/remie/iframe_segments_single.html Thu Sep 24 17:24:15 2015 +0200
@@ -26,6 +26,7 @@
var metadata_key = "metadata";
IriSP.libFiles.defaultDir = '{% static "remie/js/" %}';
+ IriSP.libFiles.inDefaultDir.jQuery = 'jquery.js';
IriSP.libFiles.locations.jwPlayerSWF = '{% static "remie/swf/player.swf" %}';
IriSP.libFiles.locations.recordMicSwf = '{% static "remie/swf/record_mic.swf" %}';
IriSP.libFiles.locations.zeroClipboardSwf = '{% static "remie/swf/ZeroClipboard10.swf" %}';
diff -r b3fe63cdb3fd -r d7e38162478a server/src/remie/templates/remie/iframe_teacher.html
--- a/server/src/remie/templates/remie/iframe_teacher.html Thu Sep 24 12:25:05 2015 +0200
+++ b/server/src/remie/templates/remie/iframe_teacher.html Thu Sep 24 17:24:15 2015 +0200
@@ -26,6 +26,7 @@
var metadata_key = "metadata";
IriSP.libFiles.defaultDir = '{% static "remie/js/" %}';
+ IriSP.libFiles.inDefaultDir.jQuery = 'jquery.js';
IriSP.libFiles.locations.jwPlayerSWF = '{% static "remie/swf/player.swf" %}';
IriSP.libFiles.locations.recordMicSwf = '{% static "remie/swf/record_mic.swf" %}';
IriSP.libFiles.locations.zeroClipboardSwf = '{% static "remie/swf/ZeroClipboard10.swf" %}';
diff -r b3fe63cdb3fd -r d7e38162478a server/src/remie/templates/remie/iframe_tester.html
--- a/server/src/remie/templates/remie/iframe_tester.html Thu Sep 24 12:25:05 2015 +0200
+++ b/server/src/remie/templates/remie/iframe_tester.html Thu Sep 24 17:24:15 2015 +0200
@@ -2,7 +2,7 @@
Test
-
+