# HG changeset patch # User durandn # Date 1439800209 -7200 # Node ID 6076bf17c133fe8fb06d9d58f1d872544893c341 # Parent b78e2ec3e7a52069569c884a7458b13902bb336c Minor changes to css + code cleanup + preparing ldt_annotate serializer for editing annotation diff -r b78e2ec3e7a5 -r 6076bf17c133 server/src/remie/static/remie/css/style.css --- a/server/src/remie/static/remie/css/style.css Fri Aug 07 17:25:23 2015 +0200 +++ b/server/src/remie/static/remie/css/style.css Mon Aug 17 10:30:09 2015 +0200 @@ -236,6 +236,7 @@ height: 30px; line-height: 30px; cursor: pointer; + height: 30px; } li.Ldt-AnnotationsList-li:hover{ background: none; @@ -260,6 +261,16 @@ font-weight: normal; color: #848484; } + +.Ldt-AnnotationsList-Description{ + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + width: 70% !important; + display: inline-block !important; + margin: 0px !important; +} + .Ldt-AnnotationsList-li .Ldt-AnnotationsList-Title a, .Ldt-AnnotationsList-li p.Ldt-AnnotationsList-Title{ color: #848484; diff -r b78e2ec3e7a5 -r 6076bf17c133 server/src/remie/static/remie/metadataplayer/AnnotationsList.js --- a/server/src/remie/static/remie/metadataplayer/AnnotationsList.js Fri Aug 07 17:25:23 2015 +0200 +++ b/server/src/remie/static/remie/metadataplayer/AnnotationsList.js Mon Aug 17 10:30:09 2015 +0200 @@ -39,7 +39,7 @@ show_filters : false, show_header : false, show_creation_date : false, - show_timecode : true, + show_timecode : true, /* * Only annotation in the current segment will be displayed. Designed to work with the Segments Widget. */ @@ -287,7 +287,8 @@ ); var _title = "", _description = _annotation.description, - _thumbnail = (typeof _annotation.thumbnail !== "undefined" && _annotation.thumbnail ? _annotation.thumbnail : _this.default_thumbnail); + _thumbnail = (typeof _annotation.thumbnail !== "undefined" && _annotation.thumbnail ? _annotation.thumbnail : _this.default_thumbnail) + // Update : display creator if (_annotation.creator) { _title = _annotation.creator; diff -r b78e2ec3e7a5 -r 6076bf17c133 server/src/remie/static/remie/metadataplayer/LdtPlayer-core.js --- a/server/src/remie/static/remie/metadataplayer/LdtPlayer-core.js Fri Aug 07 17:25:23 2015 +0200 +++ b/server/src/remie/static/remie/metadataplayer/LdtPlayer-core.js Mon Aug 17 10:30:09 2015 +0200 @@ -1952,6 +1952,7 @@ title: _data.title, audio: _data.audio }, + id: _data.id ? _data.id : "", // If annotation is new, id will be undefined tags: _data.getTagTexts(), media: _data.getMedia().id, project: _data.project_id,