rework autocomplete: css work
This commit is contained in:
parent
c42922f25f
commit
e3475bd587
20 changed files with 460 additions and 36 deletions
|
@ -1,10 +1,14 @@
|
||||||
/**
|
/**
|
||||||
* Red people autocomplete
|
* Friendica people autocomplete
|
||||||
*
|
*
|
||||||
* require jQuery, jquery.textcomplete
|
* require jQuery, jquery.textcomplete
|
||||||
*/
|
*/
|
||||||
function contact_search(term, callback, backend_url, type) {
|
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
|
// 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;
|
var bt = backend_url+type;
|
||||||
if(!(bt in contact_search.cache)) contact_search.cache[bt] = {};
|
if(!(bt in contact_search.cache)) contact_search.cache[bt] = {};
|
||||||
|
@ -27,6 +31,9 @@ function contact_search(term, callback, backend_url, type) {
|
||||||
type:type,
|
type:type,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
if(conv_id !== null)
|
||||||
|
postdata['conversation'] = conv_id[0];
|
||||||
|
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
type:'POST',
|
type:'POST',
|
||||||
|
@ -54,7 +61,7 @@ function contact_format(item) {
|
||||||
var desc = ((item.label) ? item.nick + ' ' + item.label : item.nick);
|
var desc = ((item.label) ? item.nick + ' ' + item.label : item.nick);
|
||||||
if(typeof desc === 'undefined') desc = '';
|
if(typeof desc === 'undefined') desc = '';
|
||||||
if(desc) desc = ' ('+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
|
else
|
||||||
return "<div>" + item.text + "</div>";
|
return "<div>" + item.text + "</div>";
|
||||||
|
@ -190,3 +197,163 @@ function submit_form(e) {
|
||||||
a.on('textComplete:select', function(e, value, strategy) { onselect(value); });
|
a.on('textComplete:select', function(e, value, strategy) { onselect(value); });
|
||||||
};
|
};
|
||||||
})( jQuery );
|
})( 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();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
|
@ -183,6 +183,61 @@ key { display: inline; background-color: #eee; color: #666; padding:0.2em; font-
|
||||||
/* notifications unseen */
|
/* notifications unseen */
|
||||||
.notify-unseen { background-color: #cceeFF; }
|
.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 */
|
/* plain text editor upload/select popup */
|
||||||
|
|
||||||
.fbrowser .path a { padding: 5px; }
|
.fbrowser .path a { padding: 5px; }
|
||||||
|
|
|
@ -44,7 +44,7 @@ if(plaintext != 'none') {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
$("#prvmail-text").contact_autocomplete(baseurl+"/acl");
|
$("#prvmail-text").editor_autocomplete(baseurl+"/acl");
|
||||||
|
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
|
@ -44,7 +44,7 @@ if(plaintext != 'none') {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
$("#prvmail-text").contact_autocomplete(baseurl+"/acl");
|
$("#prvmail-text").editor_autocomplete(baseurl+"/acl");
|
||||||
|
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
|
@ -144,7 +144,7 @@ nav #banner #logo-text a:hover { text-decoration: none; }
|
||||||
height: 15px;
|
height: 15px;
|
||||||
margin-top: 67px;
|
margin-top: 67px;
|
||||||
margin-right: 2px;
|
margin-right: 2px;
|
||||||
//padding: 6px 10px;
|
/*padding: 6px 10px;*/
|
||||||
padding: 6px 3px;
|
padding: 6px 3px;
|
||||||
float: left;
|
float: left;
|
||||||
bottom: 140px;
|
bottom: 140px;
|
||||||
|
@ -244,7 +244,7 @@ section {
|
||||||
display:block;
|
display:block;
|
||||||
float:left;
|
float:left;
|
||||||
padding: 0.4em;
|
padding: 0.4em;
|
||||||
//margin-right: 1em;
|
/*margin-right: 1em;*/
|
||||||
margin-right: 3px ;
|
margin-right: 3px ;
|
||||||
}
|
}
|
||||||
.tab.active {
|
.tab.active {
|
||||||
|
@ -3288,6 +3288,12 @@ aside input[type='text'] {
|
||||||
|
|
||||||
/* autocomplete popup */
|
/* autocomplete popup */
|
||||||
.acpopup {
|
.acpopup {
|
||||||
|
background-color:#ffffff;
|
||||||
|
overflow:auto;
|
||||||
|
z-index:100000;
|
||||||
|
border:1px solid #cccccc;
|
||||||
|
}
|
||||||
|
.acpopup-mce {
|
||||||
max-height:150px;
|
max-height:150px;
|
||||||
background-color:#ffffff;
|
background-color:#ffffff;
|
||||||
overflow:auto;
|
overflow:auto;
|
||||||
|
@ -3306,6 +3312,12 @@ aside input[type='text'] {
|
||||||
.acpopupitem.selected {
|
.acpopupitem.selected {
|
||||||
color: #FFFFFF; background: #3465A4;
|
color: #FFFFFF; background: #3465A4;
|
||||||
}
|
}
|
||||||
|
.textcomplete-item.active {
|
||||||
|
color: #FFFFFF; background: #3465A4;
|
||||||
|
}
|
||||||
|
.active a .acpopup-sub-text {
|
||||||
|
color: #fff;
|
||||||
|
}
|
||||||
|
|
||||||
/* popup notifications */
|
/* popup notifications */
|
||||||
div.jGrowl div.notice {
|
div.jGrowl div.notice {
|
||||||
|
|
|
@ -389,7 +389,7 @@
|
||||||
$('body').css('cursor', 'auto');
|
$('body').css('cursor', 'auto');
|
||||||
}
|
}
|
||||||
/* autocomplete @nicknames */
|
/* 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
|
// setup videos, since VideoJS won't take care of any loaded via AJAX
|
||||||
if(typeof videojs != 'undefined') videojs.autoSetup();
|
if(typeof videojs != 'undefined') videojs.autoSetup();
|
||||||
|
|
|
@ -121,7 +121,7 @@ $(document).ready(function() {
|
||||||
a.setOptions({ params: { type: 'a' }});
|
a.setOptions({ params: { type: 'a' }});
|
||||||
break;
|
break;
|
||||||
case 'display-head':
|
case 'display-head':
|
||||||
$(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
|
$(".comment-wwedit-wrapper textarea").editor_autocomplete(baseurl+"/acl");
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
@ -286,7 +286,7 @@ function initEditor(cb){
|
||||||
if(plaintext == 'none') {
|
if(plaintext == 'none') {
|
||||||
// $("#profile-jot-text-loading").hide();
|
// $("#profile-jot-text-loading").hide();
|
||||||
$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
|
$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
|
||||||
$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
|
$("#profile-jot-text").editor_autocomplete(baseurl+"/acl");
|
||||||
editor = true;
|
editor = true;
|
||||||
/* $("a#jot-perms-icon").colorbox({
|
/* $("a#jot-perms-icon").colorbox({
|
||||||
'inline' : true,
|
'inline' : true,
|
||||||
|
|
|
@ -4160,6 +4160,64 @@ aside input[type='text'] {
|
||||||
.acpopupitem.selected {
|
.acpopupitem.selected {
|
||||||
color: #FFFFFF; background: #3465A4;
|
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 */
|
/* popup notifications */
|
||||||
div.jGrowl div.notice {
|
div.jGrowl div.notice {
|
||||||
|
|
|
@ -7,7 +7,8 @@
|
||||||
<script type="text/javascript" src="{{$baseurl}}/library/jgrowl/jquery.jgrowl_minimized.js"></script>
|
<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}}/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}}/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}}/js/webtoolkit.base64.js" ></script>
|
||||||
<script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/main.js" ></script>
|
<script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/main.js" ></script>
|
||||||
|
|
|
@ -402,7 +402,7 @@
|
||||||
$('body').css('cursor', 'auto');
|
$('body').css('cursor', 'auto');
|
||||||
}
|
}
|
||||||
/* autocomplete @nicknames */
|
/* autocomplete @nicknames */
|
||||||
$(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl");
|
$(".comment-edit-form textarea").editor_autocomplete(baseurl+"/acl");
|
||||||
|
|
||||||
collapseHeight();
|
collapseHeight();
|
||||||
|
|
||||||
|
|
|
@ -232,7 +232,7 @@ $(document).ready(function() {
|
||||||
a.setOptions({ params: { type: 'a' }});
|
a.setOptions({ params: { type: 'a' }});
|
||||||
break;
|
break;
|
||||||
case 'display-head':
|
case 'display-head':
|
||||||
$(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
|
$(".comment-wwedit-wrapper textarea").editor_autocomplete(baseurl+"/acl");
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
@ -587,7 +587,7 @@ function initEditor(cb){
|
||||||
plaintextFn : function() {
|
plaintextFn : function() {
|
||||||
$("#profile-jot-text-loading").hide();
|
$("#profile-jot-text-loading").hide();
|
||||||
$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
|
$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
|
||||||
$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
|
$("#profile-jot-text").editor_autocomplete(baseurl+"/acl");
|
||||||
$(".jothidden").show();
|
$(".jothidden").show();
|
||||||
if (typeof cb!="undefined") cb();
|
if (typeof cb!="undefined") cb();
|
||||||
}
|
}
|
||||||
|
@ -660,7 +660,7 @@ function msgInitEditor() {
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
plaintextFn : function() {
|
plaintextFn : function() {
|
||||||
$("#prvmail-text").contact_autocomplete(baseurl+"/acl");
|
$("#prvmail-text").editor_autocomplete(baseurl+"/acl");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
InitMCEEditor(editorData);
|
InitMCEEditor(editorData);
|
||||||
|
|
|
@ -4010,13 +4010,15 @@ aside input[type='text'] {
|
||||||
|
|
||||||
|
|
||||||
/* autocomplete popup */
|
/* autocomplete popup */
|
||||||
.acpopup {
|
.acpopup, .acpopup-mce {
|
||||||
max-height:150px;
|
|
||||||
background-color:#ffffff;
|
background-color:#ffffff;
|
||||||
overflow:auto;
|
overflow:auto;
|
||||||
z-index:100000;
|
z-index:100000;
|
||||||
border:1px solid #cccccc;
|
border:1px solid #cccccc;
|
||||||
}
|
}
|
||||||
|
.acpopup-mce {
|
||||||
|
max-height:150px;
|
||||||
|
}
|
||||||
.acpopupitem {
|
.acpopupitem {
|
||||||
background-color:#ffffff; padding: 4px;
|
background-color:#ffffff; padding: 4px;
|
||||||
clear:left;
|
clear:left;
|
||||||
|
@ -4030,6 +4032,65 @@ aside input[type='text'] {
|
||||||
color: #FFFFFF; background: #3465A4;
|
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 */
|
/* popup notifications */
|
||||||
div.jGrowl div.notice {
|
div.jGrowl div.notice {
|
||||||
background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
|
background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
|
||||||
|
|
|
@ -19,7 +19,8 @@
|
||||||
|
|
||||||
<script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/acl.js" ></script>
|
<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/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/main.js" ></script>
|
||||||
<script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/theme.js"></script>
|
<script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/theme.js"></script>
|
||||||
|
|
||||||
|
|
|
@ -463,7 +463,7 @@ a:hover {
|
||||||
text-decoration: underline;
|
text-decoration: underline;
|
||||||
}
|
}
|
||||||
blockquote {
|
blockquote {
|
||||||
background: #FFFFFF;
|
background: #ffffff;
|
||||||
padding: 1em;
|
padding: 1em;
|
||||||
margin-left: 1em;
|
margin-left: 1em;
|
||||||
border-left: 1em solid #e6e6e6;
|
border-left: 1em solid #e6e6e6;
|
||||||
|
@ -744,8 +744,12 @@ ul.menu-popup .toolbar a:hover {
|
||||||
}
|
}
|
||||||
/* autocomplete popup */
|
/* autocomplete popup */
|
||||||
.autocomplete,
|
.autocomplete,
|
||||||
.acpopup {
|
.acpopup-mce {
|
||||||
max-height: 150px;
|
max-height: 150px;
|
||||||
|
}
|
||||||
|
.autocomplete,
|
||||||
|
.acpopup-mce,
|
||||||
|
.acpopup {
|
||||||
background-color: #ffffff;
|
background-color: #ffffff;
|
||||||
color: #2d2d2d;
|
color: #2d2d2d;
|
||||||
border: 1px solid #364e59;
|
border: 1px solid #364e59;
|
||||||
|
@ -774,6 +778,15 @@ ul.menu-popup .toolbar a:hover {
|
||||||
.acpopupitem.selected {
|
.acpopupitem.selected {
|
||||||
background-color: #bdcdd4;
|
background-color: #bdcdd4;
|
||||||
}
|
}
|
||||||
|
.textcomplete-item {
|
||||||
|
color: #2d2d2d;
|
||||||
|
}
|
||||||
|
.textcomplete-item a:hover {
|
||||||
|
color: #2d2d2d;
|
||||||
|
}
|
||||||
|
.textcomplete-item.active {
|
||||||
|
background-color: #bdcdd4;
|
||||||
|
}
|
||||||
#nav-notifications-menu {
|
#nav-notifications-menu {
|
||||||
width: 400px;
|
width: 400px;
|
||||||
max-height: 550px;
|
max-height: 550px;
|
||||||
|
|
|
@ -463,7 +463,7 @@ a:hover {
|
||||||
text-decoration: underline;
|
text-decoration: underline;
|
||||||
}
|
}
|
||||||
blockquote {
|
blockquote {
|
||||||
background: #FFFFFF;
|
background: #ffffff;
|
||||||
padding: 1em;
|
padding: 1em;
|
||||||
margin-left: 1em;
|
margin-left: 1em;
|
||||||
border-left: 1em solid #e6e6e6;
|
border-left: 1em solid #e6e6e6;
|
||||||
|
@ -744,8 +744,12 @@ ul.menu-popup .toolbar a:hover {
|
||||||
}
|
}
|
||||||
/* autocomplete popup */
|
/* autocomplete popup */
|
||||||
.autocomplete,
|
.autocomplete,
|
||||||
.acpopup {
|
.acpopup-mce {
|
||||||
max-height: 150px;
|
max-height: 150px;
|
||||||
|
}
|
||||||
|
.autocomplete,
|
||||||
|
.acpopup-mce,
|
||||||
|
.acpopup {
|
||||||
background-color: #ffffff;
|
background-color: #ffffff;
|
||||||
color: #2d2d2d;
|
color: #2d2d2d;
|
||||||
border: 1px solid #364e59;
|
border: 1px solid #364e59;
|
||||||
|
@ -774,6 +778,15 @@ ul.menu-popup .toolbar a:hover {
|
||||||
.acpopupitem.selected {
|
.acpopupitem.selected {
|
||||||
background-color: #ccff42;
|
background-color: #ccff42;
|
||||||
}
|
}
|
||||||
|
.textcomplete-item {
|
||||||
|
color: #2d2d2d;
|
||||||
|
}
|
||||||
|
.textcomplete-item a:hover {
|
||||||
|
color: #2d2d2d;
|
||||||
|
}
|
||||||
|
.textcomplete-item.active {
|
||||||
|
background-color: #ccff42;
|
||||||
|
}
|
||||||
#nav-notifications-menu {
|
#nav-notifications-menu {
|
||||||
width: 400px;
|
width: 400px;
|
||||||
max-height: 550px;
|
max-height: 550px;
|
||||||
|
|
|
@ -420,7 +420,7 @@
|
||||||
body {
|
body {
|
||||||
font-family: Liberation Sans, helvetica, arial, clean, sans-serif;
|
font-family: Liberation Sans, helvetica, arial, clean, sans-serif;
|
||||||
font-size: 11px;
|
font-size: 11px;
|
||||||
background-color: #F6ECF9;
|
background-color: #f6ecf9;
|
||||||
color: #2d2d2d;
|
color: #2d2d2d;
|
||||||
margin: 50px 0 0 0;
|
margin: 50px 0 0 0;
|
||||||
display: table;
|
display: table;
|
||||||
|
@ -463,7 +463,7 @@ a:hover {
|
||||||
text-decoration: underline;
|
text-decoration: underline;
|
||||||
}
|
}
|
||||||
blockquote {
|
blockquote {
|
||||||
background: #FFFFFF;
|
background: #ffffff;
|
||||||
padding: 1em;
|
padding: 1em;
|
||||||
margin-left: 1em;
|
margin-left: 1em;
|
||||||
border-left: 1em solid #e6e6e6;
|
border-left: 1em solid #e6e6e6;
|
||||||
|
@ -744,8 +744,12 @@ ul.menu-popup .toolbar a:hover {
|
||||||
}
|
}
|
||||||
/* autocomplete popup */
|
/* autocomplete popup */
|
||||||
.autocomplete,
|
.autocomplete,
|
||||||
.acpopup {
|
.acpopup-mce {
|
||||||
max-height: 150px;
|
max-height: 150px;
|
||||||
|
}
|
||||||
|
.autocomplete,
|
||||||
|
.acpopup-mce,
|
||||||
|
.acpopup {
|
||||||
background-color: #ffffff;
|
background-color: #ffffff;
|
||||||
color: #2d2d2d;
|
color: #2d2d2d;
|
||||||
border: 1px solid #364e59;
|
border: 1px solid #364e59;
|
||||||
|
@ -774,6 +778,15 @@ ul.menu-popup .toolbar a:hover {
|
||||||
.acpopupitem.selected {
|
.acpopupitem.selected {
|
||||||
background-color: #c0a3c7;
|
background-color: #c0a3c7;
|
||||||
}
|
}
|
||||||
|
.textcomplete-item {
|
||||||
|
color: #2d2d2d;
|
||||||
|
}
|
||||||
|
.textcomplete-item a:hover {
|
||||||
|
color: #2d2d2d;
|
||||||
|
}
|
||||||
|
.textcomplete-item.active {
|
||||||
|
background-color: #c0a3c7;
|
||||||
|
}
|
||||||
#nav-notifications-menu {
|
#nav-notifications-menu {
|
||||||
width: 400px;
|
width: 400px;
|
||||||
max-height: 550px;
|
max-height: 550px;
|
||||||
|
@ -1753,7 +1766,7 @@ span[id^="showmore-wrap"] {
|
||||||
height: 20px;
|
height: 20px;
|
||||||
width: 500px;
|
width: 500px;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
border: 1px solid #F6ECF9;
|
border: 1px solid #f6ecf9;
|
||||||
}
|
}
|
||||||
#jot #jot-title:-webkit-input-placeholder {
|
#jot #jot-title:-webkit-input-placeholder {
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
|
@ -1780,7 +1793,7 @@ span[id^="showmore-wrap"] {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
height: 20px;
|
height: 20px;
|
||||||
width: 200px;
|
width: 200px;
|
||||||
border: 1px solid #F6ECF9;
|
border: 1px solid #f6ecf9;
|
||||||
}
|
}
|
||||||
#jot #jot-category:hover {
|
#jot #jot-category:hover {
|
||||||
border: 1px solid #999999;
|
border: 1px solid #999999;
|
||||||
|
|
|
@ -265,9 +265,10 @@ ul.menu-popup {
|
||||||
}
|
}
|
||||||
|
|
||||||
/* autocomplete popup */
|
/* autocomplete popup */
|
||||||
|
.autocomplete, .acpopup-mce { max-height:150px; }
|
||||||
.autocomplete,
|
.autocomplete,
|
||||||
|
.acpopup-mce,
|
||||||
.acpopup {
|
.acpopup {
|
||||||
max-height:150px;
|
|
||||||
background-color:@MenuBg;
|
background-color:@MenuBg;
|
||||||
color: @Menu;
|
color: @Menu;
|
||||||
border:1px solid @MenuBorder;
|
border:1px solid @MenuBorder;
|
||||||
|
@ -291,6 +292,15 @@ ul.menu-popup {
|
||||||
background-color: @MenuItemHoverBg;
|
background-color: @MenuItemHoverBg;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
.textcomplete-item {
|
||||||
|
color: @MenuItem;
|
||||||
|
a:hover{
|
||||||
|
color: @MenuItem;
|
||||||
|
}
|
||||||
|
&.active{
|
||||||
|
background-color: @MenuItemHoverBg;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
#nav-notifications-menu {
|
#nav-notifications-menu {
|
||||||
|
|
|
@ -4353,8 +4353,7 @@ ul.menu-popup {
|
||||||
}
|
}
|
||||||
|
|
||||||
/* autocomplete popup */
|
/* autocomplete popup */
|
||||||
.acpopup {
|
.acpopup, acpopup-mce {
|
||||||
max-height: 150px;
|
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
z-index: 100000;
|
z-index: 100000;
|
||||||
color: #2e3436;
|
color: #2e3436;
|
||||||
|
@ -4371,6 +4370,10 @@ ul.menu-popup {
|
||||||
-webkit-box-shadow: 0 0 8px #BDBDBD;
|
-webkit-box-shadow: 0 0 8px #BDBDBD;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.acpopup-mce {
|
||||||
|
max-height: 150px;
|
||||||
|
}
|
||||||
|
|
||||||
.acpopupitem {
|
.acpopupitem {
|
||||||
color: #2e3436;
|
color: #2e3436;
|
||||||
padding: 4px;
|
padding: 4px;
|
||||||
|
@ -4381,7 +4384,7 @@ ul.menu-popup {
|
||||||
margin-right: 4px;
|
margin-right: 4px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.acpopupitem.selected {
|
.acpopupitem.selected, .textcomplete-item.active {
|
||||||
color: #efefef;
|
color: #efefef;
|
||||||
background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
|
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% );
|
background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
|
||||||
|
@ -4390,6 +4393,10 @@ ul.menu-popup {
|
||||||
order-bottom: none;
|
order-bottom: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.textcomplete-item a:hover, .textcomplete-item a:hover .acpopup-sub-text, .textcomplete-item.active a .acpopup-sub-text {
|
||||||
|
color: #efefef;
|
||||||
|
}
|
||||||
|
|
||||||
.qcomment {
|
.qcomment {
|
||||||
opacity: 0.8;
|
opacity: 0.8;
|
||||||
filter: alpha(opacity=0);
|
filter: alpha(opacity=0);
|
||||||
|
|
|
@ -12,7 +12,7 @@ function initEditor(cb){
|
||||||
if(plaintext == 'none') {
|
if(plaintext == 'none') {
|
||||||
$("#profile-jot-text-loading").hide();
|
$("#profile-jot-text-loading").hide();
|
||||||
$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
|
$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
|
||||||
$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
|
$("#profile-jot-text").editor_autocomplete(baseurl+"/acl");
|
||||||
$(".jothidden").show();
|
$(".jothidden").show();
|
||||||
editor = true;
|
editor = true;
|
||||||
$("a#jot-perms-icon").colorbox({
|
$("a#jot-perms-icon").colorbox({
|
||||||
|
|
|
@ -430,7 +430,7 @@ code {
|
||||||
.sidebar-group-li:hover, #sidebar-new-group:hover, #sidebar-edit-groups:hover,#forum-widget-collapse:hover,
|
.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,
|
#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,
|
.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: #ddd; */
|
||||||
/* background-color: #e5e5e5; */
|
/* background-color: #e5e5e5; */
|
||||||
background-color: #F5F5F5;
|
background-color: #F5F5F5;
|
||||||
|
@ -900,15 +900,18 @@ ul.menu-popup .empty {
|
||||||
color: #9eabb0;
|
color: #9eabb0;
|
||||||
}
|
}
|
||||||
/* autocomplete popup */
|
/* autocomplete popup */
|
||||||
.acpopup {
|
|
||||||
max-height: 150px;
|
.acpopup, .acpopup-mce {
|
||||||
background-color: #ffffff;
|
background-color: #ffffff;
|
||||||
color: #2d2d2d;
|
|
||||||
border: 1px solid #MenuBorder;
|
border: 1px solid #MenuBorder;
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
z-index: 100000;
|
z-index: 100000;
|
||||||
box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
|
box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
|
||||||
}
|
}
|
||||||
|
acpopup-mce {
|
||||||
|
color: #2d2d2d;
|
||||||
|
max-height: 150px;
|
||||||
|
}
|
||||||
.acpopupitem {
|
.acpopupitem {
|
||||||
color: #2d2d2d;
|
color: #2d2d2d;
|
||||||
padding: 4px;
|
padding: 4px;
|
||||||
|
@ -921,6 +924,16 @@ ul.menu-popup .empty {
|
||||||
.acpopupitem.selected {
|
.acpopupitem.selected {
|
||||||
background-color: #bdcdd4;
|
background-color: #bdcdd4;
|
||||||
}
|
}
|
||||||
|
.textcomplete-item {
|
||||||
|
float: none;
|
||||||
|
}
|
||||||
|
.textcomplete-item a {
|
||||||
|
color: #737373;
|
||||||
|
}
|
||||||
|
.textcomplete-item a:hover {
|
||||||
|
padding: 3px 20px;
|
||||||
|
}
|
||||||
|
|
||||||
#nav-notifications-menu {
|
#nav-notifications-menu {
|
||||||
width: 400px;
|
width: 400px;
|
||||||
max-height: 550px;
|
max-height: 550px;
|
||||||
|
|
Loading…
Reference in a new issue