rework autocomplete: css work

diff --git a/js/autocomplete.js b/js/autocomplete.js
index aa4494b714dad5f210ef9bce28fa61983cd0c7f1..1f7df011d32ea6f645c345891ab67a72bed8b98f 100644 (file)
--- a/js/autocomplete.js
+++ b/js/autocomplete.js
@@ -1,10 +1,14 @@
 /**
- * Red people autocomplete
+ * Friendica people autocomplete
  *
  * require jQuery, jquery.textcomplete
  */
 function contact_search(term, callback, backend_url, type) {
 
+       // Check if there is a conversation id to include the unkonwn contacts of the conversation
+       var conv_id = document.activeElement.id.match(/\d+$/);
+
+
        // Check if there is a cached result that contains the same information we would get with a full server-side search
        var bt = backend_url+type;
        if(!(bt in contact_search.cache)) contact_search.cache[bt] = {};
@@ -27,6 +31,9 @@ function contact_search(term, callback, backend_url, type) {
                type:type,
        };
 
+       if(conv_id !== null)
+               postdata['conversation'] = conv_id[0];
+
 
        $.ajax({
                type:'POST',
@@ -54,7 +61,7 @@ function contact_format(item) {
                var desc = ((item.label) ? item.nick + ' ' + item.label : item.nick);
                if(typeof desc === 'undefined') desc = '';
                if(desc) desc = ' ('+desc+')';
-               return "<div class='{0}' title='{4}'><img class='dropdown-menu-img-sm' src='{1}'><span class='contactname'>{2}</span><span class='dropdown-sub-text'>{3}</span><div class='clear'></div></div>".format(item.taggable, item.photo, item.name, desc, item.link);
+               return "<div class='{0}' title='{4}'><img class='acpopup-img' src='{1}'><span class='acpopup-contactname'>{2}</span><span class='acpopup-sub-text'>{3}</span><div class='clear'></div></div>".format(item.taggable, item.photo, item.name, desc, item.link);
        }
        else
                return "<div>" + item.text + "</div>";
@@ -190,3 +197,163 @@ function submit_form(e) {
                        a.on('textComplete:select', function(e, value, strategy) { onselect(value); });
        };
 })( jQuery );
+
+
+/**
+ * Friendica people autocomplete legacy
+ * code which is needed for tinymce
+ *
+ * require jQuery, jquery.textareas
+ */
+
+function ACPopup(elm,backend_url){
+       this.idsel=-1;
+       this.element = elm;
+       this.searchText="";
+       this.ready=true;
+       this.kp_timer = false;
+       this.url = backend_url;
+
+       this.conversation_id = null;
+       var conv_id = this.element.id.match(/\d+$/);
+       if (conv_id) this.conversation_id = conv_id[0];
+       console.log("ACPopup elm id",this.element.id,"conversation",this.conversation_id);
+
+       var w = 530;
+       var h = 130;
+
+
+       if(tinyMCE.activeEditor == null) {
+               style = $(elm).offset();
+               w = $(elm).width();
+               h = $(elm).height();
+       }
+       else {
+               // I can't find an "official" way to get the element who get all
+               // this fraking thing that is tinyMCE.
+               // This code will broke again at some point...
+               var container = $(tinyMCE.activeEditor.getContainer()).find("table");
+               style = $(container).offset();
+               w = $(container).width();
+               h = $(container).height();
+       }
+
+       style.top=style.top+h;
+       style.width = w;
+       style.position = 'absolute';
+       /*      style['max-height'] = '150px';
+               style.border = '1px solid red';
+               style.background = '#cccccc';
+
+               style.overflow = 'auto';
+               style['z-index'] = '100000';
+       */
+       style.display = 'none';
+
+       this.cont = $("<div class='acpopup-mce'></div>");
+       this.cont.css(style);
+
+       $("body").append(this.cont);
+    }
+
+ACPopup.prototype.close = function(){
+       $(this.cont).remove();
+       this.ready=false;
+}
+ACPopup.prototype.search = function(text){
+       var that = this;
+       this.searchText=text;
+       if (this.kp_timer) clearTimeout(this.kp_timer);
+       this.kp_timer = setTimeout( function(){that._search();}, 500);
+}
+
+ACPopup.prototype._search = function(){
+       console.log("_search");
+       var that = this;
+       var postdata = {
+               start:0,
+               count:100,
+               search:this.searchText,
+               type:'c',
+               conversation: this.conversation_id,
+       }
+
+       $.ajax({
+               type:'POST',
+               url: this.url,
+               data: postdata,
+               dataType: 'json',
+               success:function(data){
+                       that.cont.html("");
+                       if (data.tot>0){
+                               that.cont.show();
+                               $(data.items).each(function(){
+                                       var html = "<img src='{0}' height='16px' width='16px'>{1} ({2})".format(this.photo, this.name, this.nick);
+                                       var nick = this.nick.replace(' ','');
+                                       if (this.id!=='')  nick += '+' + this.id;
+                                       that.add(html, nick + ' - ' + this.link);
+                               });
+                       } else {
+                               that.cont.hide();
+                       }
+               }
+       });
+
+}
+
+ACPopup.prototype.add = function(label, value){
+       var that=this;
+       var elm = $("<div class='acpopupitem' title='"+value+"'>"+label+"</div>");
+       elm.click(function(e){
+               t = $(this).attr('title').replace(new RegExp(' \- .*'),'');
+               if(typeof(that.element.container) === "undefined") {
+                       el=$(that.element);
+                       sel = el.getSelection();
+                       sel.start = sel.start- that.searchText.length;
+                       el.setSelection(sel.start,sel.end).replaceSelectedText(t+' ').collapseSelection(false);
+                       that.close();
+               }
+               else {
+                       txt = tinyMCE.activeEditor.getContent();
+                       //                      alert(that.searchText + ':' + t);
+                       newtxt = txt.replace('@' + that.searchText,'@' + t +' ');
+                       tinyMCE.activeEditor.setContent(newtxt);
+                       tinyMCE.activeEditor.focus();
+                       that.close();
+               }
+       });
+       $(this.cont).append(elm);
+}
+
+ACPopup.prototype.onkey = function(event){
+       if (event.keyCode == '13') {
+               if(this.idsel>-1) {
+                       this.cont.children()[this.idsel].click();
+                       event.preventDefault();
+               }
+               else
+                       this.close();
+       }
+       if (event.keyCode == '38') { //cursor up
+               cmax = this.cont.children().size()-1;
+               this.idsel--;
+               if (this.idsel<0) this.idsel=cmax;
+               event.preventDefault();
+       }
+       if (event.keyCode == '40' || event.keyCode == '9') { //cursor down
+               cmax = this.cont.children().size()-1;
+               this.idsel++;
+               if (this.idsel>cmax) this.idsel=0;
+               event.preventDefault();
+       }
+
+       if (event.keyCode == '38' || event.keyCode == '40' || event.keyCode == '9') {
+               this.cont.children().removeClass('selected');
+               $(this.cont.children()[this.idsel]).addClass('selected');
+       }
+
+       if (event.keyCode == '27') { //ESC
+               this.close();
+       }
+}
+

diff --git a/view/global.css b/view/global.css
index 8646bf8e448c532ee66165f6f7e77a831c847faf..ff2810292c31bde49fa4079797be7b37a256715b 100644 (file)
--- a/view/global.css
+++ b/view/global.css
@@ -177,12 +177,67 @@ key { display: inline; background-color: #eee; color: #666; padding:0.2em; font-
 
 /* fields help text */
 .field .field_help {
-    clear: left;
+  clear: left;
 }
 
 /* notifications unseen */
 .notify-unseen { background-color: #cceeFF; }
 
+/* autocomplete popup */
+
+ul.acpopup {
+  list-style: none;
+  float: left;
+  min-width: 160px;
+  padding: 5px 0;
+  margin: 2px 0 0;
+}
+nav .acpopup {
+  width: 290px;
+  margin-left: -35px;
+  max-height: 450px;
+  max-width: 300px;
+  overflow-y: auto;
+  overflow-x: hidden;
+  margin-top: 0px;
+}
+img.acpopup-img {
+  float: left;
+  width: 36px;
+  height: 36px;
+  margin-right: 5px;
+  vertical-align: middle;
+}
+.acpopup-contactname {
+  padding-top: 2px;
+  font-weight: bold;
+  line-height: 1em;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: block;
+}
+.acpopup-sub-text {
+  color: #777;
+  font-size: 0.833em;
+  line-height: 1em;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: block;
+}
+.textcomplete-item a {
+  color: inherit;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  clear: both;
+  white-space: nowrap;
+  padding: 3px 20px;
+  display: block;
+}
+.textcomplete-item a:hover {
+  text-decoration: none;
+}
+
 /* plain text editor upload/select popup */
 
 .fbrowser .path a { padding: 5px; }

diff --git a/view/templates/msg-header.tpl b/view/templates/msg-header.tpl
index 86598bbf6ce7d6e612fd8a08935a4e4b93c6c2f9..9b1a92ef5fc9938d47d26d354660c43017902c59 100644 (file)
--- a/view/templates/msg-header.tpl
+++ b/view/templates/msg-header.tpl
@@ -44,7 +44,7 @@ if(plaintext != 'none') {
        });
 }
 else
-       $("#prvmail-text").contact_autocomplete(baseurl+"/acl");
+       $("#prvmail-text").editor_autocomplete(baseurl+"/acl");
 
 
 </script>

diff --git a/view/templates/wallmsg-header.tpl b/view/templates/wallmsg-header.tpl
index f03f496fe2948d060e2eb9db03b03f4b1a365480..2d4cd23797698ac4403c13809a93b6670886885d 100644 (file)
--- a/view/templates/wallmsg-header.tpl
+++ b/view/templates/wallmsg-header.tpl
@@ -44,7 +44,7 @@ if(plaintext != 'none') {
        });
 }
 else
-       $("#prvmail-text").contact_autocomplete(baseurl+"/acl");
+       $("#prvmail-text").editor_autocomplete(baseurl+"/acl");
 
 
 </script>

diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index c004eb53d0ce85c4c1af77be3431bbd4750235e7..e5cc39046d9eb20db020111fda69bc4c25e04d55 100644 (file)
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -144,7 +144,7 @@ nav #banner #logo-text a:hover { text-decoration: none; }
     height: 15px;
        margin-top: 67px;
        margin-right: 2px;
-       //padding: 6px 10px;
+       /*padding: 6px 10px;*/
        padding: 6px 3px;
        float: left;
        bottom: 140px;
@@ -244,7 +244,7 @@ section {
        display:block;
        float:left;
        padding: 0.4em;
-       //margin-right: 1em;
+       /*margin-right: 1em;*/
        margin-right: 3px ;
 }
 .tab.active {
@@ -3288,6 +3288,12 @@ aside input[type='text'] {
 
 /* autocomplete popup */
 .acpopup {
+       background-color:#ffffff;
+       overflow:auto;
+       z-index:100000;
+       border:1px solid #cccccc;
+}
+.acpopup-mce {
        max-height:150px;
        background-color:#ffffff;
        overflow:auto;
@@ -3306,6 +3312,12 @@ aside input[type='text'] {
 .acpopupitem.selected {
        color: #FFFFFF; background: #3465A4;
 }
+.textcomplete-item.active {
+       color: #FFFFFF; background: #3465A4;
+}
+.active a .acpopup-sub-text {
+       color: #fff;
+}
 
 /* popup notifications */
 div.jGrowl div.notice {

diff --git a/view/theme/frost-mobile/js/main.js b/view/theme/frost-mobile/js/main.js
index 9eac71be8344d1767aec5413b18ebcecb3f36da8..d24e41e8c6660bdf608fd6ce71636561c5122446 100644 (file)
--- a/view/theme/frost-mobile/js/main.js
+++ b/view/theme/frost-mobile/js/main.js
@@ -389,7 +389,7 @@
                                $('body').css('cursor', 'auto');
                        }
                        /* autocomplete @nicknames */
-                       $(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl");
+                       $(".comment-edit-form  textarea").editor_autocomplete(baseurl+"/acl");
 
                        // setup videos, since VideoJS won't take care of any loaded via AJAX
                        if(typeof videojs != 'undefined') videojs.autoSetup();

diff --git a/view/theme/frost-mobile/js/theme.js b/view/theme/frost-mobile/js/theme.js
index 8133c602c86c0935894ad3763c2c90167d8d291a..c0213708749d46b8dd12cd6010d36a032fdd7b5c 100644 (file)
--- a/view/theme/frost-mobile/js/theme.js
+++ b/view/theme/frost-mobile/js/theme.js
@@ -121,7 +121,7 @@ $(document).ready(function() {
                        a.setOptions({ params: { type: 'a' }});
                        break;
                case 'display-head':
-                       $(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
+                       $(".comment-wwedit-wrapper textarea").editor_autocomplete(baseurl+"/acl");
                        break;
                default:
                        break;
@@ -286,7 +286,7 @@ function initEditor(cb){
                if(plaintext == 'none') {
 //                     $("#profile-jot-text-loading").hide();
                        $("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
-                       $("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
+                       $("#profile-jot-text").editor_autocomplete(baseurl+"/acl");
                        editor = true;
 /*                     $("a#jot-perms-icon").colorbox({
                                'inline' : true,

diff --git a/view/theme/frost-mobile/style.css b/view/theme/frost-mobile/style.css
index 400b23c10b38b2f2e4f73e335c2d833a31bcf476..24373eda54e64cbb35e67f24f88103d98ad18cde 100644 (file)
--- a/view/theme/frost-mobile/style.css
+++ b/view/theme/frost-mobile/style.css
@@ -4160,6 +4160,64 @@ aside input[type='text'] {
 .acpopupitem.selected {\r
        color: #FFFFFF; background: #3465A4;\r
 }\r
+ul.acpopup {\r
+       list-style: none;\r
+       float: left;\r
+       min-width: 160px;\r
+       padding: 5px 0;\r
+       margin: 2px 0 0;\r
+}\r
+nav .acpopup {\r
+       width: 290px;\r
+       margin-left: -35px;\r
+       max-height: 450px;\r
+       max-width: 300px;\r
+       overflow-y: auto;\r
+       overflow-x: hidden;\r
+       margin-top: 0px;\r
+}\r
+img.acpopup-img {\r
+       float: left;\r
+       width: 36px;\r
+       height: 36px;\r
+       margin-right: 5px;\r
+       vertical-align: middle;\r
+}\r
+.acpopup-contactname {\r
+       padding-top: 2px;\r
+       font-weight: bold;\r
+       line-height: 1em;\r
+       white-space: nowrap;\r
+       overflow: hidden;\r
+       text-overflow: ellipsis;\r
+       display: block;\r
+}\r
+.acpopup-sub-text {\r
+       color: #777;\r
+       font-size: 0.833em;\r
+       line-height: 1em;\r
+       overflow: hidden;\r
+       text-overflow: ellipsis;\r
+       display: block;\r
+}\r
+.textcomplete-item a {\r
+       color: inherit;\r
+       overflow: hidden;\r
+       text-overflow: ellipsis;\r
+       clear: both;\r
+       white-space: nowrap;\r
+       padding: 3px 20px;\r
+       display: block;\r
+}\r
+.textcomplete-item a:hover {\r
+       text-decoration: none;\r
+}\r
+.textcomplete-item.active {\r
+       color: #FFFFFF; background: #3465A4;\r
+}\r
+.active a .acpopup-sub-text {\r
+       color: #fff;\r
+}\r
 \r
 /* popup notifications */\r
 div.jGrowl div.notice {\r

diff --git a/view/theme/frost-mobile/templates/end.tpl b/view/theme/frost-mobile/templates/end.tpl
index 8d4b26bdcbe155ac0eb7cd3d9aedc2caf5bc13fe..c1acbfb2a6552997908b5da3090ecd8ddc449d49 100644 (file)
--- a/view/theme/frost-mobile/templates/end.tpl
+++ b/view/theme/frost-mobile/templates/end.tpl
@@ -7,7 +7,8 @@
 <script type="text/javascript" src="{{$baseurl}}/library/jgrowl/jquery.jgrowl_minimized.js"></script>
 <script type="text/javascript" src="{{$baseurl}}/library/datetimepicker/jquery.datetimepicker.js"></script>
 
-<script type="text/javascript" src="{{$baseurl}}/js/fk.autocomplete.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/library/jquery-textcomplete/jquery.textcomplete.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/js/autocomplete.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/acl.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/js/webtoolkit.base64.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/main.js" ></script>

diff --git a/view/theme/frost/js/main.js b/view/theme/frost/js/main.js
index 5483ad6bc33661c6be2dda260bdb6a038e309fa9..733064b30df3793258baa6d890d2999469c4e9f7 100644 (file)
--- a/view/theme/frost/js/main.js
+++ b/view/theme/frost/js/main.js
@@ -402,7 +402,7 @@
                                $('body').css('cursor', 'auto');
                        }
                        /* autocomplete @nicknames */
-                       $(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl");
+                       $(".comment-edit-form  textarea").editor_autocomplete(baseurl+"/acl");
                
                        collapseHeight();
 

diff --git a/view/theme/frost/js/theme.js b/view/theme/frost/js/theme.js
index a14a034bc15ae67eab929f772e74e1cf9c0037a2..4418c1f3c42c08e75ebd94dbe43fa51ff5d3ba4c 100644 (file)
--- a/view/theme/frost/js/theme.js
+++ b/view/theme/frost/js/theme.js
@@ -232,7 +232,7 @@ $(document).ready(function() {
                        a.setOptions({ params: { type: 'a' }});
                        break;
                case 'display-head':
-                       $(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
+                       $(".comment-wwedit-wrapper textarea").editor_autocomplete(baseurl+"/acl");
                        break;
                default:
                        break;
@@ -587,7 +587,7 @@ function initEditor(cb){
                        plaintextFn : function() {
                                $("#profile-jot-text-loading").hide();
                                $("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
-                               $("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
+                               $("#profile-jot-text").editor_autocomplete(baseurl+"/acl");
                                $(".jothidden").show();
                                if (typeof cb!="undefined") cb();
                        }
@@ -660,7 +660,7 @@ function msgInitEditor() {
                        });
                },
                plaintextFn : function() {
-                       $("#prvmail-text").contact_autocomplete(baseurl+"/acl");
+                       $("#prvmail-text").editor_autocomplete(baseurl+"/acl");
                }
        }
        InitMCEEditor(editorData);

diff --git a/view/theme/frost/style.css b/view/theme/frost/style.css
index 3dd400c76b396e2d752304cdb05f93c5212d136a..fe07ad26515ed8d8a8fd11325fee9575618e73c3 100644 (file)
--- a/view/theme/frost/style.css
+++ b/view/theme/frost/style.css
@@ -4010,13 +4010,15 @@ aside input[type='text'] {
 
 
 /* autocomplete popup */
-.acpopup {
-       max-height:150px;
+.acpopup, .acpopup-mce {
        background-color:#ffffff;
        overflow:auto;
        z-index:100000;
        border:1px solid #cccccc;
 }
+.acpopup-mce {
+       max-height:150px;
+}
 .acpopupitem {
        background-color:#ffffff; padding: 4px;
        clear:left;
@@ -4030,6 +4032,65 @@ aside input[type='text'] {
        color: #FFFFFF; background: #3465A4;
 }
 
+ul.acpopup {
+       list-style: none;
+       float: left;
+       min-width: 160px;
+       padding: 5px 0;
+       margin: 2px 0 0;
+}
+nav .acpopup {
+       width: 290px;
+       margin-left: -35px;
+       max-height: 450px;
+       max-width: 300px;
+       overflow-y: auto;
+       overflow-x: hidden;
+       margin-top: 0px;
+}
+img.acpopup-img {
+       float: left;
+       width: 36px;
+       height: 36px;
+       margin-right: 5px;
+       vertical-align: middle;
+}
+.acpopup-contactname {
+       padding-top: 2px;
+       font-weight: bold;
+       line-height: 1em;
+       white-space: nowrap;
+       overflow: hidden;
+       text-overflow: ellipsis;
+       display: block;
+}
+.acpopup-sub-text {
+       color: #777;
+       font-size: 0.833em;
+       line-height: 1em;
+       overflow: hidden;
+       text-overflow: ellipsis;
+       display: block;
+}
+.textcomplete-item a {
+       color: inherit;
+       overflow: hidden;
+       text-overflow: ellipsis;
+       clear: both;
+       white-space: nowrap;
+       padding: 3px 20px;
+       display: block;
+}
+.textcomplete-item a:hover {
+       text-decoration: none;
+}
+.textcomplete-item.active {
+       color: #FFFFFF; background: #3465A4;
+}
+.active a .acpopup-sub-text {
+       color: #fff;
+}
+
 /* popup notifications */
 div.jGrowl div.notice {
   background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;

diff --git a/view/theme/frost/templates/end.tpl b/view/theme/frost/templates/end.tpl
index 4242f80c819707cf7796ba10d2072ccc75cf9eda..e864a9498dee892f1a79dfbac2076680e478d30c 100644 (file)
--- a/view/theme/frost/templates/end.tpl
+++ b/view/theme/frost/templates/end.tpl
@@ -19,7 +19,8 @@
 
 <script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/acl.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/js/webtoolkit.base64.js" ></script>
-<script type="text/javascript" src="{{$baseurl}}/js/fk.autocomplete.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/library/jquery-textcomplete/jquery.textcomplete.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/js/autocomplete.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/main.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/theme.js"></script>
 

diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css
index 847017ee5bf36b361b3bacafae855ea930329285..04e7a2ad54e47f37999cdd8dd8b861b28b255c19 100644 (file)
--- a/view/theme/quattro/dark/style.css
+++ b/view/theme/quattro/dark/style.css
@@ -463,7 +463,7 @@ a:hover {
   text-decoration: underline;
 }
 blockquote {
-  background: #FFFFFF;
+  background: #ffffff;
   padding: 1em;
   margin-left: 1em;
   border-left: 1em solid #e6e6e6;
@@ -744,8 +744,12 @@ ul.menu-popup .toolbar a:hover {
 }
 /* autocomplete popup */
 .autocomplete,
-.acpopup {
+.acpopup-mce {
   max-height: 150px;
+}
+.autocomplete,
+.acpopup-mce,
+.acpopup {
   background-color: #ffffff;
   color: #2d2d2d;
   border: 1px solid #364e59;
@@ -774,6 +778,15 @@ ul.menu-popup .toolbar a:hover {
 .acpopupitem.selected {
   background-color: #bdcdd4;
 }
+.textcomplete-item {
+  color: #2d2d2d;
+}
+.textcomplete-item a:hover {
+  color: #2d2d2d;
+}
+.textcomplete-item.active {
+  background-color: #bdcdd4;
+}
 #nav-notifications-menu {
   width: 400px;
   max-height: 550px;

diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css
index 4cfcb5927311f34fb4312faa8c8c436d4bf691dd..13f328d0269bd72f60750ac6b19054f82436d107 100644 (file)
--- a/view/theme/quattro/green/style.css
+++ b/view/theme/quattro/green/style.css
@@ -463,7 +463,7 @@ a:hover {
   text-decoration: underline;
 }
 blockquote {
-  background: #FFFFFF;
+  background: #ffffff;
   padding: 1em;
   margin-left: 1em;
   border-left: 1em solid #e6e6e6;
@@ -744,8 +744,12 @@ ul.menu-popup .toolbar a:hover {
 }
 /* autocomplete popup */
 .autocomplete,
-.acpopup {
+.acpopup-mce {
   max-height: 150px;
+}
+.autocomplete,
+.acpopup-mce,
+.acpopup {
   background-color: #ffffff;
   color: #2d2d2d;
   border: 1px solid #364e59;
@@ -774,6 +778,15 @@ ul.menu-popup .toolbar a:hover {
 .acpopupitem.selected {
   background-color: #ccff42;
 }
+.textcomplete-item {
+  color: #2d2d2d;
+}
+.textcomplete-item a:hover {
+  color: #2d2d2d;
+}
+.textcomplete-item.active {
+  background-color: #ccff42;
+}
 #nav-notifications-menu {
   width: 400px;
   max-height: 550px;

diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css
index 2ff7cfcb0c4b271d1dd2a6310777c7bb5b5518f1..5ad7e20284082c2ffcb12904bfd79c939e203865 100644 (file)
--- a/view/theme/quattro/lilac/style.css
+++ b/view/theme/quattro/lilac/style.css
@@ -420,7 +420,7 @@
 body {
   font-family: Liberation Sans, helvetica, arial, clean, sans-serif;
   font-size: 11px;
-  background-color: #F6ECF9;
+  background-color: #f6ecf9;
   color: #2d2d2d;
   margin: 50px 0 0 0;
   display: table;
@@ -463,7 +463,7 @@ a:hover {
   text-decoration: underline;
 }
 blockquote {
-  background: #FFFFFF;
+  background: #ffffff;
   padding: 1em;
   margin-left: 1em;
   border-left: 1em solid #e6e6e6;
@@ -744,8 +744,12 @@ ul.menu-popup .toolbar a:hover {
 }
 /* autocomplete popup */
 .autocomplete,
-.acpopup {
+.acpopup-mce {
   max-height: 150px;
+}
+.autocomplete,
+.acpopup-mce,
+.acpopup {
   background-color: #ffffff;
   color: #2d2d2d;
   border: 1px solid #364e59;
@@ -774,6 +778,15 @@ ul.menu-popup .toolbar a:hover {
 .acpopupitem.selected {
   background-color: #c0a3c7;
 }
+.textcomplete-item {
+  color: #2d2d2d;
+}
+.textcomplete-item a:hover {
+  color: #2d2d2d;
+}
+.textcomplete-item.active {
+  background-color: #c0a3c7;
+}
 #nav-notifications-menu {
   width: 400px;
   max-height: 550px;
@@ -1753,7 +1766,7 @@ span[id^="showmore-wrap"] {
   height: 20px;
   width: 500px;
   font-weight: bold;
-  border: 1px solid #F6ECF9;
+  border: 1px solid #f6ecf9;
 }
 #jot #jot-title:-webkit-input-placeholder {
   font-weight: normal;
@@ -1780,7 +1793,7 @@ span[id^="showmore-wrap"] {
   margin: 0;
   height: 20px;
   width: 200px;
-  border: 1px solid #F6ECF9;
+  border: 1px solid #f6ecf9;
 }
 #jot #jot-category:hover {
   border: 1px solid #999999;

diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 681cfcc3748634cf6eb0e9114b42ee1cd7873997..3360ce3373ee621f925d1cf58434191aa3d622b6 100644 (file)
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -265,9 +265,10 @@ ul.menu-popup {
 }
 
 /* autocomplete popup */
+.autocomplete, .acpopup-mce { max-height:150px; }
 .autocomplete,
+.acpopup-mce,
 .acpopup {
-       max-height:150px;
        background-color:@MenuBg;
        color: @Menu;
        border:1px solid @MenuBorder;
@@ -291,6 +292,15 @@ ul.menu-popup {
                background-color: @MenuItemHoverBg;
        }
 }
+.textcomplete-item {
+       color: @MenuItem;
+       a:hover{
+               color: @MenuItem;
+       }
+       &.active{
+               background-color: @MenuItemHoverBg;
+       }
+}
 
 
 #nav-notifications-menu {

diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css
index b9f094932ddb1c52949116df9ef1302c0bd00c70..141594960685a4869af3cb98184c0ce92599979c 100644 (file)
--- a/view/theme/smoothly/style.css
+++ b/view/theme/smoothly/style.css
@@ -4353,8 +4353,7 @@ ul.menu-popup {
 }
 
 /* autocomplete popup */
-.acpopup {
-       max-height: 150px;
+.acpopup, acpopup-mce {
        overflow: auto;
        z-index: 100000;
        color: #2e3436;
@@ -4371,6 +4370,10 @@ ul.menu-popup {
                -webkit-box-shadow: 0 0 8px #BDBDBD;
 }
 
+.acpopup-mce {
+       max-height: 150px;
+}
+
 .acpopupitem {
        color: #2e3436;
        padding: 4px;
@@ -4381,7 +4384,7 @@ ul.menu-popup {
        margin-right: 4px;
 }
 
-.acpopupitem.selected {
+.acpopupitem.selected, .textcomplete-item.active {
        color: #efefef;
        background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
        background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
@@ -4390,6 +4393,10 @@ ul.menu-popup {
        order-bottom: none;
 }
 
+.textcomplete-item a:hover, .textcomplete-item a:hover .acpopup-sub-text, .textcomplete-item.active a .acpopup-sub-text {
+       color: #efefef;
+}
+
 .qcomment {
        opacity: 0.8;
        filter: alpha(opacity=0);

diff --git a/view/theme/smoothly/templates/jot-header.tpl b/view/theme/smoothly/templates/jot-header.tpl
index f096d258238941ffa642c3188093a2b140f8380e..8b2666f0f3f147254694edbfa4be0f658b279081 100644 (file)
--- a/view/theme/smoothly/templates/jot-header.tpl
+++ b/view/theme/smoothly/templates/jot-header.tpl
@@ -12,7 +12,7 @@ function initEditor(cb){
                if(plaintext == 'none') {
                        $("#profile-jot-text-loading").hide();
                        $("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
-                       $("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
+                       $("#profile-jot-text").editor_autocomplete(baseurl+"/acl");
                        $(".jothidden").show();
                        editor = true;
                        $("a#jot-perms-icon").colorbox({

diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index defeec7023baa32cb21fd45b7fd1bf7d929b0555..ddf3df1dee2e7d8b7596304fb842ba706ff9f7ea 100644 (file)
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -430,7 +430,7 @@ code {
 .sidebar-group-li:hover, #sidebar-new-group:hover, #sidebar-edit-groups:hover,#forum-widget-collapse:hover,
 #sidebar-ungrouped:hover, .side-link:hover, .nets-ul li:hover, #forumlist-sidebar li:hover, #forumlist-sidebar-right li:hover,
 .nets-all:hover, .saved-search-li:hover, li.tool:hover, .admin.link:hover, aside h4 a:hover, right_aside h4 a:hover, #message-new:hover,
-#sidebar-photos-albums li:hover, .photos-upload-link:hover {
+#sidebar-photos-albums li:hover, .photos-upload-link:hover, .textcomplete-item.active {
   /* background-color: #ddd; */
 /*  background-color: #e5e5e5; */
   background-color: #F5F5F5;
@@ -900,15 +900,18 @@ ul.menu-popup .empty {
   color: #9eabb0;
 }
 /* autocomplete popup */
-.acpopup {
-  max-height: 150px;
+
+.acpopup, .acpopup-mce {
   background-color: #ffffff;
-  color: #2d2d2d;
   border: 1px solid #MenuBorder;
   overflow: auto;
   z-index: 100000;
   box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
 }
+acpopup-mce {
+  color: #2d2d2d;
+  max-height: 150px;
+}
 .acpopupitem {
   color: #2d2d2d;
   padding: 4px;
@@ -921,6 +924,16 @@ ul.menu-popup .empty {
 .acpopupitem.selected {
   background-color: #bdcdd4;
 }
+.textcomplete-item {
+  float: none;
+}
+.textcomplete-item a {
+  color: #737373;
+}
+.textcomplete-item a:hover {
+  padding: 3px 20px;
+}
+
 #nav-notifications-menu {
   width: 400px;
   max-height: 550px;