diff options
| author | friendica <info@friendica.com> | 2014-04-12 00:41:36 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-04-12 00:41:36 -0700 |
| commit | aa5054d5ba9fa1bcae06b39b858a56e53ed08738 (patch) | |
| tree | 0317cda4afe4881c62cffdb2ae0872f405eef4f3 | |
| parent | 2212ddb91317de34b584861f4e2c1dc625924612 (diff) | |
| download | volse-hubzilla-aa5054d5ba9fa1bcae06b39b858a56e53ed08738.tar.gz volse-hubzilla-aa5054d5ba9fa1bcae06b39b858a56e53ed08738.tar.bz2 volse-hubzilla-aa5054d5ba9fa1bcae06b39b858a56e53ed08738.zip | |
this is looking better, call the forum version of a tag "foobar network", besides altering the icon
| -rw-r--r-- | mod/acl.php | 8 | ||||
| -rw-r--r-- | view/js/autocomplete.js | 7 |
2 files changed, 6 insertions, 9 deletions
diff --git a/mod/acl.php b/mod/acl.php index 589a10eb5..3b737d36e 100644 --- a/mod/acl.php +++ b/mod/acl.php @@ -209,14 +209,15 @@ function acl_init(&$a){ if($g['abook_their_perms'] & PERMS_W_TAGWALL) { $contacts[] = array( "type" => "c", - "photo" => $g['micro'], + "photo" => "images/twopeople.png", "name" => $g['name'] . '+', "id" => $g['id'] . '+', "xid" => $g['hash'], "link" => $g['nick'], "nick" => substr($g['nick'],0,strpos($g['nick'],'@')), "self" => (($g['abook_flags'] & ABOOK_FLAG_SELF) ? 'abook-self' : ''), - "taggable" => 'taggable' + "taggable" => 'taggable', + "label" => t('network') ); } $contacts[] = array( @@ -228,7 +229,8 @@ function acl_init(&$a){ "link" => $g['nick'], "nick" => substr($g['nick'],0,strpos($g['nick'],'@')), "self" => (($g['abook_flags'] & ABOOK_FLAG_SELF) ? 'abook-self' : ''), - "taggable" => '' + "taggable" => '', + "label" => '', ); } } diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index c820b3b47..c01ba6990 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -85,12 +85,7 @@ ACPopup.prototype._search = function(){ if (data.tot>0){ that.cont.show(); $(data.items).each(function(){ - if(this.taggable) - 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) + html = "<img src='{0}' height='16px' width='16px'>{1} ({2})".format(this.photo, this.name, ((this.label) ? this.nick + ' ' + this.label : this.nick) ) that.add(this.taggable, html, this.nick.replace(' ','') + '+' + this.id + ' - ' + this.link); }); } else { |