diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-09-04 20:48:26 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-09-04 20:48:26 +0200 |
| commit | c8000fca1f2ee379b62b473a00838af9a48bc4b6 (patch) | |
| tree | e59c58c9e33e63dc9cb9870d338fc0e8033b8f3a | |
| parent | 48547f5f9e200254d1d96db542aa00a6f53cff61 (diff) | |
| download | volse-hubzilla-c8000fca1f2ee379b62b473a00838af9a48bc4b6.tar.gz volse-hubzilla-c8000fca1f2ee379b62b473a00838af9a48bc4b6.tar.bz2 volse-hubzilla-c8000fca1f2ee379b62b473a00838af9a48bc4b6.zip | |
Default Access Control List (ACL) -> Default Privacy Group and minor template fix
| -rw-r--r-- | Zotlabs/Module/Settings/Channel.php | 2 | ||||
| -rwxr-xr-x | view/tpl/settings.tpl | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/Zotlabs/Module/Settings/Channel.php b/Zotlabs/Module/Settings/Channel.php index eb31841ed..e49c34666 100644 --- a/Zotlabs/Module/Settings/Channel.php +++ b/Zotlabs/Module/Settings/Channel.php @@ -509,7 +509,7 @@ class Channel { '$expire' => array('expire',t('Expire other channel content after this many days'),$expire, t('0 or blank to use the website limit.') . ' ' . ((intval($sys_expire)) ? sprintf( t('This website expires after %d days.'),intval($sys_expire)) : t('This website does not expire imported content.')) . ' ' . t('The website limit takes precedence if lower than your limit.')), '$maxreq' => array('maxreq', t('Maximum Friend Requests/Day:'), intval($channel['channel_max_friend_req']) , t('May reduce spam activity')), - '$permissions' => t('Default Access Control List (ACL)'), + '$permissions' => t('Default Privacy Group'), '$permdesc' => t("\x28click to open/close\x29"), '$aclselect' => populate_acl($perm_defaults, false, \Zotlabs\Lib\PermissionDescription::fromDescription(t('Use my default audience setting for the type of object published'))), '$allow_cid' => acl2json($perm_defaults['allow_cid']), diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 3a8e31107..704d89bdd 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -46,7 +46,6 @@ <div class="section-content-tools-wrapper"> {{include file="field_select_grouped.tpl" field=$role}} <div id="advanced-perm" style="display:{{if $permissions_set}}none{{else}}block{{/if}};"> - <div class="form-group"> <button type="button" class="btn btn-outline-secondary" data-toggle="modal" data-target="#apsModal">{{$lbl_p2macro}}</button> </div> @@ -54,8 +53,8 @@ <div class="modal-dialog"> <div class="modal-content"> <div class="modal-header"> - <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> <h4 class="modal-title">{{$lbl_p2macro}}</h4> + <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> </div> <div class="modal-body"> {{foreach $permiss_arr as $permit}} |