Merge pull request #758 from pafcu/autocomplete

Show autocomplete taggable with special color

2 files changed, 4 insertions, 31 deletions

diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index e62959a6c..ba71bb2f5 100644
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -24,7 +24,7 @@ function mysearch(term, callback, backend_url) {
 }
 
 function format(item) {
-	return "<img src='{0}' height='16px' width='16px'>{1} ({2})".format(item.photo, item.name, ((item.label) ? item.nick + ' ' + item.label : item.nick) )
+	return "<div class='{0}'><img src='{1}'>{2} ({3})</div>".format(item.taggable, item.photo, item.name, ((item.label) ? item.nick + ' ' + item.label : item.nick) )
 }
 
 function replace(item) {
@@ -54,6 +54,6 @@ function replace(item) {
 		template: function(item) { return item['icon'] + item['text'] },
 		replace: function(item) { return "$1"+item['text'] + ' '; },
 	}
-	this.textcomplete([contacts,smilies],{});
+	this.textcomplete([contacts,smilies],{className:'acpopup'});
   };
 })( jQuery );
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 4681ef5ba..d0b86982a 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1338,35 +1338,8 @@ footer {
 	margin-top: 10px;
 }
 
-
-
-/* autocomplete popup */
-.acpopup {
-	max-height:150px;
-	background-color:$acpopup_bgcolour;
-	overflow:auto;
-	border:1px solid $acpopup_bordercolour;
-}
-.acpopupitem {
-	background-color:$acpopup_bgcolour;
-	clear:left;
-}
-.acpopupitem.taggable {
-	background-color: $acpopup_tgbl_bgcolour;
-}
-.acpopupitem img {
-	float: left;
-	margin-right: 4px;
-}
-
-.acpopupitem:hover {
-	text-decoration: underline;
-	color: $acpopup_hovercolour;
-	cursor:pointer;
-}
-
-.acpopupitem.selected {
-	color: #FFFFFF; background: #3465A4;
+.acpopup li div.taggable {
+	color:#cc0000;
 }
 
 /* popup notifications */