aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-11-09 06:44:18 +1100
committerredmatrix <redmatrix@redmatrix.me>2015-11-09 06:44:18 +1100
commit9c12ba5708cac526dbf043aa9ae46fde60cd7a68 (patch)
treed229975e8d42b88312e718ec9c628cd942ef57ee
parent1874346c460c29a087bb81833c0b760a91e35970 (diff)
parent8639eda70fb783c0c9af286a3098d3749242389e (diff)
downloadvolse-hubzilla-9c12ba5708cac526dbf043aa9ae46fde60cd7a68.tar.gz
volse-hubzilla-9c12ba5708cac526dbf043aa9ae46fde60cd7a68.tar.bz2
volse-hubzilla-9c12ba5708cac526dbf043aa9ae46fde60cd7a68.zip
Merge pull request #131 from tluther/master
Quick fix: Moved Twitter select box to the top of ACL selector
-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>