harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

a few tweaks to uno settings page to allow a default ACL to be created

Browse Source
This commit is contained in:
redmatrix 2016-02-07 21:06:17 -08:00
parent a606173e07
commit 00ae6bdac6
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/settings.php
View File

@ -1013,6 +1013,7 @@ function settings_content(&$a) {
$permissions_role = 'custom'; $permissions_role = 'custom';
$permissions_set = (($permissions_role != 'custom') ? true : false); $permissions_set = (($permissions_role != 'custom') ? true : false);
$vnotify = get_pconfig(local_channel(),'system','vnotify'); $vnotify = get_pconfig(local_channel(),'system','vnotify');
$always_show_in_notices = get_pconfig(local_channel(),'system','always_show_in_notices'); $always_show_in_notices = get_pconfig(local_channel(),'system','always_show_in_notices');
if($vnotify === false) if($vnotify === false)
@ -1037,6 +1038,7 @@ function settings_content(&$a) {
'$h_prv' => t('Security and Privacy Settings'), '$h_prv' => t('Security and Privacy Settings'),
'$permissions_set' => $permissions_set, '$permissions_set' => $permissions_set,
'$server_role' => get_server_role(),
'$perms_set_msg' => t('Your permissions are already configured. Click to view/adjust'), '$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), '$hide_presence' => array('hide_presence', t('Hide my online presence'),$hide_presence, t('Prevents displaying in your profile that you are online'), $yes_no),

7
view/tpl/settings.tpl
View File

@ -42,8 +42,12 @@
</div> </div>
<div id="privacy-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="privacy-settings"> <div id="privacy-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="privacy-settings">
<div class="section-content-tools-wrapper"> <div class="section-content-tools-wrapper">
{{if $server_role != 'basic'}}
{{include file="field_select_grouped.tpl" field=$role}} {{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"> <div class="form-group">
<button type="button" class="btn btn-default" data-toggle="modal" data-target="#apsModal">{{$lbl_p2macro}}</button> <button type="button" class="btn btn-default" data-toggle="modal" data-target="#apsModal">{{$lbl_p2macro}}</button>
</div> </div>
@ -65,6 +69,7 @@
</div><!-- /.modal-content --> </div><!-- /.modal-content -->
</div><!-- /.modal-dialog --> </div><!-- /.modal-dialog -->
</div><!-- /.modal --> </div><!-- /.modal -->
{{/if}}
<div id="settings-default-perms" class="form-group" > <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>&nbsp;{{$permissions}}</button> <button type="button" class="btn btn-default" data-toggle="modal" data-target="#aclModal"><i id="jot-perms-icon"></i>&nbsp;{{$permissions}}</button>
{{$aclselect}} {{$aclselect}}