# HG changeset patch
# User cavaliet
# Date 1344355360 -7200
# Node ID 348c7ac4dac16e9ee22d81abab80d4f43b2b42a4
# Parent  93af6b5ad5acacef3727d64092681233d2cf9c1e
debug #31 #32

diff -r 93af6b5ad5ac -r 348c7ac4dac1 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/published_projects.html
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/published_projects.html	Tue Aug 07 15:49:18 2012 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/published_projects.html	Tue Aug 07 18:02:40 2012 +0200
@@ -67,7 +67,7 @@
 			<div class="span-8 projectscontentstitle" >{% trans "Published projects" %}
 			<a class='ldt_link_create_project' href="{% url ldt.ldt_utils.views.project.create_ldt_view %}" ><img class='icon_title' src="{{LDT_MEDIA_PREFIX}}img/page_add_large.png" alt="{% trans 'Create project' %}" title="{% trans 'Create project' %}" /></a></div>
 			<div class="span-4 last searchfielddiv" >
-			    <div class="searchfield rounded"><input id="searchprojectsinput" class="searchfieldinput searchfieldinputbase" value="{% trans 'search' %}" type="text" /><img id="projectsajaxloader" class="searchajaxloader" src="{{LDT_MEDIA_PREFIX}}/img/ajax-loader-16x16.gif" alt="loader"/><img id="projecsclear" class="searchclear" src="{{LDT_MEDIA_PREFIX}}img/clear-left.png"/></div>
+			    <div class="searchfield rounded"><input id="searchprojectsinput" class="searchfieldinput searchfieldinputbase" placeholder="{% trans 'search' %}" type="text" /><img id="projectsajaxloader" class="searchajaxloader" src="{{LDT_MEDIA_PREFIX}}/img/ajax-loader-16x16.gif" alt="loader"/><img id="projecsclear" class="searchclear" src="{{LDT_MEDIA_PREFIX}}img/clear-left.png"/></div>
 			</div>
 		</div>
 		<div class="span-12 last projectscontentsdiv" id="projectslistcontainer">
diff -r 93af6b5ad5ac -r 348c7ac4dac1 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/workspace_base.html
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/workspace_base.html	Tue Aug 07 15:49:18 2012 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/workspace_base.html	Tue Aug 07 18:02:40 2012 +0200
@@ -52,7 +52,7 @@
 			<div class="span-8 projectscontentstitle">{% trans "content list" %}
 			<a class='content_link_create' href="{% url ldt.ldt_utils.views.content.write_content %}" ><img class='icon_title' src="{{LDT_MEDIA_PREFIX}}img/film_add.png" alt="{% trans 'Create content' %}" title="{% trans 'Create content' %}" /></a></div>
 			<div class="span-4 last searchfielddiv" >
-			    <div class="searchfield rounded"><input id="searchcontentsinput" class="searchfieldinput searchfieldinputbase" value="{% trans 'search' %}" type="text" /><img id="contentsajaxloader" class="searchajaxloader" src="{{LDT_MEDIA_PREFIX}}/img/ajax-loader-16x16.gif" alt="loader"/><img id="contentsclear" class="searchclear" src="{{LDT_MEDIA_PREFIX}}img/clear-left.png"/></div>
+			    <div class="searchfield rounded"><input id="searchcontentsinput" class="searchfieldinput searchfieldinputbase" placeholder="{% trans 'search' %}" type="text" /><img id="contentsajaxloader" class="searchajaxloader" src="{{LDT_MEDIA_PREFIX}}/img/ajax-loader-16x16.gif" alt="loader"/><img id="contentsclear" class="searchclear" src="{{LDT_MEDIA_PREFIX}}img/clear-left.png"/></div>
 			</div>
 		</div>
 		<div class="span-12 last projectscontentsdiv" id="contentslistcontainer">
@@ -64,7 +64,7 @@
 			<div class="span-8 projectscontentstitle" >{% trans "My projects" %}
 			<a class='ldt_link_create_project' href="{% url ldt.ldt_utils.views.project.create_ldt_view %}" ><img class='icon_title' src="{{LDT_MEDIA_PREFIX}}img/page_add_large.png" alt="{% trans 'Create project' %}" title="{% trans 'Create project' %}" /></a></div>
 			<div class="span-4 last searchfielddiv" >
-			    <div class="searchfield rounded"><input id="searchprojectsinput" class="searchfieldinput searchfieldinputbase" value="{% trans 'search' %}" type="text" /><img id="projectsajaxloader" class="searchajaxloader" src="{{LDT_MEDIA_PREFIX}}/img/ajax-loader-16x16.gif" alt="loader"/><img id="projecsclear" class="searchclear" src="{{LDT_MEDIA_PREFIX}}img/clear-left.png"/></div>
+			    <div class="searchfield rounded"><input id="searchprojectsinput" class="searchfieldinput searchfieldinputbase" placeholder="{% trans 'search' %}" type="text" /><img id="projectsajaxloader" class="searchajaxloader" src="{{LDT_MEDIA_PREFIX}}/img/ajax-loader-16x16.gif" alt="loader"/><img id="projecsclear" class="searchclear" src="{{LDT_MEDIA_PREFIX}}img/clear-left.png"/></div>
 			</div>
 		</div>
 		<div class="span-12 last projectscontentsdiv" id="projectslistcontainer">
diff -r 93af6b5ad5ac -r 348c7ac4dac1 src/ldt/ldt/static/ldt/js/projectscontents.js
--- a/src/ldt/ldt/static/ldt/js/projectscontents.js	Tue Aug 07 15:49:18 2012 +0200
+++ b/src/ldt/ldt/static/ldt/js/projectscontents.js	Tue Aug 07 18:02:40 2012 +0200
@@ -1,20 +1,4 @@
 
-$.fn.realVal = function() {
-    var obj = $(this[0]);
-    if(obj.val) {
-        if(obj.val() === obj.attr('defaultText')) {
-            return '';
-        }
-        else {
-            return obj.val();
-        }
-    }
-    else {
-        return null;
-    }
-};
-
-
 function init_events_base(base_node, embed_url) {
 
     $('.ldt_link_embed',base_node).click(function(e) {
@@ -135,71 +119,65 @@
     // remove all qtip
     $(".qtip").remove();
     
-    if(target.realVal().length > 0) {
+    //if(target.realVal().length > 0) {
+    if(target.val().length > 0) {
         target.nextAll(".searchclear").show();
     }
-
-    if(target.attr('timer')) {
-        clearTimeout(target.attr('timer'));
+    
+    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;
+    	}
     }
-
-    target.attr(
-        'timer',
-        setTimeout(function() {
-            target.next(".searchajaxloader").show();
-            target.nextAll(".searchclear").hide();
-            var filterVal = "_" + encodeURIComponent(target.realVal());
-            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(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) {
-	                        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) {
-	                        target.nextAll(".searchclear").show();
-	                    }
-	                    init_events($(container_selector));
-	                    target.removeAttr('timer');
-	                }
-	            });
-            }
-        },
-        300)
-    );
+        });
+    }
 }
 
 function init_events_contents(base_node, embed_url, content_filter_url, project_filter_url) {
@@ -498,47 +476,25 @@
 
 
 function searchFieldInit(input_list_init) {
-
     $(".searchfieldinputbase").keydown(function (e) {
          if(e.which === 27) {
               $(e.target).blur();
               $(e.target).next(".searchajaxloader").hide();
          }
-    });   
-         
-    $('.searchfieldinput').each(function(i) {
-         var sbox = $(this);
-         if(sbox.val() !== '') {
-             sbox.attr('defaultText', sbox.val());
-         }
-    
-         sbox.focus(function() {
-             box = $(this);
-             if(box.val() === box.attr('defaultText')) {
-                 box.val('');
-                 box.toggleClass("searchfieldinput");
-             }
-         });
-    
-         sbox.blur(function() {
-             var box = $(this);
-             if(box.val() === '' && box.attr('defaultText')) {
-                 box.val(box.attr('defaultText'));
-                 box.toggleClass("searchfieldinput");
-             }
-         });
-                  
     });
 
     $.each(input_list_init, function(index, value) {
         $(value['input_selector']).keyup(function (e) {
-            searchCallback(e.target, value['container_selector'], value['url']);
+        	// Validate search only if key is enter or if the call does not come from keyboard
+        	if(e.which===13 || e.which==undefined){
+        		searchCallback(e.target, value['container_selector'], value['url']);
+        	}
         });
     });
     
     $('.searchclear').click(function(e) {
         var box = $(e.target).parent().find("input");
-        box.val(box.attr('defaultText'));
+        box.val("");
         box.addClass("searchfieldinput");
         box.blur();
         box.keyup();