From 3c50f985a9f9a482c5a254db416c3363c29af3fc Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Tue, 31 Mar 2020 21:43:04 -0400 Subject: [PATCH] Remove modal window for default post permission setting --- mod/settings.php | 1 - view/templates/settings/settings.tpl | 22 ++++------------ .../frio/templates/settings/settings.tpl | 26 +++---------------- 3 files changed, 9 insertions(+), 40 deletions(-) diff --git a/mod/settings.php b/mod/settings.php index 4b34e9c18..3832de1b1 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -937,7 +937,6 @@ function settings_content(App $a) '$maxreq' => ['maxreq', DI::l10n()->t('Maximum Friend Requests/Day:'), $maxreq , DI::l10n()->t("\x28to prevent spam abuse\x29")], '$permissions' => DI::l10n()->t('Default Post Permissions'), - '$permdesc' => DI::l10n()->t("\x28click to open/close\x29"), '$visibility' => $profile['net-publish'], '$aclselect' => ACL::getFullSelectorHTML(DI::page(), $a->user), '$blockwall'=> $blockwall, // array('blockwall', DI::l10n()->t('Allow friends to post to your profile page:'), !$blockwall, ''), diff --git a/view/templates/settings/settings.tpl b/view/templates/settings/settings.tpl index fd0de22da..fe83ebf0c 100644 --- a/view/templates/settings/settings.tpl +++ b/view/templates/settings/settings.tpl @@ -65,24 +65,12 @@ {{include file="field_input.tpl" field=$cntunkmail}} -
- {{$permissions}} {{$permdesc}} -
- - -
-
-
- {{$group_select nofilter}} + +

{{$permissions}}

+ +{{$aclselect nofilter}} +
diff --git a/view/theme/frio/templates/settings/settings.tpl b/view/theme/frio/templates/settings/settings.tpl index 11e697b30..40c1d85dd 100644 --- a/view/theme/frio/templates/settings/settings.tpl +++ b/view/theme/frio/templates/settings/settings.tpl @@ -101,30 +101,12 @@ {{include file="field_input.tpl" field=$cntunkmail}} - {{* Block for setting default permissions *}} -
- {{$permissions}} {{$permdesc}} -
- - {{* We include the aclModal directly into the template since we cant use frio's default modal *}} - -
-
- {{$group_select nofilter}} +

{{$permissions}}

+ + {{$aclselect nofilter}} +