# HG changeset patch
# User cavaliet
# Date 1382005937 -7200
# Node ID e78e490102432809bc1ffd811d89f97a0b4a2a64
# Parent  a9d953866a5037366e171283846b5070735bef67
allow no tags in createAnnotation widget and version number 1.51.6

diff -r a9d953866a50 -r e78e49010243 src/ldt/ldt/__init__.py
--- a/src/ldt/ldt/__init__.py	Wed Oct 09 10:14:55 2013 +0200
+++ b/src/ldt/ldt/__init__.py	Thu Oct 17 12:32:17 2013 +0200
@@ -1,6 +1,6 @@
 __all__ = ["VERSION", "get_version", "__version__"]
 
-VERSION = (1, 51, 5, "final", 0)
+VERSION = (1, 51, 6, "final", 0)
 
 
 def get_version():
diff -r a9d953866a50 -r e78e49010243 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_iframe.html
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_iframe.html	Wed Oct 09 10:14:55 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_iframe.html	Thu Oct 17 12:32:17 2013 +0200
@@ -15,7 +15,7 @@
 		<meta http-equiv="Expires" content="-1" />
 		<title>Ligne de Temps - IRI - Metadata Player</title>
 		<script type="text/javascript">
-			{% if tag_titles %}
+			{% if tag_titles or tag_titles == "" %}
 				tag_string= '{{ tag_titles }}';
 				tag_titles_array=tag_string.split(",");
 			{% endif %}
@@ -152,7 +152,7 @@
 			            api_endpoint_template: "{% absurl 'api_dispatch_list' resource_name='annotations' api_name='1.0' %}",
 			            api_method: "PUT",
 			            after_send_timeout: 8000,
-			            {% if tag_titles %}
+			            {% if tag_titles or tag_titles == "" %}
 			           		tag_titles : tag_titles_array,
 			           	{% else %}
 			            	tag_titles : false,
diff -r a9d953866a50 -r e78e49010243 src/ldt/ldt/ldt_utils/views/workspace.py
--- a/src/ldt/ldt/ldt_utils/views/workspace.py	Wed Oct 09 10:14:55 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/views/workspace.py	Thu Oct 17 12:32:17 2013 +0200
@@ -177,7 +177,7 @@
         rend_dict["annotations_list"] = {'true': True, 'false': False, "0": False, "1": True}.get(request.GET.get("annotations_list").lower())
         rend_dict["player_width"] = 550
     if request.GET.has_key("tag_titles"):
-        rend_dict["tag_titles"] = request.GET.get("tag_titles") 
+        rend_dict["tag_titles"] = request.GET.get("tag_titles")
     if request.GET.has_key("sparkline"):
         rend_dict["sparkline"] = request.GET.get("sparkline")
         if request.GET.has_key("sparkline_lineColor"):
diff -r a9d953866a50 -r e78e49010243 src/ldt/ldt/static/ldt/js/projectscontents.js
--- a/src/ldt/ldt/static/ldt/js/projectscontents.js	Wed Oct 09 10:14:55 2013 +0200
+++ b/src/ldt/ldt/static/ldt/js/projectscontents.js	Thu Oct 17 12:32:17 2013 +0200
@@ -93,64 +93,65 @@
     // remove all qtip
     $(".qtip").remove();
     
-    //if(target.realVal().length > 0) {
-    if(target.val().length > 0) {
-        target.nextAll(".searchclear").show();
-    }
-    
-    target.next(".searchajaxloader").show();
-    target.nextAll(".searchclear").hide();
-    //var filterVal = "_" + encodeURIComponent(target.realVal());
-    var filterVal = "_" + encodeURIComponent(target.val());
-    url = url.replace('__FILTER__',filterVal);
-    url = url.replace('__ID_GROUP__',$('#id_group').val());
-    var data_obj = null;
-    if(num_page || tag_filter){
-    	data_obj = {};
-    	if(num_page){
-    		data_obj["num_page"] = num_page;
-    	}
-    	if(tag_filter){
-    		data_obj["tag_filter"] = tag_filter;
-    	}
-    }
-    if(data_obj!=null){
-        $.ajax({
-            url: url,
-            cache: false,
-            type: 'GET',
-            data: data_obj,
-            success: function(data, status, request) {
-            	$(container_selector).html(data);
-                target.next(".searchajaxloader").hide();
-                //if(target.realVal().length > 0) {
-                if(target.val().length > 0) {
-                    target.nextAll(".searchclear").show();
-                }
-                init_events($(container_selector));
-                target.removeAttr('timer');
-            },
-    		error: function(jqXHR, textStatus, errorThrown) {
-    			resp = $.parseJSON(jqXHR.responseText);
-    			alert(resp.message);
-    		}
-        });
-    }
-    else{
-        $.ajax({
-            url: url,
-            cache: false,
-            success: function(data, status, request) {
-            	$(container_selector).html(data);
-                target.next(".searchajaxloader").hide();
-                //if(target.realVal().length > 0) {
-                if(target.val().length > 0) {
-                    target.nextAll(".searchclear").show();
-                }
-                init_events($(container_selector));
-                target.removeAttr('timer');
-            }
-        });
+    if(target.val()) {
+	    if(target.val().length > 0) {
+	        target.nextAll(".searchclear").show();
+	    }
+	    
+	    target.next(".searchajaxloader").show();
+	    target.nextAll(".searchclear").hide();
+	    //var filterVal = "_" + encodeURIComponent(target.realVal());
+	    var filterVal = "_" + encodeURIComponent(target.val());
+	    url = url.replace('__FILTER__',filterVal);
+	    url = url.replace('__ID_GROUP__',$('#id_group').val());
+	    var data_obj = null;
+	    if(num_page || tag_filter){
+	    	data_obj = {};
+	    	if(num_page){
+	    		data_obj["num_page"] = num_page;
+	    	}
+	    	if(tag_filter){
+	    		data_obj["tag_filter"] = tag_filter;
+	    	}
+	    }
+	    if(data_obj!=null){
+	        $.ajax({
+	            url: url,
+	            cache: false,
+	            type: 'GET',
+	            data: data_obj,
+	            success: function(data, status, request) {
+	            	$(container_selector).html(data);
+	                target.next(".searchajaxloader").hide();
+	                //if(target.realVal().length > 0) {
+	                if(target.val().length > 0) {
+	                    target.nextAll(".searchclear").show();
+	                }
+	                init_events($(container_selector));
+	                target.removeAttr('timer');
+	            },
+	    		error: function(jqXHR, textStatus, errorThrown) {
+	    			resp = $.parseJSON(jqXHR.responseText);
+	    			alert(resp.message);
+	    		}
+	        });
+	    }
+	    else{
+	        $.ajax({
+	            url: url,
+	            cache: false,
+	            success: function(data, status, request) {
+	            	$(container_selector).html(data);
+	                target.next(".searchajaxloader").hide();
+	                //if(target.realVal().length > 0) {
+	                if(target.val().length > 0) {
+	                    target.nextAll(".searchclear").show();
+	                }
+	                init_events($(container_selector));
+	                target.removeAttr('timer');
+	            }
+	        });
+	    }
     }
 }
 
diff -r a9d953866a50 -r e78e49010243 src/ldt/ldt/static/ldt/metadataplayer/CreateAnnotation.js
--- a/src/ldt/ldt/static/ldt/metadataplayer/CreateAnnotation.js	Wed Oct 09 10:14:55 2013 +0200
+++ b/src/ldt/ldt/static/ldt/metadataplayer/CreateAnnotation.js	Thu Oct 17 12:32:17 2013 +0200
@@ -56,7 +56,7 @@
         at_time: "at",
         submit: "Submit",
         add_keywords_: "Add keywords:",
-        add_polemic_keywords_: "Add polemic keywords:",
+        add_polemic_keywords_: "Add polemic attributes :",
         your_name_: "Your name:",
         annotate_video: "Annotate this video",
         type_title: "Annotation title",
@@ -77,7 +77,7 @@
         at_time: "à",
         submit: "Envoyer",
         add_keywords_: "Ajouter des mots-clés\u00a0:",
-        add_polemic_keywords_: "Ajouter des mots-clés polémiques\u00a0:",
+        add_polemic_keywords_: "Ajouter des attributs polémiques\u00a0:",
         your_name_: "Votre nom\u00a0:",
         annotate_video: "Annoter cette vidéo",
         type_title: "Titre de l'annotation",
@@ -150,18 +150,24 @@
     this.tag_prefix = this.tag_prefix || "";
     
     if (this.tag_titles && !this.tags) {
-        this.tags = IriSP._(this.tag_titles).map(function(_tag_title) {
-            var _tag,
-                _tags = _this.source.getTags().searchByTitle(_tag_title, true);
-            if (_tags.length) {
-                _tag = _tags[0];
-            } else {
-                _tag = new IriSP.Model.Tag(false, _this.source);
-                _this.source.getTags().push(_tag);
-                _tag.title = _tag_title;
-            }
-            return _tag;
-        });
+		if(!(this.tag_titles.length==1 && this.tag_titles[0]=="")){
+			this.tags = IriSP._(this.tag_titles).map(function(_tag_title) {
+				var _tag,
+					_tags = _this.source.getTags().searchByTitle(_tag_title, true);
+				if (_tags.length) {
+					_tag = _tags[0];
+				} else {
+					_tag = new IriSP.Model.Tag(false, _this.source);
+					_this.source.getTags().push(_tag);
+					_tag.title = _tag_title;
+				}
+				return _tag;
+			});
+        }
+        else{
+        	// we forced no tags if this.tag_titles = [''] (and not false)
+        	this.tags = true;
+        }
     }
     if (!this.tags) {
         this.tags = this.source.getTags()