# HG changeset patch # User durandn # Date 1443108255 -7200 # Node ID d7e38162478a338aa9dad42ce5d900bc2c057824 # Parent b3fe63cdb3fd952203f24437261773994e2e4ea3 Added 2 preview scenarii for remie + made remie iframes load jquery.js instead of jquery.min.js in an attemps to fix diff -r b3fe63cdb3fd -r d7e38162478a server/src/remie/static/remie/css/markers.css --- a/server/src/remie/static/remie/css/markers.css Thu Sep 24 12:25:05 2015 +0200 +++ b/server/src/remie/static/remie/css/markers.css Thu Sep 24 17:24:15 2015 +0200 @@ -179,6 +179,13 @@ background-color: #CD000B; border-color: #4d0004; } +.Ldt-Markers-Screen.Ldt-Markers-ScreenMain .Ldt-Markers-RoundButton.Ldt-Markers-PreviewDelete{ + font-size: 35px; + line-height: 20px; + text-indent: 2px; + background-color: #999999; + border-color: #4d0004; +} .Ldt-Markers-Screen.Ldt-Markers-ScreenMain .Ldt-Markers-RoundButton.Ldt-Markers-Delete:hover{ background-color: #CD000B; diff -r b3fe63cdb3fd -r d7e38162478a server/src/remie/static/remie/css/style.css --- a/server/src/remie/static/remie/css/style.css Thu Sep 24 12:25:05 2015 +0200 +++ b/server/src/remie/static/remie/css/style.css Thu Sep 24 17:24:15 2015 +0200 @@ -249,6 +249,11 @@ background-color: #a2cf18; left: 0; } + +.Ldt-CreateAnnotation-Screen.Ldt-CreateAnnotation-Main .Ldt-CreateAnnotation-PreviewSubmit{ + left: 0; +} + .Ldt-CreateAnnotation-Screen.Ldt-CreateAnnotation-Main .Ldt-CreateAnnotation-Cancel{ background-color: #CD000B; left: 95px; diff -r b3fe63cdb3fd -r d7e38162478a server/src/remie/static/remie/metadataplayer/CreateAnnotation.css --- a/server/src/remie/static/remie/metadataplayer/CreateAnnotation.css Thu Sep 24 12:25:05 2015 +0200 +++ b/server/src/remie/static/remie/metadataplayer/CreateAnnotation.css Thu Sep 24 17:24:15 2015 +0200 @@ -44,7 +44,8 @@ } .Ldt-CreateAnnotation-Submit, -.Ldt-CreateAnnotation-Cancel{ +.Ldt-CreateAnnotation-Cancel, +.Ldt-CreateAnnotation-PreviewSubmit{ position: absolute; bottom: 7px; right: 7px; diff -r b3fe63cdb3fd -r d7e38162478a server/src/remie/static/remie/metadataplayer/CreateAnnotation.js --- a/server/src/remie/static/remie/metadataplayer/CreateAnnotation.js Thu Sep 24 12:25:05 2015 +0200 +++ b/server/src/remie/static/remie/metadataplayer/CreateAnnotation.js Thu Sep 24 17:24:15 2015 +0200 @@ -55,6 +55,7 @@ pause_when_displaying: false, custom_send_button: false, custom_cancel_button: false, + preview_mode: false, }; IriSP.Widgets.CreateAnnotation.prototype.messages = { @@ -63,6 +64,7 @@ to_time: "to", at_time: "at", submit: "Submit", + preview_submit: "You cannot submit annotations in preview mode", cancel: "Cancel", add_keywords_: "Add keywords:", add_polemic_keywords_: "Add polemic attributes :", @@ -85,6 +87,7 @@ to_time: "à", at_time: "à", submit: "Envoyer", + preview_submit: "Vous ne pouvez pas envoyer d'annotation en mode aperçu", cancel: "Annuler", add_keywords_: "Ajouter des mots-clés\u00a0:", add_polemic_keywords_: "Ajouter des attributs polémiques\u00a0:", @@ -116,7 +119,8 @@ + '{{#show_creator_field}}{{l10n.your_name_}} {{/show_creator_field}}' + '' + '
' - + '' + + '{{#preview_mode}}{{/preview_mode}}' + + '{{^preview_mode}}{{/preview_mode}}' + '' + '{{#show_mic_record}}
Add voice annotation
' + ' ' diff -r b3fe63cdb3fd -r d7e38162478a server/src/remie/static/remie/metadataplayer/LdtPlayer-core.js --- a/server/src/remie/static/remie/metadataplayer/LdtPlayer-core.js Thu Sep 24 12:25:05 2015 +0200 +++ b/server/src/remie/static/remie/metadataplayer/LdtPlayer-core.js Thu Sep 24 17:24:15 2015 +0200 @@ -2329,20 +2329,7 @@ $L.queueScript(ns.getLib("json")); } - $L.queueWait(function(){ - if (typeof ns.jQuery === "undefined" && typeof window.jQuery !== "undefined") { - ns.jQuery = window.jQuery; - if (former$ || formerJQuery) { - window.jQuery.noConflict(formerJQuery); - } - } - if (typeof ns._ === "undefined" && typeof window._ !== "undefined") { - ns._ = window._; - if (formerUnderscore) { - _.noConflict(); - } - } - }).queueScript(ns.getLib("jQueryUI")).queueWait(); + $L.queueWait().queueScript(ns.getLib("jQueryUI")).queueWait(); /* widget specific requirements */ for(var _i = 0; _i < this.config.widgets.length; _i++) { @@ -2366,6 +2353,19 @@ Metadataplayer.prototype.onLibsLoaded = function() { ns.log("IriSP.Metadataplayer.prototype.onLibsLoaded"); + if (typeof ns.jQuery === "undefined" && typeof window.jQuery !== "undefined") { + ns.jQuery = window.jQuery; + if (former$ || formerJQuery) { + window.jQuery.noConflict(formerJQuery); + } + } + if (typeof ns._ === "undefined" && typeof window._ !== "undefined") { + ns._ = window._; + if (formerUnderscore) { + _.noConflict(); + } + } + ns.loadCss(ns.getLib("cssjQueryUI")); ns.loadCss(this.config.css); diff -r b3fe63cdb3fd -r d7e38162478a server/src/remie/static/remie/metadataplayer/Markers.css --- a/server/src/remie/static/remie/metadataplayer/Markers.css Thu Sep 24 12:25:05 2015 +0200 +++ b/server/src/remie/static/remie/metadataplayer/Markers.css Thu Sep 24 17:24:15 2015 +0200 @@ -66,6 +66,11 @@ text-indent: 2px; } +.Ldt-Markers-RoundButton.Ldt-Markers-PreviewDelete{ + line-height: 23px; + text-indent: 2px; +} + .Ldt-Markers-Info{ height: 125px; width: 90%; @@ -146,7 +151,7 @@ vertical-align: top; } -.Ldt-Markers-MarkerSend, .Ldt-Markers-MarkerCancel{ +.Ldt-Markers-MarkerSend, .Ldt-Markers-MarkerPreviewSend, .Ldt-Markers-MarkerCancel{ display: inline-block; background-color: #d93c71; color: #ffffff; @@ -169,7 +174,7 @@ vertical-align: top; } -.Ldt-Markers-RoundButton:hover, .Ldt-Markers-MarkerSend:hover, .Ldt-Markers-MarkerCancel:hover{ +.Ldt-Markers-RoundButton:hover, .Ldt-Markers-MarkerSend:hover, .Ldt-Markers-MarkerPreviewSend:hover, .Ldt-Markers-MarkerCancel:hover{ background-color: #e15581; border-color: #222222 #e87d9f #f0adc3 #68273c; } diff -r b3fe63cdb3fd -r d7e38162478a server/src/remie/static/remie/metadataplayer/Markers.js --- a/server/src/remie/static/remie/metadataplayer/Markers.js Thu Sep 24 12:25:05 2015 +0200 +++ b/server/src/remie/static/remie/metadataplayer/Markers.js Thu Sep 24 17:24:15 2015 +0200 @@ -31,6 +31,7 @@ close_after_send: false, custom_send_button: false, custom_cancel_button: false, + preview_mode: false, }; IriSP.Widgets.Markers.prototype.template = @@ -42,7 +43,8 @@ + '
' + '
+
' + '
+
' - + '
' + + '{{^preview_mode}}
{{/preview_mode}}' + + '{{#preview_mode}}
{{/preview_mode}}' + '
' + '
' + '
' @@ -86,7 +88,8 @@ '{{#edit}}
' + '' + '
' + - '
{{send}}
' + + '{{^preview_mode}}
{{send}}
{{/preview_mode}}' + + '{{#preview_mode}}
{{send}}
{{/preview_mode}}' + '
{{cancel}}
' + '
' + '
{{/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 - +