# HG changeset patch # User durandn # Date 1443174312 -7200 # Node ID 8a127568876cc3c6e7e3527a0c0542fa1d01069d # Parent d7e38162478a338aa9dad42ce5d900bc2c057824 Small changes on Markers widget preview mode diff -r d7e38162478a -r 8a127568876c server/src/remie/static/remie/metadataplayer/Markers.js --- a/server/src/remie/static/remie/metadataplayer/Markers.js Thu Sep 24 17:24:15 2015 +0200 +++ b/server/src/remie/static/remie/metadataplayer/Markers.js Fri Sep 25 11:45:12 2015 +0200 @@ -41,7 +41,7 @@ + '' + '
' + '
' - + '
+
' + + '
+
' + '
+
' + '{{^preview_mode}}
{{/preview_mode}}' + '{{#preview_mode}}
{{/preview_mode}}' @@ -172,7 +172,7 @@ IriSP.Widgets.Markers.prototype.updateCreateButtonState = function(_time){ _this = this - var can_create = this.markers.every(function(_marker){ + var can_create = this.preview_mode? false : this.markers.every(function(_marker){ return ((_time < (_marker.begin-_this.markers_gap))||(_time > (_marker.begin+_this.markers_gap))) }); if (can_create){ @@ -253,7 +253,9 @@ marker_info: this.selectedMarker.description, }) this.$.find(".Ldt-Markers-Info").html(_divHtml); - this.$.find(".Ldt-Markers-MarkerDescription").click(this.functionWrapper("startEdit")); + if (!this.preview_mode){ + this.$.find(".Ldt-Markers-MarkerDescription").click(this.functionWrapper("startEdit")); + } } else { // Clic sur "cancel" pendant la création d'un marqueur = retour à l'état initial @@ -407,7 +409,9 @@ }) _this.$.find(".Ldt-Markers-Info").html(_divHtml); - _this.$.find(".Ldt-Markers-MarkerDescription").click(_this.functionWrapper("startEdit")); + if (!_this.preview_mode){ + _this.$.find(".Ldt-Markers-MarkerDescription").click(_this.functionWrapper("startEdit")); + } _this.$.find(".Ldt-Markers-RoundButton").hide(); if (_this.preview_mode){ _this.$.find(".Ldt-Markers-PreviewDelete").show(); diff -r d7e38162478a -r 8a127568876c server/src/remie/templates/remie/iframe_markers_preview.html --- a/server/src/remie/templates/remie/iframe_markers_preview.html Thu Sep 24 17:24:15 2015 +0200 +++ b/server/src/remie/templates/remie/iframe_markers_preview.html Fri Sep 25 11:45:12 2015 +0200 @@ -66,7 +66,7 @@ default_type: "AdaptivePlayer", autostart: false },{ - type: "Slider" + type: "Slider" },{ type: "Controller", disable_annotate_btn: true, diff -r d7e38162478a -r 8a127568876c server/src/remie/templates/remie/iframe_tester.html --- a/server/src/remie/templates/remie/iframe_tester.html Thu Sep 24 17:24:15 2015 +0200 +++ b/server/src/remie/templates/remie/iframe_tester.html Fri Sep 25 11:45:12 2015 +0200 @@ -124,8 +124,8 @@ Elève - Segments, groupe
Elève - Marqueurs
Professeur - Segments
- Visualisation - Segments
- Visualisation - Marqueurs
+ Aperçu - Segments
+ Aperçu - Marqueurs