Merge pull request #16034 from owncloud/issue-15987-encryption-module-admin-page

Display the module settings in the list of the encryption modules

3 files changed, 5 insertions, 7 deletions

diff --git a/apps/encryption/js/settings-personal.js b/apps/encryption/js/settings-personal.js
index 658ba2a86ec..fa94bea6bc5 100644
--- a/apps/encryption/js/settings-personal.js
+++ b/apps/encryption/js/settings-personal.js
@@ -12,7 +12,7 @@ OC.Encryption = {
 	updatePrivateKeyPassword: function () {
 		var oldPrivateKeyPassword = $('input:password[id="oldPrivateKeyPassword"]').val();
 		var newPrivateKeyPassword = $('input:password[id="newPrivateKeyPassword"]').val();
-		OC.msg.startSaving('#encryption .msg');
+		OC.msg.startSaving('#ocDefaultEncryptionModule .msg');
 		$.post(
 			OC.generateUrl('/apps/encryption/ajax/updatePrivateKeyPassword'),
 			{
@@ -20,10 +20,10 @@ OC.Encryption = {
 				newPassword: newPrivateKeyPassword
 			}
 		).done(function (data) {
-				OC.msg.finishedSuccess('#encryption .msg', data.message);
+				OC.msg.finishedSuccess('#ocDefaultEncryptionModule .msg', data.message);
 			})
 			.fail(function (jqXHR) {
-				OC.msg.finishedError('#encryption .msg', JSON.parse(jqXHR.responseText).message);
+				OC.msg.finishedError('#ocDefaultEncryptionModule .msg', JSON.parse(jqXHR.responseText).message);
 			});
 	}
 };
diff --git a/apps/encryption/templates/settings-admin.php b/apps/encryption/templates/settings-admin.php
index f1cb83f7457..59bc4a8ce3d 100644
--- a/apps/encryption/templates/settings-admin.php
+++ b/apps/encryption/templates/settings-admin.php
@@ -4,9 +4,7 @@
 script('encryption', 'settings-admin');
 script('core', 'multiselect');
 ?>
-<form id="encryption" class="section">
-	<h2><?php p($l->t('ownCloud basic encryption module')); ?></h2>
-
+<form id="ocDefaultEncryptionModule" class="sub-section">
 	<?php if(!$_["initStatus"]): ?>
 		<?php p($l->t("Encryption App is enabled but your keys are not initialized, please log-out and log-in again")); ?>
 	<?php else: ?>
diff --git a/apps/encryption/templates/settings-personal.php b/apps/encryption/templates/settings-personal.php
index 6b8821ca8a8..e0a7fc22eeb 100644
--- a/apps/encryption/templates/settings-personal.php
+++ b/apps/encryption/templates/settings-personal.php
@@ -4,7 +4,7 @@
 script('encryption', 'settings-personal');
 script('core', 'multiselect');
 ?>
-<form id="encryption" class="section">
+<form id="ocDefaultEncryptionModule" class="section">
 	<h2><?php p($l->t('ownCloud basic encryption module')); ?></h2>
 
 	<?php if ($_["initialized"] === \OCA\Encryption\Session::NOT_INITIALIZED ): ?>