Merge pull request #14755 from haheute/photo-permission-modal

[frio] Use modal instead of popupbox for permissions on photo edit page
This commit is contained in:
Hypolite Petovan 2025-01-29 22:19:12 -05:00 committed by GitHub
commit f1dfa63764
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 51 additions and 6 deletions

View file

@ -0,0 +1,45 @@
{{*
* Copyright (C) 2010-2024, the Friendica project
* SPDX-FileCopyrightText: 2010-2024 the Friendica project
*
* SPDX-License-Identifier: AGPL-3.0-or-later
*}}
<form action="photos/{{$nickname}}/image/{{$resource_id}}/edit" method="post" id="photo_edit_form">
<input type="hidden" name="item_id" value="{{$item_id}}" />
<input type="hidden" name="origaname" value="{{$album.2}}" />
{{include file="field_input.tpl" field=$album}}
{{include file="field_input.tpl" field=$caption}}
{{include file="field_input.tpl" field=$tags}}
{{include file="field_radio.tpl" field=$rotate_none}}
{{include file="field_radio.tpl" field=$rotate_cw}}
{{include file="field_radio.tpl" field=$rotate_ccw}}
<div id="photo-edit-perms">
<button class="btn btn-default btn-sm" data-toggle="modal" data-target="#photo-edit-permission-acl" onclick="return false;">
<i id="jot-perms-icon" class="fa {{$lockstate}}"></i> {{$permissions}}
</button>
</div>
<input id="photo-edit-submit-button" type="submit" name="submit" value="{{$submit}}" />
{{* The modal for advanced-expire (photo permissions) *}}
<div id="photo-edit-permission-acl" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button id="modal-close" type="button" class="close" data-dismiss="modal" aria-hidden="true">
&times;
</button>
<h4 class="modal-title">{{$permissions}}</h4>
</div>
<div id="photos-edit-permissions-wrapper" class="modal-body">
{{$aclselect nofilter}}
</div>
</div>
</div>
</div>
</form>

View file

@ -30,7 +30,7 @@
{{if $alt_uploader}}
<div id="photos-upload-perms" class="pull-right">
<button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
<button class="btn btn-default btn-sm" data-toggle="modal" data-target="#photo-upload-permission-acl" onclick="return false;">
<i id="jot-perms-icon" class="fa {{$lockstate}}"></i> {{$permissions}}
</button>
</div>
@ -49,7 +49,7 @@
<div class="photos-upload-wrapper">
<div id="photos-upload-perms" class="btn-group pull-right">
<button class="btn btn-default" data-toggle="modal" data-target="#aclModal" onclick="return false;">
<button class="btn btn-default" data-toggle="modal" data-target="#photo-upload-permission-acl" onclick="return false;">
<i id="jot-perms-icon" class="fa {{$lockstate}}"></i>
</button>
@ -63,14 +63,14 @@
<div class="photos-upload-end" class="clearfix"></div>
{{* The modal for advanced-expire *}}
<div id="aclModal" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
<div id="photo-upload-permission-acl" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header" class="modal-header">
<div class="modal-header">
<button id="modal-close" type="button" class="close" data-dismiss="modal" aria-hidden="true">
&times;
</button>
<h4 id="modal-title" class="modal-title">{{$permissions}}</h4>
<h4 class="modal-title">{{$permissions}}</h4>
</div>
<div id="photos-upload-permissions-wrapper" class="modal-body">
{{$aclselect nofilter}}

View file

@ -19,7 +19,7 @@
</p>
{{* We include the aclModal directly into the template since we cant use frio's default modal *}}
<div class="modal" id="profile-field-acl-{{$profile_field.id}}">
<div id="profile-field-acl-{{$profile_field.id}}" class="modal fade">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">