From 7980a9e9325175221f51e044ab18cdc357b4096b Mon Sep 17 00:00:00 2001
From: Hannes Heute <haheute@posteo.de>
Date: Wed, 29 Jan 2025 21:18:15 +0100
Subject: [PATCH 1/2] [frio] Use modal instead of popupbox for permissions on
 photo edit page

---
 view/theme/frio/templates/photo_edit.tpl    | 45 +++++++++++++++++++++
 view/theme/frio/templates/photos_upload.tpl |  2 +-
 2 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 view/theme/frio/templates/photo_edit.tpl

diff --git a/view/theme/frio/templates/photo_edit.tpl b/view/theme/frio/templates/photo_edit.tpl
new file mode 100644
index 0000000000..7978ebe0f8
--- /dev/null
+++ b/view/theme/frio/templates/photo_edit.tpl
@@ -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="#aclModal" 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="aclModal" 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">
+					<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>
+				</div>
+				<div id="photos-edit-permissions-wrapper" class="modal-body">
+					{{$aclselect nofilter}}
+				</div>
+			</div>
+		</div>
+	</div>
+</form>
diff --git a/view/theme/frio/templates/photos_upload.tpl b/view/theme/frio/templates/photos_upload.tpl
index 1920caa088..9f9675bba5 100644
--- a/view/theme/frio/templates/photos_upload.tpl
+++ b/view/theme/frio/templates/photos_upload.tpl
@@ -66,7 +66,7 @@
 		<div id="aclModal" 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>

From e296938dd4d3ae270ef2729d27e45de9de4bb794 Mon Sep 17 00:00:00 2001
From: Hannes Heute <haheute@posteo.de>
Date: Wed, 29 Jan 2025 23:32:18 +0100
Subject: [PATCH 2/2] [frio] Don't lose title in photo permission modals

---
 view/theme/frio/templates/photo_edit.tpl                  | 8 ++++----
 view/theme/frio/templates/photos_upload.tpl               | 8 ++++----
 view/theme/frio/templates/settings/profile/field/edit.tpl | 2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/view/theme/frio/templates/photo_edit.tpl b/view/theme/frio/templates/photo_edit.tpl
index 7978ebe0f8..1d77ddcb75 100644
--- a/view/theme/frio/templates/photo_edit.tpl
+++ b/view/theme/frio/templates/photo_edit.tpl
@@ -19,7 +19,7 @@
 	{{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="#aclModal" onclick="return false;">
+		<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>
@@ -27,14 +27,14 @@
 	<input id="photo-edit-submit-button" type="submit" name="submit" value="{{$submit}}" />
 
 	{{* The modal for advanced-expire (photo permissions) *}}
-	<div id="aclModal" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
+	<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" 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-edit-permissions-wrapper" class="modal-body">
 					{{$aclselect nofilter}}
diff --git a/view/theme/frio/templates/photos_upload.tpl b/view/theme/frio/templates/photos_upload.tpl
index 9f9675bba5..d315a050c5 100644
--- a/view/theme/frio/templates/photos_upload.tpl
+++ b/view/theme/frio/templates/photos_upload.tpl
@@ -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">
 						<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}}
diff --git a/view/theme/frio/templates/settings/profile/field/edit.tpl b/view/theme/frio/templates/settings/profile/field/edit.tpl
index 34dd700b00..38e7a928d8 100644
--- a/view/theme/frio/templates/settings/profile/field/edit.tpl
+++ b/view/theme/frio/templates/settings/profile/field/edit.tpl
@@ -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">