aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl/acl_selector.tpl
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-05-09 22:00:21 -0400
committerAndrew Manning <tamanning@zoho.com>2016-05-09 22:00:21 -0400
commit0b8a7f1bd03edb2bb18eb050fcb0b482d0e231be (patch)
tree2e4f069d66885c5ca5b77154e9dd5a43ec004ff5 /view/tpl/acl_selector.tpl
parent9c8cf7d43372aeea4d8a450e7cb17d7a24b64d5f (diff)
parentea1173f8f632151d02c71fe6004c6a64d014e80a (diff)
downloadvolse-hubzilla-0b8a7f1bd03edb2bb18eb050fcb0b482d0e231be.tar.gz
volse-hubzilla-0b8a7f1bd03edb2bb18eb050fcb0b482d0e231be.tar.bz2
volse-hubzilla-0b8a7f1bd03edb2bb18eb050fcb0b482d0e231be.zip
Merge remote-tracking branch 'upstream/dev' into plugin-repo
Diffstat (limited to 'view/tpl/acl_selector.tpl')
-rwxr-xr-xview/tpl/acl_selector.tpl8
1 files changed, 7 insertions, 1 deletions
diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl
index 0df72747a..050417257 100755
--- a/view/tpl/acl_selector.tpl
+++ b/view/tpl/acl_selector.tpl
@@ -25,8 +25,12 @@
<div id="acl-radiowrapper-showall" class="radio">
<label>
<input id="acl-showall" type="radio" name="optionsRadios" value="option1" checked>
- <i class="fa fa-globe"></i><span id=acl-showall-caption>{{$showall}}</span>
+ {{if $showallIcon}}<i class="fa {{$showallIcon}}"></i>{{/if}}
+ <span id="acl-showall-caption">{{$showall}}</span>
</label>
+ {{if $showallOrigin}}
+ &nbsp;<a id="acl-info-icon" role="button" tabindex="0" class="fa fa-info-circle" data-trigger="focus" data-toggle="popover" data-placement="top" data-content="{{$showallOrigin}}"></a>
+ {{/if}}
</div>
<div id="acl-radiowrapper-showlimited" class="radio">
<label>
@@ -61,6 +65,8 @@
</div><!-- /.modal -->
<script>
+ $('[data-toggle="popover"]').popover(); // Init the popover, if present
+
if(typeof acl=="undefined"){
acl = new ACL(
baseurl+"/acl",