# HG changeset patch
# User cavaliet
# Date 1388660780 -3600
# Node ID 10b80515b46ae930486cc11754d094cb3426ff06
# Parent  9b586dc95ff167ff8c5af48f7293e5df77fec540
v1.51.18 : display name in annotation list

diff -r 9b586dc95ff1 -r 10b80515b46a src/ldt/ldt/__init__.py
--- a/src/ldt/ldt/__init__.py	Fri Nov 29 17:42:13 2013 +0100
+++ b/src/ldt/ldt/__init__.py	Thu Jan 02 12:06:20 2014 +0100
@@ -1,6 +1,6 @@
 __all__ = ["VERSION", "get_version", "__version__"]
 
-VERSION = (1, 51, 17, "final", 0)
+VERSION = (1, 51, 18, "final", 0)
 
 
 def get_version():
diff -r 9b586dc95ff1 -r 10b80515b46a src/ldt/ldt/static/ldt/css/front_player.css
--- a/src/ldt/ldt/static/ldt/css/front_player.css	Fri Nov 29 17:42:13 2013 +0100
+++ b/src/ldt/ldt/static/ldt/css/front_player.css	Thu Jan 02 12:06:20 2014 +0100
@@ -1,6 +1,9 @@
 #player_col_g {
     float: left; margin: 10px 0; position: relative;
 }
+#player_col_g > h2 {
+    max-width: 545px;
+}
 
 #top_media {
     width: 550px; border-bottom: 1px solid #484848; margin-bottom: 5px;
diff -r 9b586dc95ff1 -r 10b80515b46a src/ldt/ldt/static/ldt/metadataplayer/AnnotationsList.js
--- a/src/ldt/ldt/static/ldt/metadataplayer/AnnotationsList.js	Fri Nov 29 17:42:13 2013 +0100
+++ b/src/ldt/ldt/static/ldt/metadataplayer/AnnotationsList.js	Thu Jan 02 12:06:20 2014 +0100
@@ -183,15 +183,15 @@
                     : document.location.href.replace(/#.*$/,'') + '#id=' + _annotation.id
                     )
             );
-            var _title = (_annotation.title || "").replace(_annotation.description,''),
+            var _title = "",
                 _description = _annotation.description,
                 _thumbnail = (typeof _annotation.thumbnail !== "undefined" && _annotation.thumbnail ? _annotation.thumbnail : _this.default_thumbnail);
-            if (!_annotation.title) {
-                _title = _annotation.creator;
+            // Update : display creator
+            if (_annotation.creator) {
+            	_title = _annotation.creator;
             }
-            if (!_annotation.description && _annotation.creator) {
-                _description = _annotation.title;
-                _title = _annotation.creator;
+            if (_annotation.title) {
+                _title = _title + ( (_title=="") ? "" : " : ") + _annotation.title;
             }
             var _bgcolor;
             IriSP._(_this.polemics).each(function(_polemic) {
diff -r 9b586dc95ff1 -r 10b80515b46a src/ldt/ldt/static/ldt/metadataplayer/MultiSegments.js
--- a/src/ldt/ldt/static/ldt/metadataplayer/MultiSegments.js	Fri Nov 29 17:42:13 2013 +0100
+++ b/src/ldt/ldt/static/ldt/metadataplayer/MultiSegments.js	Thu Jan 02 12:06:20 2014 +0100
@@ -104,7 +104,6 @@
         }
         IriSP._(lines).each(function(line) {
         	if($j(e.target).parent().parent()[0]==line.segmentWidget[0]){
-        		window.console.log("YIHAH !");
         		currentLine = line;
         		line.show();
         	} else {