diff options
| author | redmatrix <git@macgirvin.com> | 2016-02-07 21:06:17 -0800 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-02-07 21:06:17 -0800 |
| commit | 00ae6bdac6062594d16870dbd9ca0593f534198e (patch) | |
| tree | b0bf506c954254c714e20de8892779b1c2178b01 | |
| parent | a606173e07cfb1e9dda56d65e304f0ad53b934e6 (diff) | |
| download | volse-hubzilla-00ae6bdac6062594d16870dbd9ca0593f534198e.tar.gz volse-hubzilla-00ae6bdac6062594d16870dbd9ca0593f534198e.tar.bz2 volse-hubzilla-00ae6bdac6062594d16870dbd9ca0593f534198e.zip | |
a few tweaks to uno settings page to allow a default ACL to be created
| -rw-r--r-- | mod/settings.php | 2 | ||||
| -rwxr-xr-x | view/tpl/settings.tpl | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/mod/settings.php b/mod/settings.php index eea3d9995..3ca2d1218 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -1013,6 +1013,7 @@ function settings_content(&$a) { $permissions_role = 'custom'; $permissions_set = (($permissions_role != 'custom') ? true : false); + $vnotify = get_pconfig(local_channel(),'system','vnotify'); $always_show_in_notices = get_pconfig(local_channel(),'system','always_show_in_notices'); if($vnotify === false) @@ -1037,6 +1038,7 @@ function settings_content(&$a) { '$h_prv' => t('Security and Privacy Settings'), '$permissions_set' => $permissions_set, + '$server_role' => get_server_role(), '$perms_set_msg' => t('Your permissions are already configured. Click to view/adjust'), '$hide_presence' => array('hide_presence', t('Hide my online presence'),$hide_presence, t('Prevents displaying in your profile that you are online'), $yes_no), 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}} |