diff --git a/www/i18n/locale-fr-FR.json b/www/i18n/locale-fr-FR.json index 4a3dd19d90ce91324ac9996f326abef16fd69df2..dd9fda620c558a9b2d79f54ea97dd6375d483574 100644 --- a/www/i18n/locale-fr-FR.json +++ b/www/i18n/locale-fr-FR.json @@ -129,77 +129,6 @@ "TITLE": "Paiement" } }, - "MARKET": { - "COMMON": { - "CATEGORY": "Catégorie", - "CATEGORIES": "Catégories", - "ISSUER": "Soumis par", - "PRICE": "Prix", - "BTN_BUY": "Acheter" - }, - "SEARCH": { - "TITLE": "Annonces", - "SEARCH_HELP": "Recherche (voiture, livre...)", - "BTN_ADD": "Nouveau", - "BTN_OPTIONS": "Recherche avancée", - "BTN_AROUND_ME": "Autour de moi", - "LOCATION": "Localisation", - "LOCATION_HELP": "Ville" - }, - "VIEW": { - "TITLE": "Annonce" - }, - "EDIT": { - "TITLE": "Edition", - "BTN_ADD_PICTURES": "Ajouter des photos", - "RECORD_TITLE": "Titre", - "RECORD_TITLE_HELP": "Titre", - "RECORD_DESCRIPTION": "Description", - "RECORD_DESCRIPTION_HELP": "Description", - "RECORD_PRICE": "Prix", - "RECORD_PRICE_HELP": "Prix (optionnel)", - "RECORD_LOCATION": "Ville", - "RECORD_LOCATION_HELP": "Adresse, Ville" - } - }, - "REGISTRY": { - "COMMON": { - "CATEGORY": "Catégorie", - "CATEGORIES": "Catégories", - "ISSUER": "Soumis par" - }, - "SEARCH": { - "TITLE": "Annuaire", - "SEARCH_HELP": "Recherche (nom, pseudo, clé publique...)", - "BTN_ADD": "Nouveau", - "BTN_OPTIONS": "Recherche avancée", - "LOCATION": "Localisation", - "LOCATION_HELP": "Ville" - }, - "VIEW": { - "TITLE": "" - }, - "NEW": { - "TITLE": "Nouveau", - "SELECT_TYPE": "Type d'ajout :", - "TYPE_PARTICULAR": "Particulier", - "TYPE_COMPANY": "Entreprise, organisme ou institution" - }, - "EDIT": { - "TITLE": "Edition", - "BTN_ADD_PICTURES": "Ajouter des photos", - "RECORD_TITLE": "Nom", - "RECORD_TITLE_HELP": "Nom", - "RECORD_DESCRIPTION": "À propos de moi", - "RECORD_DESCRIPTION_HELP": "À propos de moi", - "RECORD_PRICE": "Prix", - "RECORD_PRICE_HELP": "Prix (optionnel)", - "RECORD_LOCATION": "Localisation", - "RECORD_LOCATION_HELP": "Localisation (adresse, ville)", - "RECORD_SOCIAL_NETWORKS": "Réseaux sociaux", - "RECORD_PUBKEY": "Clé publique" - } - }, "ERROR": { "POPUP_TITLE": "Erreur", "UNKNOWN_ERROR": "Erreur inconnue", diff --git a/www/js/config.js b/www/js/config.js index 833a34d7b7194702ecc085facee903dd70a096f0..785c6ff5aea202b06b176436dca21e5b0cf9d987 100644 --- a/www/js/config.js +++ b/www/js/config.js @@ -10,9 +10,8 @@ angular.module("cesium.config", []) .constant("APP_CONFIG", { "UCOIN_NODE": "twiced.fr:9330", - "UCOIN_NODE_ES": "es.ucoin.fr", "VERSION": "0.0.1", "BUILD_DATE": "2016-04-16T16:07:33.159Z" }) -; \ No newline at end of file +; diff --git a/www/js/controllers.js b/www/js/controllers.js index 5560427335bbeabcc6012005f46c8c2385341045..c2bed9b556a4550b4a4f82f55179120eb09de9b3 100644 --- a/www/js/controllers.js +++ b/www/js/controllers.js @@ -6,9 +6,7 @@ angular.module('cesium.controllers', [ 'cesium.currency.controllers', 'cesium.wot.controllers', 'cesium.transfer.controllers', - 'cesium.settings.controllers', - 'cesium.market.controllers', - 'cesium.registry.controllers' + 'cesium.settings.controllers' ]) .config(function($httpProvider) { diff --git a/www/js/controllers/app-controllers.js b/www/js/controllers/app-controllers.js index 8a0155c198290fbc0a083cee931969193a2cc1e4..8b50ddb3e3c801a9fc7fbcc04f0f0ee22487cce5 100644 --- a/www/js/controllers/app-controllers.js +++ b/www/js/controllers/app-controllers.js @@ -27,19 +27,6 @@ angular.module('cesium.app.controllers', ['cesium.services']) .controller('AppCtrl', AppController) - //.controller('LoginCtrl', LoginController) - -// .factory('AppModals', ['ModalService', function(ModalService){ -// function showLogin(walletData){ -// return ModalService.show('templates/login.html', 'LoginCtrl', walletData); -// } -// -// // all app modals here -// return { -// showLogin: showLogin -// }; -// -// }]) ; function LoginModalController($scope, $ionicModal, Wallet, CryptoUtils, UIUtils, $q, $state, $timeout, $ionicSideMenuDelegate, $ionicHistory) { @@ -201,23 +188,11 @@ function AppController($scope, $ionicModal, $state, $ionicSideMenuDelegate, UIUt $scope.hasHeaderFabLeft = false; $scope.hasHeaderFabRight = false; $scope.system = System; - $scope.options = { - market: { - enable: !!Market - }, - registry: { - enable: !!Registry - } - }; LoginModalController.call(this, $scope, $ionicModal, Wallet, CryptoUtils, UIUtils, $q, $state, $timeout, $ionicSideMenuDelegate, $ionicHistory); TransferModalController.call(this, $scope, $ionicModal, $state, BMA, Wallet, UIUtils, $timeout, System); - ionic.Platform.ready(function() { - //System.init(navigator); - }); - //////////////////////////////////////// // Load currencies //////////////////////////////////////// diff --git a/www/js/services.js b/www/js/services.js index 650bb8320419e8dfbff7c1f83fe591a1a8accb6a..4723b2c850eff0ba47952b112974174d2f8431ca 100644 --- a/www/js/services.js +++ b/www/js/services.js @@ -3,8 +3,6 @@ angular.module('cesium.services', [ 'cesium.bma.services', 'cesium.crypto.services', 'cesium.utils.services', - 'cesium.wallet.services', - 'cesium.market.services', - 'cesium.registry.services' + 'cesium.wallet.services' ]) ;