# HG changeset patch # User durandn # Date 1440755562 -7200 # Node ID 3926ac9e5c77033484f50f60f946f62044d5f923 # Parent 692b9d9fd29f7f17fdb42b623ff87e2d7b490352 Small corrections on Markers widget + corrections on headers for LastAnnotation and AnnotationsList diff -r 692b9d9fd29f -r 3926ac9e5c77 server/src/remie/static/remie/metadataplayer/Markers.css --- a/server/src/remie/static/remie/metadataplayer/Markers.css Mon Aug 17 17:06:42 2015 +0200 +++ b/server/src/remie/static/remie/metadataplayer/Markers.css Fri Aug 28 11:52:42 2015 +0200 @@ -56,11 +56,6 @@ line-height: 20px; } -.Ldt-Markers-Create:hover{ - background-color: #e15581; - border-color: #222222 #e87d9f #f0adc3 #68273c; -} - .Ldt-Markers-Info{ height: 125px; width: 90%; @@ -98,12 +93,16 @@ .Ldt-Markers-MarkerDescription{ height: 45%; width: 90%; - border: 2px solid #68273c; + border: 1px solid #68273c; margin: 10px; padding: 10px; background: #ffffff; } +.Ldt-Markers-MarkerDescription:hover{ + border: 2px solid #e87d9f; +} + .Ldt-Markers-MarkerEdit{ height: 70%; width: 100%; @@ -148,4 +147,9 @@ vertical-align: top; line-height: 20px; vertical-align: top; +} + +.Ldt-Markers-Create:hover, .Ldt-Markers-MarkerSend:hover, .Ldt-Markers-MarkerCancel:hover{ + background-color: #e15581; + border-color: #222222 #e87d9f #f0adc3 #68273c; } \ No newline at end of file diff -r 692b9d9fd29f -r 3926ac9e5c77 server/src/remie/static/remie/metadataplayer/Markers.js --- a/server/src/remie/static/remie/metadataplayer/Markers.js Mon Aug 17 17:06:42 2015 +0200 +++ b/server/src/remie/static/remie/metadataplayer/Markers.js Fri Aug 28 11:52:42 2015 +0200 @@ -93,7 +93,20 @@ this.drawMarkers(); this.$.find(".Ldt-Markers-Create").click(function(){ - _this.toggleCreateMarker(); + if (!_this.selectedMarker){ + _this.toggleCreateMarker(); + } + else { + _this.selectedMarker = false; + _this.$.find(".Ldt-Markers-Info").html(""); + _this.$.find(".Ldt-Markers-MarkerBall").css("background-color", _this.marker_color) + _this.$.find(".Ldt-Markers-Create").html("+"); + } + }) + this.$.find(".Ldt-Markers-Info").click(function(){ + if (_this.selectedMarker&&!_this.editing){ + _this.toggleCreateMarker(); + } }) this.showScreen("Main"); this.$.css({ @@ -139,9 +152,6 @@ }) this.$.find(".Ldt-Markers-Info").html(_divHtml); - this.$.find(".Ldt-Markers-MarkerCancel").click(function(){ - _this.toggleCreateMarker(); - }) } else { if (this.editing) { @@ -159,6 +169,10 @@ this.$.find(".Ldt-Markers-MarkerSend").click(this.functionWrapper("onSubmit")); this.$.find(".Ldt-Markers-MarkerCancel").click(this.functionWrapper("toggleCreateMarker")); this.$.find(".Ldt-Markers-MarkerTextArea").bind("change keyup input paste", this.functionWrapper("onDescriptionChange")); + this.$.find(".Ldt-Markers-Create").html("-"); + } + else { + this.$.find(".Ldt-Markers-Create").html("+"); } }; @@ -232,6 +246,7 @@ }) _this.$.find(".Ldt-Markers-Info").html(_divHtml); + if(_this.editing){ _this.$.find(".Ldt-Markers-MarkerSend").click(_this.functionWrapper("onSubmit")); _this.$.find(".Ldt-Markers-MarkerCancel").click(_this.functionWrapper("toggleCreateMarker")); @@ -256,6 +271,19 @@ _this.$.find(".Ldt-Markers-MarkerCancel").click(_this.functionWrapper("toggleCreateMarker")); } } + + if (_this.selectedMarker){ + _this.$.find(".Ldt-Markers-Create").html("-") + } + else { + _this.$.find(".Ldt-Markers-Create").html("+") + } + + if (_this.selectedMarker) { + // If we unselect a marker we shouldn't trigger pause or time jump + _this.media.pause(); + _marker.trigger("click"); + } }) .appendTo(list_$); }) @@ -327,7 +355,6 @@ contentType: 'application/json', data: _export.serialize(), /* L'objet Source est sérialisé */ success: function(_data) { - console.log(_data) _this.showScreen('Success'); /* Si l'appel a fonctionné, on affiche l'écran "Annotation enregistrée" */ window.setTimeout(function(){ _this.showScreen("Main") diff -r 692b9d9fd29f -r 3926ac9e5c77 server/src/remie/templates/remie/iframe_markers.html --- a/server/src/remie/templates/remie/iframe_markers.html Mon Aug 17 17:06:42 2015 +0200 +++ b/server/src/remie/templates/remie/iframe_markers.html Fri Aug 28 11:52:42 2015 +0200 @@ -63,7 +63,7 @@ } return url.replace('/ddc_player/video/','/ddc_player/mp4:video/'); }, - default_type: "AdaptivePlayer", + default_type: "AdaptivePlayer", autostart: false },{ type: "Slider" diff -r 692b9d9fd29f -r 3926ac9e5c77 server/src/remie/templates/remie/iframe_segments_group.html --- a/server/src/remie/templates/remie/iframe_segments_group.html Mon Aug 17 17:06:42 2015 +0200 +++ b/server/src/remie/templates/remie/iframe_segments_group.html Fri Aug 28 11:52:42 2015 +0200 @@ -64,7 +64,8 @@ return url.replace('/ddc_player/video/','/ddc_player/mp4:video/'); }, default_type: "AdaptivePlayer", - autostart: false + autostart: false, + adapt_to_device: true },{ type: "Slider" },{ @@ -130,7 +131,7 @@ show_only_annotation_from_user: false, show_timecode: false, show_filters: true, - show_header: false, + show_header: true, limit_count: false, start_visible: false, newest_first: true, @@ -145,7 +146,7 @@ segments_annotation_type: "découpage", selectable_annotations: true, copy_and_edit_button: true, - show_header: false + show_header: true },{ type: "CurrentSegmentInfobox", annotation_type: "découpage", diff -r 692b9d9fd29f -r 3926ac9e5c77 server/src/remie/templates/remie/iframe_segments_single.html --- a/server/src/remie/templates/remie/iframe_segments_single.html Mon Aug 17 17:06:42 2015 +0200 +++ b/server/src/remie/templates/remie/iframe_segments_single.html Fri Aug 28 11:52:42 2015 +0200 @@ -47,24 +47,24 @@ 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/'); - }, - default_type: "AdaptivePlayer", - autostart: false + 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/'); + }, + default_type: "AdaptivePlayer", + autostart: false },{ type: "Slider" },{ @@ -123,14 +123,14 @@ },{ type: "AnnotationsList", container: "AnnotationsList_container", - annotation_type: "user_{% if not group_mode %}{{current_user}}{% endif %}", + annotation_type: "user_{{current_user}}", 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, - show_header: false, + show_header: true, limit_count: false, start_visible: false, newest_first: true, @@ -145,13 +145,12 @@ segments_annotation_type: "découpage", selectable_annotations: true, copy_and_edit_button: true, - show_header: false + show_header: true },{ type: "CurrentSegmentInfobox", annotation_type: "découpage", container: "CurrentSegmentInfobox_container", empty_message: "Clique sur un segment pour ouvrir le chapitre", - pause_on_segment_end: true } ]