Remove modal window for default post permission setting

diff --git a/mod/settings.php b/mod/settings.php
index 4b34e9c1832fb9ecb08bcfb497e54de99b576cbf..3832de1b1f6ec54cb564d91546a2ca7438331ad2 100644 (file)
--- 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 fd0de22da42a7fe1823678dae621c217556081b9..fe83ebf0c5ae33a32f80173976dd1f13de94b7de 100644 (file)
--- a/view/templates/settings/settings.tpl
+++ b/view/templates/settings/settings.tpl
@@ -65,24 +65,12 @@
 
 {{include file="field_input.tpl" field=$cntunkmail}}
 
-<div id="settings-default-perms" class="settings-default-perms" >
-       <a href="#profile-jot-acl-wrapper" id="settings-default-perms-menu" class='popupbox'>{{$permissions}} {{$permdesc}}</a>
-       <div id="settings-default-perms-menu-end"></div>
-
-       <div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >
+{{$group_select nofilter}}
 
-       <div style="display: none;">
-               <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-                       {{$aclselect nofilter}}
-               </div>
-       </div>
+<h3>{{$permissions}}</h3>
 
-       </div>
-</div>
-<br/>
-<div id="settings-default-perms-end"></div>
+{{$aclselect nofilter}}
 
-{{$group_select nofilter}}
 <div class="settings-submit-wrapper" >
 <input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
 </div>

diff --git a/view/theme/frio/templates/settings/settings.tpl b/view/theme/frio/templates/settings/settings.tpl
index 11e697b30b0838481aa0294aca43aa28c1ecdf63..40c1d85ddf30888ce6e45a47f2ca82a1b7bda395 100644 (file)
--- 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 *}}
-                                               <div id="settings-default-perms" class="settings-default-perms">
-                                                       <a id="settings-default-perms-menu" class="settings-default-perms" data-toggle="modal" data-target="#aclModal">{{$permissions}} {{$permdesc}}</a>
-                                                       <div id="settings-default-perms-menu-end"></div>
-
-                                                       {{* We include the aclModal directly into the template since we cant use frio's default modal *}}
-                                                       <div class="modal" id="aclModal">
-                                                               <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">&times;</span></button>
-                                                                                       <h4 class="modal-title">{{$permissions}}</h4>
-                                                                               </div>
-                                                                               <div class="modal-body">
-                                                                                       {{$aclselect nofilter}}
-                                                                               </div>
-                                                                       </div>
-                                                               </div>
-                                                       </div>
-                                               </div>
-                                               <br/>
-
                                                {{$group_select nofilter}}
 
+                                               <h4>{{$permissions}}</h4>
+
+                                               {{$aclselect nofilter}}
+
                                                <div class="form-group pull-right settings-submit-wrapper" >
                                                        <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
                                                </div>