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

make >>indicate group members<< in acl selector work again on group > show or group > dont show is selected

Browse Source
This commit is contained in:
Mario Vavti 2016-03-20 01:45:56 +01:00
parent 51cd4e8519
commit 30cf56bdb5
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
view/js/acl.js
View File

@ -231,14 +231,15 @@ ACL.prototype.update_view = function() {
} }
$(that.group_uids[id]).each(function(i, v) { $(that.group_uids[id]).each(function(i, v) {
if(uclass == "grouphide") if(uclass == "grouphide")
$("#c"+v).removeClass("groupshow"); // we need attr selection here because the id can include an @ (diaspora/friendica xchans)
$('[id="c' + v + '"]').removeClass("groupshow");
if(uclass !== "") { if(uclass !== "") {
var cls = $("#c"+v).attr('class'); var cls = $('[id="c' + v + '"]').attr('class');
if( cls === undefined) if( cls === undefined)
return true; return true;
var hiding = cls.indexOf('grouphide'); var hiding = cls.indexOf('grouphide');
if(hiding == -1) if(hiding == -1)
$("#c"+v).addClass(uclass); $('[id="c' + v + '"]').addClass(uclass);
} }
}); });
break; break;
@ -277,7 +278,7 @@ ACL.prototype.populate = function(data) {
$(data.items).each(function(){ $(data.items).each(function(){
html = "<div class='acl-list-item {4} {7} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>"; html = "<div class='acl-list-item {4} {7} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>";
html = html.format(this.photo, this.name, this.type, this.xid, '', this.self, this.link, this.taggable); html = html.format(this.photo, this.name, this.type, this.xid, '', this.self, this.link, this.taggable);
if (this.uids !== undefined) that.group_uids[this.id] = this.uids; if (this.uids !== undefined) that.group_uids[this.xid] = this.uids;
//console.log(html); //console.log(html);
that.list_content.append(html); that.list_content.append(html);
}); });
@ -287,4 +288,4 @@ ACL.prototype.populate = function(data) {
$(el).removeAttr("data-src"); $(el).removeAttr("data-src");
}); });
that.update_view(); that.update_view();
}; };

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

@ -915,7 +915,15 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover {
border-radius: $radiuspx; border-radius: $radiuspx;
} }
.acl-list-item img{ .acl-list-item.grouphide {
border: 1px solid red;
}
.acl-list-item.groupshow {
border: 1px solid green;
}
.acl-list-item img {
width: 40px; width: 40px;
height: 40px; height: 40px;
float: left; float: left;

3
view/tpl/acl_selector.tpl
View File

@ -15,14 +15,11 @@
<div class="clear"></div> <div class="clear"></div>
</div> </div>
{{/if}} {{/if}}
<div id="acl-wrapper"> <div id="acl-wrapper">
<button id="acl-showall" class="btn btn-block btn-default"><i class="icon-globe"></i> {{$showall}}</button> <button id="acl-showall" class="btn btn-block btn-default"><i class="icon-globe"></i> {{$showall}}</button>
<input type="text" id="acl-search" placeholder="&#xf002;"> <input type="text" id="acl-search" placeholder="&#xf002;">
<div id="acl-list"> <div id="acl-list">
<div id="acl-list-content"></div> <div id="acl-list-content"></div>
</div> </div>
<span id="acl-fields"></span> <span id="acl-fields"></span>
</div> </div>