strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #8480 from MrPetovan/task/8425-remove-default-permission-modal

Browse source 
Remove default post permission modal window
This commit is contained in:
Michael Vogel 2020-04-01 15:50:10 +02:00 committed by GitHub
parent 0584667d13 3c50f985a9
commit 16ff943ed3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mod/settings.php
View file

@ -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")], '$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'), '$permissions' => DI::l10n()->t('Default Post Permissions'),
'$permdesc' => DI::l10n()->t("\x28click to open/close\x29"),
'$visibility' => $profile['net-publish'], '$visibility' => $profile['net-publish'],
'$aclselect' => ACL::getFullSelectorHTML(DI::page(), $a->user), '$aclselect' => ACL::getFullSelectorHTML(DI::page(), $a->user),
'$blockwall'=> $blockwall, // array('blockwall', DI::l10n()->t('Allow friends to post to your profile page:'), !$blockwall, ''), '$blockwall'=> $blockwall, // array('blockwall', DI::l10n()->t('Allow friends to post to your profile page:'), !$blockwall, ''),

22
view/templates/settings/settings.tpl
View file

@ -65,24 +65,12 @@
{{include file="field_input.tpl" field=$cntunkmail}} {{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" >
<div style="display: none;">
<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
{{$aclselect nofilter}}
</div>
</div>
</div>
</div>
<br/>
<div id="settings-default-perms-end"></div>
{{$group_select nofilter}} {{$group_select nofilter}}
<h3>{{$permissions}}</h3>
{{$aclselect nofilter}}
<div class="settings-submit-wrapper" > <div class="settings-submit-wrapper" >
<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" /> <input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
</div> </div>

26
view/theme/frio/templates/settings/settings.tpl
View file

@ -101,30 +101,12 @@
{{include file="field_input.tpl" field=$cntunkmail}} {{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}} {{$group_select nofilter}}
<h4>{{$permissions}}</h4>
{{$aclselect nofilter}}
<div class="form-group pull-right settings-submit-wrapper" > <div class="form-group pull-right settings-submit-wrapper" >
<button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button> <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
</div> </div>