aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-05-04 17:36:13 -0700
committerredmatrix <git@macgirvin.com>2016-05-04 17:36:13 -0700
commit1b6bc5394b7cf8435928eaa2ace4e321f517ecb6 (patch)
tree0d1e8c70de7961b9332d4e624e134691c40fc84c /view/tpl
parent50fb525b280069e4a95f9ae133b15460e8b02318 (diff)
parent8c9a773a90fc331f0b4d6ce44119abe1278fd8ea (diff)
downloadvolse-hubzilla-1b6bc5394b7cf8435928eaa2ace4e321f517ecb6.tar.gz
volse-hubzilla-1b6bc5394b7cf8435928eaa2ace4e321f517ecb6.tar.bz2
volse-hubzilla-1b6bc5394b7cf8435928eaa2ace4e321f517ecb6.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'view/tpl')
-rwxr-xr-xview/tpl/acl_selector.tpl29
1 files changed, 24 insertions, 5 deletions
diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl
index e57fdba12..a3fe73d0c 100755
--- a/view/tpl/acl_selector.tpl
+++ b/view/tpl/acl_selector.tpl
@@ -3,9 +3,15 @@
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
- <h4 class="modal-title">{{$aclModalTitle}}</h4>
+ {{if $helpUrl}}
+ <a type="button" target="hubzilla-help" href="{{$helpUrl}}" class="contextual-help-tool" title="Help and documentation"><i class="fa fa-question"></i></a>
+ {{/if}}
+ <h4 class="modal-title"><i id="dialog-perms-icon" class="fa fa-fw"></i> {{$aclModalTitle}}</h4>
</div>
<div class="modal-body">
+ {{if $aclModalDesc}}
+ <div id="acl-dialog-description">{{$aclModalDesc}}</div>
+ {{/if}}
{{if $jotnets}}
<div class="jotnets-wrapper" role="tab" id="jotnets-wrapper">
<a data-toggle="collapse" class="btn btn-block btn-default" href="#jotnets-collapse" aria-expanded="false" aria-controls="jotnets-collapse">{{$jnetModalTitle}} <span class="caret"></span></a>
@@ -16,11 +22,24 @@
</div>
{{/if}}
<div id="acl-wrapper">
- <button id="acl-showall" class="btn btn-block btn-default"><i class="fa fa-globe"></i> {{$showall}}</button>
- <input type="text" id="acl-search" placeholder="&#xf002;">
- <div id="acl-list">
- <div id="acl-list-content"></div>
+ <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>
+ </label>
</div>
+ <div id="acl-radiowrapper-showlimited" class="radio">
+ <label>
+ <input id="acl-showlimited" type="radio" name="optionsRadios" style="readonly" value="option2">
+ <span id=acl-showlimited-caption>{{$showlimited}}</span>
+ </label>
+ <div id="acl-list">
+ <input type="text" id="acl-search" placeholder="&#xf002; {{$search}}">
+ <div id=acl-showlimited-description>{{$showlimitedDesc}}</div>
+ <div id="acl-list-content"></div>
+ </div>
+ </div>
+
<span id="acl-fields"></span>
</div>