diff --git a/scss/ionic.app.scss b/scss/ionic.app.scss
index 7e6e403880482567054c2ea33dddab51bd60bc5d..43045ee2c70a82f2cc1c59c3880b50da9adb1a19 100644
--- a/scss/ionic.app.scss
+++ b/scss/ionic.app.scss
@@ -2259,7 +2259,7 @@ $ionicon-var-badge-editable: $ionicon-var-edit + "\00a0";
height: 44px;
padding-top: 6px;
padding-bottom: 6px;
- img {
+ .flag-image {
position: relative;
bottom: 0;
width: 32px !important;
@@ -2382,7 +2382,7 @@ $ionicon-var-badge-editable: $ionicon-var-edit + "\00a0";
Drop zone component
**********/
-div[dropzone] {
+div[drop-zone] {
border: 2px dashed #bbb;
border-radius: 5px;
padding: 15px;
@@ -2398,7 +2398,7 @@ div[dropzone] {
}
}
-div[dropzone]:hover {
+div[drop-zone]:hover {
background-color: $stable-100-bg;
}
diff --git a/www/i18n/locale-en-GB.json b/www/i18n/locale-en-GB.json
index 748034c2a7c0e581b13537e438708db90e91ce46..8e89d0ea45f6174c596ab1eb1175cc1c82aecea5 100644
--- a/www/i18n/locale-en-GB.json
+++ b/www/i18n/locale-en-GB.json
@@ -146,6 +146,7 @@
"USE_WALLETS_ENCRYPTION": "Secure the list",
"USE_WALLETS_ENCRYPTION_HELP": "Enables you to encrypt the list of your wallets. Authentication required to access it.",
"ENABLE_HELPTIP": "Enable contextual help tips",
+ "DISABLE_HELPTIP": "Disable contextual help tips",
"ENABLE_UI_EFFECTS": "Enable visual effects",
"HISTORY_SETTINGS": "Account operations",
"DISPLAY_UD_HISTORY": "Display produced dividends?",
@@ -617,7 +618,8 @@
"QUESTION_19": "What was your grand-father's job ?",
"RECOVER_ID": "Recover my password...",
"RECOVER_ID_HELP": "If you have a <b>backup file of your identifiers</b>, you can find them by answering your personal questions correctly.",
- "REVOCATION_WITH_FILE" : "Rekoke my member account...",
+ "RECOVER_ID_SELECT_FILE": "Select the <b>backup file of your identifiers</b> to use:",
+ "REVOCATION_WITH_FILE" : "Revoke my member account...",
"REVOCATION_WITH_FILE_DESCRIPTION": "If you have <b>permanently lost your member account credentials (or if account security is compromised), you can use <b>the revocation file</b> of the account <b>to quit the Web Of Trust</b>.",
"REVOCATION_WITH_FILE_HELP": "To <b>permanently revoke</ b> a member account, please drag the revocation file in the box below, or click in the box to search for a file.",
"REVOCATION_WALLET": "Revoke this account immediately",
diff --git a/www/i18n/locale-en.json b/www/i18n/locale-en.json
index a9abc03c90e8c697fb976982d6844bbf6a3b2b53..c0f08fae0d5d9671cd3416b70c511e71c411ed5c 100644
--- a/www/i18n/locale-en.json
+++ b/www/i18n/locale-en.json
@@ -618,7 +618,8 @@
"QUESTION_19": "What was your grand-father's job ?",
"RECOVER_ID": "Recover my password...",
"RECOVER_ID_HELP": "If you have a <b>backup file of your identifiers</b>, you can find them by answering your personal questions correctly.",
- "REVOCATION_WITH_FILE" : "Rekoke my member account...",
+ "RECOVER_ID_SELECT_FILE": "Select the <b>backup file of your identifiers</b> to use:",
+ "REVOCATION_WITH_FILE" : "Revoke my member account...",
"REVOCATION_WITH_FILE_DESCRIPTION": "If you have <b>permanently lost your member account credentials (or if account security is compromised), you can use <b>the revocation file</b> of the account <b>to quit the Web Of Trust</b>.",
"REVOCATION_WITH_FILE_HELP": "To <b>permanently revoke</ b> a member account, please drag the revocation file in the box below, or click in the box to search for a file.",
"REVOCATION_WALLET": "Revoke this account immediately",
diff --git a/www/i18n/locale-fr-FR.json b/www/i18n/locale-fr-FR.json
index 9ea00487514cc4e3458b76e17af5c2a77cc4281b..da23c102caac88173df23aec7448c78f19b08ea1 100644
--- a/www/i18n/locale-fr-FR.json
+++ b/www/i18n/locale-fr-FR.json
@@ -618,6 +618,7 @@
"QUESTION_19": "Quel était le métier de votre grand-père ?",
"RECOVER_ID": "Retrouver mon mot de passe...",
"RECOVER_ID_HELP": "Si vous disposez d'un <b>fichier de sauvegarde de vos identifiants</b>, vous pouvez les retrouver en répondant correctement à vos questions personnelles.",
+ "RECOVER_ID_SELECT_FILE": "Choisissez le <b>fichier de sauvegarde de vos identifiants</b> Ã utiliser :",
"REVOCATION_WITH_FILE": "Révoquer mon compte membre...",
"REVOCATION_WITH_FILE_DESCRIPTION": "Si vous avez <b>définitivement perdus vos identifiants</b> de compte membre (ou que la sécurité du compte est compromise), vous pouvez utiliser <b>le fichier de révocation</b> du compte pour <b>forcer sa sortie définitive de la toile de confiance</b>.",
"REVOCATION_WITH_FILE_HELP": "Pour <b>révoquer définitivement</b> un compte membre, veuillez glisser dans la zone ci-dessous votre fichier de révocation, ou bien cliquer dans la zone pour rechercher un fichier.",
diff --git a/www/js/config.js b/www/js/config.js
index 2c750c1fd7fbd7ffbaf66e22753634e40787cb9e..539e0ce973c6f43dc5ccd1263efee9aec36b2edd 100644
--- a/www/js/config.js
+++ b/www/js/config.js
@@ -98,7 +98,7 @@ angular.module("cesium.config", [])
}
},
"version": "1.5.11",
- "build": "2020-03-12T14:50:16.897Z",
+ "build": "2020-03-13T17:20:00.591Z",
"newIssueUrl": "https://git.duniter.org/clients/cesium-grp/cesium/issues/new"
})
diff --git a/www/js/controllers/app-controllers.js b/www/js/controllers/app-controllers.js
index ca6ff0f1bf03b161c958bf91eed9fc36dba1ee7f..33e5c38d47e2a065d7c35b12d0c23a717ea55ed8 100644
--- a/www/js/controllers/app-controllers.js
+++ b/www/js/controllers/app-controllers.js
@@ -656,7 +656,7 @@ function HomeController($scope, $state, $timeout, $ionicHistory, $translate, $ht
$scope.showLocalesPopover = function(event) {
UIUtils.popover.show(event, {
- templateUrl: 'templates/api/locales_popover.html',
+ templateUrl: 'templates/common/popover_locales.html',
scope: $scope,
autoremove: true,
afterShow: function(popover) {
diff --git a/www/js/controllers/login-controllers.js b/www/js/controllers/login-controllers.js
index f5f40c7e0bd3ce82f778830ec444cffe2d6a53b2..f19bdf2ef5ade8dc8a557f46f02df0ba75204118 100644
--- a/www/js/controllers/login-controllers.js
+++ b/www/js/controllers/login-controllers.js
@@ -43,7 +43,7 @@ function LoginController($scope, $timeout, $controller, csWallet) {
}
-function LoginModalController($scope, $timeout, $q, $ionicPopover, $document, CryptoUtils, csCrypto, ionicReady,
+function LoginModalController($scope, $timeout, $q, $ionicPopover, $window, CryptoUtils, csCrypto, ionicReady,
UIUtils, BMA, Modals, csSettings, Device, parameters) {
'ngInject';
@@ -506,14 +506,17 @@ function LoginModalController($scope, $timeout, $q, $ionicPopover, $document, Cr
});
};
- $scope.fileChanged = function(event) {
- $scope.validatingFile = true;
- $scope.formData.file = event && event.target && event.target.files && event.target.files.length && event.target.files[0];
- if (!$scope.formData.file) {
+ $scope.onFileChanged = function(file) {
+ if (!file || !file.fileData) {
$scope.validatingFile = false;
- return;
+ return; // Skip
}
-
+ $scope.formData.file = {
+ name: file.fileData.name,
+ size: file.fileData.size,
+ content: file.fileContent
+ };
+ $scope.validatingFile = true;
$timeout(function() {
console.debug("[login] key file changed: ", $scope.formData.file);
$scope.validatingFile = true;
@@ -544,51 +547,6 @@ function LoginModalController($scope, $timeout, $q, $ionicPopover, $document, Cr
});
};
- /**
- * On the file chooser
- */
- $scope.openFileChooser = function() {
- var elements = angular.element(document.getElementById('loginImportFile'));
- if (elements && elements.length) {
- elements[0].click();
- }
- }
-
- /**
- * On file drop
- */
- $scope.onKeyFileDrop = function(file) {
- if (!file || !file.fileData) return;
-
- $scope.formData.file = {
- name: file.fileData.name,
- size: file.fileData.size,
- content: file.fileContent
- };
- $scope.validatingFile = true;
- $timeout(function() {
- return $scope.readKeyFile($scope.formData.file, {withSecret: false})
- .then(function (keypair) {
- if (!keypair || !keypair.signPk) {
- $scope.formData.file.valid = false;
- $scope.formData.file.pubkey = undefined;
- }
- else {
- $scope.formData.file.pubkey = CryptoUtils.util.encode_base58(keypair.signPk);
- $scope.formData.file.valid = !$scope.expectedPubkey || $scope.expectedPubkey == $scope.formData.file.pubkey;
- $scope.validatingFile = false;
- }
-
- })
- .catch(function (err) {
- $scope.validatingFile = false;
- $scope.formData.file.valid = false;
- $scope.formData.file.pubkey = undefined;
- UIUtils.onError('ERROR.AUTH_FILE_ERROR')(err);
- });
- });
- };
-
$scope.removeKeyFile = function() {
$scope.formData.file = undefined;
};
diff --git a/www/js/controllers/wallet-controllers.js b/www/js/controllers/wallet-controllers.js
index 9f91322576c1bfe343e0abaf0faccc4a64e36791..27e48324b5aa35170092a93abcfda48ecd447cf2 100644
--- a/www/js/controllers/wallet-controllers.js
+++ b/www/js/controllers/wallet-controllers.js
@@ -1267,13 +1267,12 @@ function WalletSecurityModalController($scope, UIUtils, csWallet, $translate, pa
};
/**
- * Recover Id
+ * Set the file content
*/
-
- $scope.recoverContent = function(file) {
+ $scope.onFileChanged = function(file) {
$scope.hasContent = angular.isDefined(file) && file !== '';
$scope.fileData = file.fileData ? file.fileData : '';
- $scope.isValidFile = $scope.fileData !== '' && $scope.fileData.type == 'text/plain';
+ $scope.isValidFile = $scope.fileData !== '' && $scope.fileData.type === 'text/plain';
if ($scope.isValidFile && $scope.option === 'recoverID') {
$scope.content = file.fileContent.split('\n');
@@ -1325,7 +1324,8 @@ function WalletSecurityModalController($scope, UIUtils, csWallet, $translate, pa
else {
UIUtils.alert.error('ERROR.RECOVER_ID_FAILED');
}
- });
+ })
+ .catch(UIUtils.onError('ERROR.RECOVER_ID_FAILED'));
};
@@ -1482,7 +1482,16 @@ function WalletSecurityModalController($scope, UIUtils, csWallet, $translate, pa
$scope.closeModal();
return UIUtils.loading.hide();
})
- .catch(UIUtils.onError('ERROR.REVOCATION_FAILED'));
+ .catch(function(err) {
+ if ($scope.revocation){
+ $scope.isValidFile = false;
+ $scope.revocationError = err && err.message ||Â err || 'ERROR.REVOCATION_FAILED';
+ UIUtils.loading.hide(10);
+ }
+ else {
+ UIUtils.onError('ERROR.REVOCATION_FAILED')(err);
+ }
+ });
};
diff --git a/www/js/controllers/wallets-controllers.js b/www/js/controllers/wallets-controllers.js
index 8825522a9ec4ba7067f63e32c25df12d2773b7d0..176b134398fcee9fc6f18ba4b1917165a975cbe1 100644
--- a/www/js/controllers/wallets-controllers.js
+++ b/www/js/controllers/wallets-controllers.js
@@ -755,7 +755,8 @@ function WalletListImportModalController($scope, $timeout, BMA, csWallet) {
$scope.isValidFile = false;
$scope.validatingFile = false;
- $scope.importFromFile = function(file) {
+ $scope.onFileChanged = function(file) {
+ console.log(file);
$scope.validatingFile = true;
$scope.hasContent = angular.isDefined(file) && file !== '';
diff --git a/www/js/directives.js b/www/js/directives.js
index c5ffb69b63a08a72024d360f2ce5ed1cc392c66e..fbffd51aba5f12a958cd3e5a9f31c187e929772d 100644
--- a/www/js/directives.js
+++ b/www/js/directives.js
@@ -368,49 +368,97 @@ angular.module('cesium.directives', [])
};
})
-.directive("dropzone", function($parse) {
+.directive("dropZone", function($parse) {
return {
restrict: 'A',
scope: false,
- link: function(scope, elem, attrs) {
- var fn = $parse(attrs.dropzone);
- elem.bind('dragover', function (e) {
- e.stopPropagation();
- e.preventDefault();
- });
- elem.bind('dragenter', function(e) {
- e.stopPropagation();
- e.preventDefault();
- });
- elem.bind('dragleave', function(e) {
- e.stopPropagation();
- e.preventDefault();
- });
- elem.bind('drop', function(e) {
- e.stopPropagation();
- e.preventDefault();
- var fileData = {
- name: e.dataTransfer.files[0].name,
- size: e.dataTransfer.files[0].size,
- type: e.dataTransfer.files[0].type
- };
-
- var reader = new FileReader();
- reader.onload = function(onLoadEvent) {
- scope.$apply(function () {
- fn(scope, {
- file: {
- fileContent: onLoadEvent.target.result,
- fileData : fileData}
- });
+ link: function(scope, elem, attrs) {
+ var fn = $parse(attrs.dropZone);
+ elem.bind('dragover', function (e) {
+ e.stopPropagation();
+ e.preventDefault();
+ });
+ elem.bind('dragenter', function(e) {
+ e.stopPropagation();
+ e.preventDefault();
+ });
+ elem.bind('dragleave', function(e) {
+ e.stopPropagation();
+ e.preventDefault();
+ });
+ elem.bind('drop', function(e) {
+ e.stopPropagation();
+ e.preventDefault();
+ var fileData = {
+ name: e.dataTransfer.files[0].name,
+ size: e.dataTransfer.files[0].size,
+ type: e.dataTransfer.files[0].type
+ };
+
+ var reader = new FileReader();
+ reader.onload = function(onLoadEvent) {
+ scope.$apply(function () {
+ fn(scope, {
+ file: {
+ fileContent: onLoadEvent.target.result,
+ fileData : fileData}
});
- };
- reader.readAsText(e.dataTransfer.files[0]);
- });
+ });
+ };
+ reader.readAsText(e.dataTransfer.files[0]);
+ });
}
};
})
+
+ // See http://embed.plnkr.co/2vgnFe/
+ .directive('fileSelect', function ($parse) {
+ 'use strict';
+
+ return {
+ restrict: 'A',
+ scope: false,
+ template: '<input type="file" style="display: none;" />' +
+ '<ng-transclude></ng-transclude>',
+ transclude: true,
+ link: function (scope, element, attrs) {
+ var fn = $parse(attrs.fileSelect);
+
+ var fileInput = element.children('input[file]');
+
+ if (attrs.accept) {
+ fileInput[0].accept = attrs.accept;
+ }
+
+ fileInput.on('change', function (onChangeEvent) {
+ var reader = new FileReader();
+ var fileData = {
+ name: this.files[0].name,
+ size: this.files[0].size,
+ type: this.files[0].type
+ };
+
+ reader.onload = function(onLoadEvent) {
+ scope.$applyAsync(function() {
+ fn(scope, {
+ file: {
+ fileContent: onLoadEvent.target.result,
+ fileData : fileData}
+ });
+ });
+ };
+ reader.readAsText((onChangeEvent.srcElement || onChangeEvent.target).files[0]);
+ });
+
+ element.on('click', function () {
+ fileInput[0].click();
+ });
+ }
+ };
+ })
+
+
// Un-authenticate when window closed
// see: https://stackoverflow.com/questions/28197316/javascript-or-angularjs-defer-browser-close-or-tab-close-between-refresh
.directive('windowExitUnauth', function($window, csSettings, csWallet) {
@@ -427,5 +475,5 @@ angular.module('cesium.directives', [])
});
}
};
- })
+ });
;
diff --git a/www/js/platform.js b/www/js/platform.js
index 6bbb1afb95528ca0590716edfca1493f5252a07b..595eac512d809807dcaee4e657c6c7ee1b2ccf3e 100644
--- a/www/js/platform.js
+++ b/www/js/platform.js
@@ -35,7 +35,12 @@ angular.module('cesium.platform', ['ngIdle', 'cesium.config', 'cesium.services']
.config(function($compileProvider, csConfig) {
'ngInject';
- $compileProvider.debugInfoEnabled(csConfig.debug === true);
+
+ $compileProvider.debugInfoEnabled(csConfig.debug === true);
+
+ // Fix issue #893
+ // See https://stackoverflow.com/questions/31859257/firefox-addon-using-angularjs-ng-src-not-working
+ $compileProvider.imgSrcSanitizationWhitelist(/^\s*(filesystem:resource|resource|moz-extension|chrome-extension|file):/);
})
.config(function($animateProvider) {
diff --git a/www/js/services/wallet-services.js b/www/js/services/wallet-services.js
index 1cf3b51c004d22dc5642f19c204ab2a381dff2a5..dc60b69582ddc2a2890f8995931ad28c6a5aa705 100644
--- a/www/js/services/wallet-services.js
+++ b/www/js/services/wallet-services.js
@@ -1749,6 +1749,9 @@ angular.module('cesium.wallet.services', ['ngApi', 'ngFileSaver', 'cesium.bma.se
},
recoverId = function(recover) {
+ if (!recover ||Â !recover.cypherNonce || !recover.cypherSalt ||Â !recover.cypherPwd) {
+ throw {message:'ERROR.INVALID_FILE_FORMAT'};
+ }
var nonce = CryptoUtils.util.decode_base58(recover.cypherNonce);
return getkeypairSaveId(recover)
.then(function (recover) {
@@ -1763,7 +1766,8 @@ angular.module('cesium.wallet.services', ['ngApi', 'ngFileSaver', 'cesium.bma.se
return recover;
})
.catch(function(err){
- console.warn('Incorrect answers - Unable to recover passwords');
+ console.warn('Incorrect answers: unable to recover identifiers', err);
+ throw new Error('Incorrect answers: unable to recover identifiers');
});
},
diff --git a/www/templates/api/home.html b/www/templates/api/home.html
index 017cf794a8d878d9fc3545b42d0a2a27d4abd899..e7d90af699230bb16eb390cfb3fbcd9f7dece1e3 100644
--- a/www/templates/api/home.html
+++ b/www/templates/api/home.html
@@ -7,8 +7,8 @@
<!-- locales -->
<button class="button button-clear hidden-xs hidden-sm flag"
ng-click="showLocalesPopover($event)" style="align-content: center">
- <img ng-src="../img/flag-{{$root.settings.locale.flag}}.png"/>
- <b class="icon-secondary ion-arrow-down-b gray"></b>
+ <i class="flag-image" style="background-image: url(../img/flag-{{$root.settings.locale.flag}}.png);"></i>
+ <b class="ion-arrow-down-b gray"></b>
</button>
</ion-nav-buttons>
diff --git a/www/templates/api/locales_popover.html b/www/templates/api/popover_locales.html
similarity index 100%
rename from www/templates/api/locales_popover.html
rename to www/templates/api/popover_locales.html
diff --git a/www/templates/home/locales_popover.html b/www/templates/common/popover_locales.html
similarity index 100%
rename from www/templates/home/locales_popover.html
rename to www/templates/common/popover_locales.html
diff --git a/www/templates/home/home.html b/www/templates/home/home.html
index 61b5ff0f788c080b46109ad1d46afc4de6149ac1..580448d6b74b78cc87534a5e809870555ad17a99 100644
--- a/www/templates/home/home.html
+++ b/www/templates/home/home.html
@@ -6,7 +6,7 @@
<!-- locales -->
<button class="button button-clear hidden-xs hidden-sm flag"
ng-click="showLocalesPopover($event)" style="align-content: center">
- <img ng-src="./img/flag-{{$root.settings.locale.flag}}.png"/>
+ <i class="flag-image" style="background-image: url(./img/flag-{{$root.settings.locale.flag}}.png);"></i>
<b class="ion-arrow-down-b gray"></b>
</button>
</ion-nav-buttons>
diff --git a/www/templates/login/form_file_import.html b/www/templates/login/form_file_import.html
index 0008161a4035d56feac05af82f7e7d8c06b7066e..be3018a26a58eb4c9d24e7b3b73729fb1b5ec293 100644
--- a/www/templates/login/form_file_import.html
+++ b/www/templates/login/form_file_import.html
@@ -7,16 +7,13 @@
<span class="positive" translate>LOGIN.FILE.HELP</span>
</div>
-<div dropzone="onKeyFileDrop(file)">
- <div ng-if="!formData.file" ng-click="openFileChooser()">
+<div drop-zone="onFileChanged(file)">
+ <div ng-if="!formData.file" file-select="onFileChanged(file)" accept=".dunikey,.yml">
<h2 class="gray" translate>COMMON.CHOOSE_FILE</h2>
- <input type="file" id="loginImportFile" accept=".dunikey,.yml"
- style="visibility:hidden; position:absolute;"
- onchange="angular.element(this).scope().fileChanged(event)"/>
</div>
<div class="item item-icon-left item-icon-right stable-bg"
- ng-if="formData.file" >
+ ng-if="formData.file" >
<i class="icon ion-document-text dark"></i>
<div class="item-content row">
<div class="col">
diff --git a/www/templates/wallet/list/modal_import_file.html b/www/templates/wallet/list/modal_import_file.html
index 9144ade05c660d293d5157224ea2be0478198de6..6dd572e926e5be387b1bc7701875a5ee90170700 100644
--- a/www/templates/wallet/list/modal_import_file.html
+++ b/www/templates/wallet/list/modal_import_file.html
@@ -1,6 +1,6 @@
<ion-modal-view id="transfer" class="modal-full-height">
<ion-header-bar class="bar-positive">
- <button class="button button-clear" ng-click="closeModal()" translate>COMMON.BTN_CANCEL</button>
+ <button class="button button-clear visible-xs" ng-click="closeModal()" translate>COMMON.BTN_CANCEL</button>
<h1 class="title" translate>ACCOUNT.WALLET_LIST.IMPORT_MODAL.TITLE</h1>
</ion-header-bar>
@@ -8,11 +8,11 @@
<p translate>ACCOUNT.WALLET_LIST.IMPORT_MODAL.HELP</p>
- <div dropzone="importFromFile(file)">
- <div ng-if="!hasContent" onclick="angular.element(document.querySelector('#walletsImportFile'))[0].click();">
+ <div drop-zone="onFileChanged(file)">
+ <div ng-if="!hasContent"
+ file-select="onFileChanged(file)"
+ accept=".csv,.txt">
<h2 class="gray" translate>COMMON.CHOOSE_FILE</h2>
- <input type="file" id="walletsImportFile" accept=".csv,.txt"
- style="visibility:hidden; position:absolute;" on-read-file="importFromFile(file)"/>
</div>
<div ng-if="hasContent" class="item item-icon-left item-icon-right stable-bg">
diff --git a/www/templates/wallet/slides/slides_recoverID_1.html b/www/templates/wallet/slides/slides_recoverID_1.html
index d2be1194284cb66c31e766b73f83b8504c06cd36..888c00a04b464566a6a8ac97e4c99a6035cf3428 100644
--- a/www/templates/wallet/slides/slides_recoverID_1.html
+++ b/www/templates/wallet/slides/slides_recoverID_1.html
@@ -1,26 +1,27 @@
<ion-content class="has-header padding" >
- <h3 translate>ACCOUNT.SECURITY.RECOVER_ID</h3>
+ <p translate>ACCOUNT.SECURITY.RECOVER_ID_SELECT_FILE</p>
- <div dropzone="recoverContent(file)">
- <div ng-if="!hasContent" onclick="angular.element(document.querySelector('#saveIdFile'))[0].click();">
+ <div drop-zone="onFileChanged(file)">
+ <div ng-if="!hasContent" file-select="onFileChanged(file)" accept=".txt">
<h2 class="gray" translate>COMMON.CHOOSE_FILE</h2>
- <input type="file" id="saveIdFile" accept=".txt"
- style="visibility:hidden; position:absolute;" on-read-file="recoverContent(file)"/>
</div>
- <div ng-if="hasContent" class="item row item-icon-left no-padding">
- <i class="icon ion-document-text gray"></i>
- <div class="col">
- <span>{{fileData.name}}</span>
- <br />
- <small>{{fileData.size}} Ko</small>
- </div>
- <div class="col-10">
- <b ng-class="{'ion-android-done balanced': isValidFile,'ion-close-circled assertive': !isValidFile}"
- style="font-size: 28px; position: relative; top: 6px;"></b>
- <button class="button-icon ion-close-round gray pull-right" style="font-size:10px;"
- ng-click="restore()"></button>
- </div>
+ <div ng-if="hasContent" class="item item-icon-left item-icon-right">
+ <i class="icon ion-document-text dark"></i>
+ <div class="item-content row">
+ <div class="col ">
+ <span>{{fileData.name}}</span>
+ <br />
+ <small>{{fileData.size}} Ko</small>
+ </div>
+ <div class="col-10">
+ <b ng-class="{'ion-close-circled assertive': !isValidFile}"
+ style="font-size: 28px; position: relative; top: 6px;"></b>
+ </div>
+ </div>
+ <!-- remove file button -->
+ <a class="ion-close-round gray pull-right" style="font-size: 10px; position: absolute; top: 6px; right: 6px;"
+ ng-click="restore()"></a>
</div>
</div>
diff --git a/www/templates/wallet/slides/slides_revocation_file.html b/www/templates/wallet/slides/slides_revocation_file.html
index dc31d88b3ffe3a848667593aa33b0ef6706762f1..945031dc5fa05d82ad9616da56c2342e2b6af0f1 100644
--- a/www/templates/wallet/slides/slides_revocation_file.html
+++ b/www/templates/wallet/slides/slides_revocation_file.html
@@ -1,26 +1,34 @@
<ion-content class="has-header padding" >
<p translate>ACCOUNT.SECURITY.REVOCATION_WITH_FILE_HELP</p>
- <div dropzone="recoverContent(file)">
- <div ng-if="!hasContent" onclick="angular.element(document.querySelector('#revocationFile'))[0].click();">
+ <div drop-zone="onFileChanged(file)">
+ <div ng-if="!hasContent" file-select="onFileChanged(file)" accept=".txt">
<h2 class="gray" translate>COMMON.CHOOSE_FILE</h2>
- <input type="file" id="revocationFile" accept=".txt"
- style="visibility:hidden; position:absolute;" on-read-file="recoverContent(file)"/>
</div>
- <div ng-if="hasContent" class="item row item-icon-left no-padding">
- <i class="icon ion-document-text gray"></i>
- <div class="col">
- <span>{{fileData.name}}</span>
- <br />
- <small>{{fileData.size}} Ko</small>
- </div>
- <div class="col-10">
- <b ng-class="{'ion-android-done balanced': isValidFile,'ion-close-circled assertive': !isValidFile}"
- style="font-size: 28px; position: relative; top: 6px;"></b>
- <button class="button-icon ion-close-round gray pull-right" style="font-size:10px;"
- ng-click="restore()"></button>
+ <div ng-if="hasContent" class="item item-icon-left item-icon-right">
+ <i class="icon ion-document-text dark"></i>
+ <div class="row">
+ <div class="col">
+ <h2>{{fileData.name}}</h2>
+ <h4 ng-if="fileData.lastModified">
+ <span class="gray" translate>COMMON.FILE.DATE</span> {{fileData.lastModified/1000|formatDate}}
+ </h4>
+ <h5>
+ <span class="gray" translate>COMMON.FILE.SIZE</span> {{fileData.size|formatInteger}} Ko
+ </h5>
+ </div>
+ <div class="col padding-left">
+ <h3 class="assertive animate-show-hide ng-hide" ng-show="!isValidFile"><br/>
+ <i class="ion-close-circled assertive"></i>
+ {{revocationError|translate}}
+ </h3>
+ </div>
</div>
+
+ <!-- remove file button -->
+ <a class="ion-close-round gray pull-right" style="font-size: 10px; position: absolute; top: 6px; right: 6px;"
+ ng-click="restore()"></a>
</div>
</div>