harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

this is looking better, call the forum version of a tag "foobar network", besides altering the icon

Browse Source
This commit is contained in:
friendica 2014-04-12 00:41:36 -07:00
parent 2212ddb913
commit aa5054d5ba
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mod/acl.php
View File

@ -209,14 +209,15 @@ function acl_init(&$a){
if($g['abook_their_perms'] & PERMS_W_TAGWALL) { if($g['abook_their_perms'] & PERMS_W_TAGWALL) {
$contacts[] = array( $contacts[] = array(
"type" => "c", "type" => "c",
"photo" => $g['micro'], "photo" => "images/twopeople.png",
"name" => $g['name'] . '+', "name" => $g['name'] . '+',
"id" => $g['id'] . '+', "id" => $g['id'] . '+',
"xid" => $g['hash'], "xid" => $g['hash'],
"link" => $g['nick'], "link" => $g['nick'],
"nick" => substr($g['nick'],0,strpos($g['nick'],'@')), "nick" => substr($g['nick'],0,strpos($g['nick'],'@')),
"self" => (($g['abook_flags'] & ABOOK_FLAG_SELF) ? 'abook-self' : ''), "self" => (($g['abook_flags'] & ABOOK_FLAG_SELF) ? 'abook-self' : ''),
"taggable" => 'taggable' "taggable" => 'taggable',
"label" => t('network')
); );
} }
$contacts[] = array( $contacts[] = array(
@ -228,7 +229,8 @@ function acl_init(&$a){
"link" => $g['nick'], "link" => $g['nick'],
"nick" => substr($g['nick'],0,strpos($g['nick'],'@')), "nick" => substr($g['nick'],0,strpos($g['nick'],'@')),
"self" => (($g['abook_flags'] & ABOOK_FLAG_SELF) ? 'abook-self' : ''), "self" => (($g['abook_flags'] & ABOOK_FLAG_SELF) ? 'abook-self' : ''),
"taggable" => '' "taggable" => '',
"label" => '',
); );
} }
} }

7
view/js/autocomplete.js
View File

@ -85,12 +85,7 @@ ACPopup.prototype._search = function(){
if (data.tot>0){ if (data.tot>0){
that.cont.show(); that.cont.show();
$(data.items).each(function(){ $(data.items).each(function(){
if(this.taggable) html = "<img src='{0}' height='16px' width='16px'>{1} ({2})".format(this.photo, this.name, ((this.label) ? this.nick + ' ' + this.label : this.nick) )
ihtml = '<i class="icon-group"></i>';
else
ihtml = '<i class="icon-user"></i>';
html = "<img src='{0}' height='16px' width='16px'>{1} {2} ({3})".format(this.photo, ihtml, this.name, this.nick)
that.add(this.taggable, html, this.nick.replace(' ','') + '+' + this.id + ' - ' + this.link); that.add(this.taggable, html, this.nick.replace(' ','') + '+' + this.id + ' - ' + this.link);
}); });
} else { } else {