diff --git a/www/i18n/locale-en.json b/www/i18n/locale-en.json index 97cb8a5a8c2141da658eaad8538991493cdc8859..2a82c3234501bc5b2f4b5cfd91884a249df725b3 100644 --- a/www/i18n/locale-en.json +++ b/www/i18n/locale-en.json @@ -155,7 +155,7 @@ "RESULTS": "Results:" }, "VIEW": { - "TITLE": "" + "TITLE": "Ad" }, "EDIT": { "TITLE": "Edit", @@ -194,7 +194,7 @@ "RESULTS": "Results:" }, "VIEW": { - "TITLE": "Annonce" + "TITLE": "Registry" }, "NEW": { "TITLE": "New", diff --git a/www/i18n/locale-fr-FR.json b/www/i18n/locale-fr-FR.json index 3f2789c01d913febeae73a328519f5a513c1d7e8..a6f7d3b3873a84a3c5d90afc3e55484c9ef224f3 100644 --- a/www/i18n/locale-fr-FR.json +++ b/www/i18n/locale-fr-FR.json @@ -194,7 +194,7 @@ "RESULTS": "Résultats :" }, "VIEW": { - "TITLE": "" + "TITLE": "Annuaire" }, "NEW": { "TITLE": "Nouveau", @@ -246,7 +246,7 @@ "COPY_CLIPBOARD_FAILED": "Copie de la valeur impossible", "TAKE_PICTURE_FAILED": "Echec de la récupération de la photo", "SCAN_FAILED": "Echec du scan de QR Code", - "WOT_LOOKUP_FAILED": "Echec de la recherche", + "WOT_LOOKUP_FAILED": "Echec de la recherche" }, "INFO": { "POPUP_TITLE": "Information", diff --git a/www/js/config.js b/www/js/config.js index c2dcc35fbf7aaa9e1508c5a8a681cfcc57be2de0..d48cfa2a4f511ce4fbb2f56ec165c0b982739328 100644 --- a/www/js/config.js +++ b/www/js/config.js @@ -10,8 +10,9 @@ angular.module("cesium.config", []) .constant("APP_CONFIG", { "UCOIN_NODE": "cgeek.fr:9330", + "UCOIN_NODE_ES": "data.duniter.fr", "VERSION": "0.0.1", - "BUILD_DATE": "2016-05-02T20:37:30.089Z" + "BUILD_DATE": "2016-05-04T08:08:51.555Z" }) -; \ No newline at end of file +; diff --git a/www/js/controllers/home-controllers.js b/www/js/controllers/home-controllers.js index 55f2790b2ed45f100086ae771a4f400f80698eb0..6b0666eddc008c1839098aabed8ef689319da177 100644 --- a/www/js/controllers/home-controllers.js +++ b/www/js/controllers/home-controllers.js @@ -162,7 +162,7 @@ function NewAccountWizardController($scope, $ionicModal, $state, $ionicSideMenuD Wallet.self($scope.accountData.pseudo, false/*do NOT load membership here*/) .then(function() { // Send membership IN - Wallet.membership(true) + Wallet.membership.inside() .then(function() { // Reset account data, and open wallet view $scope.cancel(); diff --git a/www/js/controllers/wot-controllers.js b/www/js/controllers/wot-controllers.js index d4eb1af248ec85f3aa1f5c6859d147eec73179c5..5825514188c829771e21cc55ac1b6fb36e0edb27 100644 --- a/www/js/controllers/wot-controllers.js +++ b/www/js/controllers/wot-controllers.js @@ -152,6 +152,8 @@ function IdentityController($scope, $state, BMA, Wallet, UIUtils, $q, $timeout, $scope.loadWallet() .then(function(walletData) { UIUtils.loading.show(); + + // TODO: ask user confirm - see issue https://github.com/duniter/cesium/issues/12 Wallet.certify($scope.identity.uid, $scope.identity.pub, $scope.identity.timestamp, diff --git a/www/templates/wot/view_identity.html b/www/templates/wot/view_identity.html index 8b17994cccffbadf1ce5490383f3f27981d78ff0..cd4d2743e60407e508b73b57411ab277955e1ceb 100644 --- a/www/templates/wot/view_identity.html +++ b/www/templates/wot/view_identity.html @@ -24,7 +24,7 @@ {{'ACCOUNT.BTN_SEND_MONEY' | translate}} </button> - <button class="button button-raised icon-left ion-person" ng-click="certifyIdentity()" ng-if="hasSelf"> + <button class="button button-raised icon-left ion-ribbon-b" ng-click="certifyIdentity()" ng-if="hasSelf"> {{'WOT.BTN_CERTIFY' | translate}} </button> </div>