summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--settings/css/settings.css4
-rw-r--r--settings/js/admin.js1
-rw-r--r--settings/templates/admin.php6
3 files changed, 10 insertions, 1 deletions
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 583e8804951..4e398c64c4e 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -494,3 +494,7 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
#encryptionModules {
padding: 10px;
}
+
+#warning {
+ color: red;
+}
diff --git a/settings/js/admin.js b/settings/js/admin.js
index 9cdb7f5b0f1..e10e1f915cb 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -55,6 +55,7 @@ $(document).ready(function(){
});
$('#encryptionEnabled').change(function() {
+ $('#encryptionAPI div#EncryptionWarning').toggleClass('hidden');
$('#encryptionAPI div#EncryptionSettingsArea').toggleClass('hidden');
});
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 5edf4e2a9c7..9938b6d01f0 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -321,11 +321,15 @@ if ($_['cronErrors']) {
<p id="enable">
<input type="checkbox" name="encryption_enabled"
id="encryptionEnabled"
- value="1" <?php if ($_['encryptionEnabled']) print_unescaped('checked="checked"'); ?> />
+ value="1" <?php if ($_['encryptionEnabled']) print_unescaped('checked="checked" disabled="disabled"'); ?> />
<label
for="encryptionEnabled"><?php p($l->t('Enable server-side encryption')); ?> <span id="startmigration_msg" class="msg"></span> </label><br/>
</p>
+ <div id="EncryptionWarning" class="warning hidden">
+ <?php p($l->t('Once encryption is enabled there is no way to disable it again. This is your last chance to disable it again.')) ?>
+ </div>
+
<div id="EncryptionSettingsArea" class="<?php if (!$_['encryptionEnabled']) p('hidden'); ?>">
<div id='selectEncryptionModules' class="<?php if (!$_['encryptionReady']) p('hidden'); ?>">
<?php