anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1239 from matiu/bug/create

Browse source 
rename #setup to #create
This commit is contained in:
Manuel Aráoz 2014-09-01 11:25:49 -03:00
commit 21d7ea5411
5 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
js/controllers/setup.js → js/controllers/create.js
View file

@ -32,7 +32,7 @@ var valid_pairs = {
'1,12': 489 '1,12': 489
}; };
angular.module('copayApp.controllers').controller('SetupController', angular.module('copayApp.controllers').controller('CreateController',
function($scope, $rootScope, $location, $timeout, walletFactory, controllerUtils, Passphrase, backupService, notification) { function($scope, $rootScope, $location, $timeout, walletFactory, controllerUtils, Passphrase, backupService, notification) {
controllerUtils.redirIfLogged(); controllerUtils.redirIfLogged();

4
js/routes.js
View file

@ -22,8 +22,8 @@ angular
templateUrl: 'views/import.html', templateUrl: 'views/import.html',
validate: false validate: false
}) })
.when('/setup', { .when('/create', {
templateUrl: 'views/setup.html', templateUrl: 'views/create.html',
validate: false validate: false
}) })
.when('/copayers', { .when('/copayers', {

6
test/unit/controllers/controllersSpec.js
View file

@ -65,11 +65,11 @@ describe("Unit: Controllers", function() {
}); });
}); });
describe('Setup Controller', function() { describe('Create Controller', function() {
var setupCtrl; var c;
beforeEach(inject(function($controller, $rootScope) { beforeEach(inject(function($controller, $rootScope) {
scope = $rootScope.$new(); scope = $rootScope.$new();
setupCtrl = $controller('SetupController', { c = $controller('CreateController', {
$scope: scope, $scope: scope,
}); });
})); }));

2
views/setup.html → views/create.html
View file

@ -1,4 +1,4 @@
<div ng-controller="SetupController"> <div ng-controller="CreateController">
<div data-alert class="loading-screen" ng-show="loading"> <div data-alert class="loading-screen" ng-show="loading">
<i class="size-60 fi-bitcoin-circle icon-rotate spinner"></i> <i class="size-60 fi-bitcoin-circle icon-rotate spinner"></i>
Creating wallet... Creating wallet...

4
views/home.html
View file

@ -9,13 +9,13 @@
<a class="text-white" href="#!/open">Open a wallet</a> <a class="text-white" href="#!/open">Open a wallet</a>
</div> </div>
<div class="button-setup" ng-show="!hasWallets"> <div class="button-setup" ng-show="!hasWallets">
<a class="text-secondary" href="#!/setup">Create a new wallet</a> <a class="text-secondary" href="#!/create">Create a new wallet</a>
</div> </div>
<div class="button-setup"> <div class="button-setup">
<a class="text-primary" href="#!/join">Join a Wallet in Creation</a> <a class="text-primary" href="#!/join">Join a Wallet in Creation</a>
</div> </div>
<div class="button-setup" ng-show="hasWallets"> <div class="button-setup" ng-show="hasWallets">
<a class="text-secondary" href="#!/setup">Create a wallet</a> <a class="text-secondary" href="#!/create">Create a wallet</a>
</div> </div>
<div class="footer-setup"> <div class="footer-setup">