Merge branch 'add-backup-notice'

Author: animalillo

controller/translationcontroller.php

@@ -104,6 +104,8 @@ public function getLanguageStrings() {
 			'settings.password' => $this->trans->t('Password settings'),
 			'settings.import' => $this->trans->t('Import credentials'),
 			'settings.export' => $this->trans->t('Export credentials'),
+			'settings.vault.change.password.hint' => $this->trans->t('Since all data has to be downloaded, re-encrypted and uploaded again when changing the password, this process is error-prone. It is strongly recommended to have an updated backup of your vault before changing the password.'),
+			'settings.vault.change.password.confirm' => $this->trans->t('I understand the risks'),
 			'settings.sharing' => $this->trans->t('Sharing'),
 			'changepw.navigate.away.warning' => $this->trans->t('Are you sure you want to leave? This will destroy all your credentials'),
 			'incorrect.password' => $this->trans->t('Old password field incorrect!'),

css/app.css

@@ -214,7 +214,7 @@
 					}
 				});
 
-
+				$scope.confirm_vault_pw_change = false;
 				$scope.changeVaultPassword = function (oldVaultPass, newVaultPass, newVaultPass2) {
 					$scope.error = '';
 					if (oldVaultPass !== VaultService.getActiveVault().vaultKey) {

css/app.css.map

@@ -110,3 +110,14 @@ h3 {
 .password-settings-padding-left-fix{
   padding-left: 0 !important;
 }
+.change-password-hint {
+  margin-top: 10px;
+  margin-bottom: 10px;
+}
+label[for=confirmVaultPWChange] {
+  margin-bottom: 10px;
+}
+label[for=confirmVaultDelete] {
+  margin-top: 10px;
+  margin-bottom: 10px;
+}

js/app/controllers/settings.js

@@ -25,8 +25,13 @@ <h3>{{ 'change.vault.key' | translate}}</h3>
 					<li ng-show="vault_key_score.score < minimal_value_key_strength">{{'min.vault.key.strength' | translate:required_score}}</li>
 				</ul>
 			</div>
-			<button ng-click="changeVaultPassword(oldVaultPass,newVaultPass,newVaultPass2)" ng-disabled="vault_key_score.score < minimal_value_key_strength"
-			>{{ 'change' | translate}}
+			<p class="change-password-hint">{{'settings.vault.change.password.hint' | translate}}</p>
+			<input id="confirmVaultPWChange" class="checkbox" type="checkbox"
+				   ng-model="$parent.confirm_vault_pw_change">
+			<label for="confirmVaultPWChange">{{'settings.vault.change.password.confirm' | translate}}</label>
+			<button ng-click="changeVaultPassword(oldVaultPass,newVaultPass,newVaultPass2)"
+					ng-disabled="vault_key_score.score < minimal_value_key_strength || !$parent.confirm_vault_pw_change">
+				{{ 'change' | translate}}
 			</button>
 			<div ng-show="change_pw.total > 0">
 				{{'warning.leave' | translate}}<br />
@@ -47,7 +52,9 @@ <h3>{{'delete.vault' | translate}}</h3>
 				   ng-model="$parent.confirm_vault_delete">
 			<label for="confirmVaultDelete">{{'delete.vault.checkbox' | translate}}</label>
 
-			<button class="btn btn-danger" ng-click="delete_vault()">{{'delete.vault.confirm' | translate}}</button>
+			<button class="btn btn-danger" ng-click="delete_vault()" ng-disabled="!$parent.confirm_vault_delete">
+				{{'delete.vault.confirm' | translate}}
+			</button>
 			<div ng-show="remove_pw">
 				{{'deleting.pw' | translate:translationData}}
 				<div progress-bar="remove_pw.percent" index="remove_pw.done" total="remove_pw.total"></div>