Merge branch 'design_team' into ldap

Conflicts:
	Gemfile
	app/models/ad_banner.rb

app/assets/javascripts/inc/search.js

@@ -0,0 +1,36 @@
+// JavaScript Document
+
+// can copy code to any of ur desired javascsript 
+
+//extended jquery to search fast.
+$.extend($.expr[':'], {
+	'containsi': function (elem, i, match, array) {
+		return (elem.textContent || elem.innerText || '').toLowerCase().indexOf((match[3] || "").toLowerCase()) >= 0;
+	}
+});
+var interval,sval;
+$(document).ready(function(){
+	$("#user_filter").keyup(function(e){
+		if((e.which>96 && e.which<123) || (e.which>64 && e.which<92) || (e.which == 32) || (e.which == 8)){ 
+			sval = $(this).val();
+			$(".checkbox").popover("hide");
+			$("div.checkblock").hide();
+			clearInterval(interval);
+			interval = setInterval(waitForSearch,1000);
+		}
+	})
+})
+var waitForSearch = function(){
+	if(sval){
+		var totalfoundbyname = $("div#users_checkbox_ary label.member-name:containsi("+sval+")").length
+		if(totalfoundbyname!=0){
+			$("div#users_checkbox_ary label.member-name:containsi("+sval+")").parent().parent().show();				
+		}else if(totalfoundbyname==0){
+			$("div#users_checkbox_ary div.for_unit:containsi("+sval+")").parent().show();
+		}	
+	}else{
+		$(".checkbox").popover('hide');	
+		$("div.checkblock").show();
+	}
+	clearInterval(interval);
+}