From e397e43c1b6afe20e630646cb560714072da16f5 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Wed, 1 Feb 2023 14:15:56 +0100
Subject: [PATCH] Fix PGP back/restore dialog

---
 api/js/jsapi/app_base.js                     |  5 ++---
 api/templates/default/pgp_backup_restore.xet | 10 +++++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/api/js/jsapi/app_base.js b/api/js/jsapi/app_base.js
index 451ad6d0d8..af2d09d87c 100644
--- a/api/js/jsapi/app_base.js
+++ b/api/js/jsapi/app_base.js
@@ -1365,8 +1365,6 @@ export const AppJS = (function(){ "use strict"; return Class.extend(
 					initialSetup:initSetup
 				};
 				_keyring.createKeyBackupContainer(selector, options).then(function(_popupId){
-					var $backup_selector = jQuery('iframe[src^="chrome-extension"],iframe[src^="about:blank?mvelo"]');
-					$backup_selector.css({position:'absolute', "z-index":1});
 					_popupId.isReady().then(function(result){
 						egw.message('Your key has been backedup into  .PGP-Key-Backup successfully.');
 						jQuery(selector).empty();
@@ -1489,7 +1487,8 @@ export const AppJS = (function(){ "use strict"; return Class.extend(
 						},
 						template: egw.webserverUrl+'/api/templates/default/pgp_backup_restore.xet',
 						class: "pgp_backup_restore",
-						modal:true
+						modal:true,
+						width: 700
 			});
 		};
 		if (typeof mailvelope != 'undefined')
diff --git a/api/templates/default/pgp_backup_restore.xet b/api/templates/default/pgp_backup_restore.xet
index 4f1eec0e50..35f2aafb4b 100644
--- a/api/templates/default/pgp_backup_restore.xet
+++ b/api/templates/default/pgp_backup_restore.xet
@@ -14,18 +14,22 @@
 					</row>
 					<row>
 						<et2-image  src="$row_cont[image]"></et2-image>
-						<et2-description  onclick="$row_cont[onclick]" class="click"></et2-description>
+						<et2-description value="$row_cont[label]" onclick="$row_cont[onclick]" class="click"></et2-description>
 					</row>
 				</rows>
 			</grid>
-			<et2-hbox  id="mvelo" width="500px" height="300" class="mveloFrame"></et2-hbox>
+			<et2-hbox  id="mvelo" class="mveloFrame"></et2-hbox>
 		</et2-hbox>
 		<styles>
 			#_mvelo.mveloFrame {
 				border:1px solid silver;
 				display: inline-block;
 				float:right;
-				position:absolute;
+				width: 550px;
+				height: 300px;
+			}
+			#_mvelo.mveloFrame iframe {
+				position: relative !important;
 			}
 			div#_mvelo:before {
 				content: "Select an operation from menu";