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

flag taggable connections in acl selector

Browse Source
This commit is contained in:
friendica 2013-06-16 00:03:22 -07:00
parent f338da04e1
commit a37ac8f2f3
5 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/acl.js
View File

@ -247,8 +247,8 @@ ACL.prototype.populate = function(data){
var height = Math.ceil(data.tot / that.nw) * 42; var height = Math.ceil(data.tot / that.nw) * 42;
that.list_content.height(height); that.list_content.height(height);
$(data.items).each(function(){ $(data.items).each(function(){
html = "<div class='acl-list-item {4} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>"; html = "<div class='acl-list-item {4} {5} {7}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>";
html = html.format( this.photo, this.name, this.type, this.xid, '', this.network, this.link ); html = html.format( this.photo, this.name, this.type, this.xid, '', this.network, this.link, this.taggable );
if (this.uids!=undefined) that.group_uids[this.id] = this.uids; if (this.uids!=undefined) that.group_uids[this.id] = this.uids;
//console.log(html); //console.log(html);
that.list_content.append(html); that.list_content.append(html);

8
mod/acl.php
View File

@ -123,7 +123,7 @@ function acl_init(&$a){
} }
if ($type=='' || $type=='c') { if ($type=='' || $type=='c') {
$r = q("SELECT abook_id as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick $r = q("SELECT abook_id as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, abook_their_perms
FROM abook left join xchan on abook_xchan = xchan_hash FROM abook left join xchan on abook_xchan = xchan_hash
WHERE abook_channel = %d AND not ( abook_flags & %d ) $sql_extra2 order by xchan_name asc" , WHERE abook_channel = %d AND not ( abook_flags & %d ) $sql_extra2 order by xchan_name asc" ,
intval(local_user()), intval(local_user()),
@ -142,7 +142,7 @@ function acl_init(&$a){
); );
} }
elseif($type == 'a') { elseif($type == 'a') {
$r = q("SELECT abook_id as id, xchan_name as name, xchan_addr as nick, xchan_photo_s as micro, xchan_network as network, xchan_url as url, xchan_addr as attag FROM abook left join xchan on abook_xchan = xchan_hash $r = q("SELECT abook_id as id, xchan_name as name, xchan_hash as hash, xchan_addr as nick, xchan_photo_s as micro, xchan_network as network, xchan_url as url, xchan_addr as attag , abook_their_perms FROM abook left join xchan on abook_xchan = xchan_hash
WHERE abook_channel = %d WHERE abook_channel = %d
$sql_extra3 $sql_extra3
ORDER BY xchan_name ASC ", ORDER BY xchan_name ASC ",
@ -202,7 +202,9 @@ function acl_init(&$a){
"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'],'@')),
"network" => '',
"taggable" => (($g['abook_their_perms'] & PERMS_W_TAGWALL) ? 'taggable' : '')
); );
} }
} }

2
version.inc
View File

@ -1 +1 @@
2013-06-15.345 2013-06-16.346

4
view/theme/redbasic/css/style.css
View File

@ -3739,6 +3739,10 @@ ul.menu-popup {
float: left; float: left;
margin: 4px; margin: 4px;
} }
.acl-list-item.taggable {
background-color: #ccccff;
}
.acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;} .acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;}
.acl-list-item a { .acl-list-item a {
font-size: 8px; font-size: 8px;

5
view/tpl/acl_selector.tpl
View File

@ -1,8 +1,3 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<div id="acl-wrapper"> <div id="acl-wrapper">
<input id="acl-search"> <input id="acl-search">
<a href="#" id="acl-showall">{{$showall}}</a> <a href="#" id="acl-showall">{{$showall}}</a>