aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-11-08 13:55:21 -0800
committerredmatrix <redmatrix@redmatrix.me>2015-11-08 13:55:21 -0800
commit2536dc39b5e49cf288883fd1f1b1a3fe8db3cbdb (patch)
treebdeebc203bcb2c5c29645401d5e22eed824f6cfe
parentcf0bff8582e7b70a4931e3c510cd0018e0b5ec6c (diff)
parent9c12ba5708cac526dbf043aa9ae46fde60cd7a68 (diff)
downloadvolse-hubzilla-2536dc39b5e49cf288883fd1f1b1a3fe8db3cbdb.tar.gz
volse-hubzilla-2536dc39b5e49cf288883fd1f1b1a3fe8db3cbdb.tar.bz2
volse-hubzilla-2536dc39b5e49cf288883fd1f1b1a3fe8db3cbdb.zip
Merge https://github.com/redmatrix/hubzilla into pending_merge
-rwxr-xr-xview/tpl/acl_selector.tpl9
1 files changed, 6 insertions, 3 deletions
diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl
index e8b779622..c7e039cd5 100755
--- a/view/tpl/acl_selector.tpl
+++ b/view/tpl/acl_selector.tpl
@@ -9,19 +9,22 @@
<div id="acl-wrapper">
<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;">
+
+ {{if $jotnets}}
+ {{$jotnets}}
+ {{/if}}
<div id="acl-list">
<div id="acl-list-content"></div>
+
</div>
<span id="acl-fields"></span>
</div>
+
<div class="acl-list-item" rel="acl-template" style="display:none">
<img data-src="{0}"><p>{1}</p>
<button class="acl-button-hide btn btn-xs btn-default"><i class="icon-remove"></i> {{$hide}}</button>
<button class="acl-button-show btn btn-xs btn-default"><i class="icon-ok"></i> {{$show}}</button>
</div>
- {{if $jotnets}}
- {{$jotnets}}
- {{/if}}
</div>
<div class="modal-footer clear">
<button type="button" class="btn btn-default" data-dismiss="modal">{{$aclModalDismiss}}</button>