diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-09 06:03:43 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-09 06:03:43 +0100 |
| commit | 8c99228c8ab4d0475dc2065e5682dd22d680d4e7 (patch) | |
| tree | 65d2d57bde451526dc1dc3567d4c8722c7df807b /view/tpl/settings.tpl | |
| parent | 2935c5fe1ad7999d6abf527bfc8e8d353ceb9d32 (diff) | |
| parent | f984502499c836cde0be647907be505508c04e0c (diff) | |
| download | volse-hubzilla-8c99228c8ab4d0475dc2065e5682dd22d680d4e7.tar.gz volse-hubzilla-8c99228c8ab4d0475dc2065e5682dd22d680d4e7.tar.bz2 volse-hubzilla-8c99228c8ab4d0475dc2065e5682dd22d680d4e7.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'view/tpl/settings.tpl')
| -rwxr-xr-x | view/tpl/settings.tpl | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index af5f222fe..820ffd711 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -42,8 +42,12 @@ </div> <div id="privacy-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="privacy-settings"> <div class="section-content-tools-wrapper"> + {{if $server_role != 'basic'}} {{include file="field_select_grouped.tpl" field=$role}} - <div id="advanced-perm" style="display:{{if $permissions_set}}none{{else}}block{{/if}};"> + {{/if}} + <div id="advanced-perm" style="display:{{if $permissions_set && $server_role != 'basic' }}none{{else}}block{{/if}};"> + + {{if $server_role != 'basic'}} <div class="form-group"> <button type="button" class="btn btn-default" data-toggle="modal" data-target="#apsModal">{{$lbl_p2macro}}</button> </div> @@ -65,6 +69,7 @@ </div><!-- /.modal-content --> </div><!-- /.modal-dialog --> </div><!-- /.modal --> + {{/if}} <div id="settings-default-perms" class="form-group" > <button type="button" class="btn btn-default" data-toggle="modal" data-target="#aclModal"><i id="jot-perms-icon"></i> {{$permissions}}</button> {{$aclselect}} |