Moving templates files + fixing default player for AutoPlayer
authordurandn
Mon, 20 Jul 2015 12:36:42 +0200
changeset 43 5248ea1ec901
parent 42 e097bb049152
child 44 37f3200c71d2
Moving templates files + fixing default player for AutoPlayer
server/src/remie/static/remie/metadataplayer/AutoPlayer.js
server/src/remie/templates/remie/iframe.html
server/src/remie/templates/remie/iframe_tester.html
server/src/remieplt/templates/remie/iframe.html
server/src/remieplt/templates/remie/iframe_tester.html
--- a/server/src/remie/static/remie/metadataplayer/AutoPlayer.js	Mon Jul 20 11:51:08 2015 +0200
+++ b/server/src/remie/static/remie/metadataplayer/AutoPlayer.js	Mon Jul 20 12:36:42 2015 +0200
@@ -5,7 +5,7 @@
 IriSP.Widgets.AutoPlayer.prototype = new IriSP.Widgets.Widget();
 
 IriSP.Widgets.AutoPlayer.prototype.defaults = {
-    default_type: "JwpPlayer"
+    default_type: "AdaptivePlayer"
 };
 
 IriSP.Widgets.AutoPlayer.prototype.draw = function() {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/server/src/remie/templates/remie/iframe.html	Mon Jul 20 12:36:42 2015 +0200
@@ -0,0 +1,158 @@
+{% load staticfiles %}
+<html>
+<head>
+<title>Test</title>
+<script type="text/javascript" src="{% static 'remie/js/jquery-1.11.2.min.js' %}"></script>
+<style type="text/css">
+  .Ldt-Tooltip{
+    visibility:hidden;
+  }
+</style>
+</head>
+<body>
+<div style="float:left; width:1191px; height:625px; margin: 0px; padding: 0px;" id="remie_player_container">
+  <div id="player_container" style='display: inline-block; vertical-align: top;'></div>
+  <div id="info_panel" style='display: inline-block; height: 100%'>
+    <div id="CurrentSegmentInfobox_container" style='max-width: 537px;'></div>
+    <div id="LatestAnnotation_container" style='max-width: 537px;'></div>
+    <div id="AnnotationsController_container" style='max-width: 537px;'></div>
+    <div id="CreateAnnotation_container" style='max-width: 537px;'></div>
+    <div id="AnnotationsList_container" style='max-width: 537px;'></div>
+  </div>
+  <script type="text/javascript" src='{% static "remie/metadataplayer/LdtPlayer-core.js" %}'></script>
+  <script type="text/javascript">
+    
+    if (typeof jQuery == "undefined") {
+        jQuery = IriSP.jQuery;
+    }
+    var metadatas = {metadata: {url: "{% url 'projectjson_id' id=project_id %}?from_display=false"}};
+    var metadata_key = "metadata"; 
+    
+    IriSP.libFiles.defaultDir = '{% static "remie/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" %}';
+    IriSP.libFiles.locations.cssjQueryUI = '{% static "remie/css/jq-css/themes/base/jquery-ui.css" %}';
+    IriSP.language = 'fr-fr';
+   
+    IriSP.widgetsDir = '{% static "remie/metadataplayer" %}';
+    var _metadata = {
+        url: metadatas[metadata_key].url,
+        format: 'ldt'
+    };
+    var _config = {
+      container: 'player_container',
+      css: '{% static "remie/metadataplayer/LdtPlayer-core.css" %}',
+      default_options: {
+          metadata: _metadata
+      },
+      widgets: 
+      [
+        {
+            type: "AutoPlayer",
+            streamer: function(_url) {
+                var _matches = _url.match(/^[^\/]+\/\/[^\/]+\/[^\/]+\//);
+                if (_matches) {
+                  return _matches[0];
+                } else {
+                  return _url;
+                }
+            },
+            url_transform: function(url) {
+                // Adaptation to jwplayer 6
+                if(url.substr(url.length - 4).toLowerCase()=='.flv'){
+                    return url.replace('/ddc_player/video/','/ddc_player/flv:video/');
+                }
+                return url.replace('/ddc_player/video/','/ddc_player/mp4:video/');
+            },
+        	autostart: false
+        },{
+         	 type: "Slider"
+        },{
+            type: "Controller",
+            disable_annotate_btn: true,
+            disable_search_btn: true,
+            disable_ctrl_f: true
+        },{
+            type: "Segments",
+            annotation_type: "découpage",
+            line_height: 24,
+            overlap: 1,
+        },{
+            type: "AnnotationsController",
+            container: "AnnotationsController_container",
+            display_or_write: true,
+            starts_hidden: true,
+            hide_without_segment: true,
+           	segments_annotation_type: "découpage"
+        },{
+            type: "CreateAnnotation",
+            container: "CreateAnnotation_container",
+            show_title_field : false,
+            show_creator_field : false,
+            show_time : false,
+            start_visible : false,
+            always_visible : false,
+            show_slice : false,
+            show_arrow : false,
+            show_mic_record: false,
+            show_mic_play: false,
+            minimize_annotation_widget : true,
+            creator_name : "{{current_user}}",
+            creator_field_readonly: true,
+            creator_avatar : "",
+            tags : true, // This may be counterintuitive but this actually hides tag tool for the widget
+            tag_titles : false,
+            pause_on_write : true,
+            max_tags : 8,
+            polemics : false,
+            annotation_type : "user_{{current_user}}",
+            api_serializer : "ldt_annotate",
+            api_endpoint_template : "/api/ldt/1.0/annotations/",
+            api_method : "POST",
+            post_at_segment_time : true,
+            segments_annotation_type: "découpage",
+            after_send_timeout : 0,
+            close_after_send: true,
+            tag_prefix: "#",
+            // Change id to a given project id
+            project_id: "{{project_id}}"
+        },{
+            type: "AnnotationsList",
+            container: "AnnotationsList_container",
+            annotation_type: "user_{% if not group_mode %}{{current_user}}{% endif %}",
+            filter_by_segments: true,
+            segments_annotation_type: "découpage",
+            show_creation_date: true,
+            show_only_annotation_from_user: false,
+            show_timecode: false,
+            show_filters: true,
+            limit_count: false,
+            start_visible: false,
+            newest_first: true,
+            tags: false,
+        },{
+            type: "LatestAnnotation",
+            annotation_type: "user_{% if not group_mode %}{{current_user}}{% endif %}",
+            container: "LatestAnnotation_container",
+           	filter_by_segment: true,
+           	starts_hidden: true,
+           	hide_without_segment: true,
+           	segments_annotation_type: "découpage",
+           	selectable_annotations: true,
+           	copy_and_edit_button: true,
+        },{
+         	type: "CurrentSegmentInfobox",
+         	annotation_type: "découpage",
+         	container: "CurrentSegmentInfobox_container",
+         	empty_message: "Clique sur un segment pour ouvrir le chapitre"
+        }
+        
+      ]
+    }
+    
+    _myPlayer = new IriSP.Metadataplayer(_config);
+  </script>
+</div>
+</body>
+</html>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/server/src/remie/templates/remie/iframe_tester.html	Mon Jul 20 12:36:42 2015 +0200
@@ -0,0 +1,31 @@
+{% load staticfiles %}
+<html>
+<head>
+<title>Test</title>
+<script type="text/javascript" src="{% static 'remie/js/jquery-1.11.2.min.js' %}"></script>
+<script type="text/javascript">
+	$(document).ready(function(){
+	    $("#iframe_update_button").click(function(){
+	        var default_url = "{% url 'remie_segment' %}";
+	        var project_id = $("#project_id").val();
+	        var group_mode = $("#group_mode").is(":checked");
+	        
+	        
+	        var final_url = default_url+"?project_id="+project_id+"&group_mode="+group_mode;
+	        $("#remie_workunit_iframe").attr("src", final_url);
+	    });
+	});
+</script>
+</head>
+<body>
+<div style="float:left; width:1191px; height:200px;">
+<label>Id projet: </label><br><input id="project_id" type="text"></input><br><br>
+<label>Mode groupe: </label><input id="group_mode" type="checkbox"></input><br><br>
+<input id="iframe_update_button" type="button" value="Générer"></input>
+<input id="copy_button" type="button" value="Copier"></input>
+</div>
+<div style="width:1191px; height:625px; outline: 1px;" id="remie_iframe_container">
+  <iframe id="remie_workunit_iframe" width="1191" height="625" src=""></iframe>
+</div>
+</body>
+</html>
\ No newline at end of file
--- a/server/src/remieplt/templates/remie/iframe.html	Mon Jul 20 11:51:08 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,158 +0,0 @@
-{% load staticfiles %}
-<html>
-<head>
-<title>Test</title>
-<script type="text/javascript" src="{% static 'remie/js/jquery-1.11.2.min.js' %}"></script>
-<style type="text/css">
-  .Ldt-Tooltip{
-    visibility:hidden;
-  }
-</style>
-</head>
-<body>
-<div style="float:left; width:1191px; height:625px; margin: 0px; padding: 0px;" id="remie_player_container">
-  <div id="player_container" style='display: inline-block; vertical-align: top;'></div>
-  <div id="info_panel" style='display: inline-block; height: 100%'>
-    <div id="CurrentSegmentInfobox_container" style='max-width: 537px;'></div>
-    <div id="LatestAnnotation_container" style='max-width: 537px;'></div>
-    <div id="AnnotationsController_container" style='max-width: 537px;'></div>
-    <div id="CreateAnnotation_container" style='max-width: 537px;'></div>
-    <div id="AnnotationsList_container" style='max-width: 537px;'></div>
-  </div>
-  <script type="text/javascript" src='{% static "remie/metadataplayer/LdtPlayer-core.js" %}'></script>
-  <script type="text/javascript">
-    
-    if (typeof jQuery == "undefined") {
-        jQuery = IriSP.jQuery;
-    }
-    var metadatas = {metadata: {url: "{% url 'projectjson_id' id=project_id %}?from_display=false"}};
-    var metadata_key = "metadata"; 
-    
-    IriSP.libFiles.defaultDir = '{% static "remie/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" %}';
-    IriSP.libFiles.locations.cssjQueryUI = '{% static "remie/css/jq-css/themes/base/jquery-ui.css" %}';
-    IriSP.language = 'fr-fr';
-   
-    IriSP.widgetsDir = '{% static "remie/metadataplayer" %}';
-    var _metadata = {
-        url: metadatas[metadata_key].url,
-        format: 'ldt'
-    };
-    var _config = {
-      container: 'player_container',
-      css: '{% static "remie/metadataplayer/LdtPlayer-core.css" %}',
-      default_options: {
-          metadata: _metadata
-      },
-      widgets: 
-      [
-        {
-            type: "AutoPlayer",
-            streamer: function(_url) {
-                var _matches = _url.match(/^[^\/]+\/\/[^\/]+\/[^\/]+\//);
-                if (_matches) {
-                  return _matches[0];
-                } else {
-                  return _url;
-                }
-            },
-            url_transform: function(url) {
-                // Adaptation to jwplayer 6
-                if(url.substr(url.length - 4).toLowerCase()=='.flv'){
-                    return url.replace('/ddc_player/video/','/ddc_player/flv:video/');
-                }
-                return url.replace('/ddc_player/video/','/ddc_player/mp4:video/');
-            },
-        	autostart: false
-        },{
-         	 type: "Slider"
-        },{
-            type: "Controller",
-            disable_annotate_btn: true,
-            disable_search_btn: true,
-            disable_ctrl_f: true
-        },{
-            type: "Segments",
-            annotation_type: "découpage",
-            line_height: 24,
-            overlap: 1,
-        },{
-            type: "AnnotationsController",
-            container: "AnnotationsController_container",
-            display_or_write: true,
-            starts_hidden: true,
-            hide_without_segment: true,
-           	segments_annotation_type: "découpage"
-        },{
-            type: "CreateAnnotation",
-            container: "CreateAnnotation_container",
-            show_title_field : false,
-            show_creator_field : false,
-            show_time : false,
-            start_visible : false,
-            always_visible : false,
-            show_slice : false,
-            show_arrow : false,
-            show_mic_record: false,
-            show_mic_play: false,
-            minimize_annotation_widget : true,
-            creator_name : "{{current_user}}",
-            creator_field_readonly: true,
-            creator_avatar : "",
-            tags : true, // This may be counterintuitive but this actually hides tag tool for the widget
-            tag_titles : false,
-            pause_on_write : true,
-            max_tags : 8,
-            polemics : false,
-            annotation_type : "user_{{current_user}}",
-            api_serializer : "ldt_annotate",
-            api_endpoint_template : "/api/ldt/1.0/annotations/",
-            api_method : "POST",
-            post_at_segment_time : true,
-            segments_annotation_type: "découpage",
-            after_send_timeout : 0,
-            close_after_send: true,
-            tag_prefix: "#",
-            // Change id to a given project id
-            project_id: "{{project_id}}"
-        },{
-            type: "AnnotationsList",
-            container: "AnnotationsList_container",
-            annotation_type: "user_{% if not group_mode %}{{current_user}}{% endif %}",
-            filter_by_segments: true,
-            segments_annotation_type: "découpage",
-            show_creation_date: true,
-            show_only_annotation_from_user: false,
-            show_timecode: false,
-            show_filters: true,
-            limit_count: false,
-            start_visible: false,
-            newest_first: true,
-            tags: false,
-        },{
-            type: "LatestAnnotation",
-            annotation_type: "user_{% if not group_mode %}{{current_user}}{% endif %}",
-            container: "LatestAnnotation_container",
-           	filter_by_segment: true,
-           	starts_hidden: true,
-           	hide_without_segment: true,
-           	segments_annotation_type: "découpage",
-           	selectable_annotations: true,
-           	copy_and_edit_button: true,
-        },{
-         	type: "CurrentSegmentInfobox",
-         	annotation_type: "découpage",
-         	container: "CurrentSegmentInfobox_container",
-         	empty_message: "Clique sur un segment pour ouvrir le chapitre"
-        }
-        
-      ]
-    }
-    
-    _myPlayer = new IriSP.Metadataplayer(_config);
-  </script>
-</div>
-</body>
-</html>
\ No newline at end of file
--- a/server/src/remieplt/templates/remie/iframe_tester.html	Mon Jul 20 11:51:08 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-{% load staticfiles %}
-<html>
-<head>
-<title>Test</title>
-<script type="text/javascript" src="{% static 'remie/js/jquery-1.11.2.min.js' %}"></script>
-<script type="text/javascript">
-	$(document).ready(function(){
-	    $("#iframe_update_button").click(function(){
-	        var default_url = "{% url 'remie_segment' %}";
-	        var project_id = $("#project_id").val();
-	        var group_mode = $("#group_mode").is(":checked");
-	        
-	        
-	        var final_url = default_url+"?project_id="+project_id+"&group_mode="+group_mode;
-	        $("#remie_workunit_iframe").attr("src", final_url);
-	    });
-	});
-</script>
-</head>
-<body>
-<div style="float:left; width:1191px; height:200px;">
-<label>Id projet: </label><br><input id="project_id" type="text"></input><br><br>
-<label>Mode groupe: </label><input id="group_mode" type="checkbox"></input><br><br>
-<input id="iframe_update_button" type="button" value="Générer"></input>
-<input id="copy_button" type="button" value="Copier"></input>
-</div>
-<div style="width:1191px; height:625px; outline: 1px;" id="remie_iframe_container">
-  <iframe id="remie_workunit_iframe" width="1191" height="625" src=""></iframe>
-</div>
-</body>
-</html>
\ No newline at end of file