Small changes on Markers widget preview mode
authordurandn
Fri, 25 Sep 2015 11:45:12 +0200
changeset 166 8a127568876c
parent 165 d7e38162478a
child 167 fe67a33f5045
Small changes on Markers widget preview mode
server/src/remie/static/remie/metadataplayer/Markers.js
server/src/remie/templates/remie/iframe_markers_preview.html
server/src/remie/templates/remie/iframe_tester.html
--- 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 @@
     + '</div>'
     + '<div class="Ldt-Markers-Inputs">'
     +     '<div class="Ldt-Markers-Screen Ldt-Markers-ScreenMain">'
-    +         '<div class="Ldt-Markers-RoundButton Ldt-Markers-CannotCreate" title="{{l10n.cannot_create}}">+</div>'
+    +         '<div class="Ldt-Markers-RoundButton Ldt-Markers-CannotCreate" title="{{#preview_mode}}{{l10n.preview_mode_submit}}{{/preview_mode}}{{^preview_mode}}{{l10n.cannot_create}}{{/preview_mode}}">+</div>'
     +         '<div class="Ldt-Markers-RoundButton Ldt-Markers-Create">+</div>'
     +         '{{^preview_mode}}<div class="Ldt-Markers-RoundButton Ldt-Markers-Delete">&#10006;</div>{{/preview_mode}}'
     +         '{{#preview_mode}}<div class="Ldt-Markers-RoundButton Ldt-Markers-PreviewDelete" title="{{l10n.preview_mode_delete}}">&#10006;</div>{{/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(); 
--- 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,
--- 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 @@
   <input id="segments_group" name="scenario" type="radio" value="segments_group">Elève - Segments, groupe</input><br>
   <input id="markers" name="scenario" type="radio" value="markers">Elève - Marqueurs</input><br>
   <input id="teacher" name="scenario" type="radio" value="teacher">Professeur - Segments</input><br>
-  <input id="segments_preview" name="scenario" type="radio" value="segments_preview">Visualisation - Segments</input><br>
-  <input id="markers_preview" name="scenario" type="radio" value="markers_preview">Visualisation - Marqueurs</input><br>
+  <input id="segments_preview" name="scenario" type="radio" value="segments_preview">Aperçu - Segments</input><br>
+  <input id="markers_preview" name="scenario" type="radio" value="markers_preview">Aperçu - Marqueurs</input><br>
   <br><input id="iframe_update_button" type="button" value="Générer"></input>
 </div>
 <div hidden="true">